summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--events.txt4
-rw-r--r--rules.js9
2 files changed, 11 insertions, 2 deletions
diff --git a/events.txt b/events.txt
index 09eb662..a62e810 100644
--- a/events.txt
+++ b/events.txt
@@ -563,8 +563,8 @@ frg_embassies
CARD 75 - Exit Visas*
# The Democratic Player may discard any cards in his hand and draw new cards from the deck.
-if !is_auto_resolve(C_EXIT_VISAS)
permanently_remove
+if !is_auto_resolve(C_EXIT_VISAS)
exit_visas
endif
@@ -586,7 +586,9 @@ endif
CARD 77 - Samizdat
# The Democratic Player can put a card in his hand aside for next turn and draw a replacement card from the deck.
permanently_remove
+if !is_auto_resolve(C_SAMIZDAT)
samizdat
+endif
CARD 78 - Workers Revolt
diff --git a/rules.js b/rules.js
index b991456..ac40f5b 100644
--- a/rules.js
+++ b/rules.js
@@ -3082,6 +3082,11 @@ function is_auto_resolve(card) {
if (!game.state.startsWith('vm')) { logi('Democrat has no cards to discard') }
return true
}
+ } else if (card === C_SAMIZDAT) {
+ if (game.democrat_hand.length === 0) {
+ if (!game.state.startsWith('vm')) { logi('Democrat has no cards to set aside') }
+ return true
+ }
}
else {
return false
@@ -8483,8 +8488,8 @@ CODE[74] = [ // FRG Embassies
]
CODE[75] = [ // Exit Visas*
- [ vm_if, ()=>!is_auto_resolve(C_EXIT_VISAS) ],
[ vm_permanently_remove ],
+ [ vm_if, ()=>!is_auto_resolve(C_EXIT_VISAS) ],
[ vm_exit_visas ],
[ vm_endif ],
[ vm_return ],
@@ -8506,7 +8511,9 @@ CODE[76] = [ // Warsaw Pact Summit
CODE[77] = [ // Samizdat
[ vm_permanently_remove ],
+ [ vm_if, ()=>!is_auto_resolve(C_SAMIZDAT) ],
[ vm_samizdat ],
+ [ vm_endif ],
[ vm_return ],
]