summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--play.js2
-rw-r--r--rules.js10
2 files changed, 8 insertions, 4 deletions
diff --git a/play.js b/play.js
index f7b1647..cb296fa 100644
--- a/play.js
+++ b/play.js
@@ -1608,7 +1608,7 @@ function update_map() {
action_button("intercept", "Intercept")
action_button("avoid", "Avoid battle")
action_button("exchange", "Exchange")
- action_button("stop", "Stop")
+ action_button("stop", "End move")
// confirm "dummy" actions
confirm_action_button("confirm_end_activations", "End activations",
diff --git a/rules.js b/rules.js
index ff15988..6d828a5 100644
--- a/rules.js
+++ b/rules.js
@@ -3529,10 +3529,14 @@ states.move = {
}
if (game.move.infiltrated) {
- if (!has_unbesieged_enemy_fort_or_fortress(from))
- view.actions.stop = 1
- else if (game.move.used === 9)
+ if (has_unbesieged_enemy_fort_or_fortress(from)) {
+ if (has_enemy_units(from))
+ view.actions.stop = 1 // 6.54 - stop and force battle
+ else
+ view.actions.stop = 0
+ } else {
view.actions.end_move = 1
+ }
} else {
if (game.move.used > 0)
view.actions.end_move = 1