summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--play.js2
-rw-r--r--rules.js5
2 files changed, 5 insertions, 2 deletions
diff --git a/play.js b/play.js
index 8ea17a2..7c53d39 100644
--- a/play.js
+++ b/play.js
@@ -629,7 +629,7 @@ function on_update() {
ui.events[C_SYSTEMATIZATION].style.display = "none"
}
- if (view.the_tyrant_is_gone) {
+ if (view.the_tyrant_is_gone && view.the_tyrant_is_gone <= last_space) {
ui.events[C_THE_TYRANT_IS_GONE].style.display = "block"
ui.events[C_THE_TYRANT_IS_GONE].style.left = ui.layout_xy[view.the_tyrant_is_gone][0] - 25 + "px"
ui.events[C_THE_TYRANT_IS_GONE].style.top = ui.layout_xy[view.the_tyrant_is_gone][1] - 50 + "px"
diff --git a/rules.js b/rules.js
index ef25261..dbd1beb 100644
--- a/rules.js
+++ b/rules.js
@@ -627,8 +627,10 @@ states.play_card ={
game.return = game.active
game.vm_event = game.played_card
if (is_auto_resolve(game.played_card) || switch_events.includes(game.played_card)) {
+ console.log('resolved automatically')
goto_vm(game.vm_event)}
else {
+ console.log('resolved normally')
next_player()
log(`C${game.vm_event}`)
goto_vm(game.vm_event)
@@ -2972,7 +2974,7 @@ function is_auto_resolve(card) {
return true
}
}
- else if (ceausecu_events.includes(card) && game.persistent_events.includes(C_THE_TYRANT_IS_GONE)) {
+ else if (ceausecu_events.includes(card) && game.the_tyrant_is_gone > 0) {
return true
}
else if (card === C_KOHL_PROPOSES_REUNIFICATION && !game.persistent_events.includes(C_THE_WALL_MUST_GO)) {
@@ -4064,6 +4066,7 @@ function vm_return() {
delete game.vm_influence_added
delete game.communist_hand_red
+ console.log('in vm_return, game.active', game.active)
game.vm_event = 0 /*Reset to 0 now that event has been completed. Hopefully this doesn't cause issues! */
if (game.persistent_events.includes(C_AUSTRIA_HUNGARY_BORDER_REOPENED)) {
reset_austria_hungary_border_reopened()