diff options
Diffstat (limited to 'rules.js')
| -rw-r--r-- | rules.js | 17 |
1 files changed, 7 insertions, 10 deletions
@@ -1223,11 +1223,13 @@ function draw_glory_from_bag() { game.glory.push(faction); game.glory_current_year[faction] = true; array_remove(game.bag_of_glory, index); - logi(`Pulled T${faction} from the Bag`); + log(`Pulled T${faction} from the Bag.`); } states.draw_glory = { inactive: 'draw from the Bag of Glory', auto_resolve() { + if (get_active_faction() === game.initiative) + return false; draw_glory_from_bag(); return true; }, @@ -1259,17 +1261,12 @@ states.end_of_year_discard = { for (let c of tableau) gen_action_card(c); } - if (needs_to_discard_from_hand && needs_to_discard_from_tableau) { - view.prompt = 'Discard a card from your hand or tableau.'; - } - else if (needs_to_discard_from_hand) { - view.prompt = 'Discard a card from your hand.'; - } - else if (needs_to_discard_from_tableau) { - view.prompt = 'Discard a card from your tableau.'; + view.prompt = JSON.stringify({ needs_to_discard_from_hand, needs_to_discard_from_tableau }); + if (needs_to_discard_from_hand || needs_to_discard_from_tableau) { + view.prompt = 'End of Year: Discard cards from your hand and tableau.'; } else { - view.prompt = 'Confirm discard.'; + view.prompt = 'End of Year: Done.'; view.actions.confirm = 1; } if (discarded[faction_id].h.length > 0 || discarded[faction_id].t.length > 0) { |