diff options
Diffstat (limited to 'rules.js')
| -rw-r--r-- | rules.js | 29 |
1 files changed, 19 insertions, 10 deletions
@@ -1802,6 +1802,7 @@ function end_crisis_dimension_scoring() { function goto_objective_card_scoring() { log_h2("Objective Card Scoring") update_presence_and_control() + game.reveal_objectives = 1 game.active = game.initiative game.count = 3 game.state = "objective_card_scoring" @@ -1815,10 +1816,6 @@ function goto_objective_card_scoring() { states.objective_card_scoring = { prompt() { view.prompt = "Objective Card Scoring!" - if (game.active === COMMUNE) - view.objective = [ commune_objective_card(), versailles_objective_card() ] - else - view.objective = [ versailles_objective_card(), commune_objective_card() ] if (game.count & 1) gen_action_space(commune_objective_space()) if (game.count & 2) @@ -1852,10 +1849,12 @@ function resume_objective_card_events() { log_br() let c = commune_objective_card() let v = versailles_objective_card() - if (c || v) + if (c || v) { game.state = "objective_card_events" - else + } else { + delete game.reveal_objectives start_round() + } } states.objective_card_events = { @@ -1909,11 +1908,13 @@ function goto_final_crisis() { game.red_hand = game.red_set_aside if (game.red_final) game.red_hand.push(game.red_final) + game.red_final = 0 game.red_set_aside = [] game.blue_hand = game.blue_set_aside if (game.blue_final) game.blue_hand.push(game.blue_final) + game.blue_final = 0 game.blue_set_aside = [] game.active = "Both" @@ -2969,6 +2970,10 @@ exports.view = function(state, player) { blue_hand: game.blue_hand.length, red_momentum: game.red_momentum, blue_momentum: game.blue_momentum, + red_final: game.red_final, + blue_final: game.blue_final, + red_objective: 0, + blue_objective: 0, pieces: game.pieces, @@ -2981,15 +2986,19 @@ exports.view = function(state, player) { if (player === COMMUNE) { view.hand = game.red_hand - view.final = game.red_final view.set_aside = game.red_set_aside - view.objective = game.red_objective + view.red_objective = game.red_objective } + if (player === VERSAILLES) { view.hand = game.blue_hand - view.final = game.blue_final view.set_aside = game.blue_set_aside - view.objective = game.blue_objective + view.blue_objective = game.blue_objective + } + + if (game.reveal_objectives) { + view.red_objective = game.red_objective + view.blue_objective = game.blue_objective } if (game.state === "game_over") { |