From 5a598077761f12126301989e98fd158f818aa0d5 Mon Sep 17 00:00:00 2001
From: iainp5 <iain.pearce.ip@gmail.com>
Date: Fri, 20 Sep 2024 14:54:42 +0100
Subject: Updates to log in scoring

---
 rules.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/rules.js b/rules.js
index 1a4e1ca..2bf4d38 100644
--- a/rules.js
+++ b/rules.js
@@ -644,7 +644,7 @@ states.resolve_opponent_event = {
 		game.return_state = 'resolve_opponent_event'
 		if (auto_resolve_events.includes(game.played_card) || switch_events.includes(game.played_card)) {
 			game.return = game.active
-			log(`C${game.played_card}`)
+			log(`Played C${game.played_card} for the event`)
 			goto_vm(game.played_card)}
 		else {
 			if (game.active === DEM) {
@@ -1164,8 +1164,8 @@ states.raise_stakes_2 = {
 		log('Raised the stakes')
 		game.raised_stakes_discard = 0
 		game.valid_cards = []
-		next_player()
 		log_h2('Play Cards')
+		next_player()
 		game.state = 'begin_power_struggle'
 	},
 }
@@ -1391,16 +1391,16 @@ states.support_loss ={
 		log(`Rolled a ${roll}`)
 		if ((game.played_power_card >= 25 && game.played_power_card <= 30) || game.played_power_card === 53) { rally_win = 2}
 		if ((game.played_power_card >= 31 && game.played_power_card <= 36) || game.played_power_card === 54) { petition_win = 2}
-		roll = roll + game.raised_stakes + rally_win - petition_win
+		let modified_roll = roll + game.raised_stakes + rally_win - petition_win
 
 		// Roll modifiers
 		if (game.active === COM && game.persistent_events['yakovlev']) {
 			log('+1 from C62')
-			roll ++
+			modified_roll ++
 		}
 
-		if (roll < 0) {roll = 0}
-		else if (roll > 7) {roll = 7}
+		if (modified_roll < 0) {modified_roll = 0}
+		else if (modified_roll > 7) {modified_roll = 7}
 
 		
 		if (game.raised_stakes !== 0) {
@@ -1412,8 +1412,10 @@ states.support_loss ={
 		if (petition_win !== 0) {
 			log('-2 from winning on a P31')
 		}
-		log(`Modified roll: ${roll}`)
-		game.available_ops = support_loss_roll[roll]
+		if (modified_roll !== roll) {
+			log(`Modified roll: ${modified_roll}`)
+		}
+		game.available_ops = support_loss_roll[modified_roll]
 		game.phase++
 		valid_spaces_support_loss()
 	},
@@ -3333,6 +3335,7 @@ function check_control_change(space_id) {
 	// Check if the Tyrant is Gone has been fulfilled
 	if (game.persistent_events['the_tyrant_is_gone'] > 0 && game.pieces[game.persistent_events['the_tyrant_is_gone']].demCtrl === 1) {
 		log('+2 VP from The Tyrant is Gone')
+		game.vp += 2
 		game.persistent_events['the_tyrant_is_gone'] = 0
 	}
 }
@@ -8212,7 +8215,7 @@ CODE[208] = [//Tiananmen Square space 8 event
 CODE[349] = [//Scare Tactics
 	[vm_scare_tactics],
 	[vm_valid_spaces_country_sc],
-	[vm_prompt, ()=>` from ${game.vm_active_country}`],
+	[vm_prompt, ()=>` from ${country_name(game.vm_active_country)}`],
 	[vm_remove_opp_infl, 1],
 	[vm_return]
 ]
-- 
cgit v1.2.3