1 files changed, 10 insertions, 4 deletions

diff --git a/rules.js b/rules.js
index e0dcfe3..6e9eea5 100644
--- a/rules.js
+++ b/rules.js
@@ -20,7 +20,7 @@
 
 const data = require("./data.js")
 
-// packed strike and hit group data
+// Packed strike and hit group lookup table.
 const GROUPS = [[[0,0,0,0,0,0,0,0,0,[[8,1]],[[8,2]],[[8,3]],[[8,4]],[[8,5]],[[8,2]],[[8,7]],0,[[16,1]],[[16,2]],[[16,3]],[[16,4]],[[16,1]],[[16,6]],[[16,7]],0,[[24,1]],[[24,2]],[[8,1],[16,2]],[[24,4]],[[24,1]],[[24,2]],[[8,1],[16,6]],0,[[32,1]],[[32,2]],[[32,2]],[[32,4]],[[32,5]],[[32,6]],[[32,7]],0,[[40,1]],[[40,2]],[[8,3],[32,2]],[[40,4]],[[8,1],[32,4]],[[8,2],[32,6]],[[8,3],[32,6]],0,[[48,1]],[[48,2]],[[48,2]],[[48,4]],[[16,1],[32,4]],[[16,2],[32,4]],[[16,3],[32,4]],0,[[56,1]],[[56,2]],[[8,1],[48,2]],[[56,4]],[[24,1],[32,4]],[[24,2],[32,4]],[[8,1],[16,2],[32,4]]],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,[[16,4]],0,0,0,0,0,0,0,[[8,1],[16,4]],0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,[[48,4]],0,0,0,0,0,0,0,[[8,1],[48,4]],0,0]],[[0,0,0,0,0,0,0,0,0,[[1,8]],[[2,8]],[[3,8]],[[4,8]],[[5,8]],[[6,8]],[[7,8]],0,[[1,16]],[[2,16]],[[3,16]],[[4,16]],[[5,16]],[[6,16]],[[7,16]],0,[[1,24]],[[2,24]],[[1,8],[2,16]],[[4,16]],[[1,24],[4,16]],[[6,16]],[[1,8],[6,16]],0,[[1,32]],[[2,32]],[[3,32]],[[4,32]],[[5,32]],[[6,32]],[[7,32]],0,[[1,40]],[[2,8]],[[3,8]],[[4,40]],[[1,8],[4,32]],[[2,8],[4,32]],[[3,8],[4,32]],0,[[1,16]],[[2,48]],[[3,16]],[[4,48]],[[1,16],[4,48]],[[2,16],[4,32]],[[3,16],[4,32]],0,[[1,56]],[[2,56]],[[1,8],[2,48]],[[4,56]],[[1,24],[4,48]],[[2,24],[4,32]],[[1,8],[2,16],[4,32]]],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,[[2,32]],[[1,8],[2,32]],0,0,[[6,32]],[[1,8],[6,32]],0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]]
 
 const TODO = false
@@ -5672,13 +5672,19 @@ function has_no_unrouted_forces() {
 function has_front_strike_choice() {
 	let s = game.battle.step & 1
 	let f = pack_battle_array_front()
-	return GROUPS[s][1][f] !== 0
+	// Choice only matters if the center Lord has strikes this step
+	if (GROUPS[s][1][f] !== 0)
+		return (game.battle.ah1[A2] + game.battle.ah2[A2] + game.battle.ah1[D2] + game.battle.ah2[D2] > 0)
+	return false
 }
 
 function has_rear_strike_choice() {
 	let s = game.battle.step & 1
 	let r = pack_battle_array_rear()
-	return GROUPS[s][1][r] !== 0
+	// Choice only matters if the center Lord has strikes this step
+	if (GROUPS[s][1][r] !== 0)
+		return (game.battle.ah1[SA2] + game.battle.ah2[SA2] + game.battle.ah1[RD2] + game.battle.ah2[RD2] > 0)
+	return false
 }
 
 function format_group(g) {
@@ -6008,7 +6014,7 @@ states.select_strike_group = {
 		for (let [sg, hg] of game.battle.groups) {
 			for (let p of sg) {
 				let lord = game.battle.array[p]
-				if (game.battle.ah1[p] > 0 || game.battle.ah2[p] > 0)
+				if (game.battle.ah1[p] + game.battle.ah2[p] > 0)
 					gen_action_battle_lord(lord)
 			}
 		}