diff options
| -rw-r--r-- | rules.js | 20 |
1 files changed, 5 insertions, 15 deletions
@@ -1439,25 +1439,23 @@ states.power_struggle = { push_undo() game.valid_cards = [] game.return_state = 'power_struggle' - if (game.phase === 0) { - delete game.power_card_1 - delete game.power_card_2 game.played_power_card = card + select_power_card() if (leader_cards.includes(card)) game.state = 'power_struggle_confirm_leader' else { game.state = 'power_struggle_confirm' } } - if (game.phase === 1) { + game.power_card_2 = card + discard(card) if (card === PC_TACTIC_FAILS) { + log(`${game.active}: P${PC_TACTIC_FAILS}`) game.state = 'power_struggle_tactic_fails' return - } else - game.power_card_2 = card - discard(card) + } if (power_cards[game.played_power_card].value === 1) { log(`${game.active}: P${card}`) log('Takes initiative.') @@ -1515,7 +1513,6 @@ states.power_struggle_confirm = { gen_action('done') }, done() { - select_power_card() log_power_card() if (game.played_power_card === PC_SCARE_TACTICS) { game.return = '' @@ -1555,28 +1552,24 @@ states.power_struggle_confirm_leader = { } }, strike() { - select_power_card() log(`${game.active}: P${game.played_power_card} as Strike.`) game.proxy_power_card = 'Strike' game.phase = 1 confirm_power_card() }, march() { - select_power_card() log(`${game.active}: P${game.played_power_card} as March`) game.proxy_power_card = 'March' game.phase = 1 confirm_power_card() }, rally() { - select_power_card() log(`${game.active}: P${game.played_power_card} as Rally in the Square`) game.proxy_power_card = 'Rally in the Square' game.phase = 1 confirm_power_card() }, petition() { - select_power_card() log(`${game.active}: P${game.played_power_card} as Petition`) game.proxy_power_card = 'Petition' game.phase = 1 @@ -1591,9 +1584,6 @@ states.power_struggle_tactic_fails = { gen_action('done') }, done() { - discard(PC_TACTIC_FAILS) - game.power_card_2 = PC_TACTIC_FAILS - log(`${game.active}: P${PC_TACTIC_FAILS}`) if (game.proxy_power_card) { game.tactics_fails = game.proxy_power_card } else { |