summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor@ccxvii.net>2024-05-30 12:01:47 +0200
committerTor Andersson <tor@ccxvii.net>2024-05-30 21:59:25 +0200
commit503ecbd197669a36c86c32f6edb9d3a1ef5f8de4 (patch)
tree9a8a11fc9035bbb89cbd4f0a68e0e151ae075665
parent8bb5f1e3a67d7efa5fd22a3bdeadb39bc87ce6f7 (diff)
downloadfriedrich-503ecbd197669a36c86c32f6edb9d3a1ef5f8de4.tar.gz
skip pause after last combat
-rw-r--r--rules.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/rules.js b/rules.js
index 5694fa2..72a2a3a 100644
--- a/rules.js
+++ b/rules.js
@@ -2121,7 +2121,9 @@ function next_combat() {
if (game.combat.length > 0)
game.state = "combat"
else
- game.state = "combat_done"
+ // TODO: a bit abrupt, but saves time if
+ // game.state = "combat_done"
+ goto_retroactive_conquest()
}
@@ -2139,6 +2141,7 @@ states.combat = {
},
}
+// TODO: unused for now
states.combat_done = {
inactive: "attack",
prompt() {