From 0dc9801e65ab8d6ca8ea076567c51a4975d65b52 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ccxvii.net>
Date: Sun, 25 Aug 2024 15:39:50 +0200
Subject: Fix issues with dispersing congress.
Only Americans can retreat before battle (so not needed).
Retreat after battle needs special handling (remove TODO).
After battle, capture if British CU remain.
---
rules.js | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/rules.js b/rules.js
index 53fe0a5..604dd5a 100644
--- a/rules.js
+++ b/rules.js
@@ -2568,8 +2568,6 @@ states.retreat_before_battle_roll = {
move_army(game.retreat)
if (has_enemy_general(to))
capture_enemy_general(to)
- if (game.active === P_BRITAIN && game.congress === to)
- disperse_continental_congress()
delete game.retreat
goto_remove_general_after_retreat_before_battle(to)
} else {
@@ -3138,7 +3136,6 @@ states.retreat_after_battle = {
else
retreat_american_army(game.move.to, to)
- // TODO: disperse congress with end_battle? (is this code redundant?)
if (game.active === P_BRITAIN && game.congress === to)
disperse_continental_congress()
if (has_enemy_general(to))
@@ -3178,8 +3175,8 @@ states.retreat_after_battle_confirm = {
function end_battle() {
game.active = game.combat.attacker
-
- if (game.active === P_BRITAIN && game.congress === game.move.to)
+
+ if (game.active === P_BRITAIN && game.congress === game.move.to && count_british_cu(game.move.to) > 0)
disperse_continental_congress()
// TODO: lose regulars manual
--
cgit v1.2.3