summaryrefslogtreecommitdiff
path: root/rules.js
diff options
context:
space:
mode:
authorTor Andersson <tor@ccxvii.net>2023-07-24 01:55:24 +0200
committerTor Andersson <tor@ccxvii.net>2023-07-24 01:55:36 +0200
commitf76fdcdd3df4cd8ae0f14bd70b4cd6253c25b77d (patch)
treec274e9a3d688360b9eb03c8bf93416df32bb067f /rules.js
parent7e9fda68ff0733dcd570aa74d8d862f0bc300342 (diff)
downloadtime-of-crisis-f76fdcdd3df4cd8ae0f14bd70b4cd6253c25b77d.tar.gz
Fix occupy pretender capital when entering empty capital!
Diffstat (limited to 'rules.js')
-rw-r--r--rules.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/rules.js b/rules.js
index 35040a0..1ae33be 100644
--- a/rules.js
+++ b/rules.js
@@ -2182,7 +2182,6 @@ states.take_actions = {
enter() {
push_undo()
enter_capital()
- resume_take_actions()
},
leave() {
@@ -2232,7 +2231,6 @@ states.take_actions = {
else if (get_general_location(game.selected_general) !== where)
move_army_to(game.selected_general, where)
enter_capital()
- resume_take_actions()
},
}
@@ -2933,8 +2931,12 @@ function enter_capital() {
}
}
- if (game.combat)
+ if (game.combat) {
goto_post_combat()
+ return
+ }
+
+ resume_take_actions()
}
function resume_occupy_seat_of_power() {
@@ -3550,7 +3552,6 @@ states.force_march = {
enter() {
push_undo()
enter_capital()
- resume_take_actions()
},
leave() {