rename "Battle" button to "End Flee" for less confusion

3 files changed, 9 insertions, 6 deletions

diff --git a/play.js b/play.js
index 26dffec..1cb5a09 100644
--- a/play.js
+++ b/play.js
@@ -1544,7 +1544,6 @@ function on_update() {
 	action_button("march", "March")
 	action_button("approach", "Approach")
 	action_button("intercept", "Intercept")
-	action_button("battle", "Battle")
 
 	// ARTS OF WAR
 	action_button("play", "Play")
@@ -1583,6 +1582,7 @@ function on_update() {
 	action_button("end_battle_round", "End Round")
 	action_button("end_command", "End Command")
 	action_button("end_feed", "End Feed")
+	action_button("end_flee", "End Flee")
 	action_button("end_muster", "End Muster")
 	action_button("end_pay", "End Pay")
 	action_button("end_plan", "End Plan")
diff --git a/rules.js b/rules.js
index 0864b57..3678135 100644
--- a/rules.js
+++ b/rules.js
@@ -5968,9 +5968,10 @@ states.flee_battle = {
         for (let p of battle_strike_positions)
             if (is_friendly_lord(game.battle.array[p]))
                 gen_action_lord(game.battle.array[p]);
-        view.actions.battle = 1;
+        view.actions.end_flee = 1;
     },
-    battle() {
+    battle() { this.end_flee(); }, // TODO: remove backwards compatibility
+    end_flee() {
         end_flee();
     },
     lord(lord) {
diff --git a/rules.ts b/rules.ts
index 88f718a..a6bf7e5 100644
--- a/rules.ts
+++ b/rules.ts
@@ -214,7 +214,7 @@ interface State {
 	march?(): void,
 	approach?(): void,
 	intercept?(): void,
-	battle?(): void,
+	battle?(): void, // TODO: remove backwards compatible
 
 	// pay/feed/pillage
 	pay?(): void,
@@ -226,6 +226,7 @@ interface State {
 	end_battle_round?(): void,
 	end_command?(): void,
 	end_feed?(): void,
+	end_flee?(): void,
 	end_muster?(): void,
 	end_pay?(): void,
 	end_spoils?(): void,
@@ -7060,9 +7061,10 @@ states.flee_battle = {
 		for (let p of battle_strike_positions)
 			if (is_friendly_lord(game.battle.array[p]))
 				gen_action_lord(game.battle.array[p])
-		view.actions.battle = 1
+		view.actions.end_flee = 1
 	},
-	battle() {
+	battle() { this.end_flee() }, // TODO: remove backwards compatibility
+	end_flee() {
 		end_flee()
 	},
 	lord(lord) {