Updates to prompt and gameplay

1 files changed, 35 insertions, 28 deletions

diff --git a/events.txt b/events.txt
index f76cb99..ccae55c 100644
--- a/events.txt
+++ b/events.txt
@@ -2,10 +2,11 @@
 CARD 1 - Legacy of Martial Law*
 # Replace 1 Democratic SP with a Communist SP in Poland and make a Support Check using the Ops value of this card in Poland.
 valid_spaces_country_opp 'Poland'
+prompt 'replace 1 Democratic SP in Poland with a Communist SP'
 legacy_of_martial_law
 valid_spaces_country_sc 'Poland'
-prompt 'Make a Support Check in Poland'
-support_check 1
+prompt 'make a Support Check in Poland'
+1_support_check
 permanently_remove
 
 
@@ -68,7 +69,7 @@ permanently_remove
 CARD 10 - Cult of Personality
 # Place 4 Communist SPs in Worker or Farmer spaces in Romania, no more than 2 per space.
 valid_spaces_country_socio_2 'Romania', 3, 4
-prompt 'in Worker or Farmer spaces in Romania, no more than 2 per space'
+prompt 'Worker or Farmer spaces in Romania, no more than 2 per space'
 add_limited_infl 4 2
 permanently_remove
 
@@ -99,8 +100,8 @@ CARD 14 - Gorbachev Charms the West
 valid_spaces_opponent
 remove_opp_infl 2
 valid_spaces_sc
-prompt 'Make a Support Check'
-support_check 1
+prompt 'select a space for the Support Check'
+1_support_check
 
 
 CARD 15 - Honecker
@@ -183,8 +184,8 @@ prompt ' from a Worker space'
 remove_opp_infl 1
 valid_spaces_opponent_socio 4
 active_country
-prompt 'Make a support check in a Worker space in the same country'
-support_check 1
+prompt `make a support check in a Worker space in ${country_name(game.vm_active_country)}`
+1_support_check
 
 
 CARD 28 - Factory Party Cells
@@ -247,8 +248,9 @@ permanently_remove
 
 CARD 36 - Dash for the West*
 # Roll a die. If the die roll exceeds the number of Communist controlled spaces in Germany, +1 VP and select any Blue Event with asterisk(*) from the discard pile. The event occurs immediately. 
-dash_for_the_west
 permanently_remove
+dash_for_the_west
+
 
 
 CARD 37 - Nagy Reburied*
@@ -284,8 +286,8 @@ valid_spaces_country 'Hungary'
 prompt  'Hungary'
 add_infl_free 3
 valid_spaces_country_sc 'Hungary'
-prompt 'Make a Support Check in Hungary'
-support_check 1
+prompt 'make a Support Check in Hungary'
+1_support_check
 permanently_remove
 
 
@@ -295,8 +297,9 @@ valid_spaces_country_sc 'Romania'
 prompt ' from Romania'
 remove_opp_infl 3
 valid_spaces_country_sc 'Romania'
-prompt 'Make a support check in Romania'
-support_check 1
+prompt 'make a support check in Romania'
+1_support_check
+prompt ' from Bucharesti'
 ceausescu
 permanently_remove
 
@@ -318,10 +321,10 @@ valid_spaces_country_sc
 prompt ()=>` from ${country_name(game.vm_active_country)}`
 remove_opp_infl 2
 inflationary_currency_discard
-if discarded_card()
+if !discarded_card()
 valid_spaces_country_sc
-prompt `Make a Support Check in ${game.vm_active_country}` 
-support_check 1
+prompt `make a Support Check in ${country_name(game.vm_active_country)}` 
+1_support_check
 endif
 permanently_remove
 
@@ -408,6 +411,7 @@ permanently_remove
 CARD 57 - Central Committee Reshuffle*
 # Place 3 Communist SPs in any Country where the Communist holds Power.
 central_committee_reshuffle
+prompt `${country_name(game.vm_active_country)}`
 add_infl_free 3
 permanently_remove
 
@@ -436,7 +440,7 @@ the_monday_demonstrations
 prompt 'the Lutheran Church Space and Leipzig'
 take_control_prep 2
 valid_spaces_country_sc 'East_Germany'
-prompt 'Make 5 Support Checks in East Germany'
+prompt 'make 5 Support Checks in East Germany'
 support_check 5
 permanently_remove
 
@@ -474,6 +478,7 @@ permanently_remove
 
 CARD 67 - Reformer Rehabilitated*
 # If you are ahead on the Tiananmen Square track, draw any card in the discard pile. The event takes place immediately. 
+prompt 'Chose any non-scoring card in the discard pile. Event takes place immediately'
 reformer_rehabilitated
 
 
@@ -515,13 +520,14 @@ CARD 73 - Laszlo Tokes*
 valid_spaces 50 56
 prompt 'in Timisoara and Harghita/Covasna'
 add_limited_infl 2 1
-prompt ' in Romania'
 laszlo_tokes
+if game.phase === 3
+prompt ' in Romania'
 add_infl
-permanently_remove
-return
-prompt 'Make 2 Support Checks in Romania'
+else
+prompt 'make 2 Support Checks in Romania'
 support_check 2
+endif
 permanently_remove
 
 
@@ -611,8 +617,8 @@ breakaway_baltic_republics
 prompt 'any Minorities space'
 take_control_prep 1
 valid_spaces_sc
-prompt 'Select a space for a support check'
-support_check 1
+prompt 'select a space for the support check'
+1_support_check
 permanently_remove
 
 
@@ -646,6 +652,7 @@ permanently_remove
 
 CARD 89 - Domino Theory*
 # If the Democrat holds Power in at least 2 counties,  he may retrieve any Power Struggle - card from the discard pile and play it immediately as an event. The Democrat receives a -1 drm to his dice rolls for this Power Struggle.
+prompt 'Choose a Power Struggle card to play from the discard pile.'
 domino_theory
 permanently_remove
 
@@ -683,7 +690,7 @@ CARD 93 - Shock Therapy*
 # Target country must be one where the Communist has been toppled from power. Successful 3-6. -1 for every Communist Worker or Farmer space. +2 VPs and place 3 SPs in the country
 shock_therapy
 valid_spaces_country
-prompt `to ${game.vm_active_country}`
+prompt ` to ${country_name(game.vm_active_country)}`
 add_infl 3
 permanently_remove
 
@@ -708,7 +715,7 @@ CARD 96 - The Chinese Solution*
 # Can only take place if the Communist has reached the Protesters Massacred space on the Tiananmen Square track. The Communist may choose 1 country where he retains Power and conduct 5 Support Checks with a +3 modifier, but suffers a penalty of +3 VPs.
 the_chinese_solution
 valid_spaces_country_sc
-prompt `Make 5 Support Checks in ${game.vm_active_country}`
+prompt `Make 5 Support Checks in ${country_name(game.vm_active_country)}`
 support_check_modified 5 3
 permanently_remove
 
@@ -728,8 +735,8 @@ valid_spaces_country_sc 'Bulgaria'
 prompt ' from Bulgaria'
 remove_limited_opp_infl 3 2
 valid_spaces_country_sc 'Bulgaria'
-prompt 'Make a support check in Bulgaria'
-support_check 1
+prompt 'make a support check in Bulgaria'
+1_support_check
 permanently_remove
 
 
@@ -790,8 +797,8 @@ social_democratic_platform_adopted
 valid_spaces_country
 add_infl_free 2
 valid_spaces_country_sc
-prompt `Make a Support Check in ${game.vm_active_country}`
-support_check 1
+prompt `make a Support Check in ${country_name(game.vm_active_country)}`
+1_support_check
 permanently_remove