Place Governor: Automatic vs players if enough guaranteed votes.

From Ambitus or Populace Emperor malus.

1 files changed, 6 insertions, 5 deletions

diff --git a/rules.js b/rules.js
index 90f42d4..56798fe 100644
--- a/rules.js
+++ b/rules.js
@@ -2450,19 +2450,20 @@ function format_votes(need, extra, dice) {
 	return s
 }
 
-function gen_place_governor_spend(ip, enough, action) {
+function gen_place_governor_spend(ip, need, extra, dice, action) {
+	let enough = need - extra - dice
 	view.selected_region = game.where
 	view.selected_governor = game.selected_governor
 
 	// Don't prompt "Ambitus" if already enough votes for automatic success.
-	if (!is_neutral_province(game.where) || enough > 0) {
+	if (!(is_neutral_province(game.where) || extra >= need) || enough > 0) {
 		if (game.ambitus < game.count && has_card_event(CARD_P2X)) {
 			view.prompt += " Ambitus?"
 			gen_card_event(CARD_P2X)
 		}
 	}
 
-	if (is_neutral_province(game.where)) {
+	if (is_neutral_province(game.where) || extra >= need) {
 		if (enough > 0) {
 			view.actions[action] = (ip >= 1) ? 1 : 0
 			view.actions.automatic = 0
@@ -2486,7 +2487,7 @@ states.place_governor = {
 		let dice = calc_used_dice()
 		view.color = SENATE
 		prompt("Place Governor: " + game.sip + " senate. " + format_votes(need, extra, dice))
-		gen_place_governor_spend(game.sip, need - extra - dice, "spend_senate")
+		gen_place_governor_spend(game.sip, need, extra, dice, "spend_senate")
 	},
 	card(c) {
 		push_undo()
@@ -2522,7 +2523,7 @@ states.praetorian_guard = {
 		let dice = calc_used_dice()
 		view.color = MILITARY
 		prompt("Praetorian Guard: " + game.mip + " military. " + format_votes(need, extra, dice))
-		gen_place_governor_spend(game.mip, need - extra - dice, "spend_military")
+		gen_place_governor_spend(game.mip, need, extra, dice, "spend_military")
 	},
 	card(c) {
 		push_undo()