Fix regroup end transition if used during melee phase.

1 files changed, 3 insertions, 2 deletions

diff --git a/rules.ts b/rules.ts
index e15dc7f..bcdce10 100644
--- a/rules.ts
+++ b/rules.ts
@@ -6864,7 +6864,7 @@ states.regroup = {
 		]
 	},
 	pass() {
-		if (game.battle.step < 2)
+		if (game.battle.step <= 2)
 			game.state = "assign_hits"
 		else
 			goto_battle_lord_rout_2()
@@ -6930,7 +6930,7 @@ function end_regroup() {
 	game.who = NOBODY
 	delete game.event_regroup
 
-	if (game.battle.step < 2)
+	if (game.battle.step <= 2)
 		game.state = "assign_hits"
 	else
 		goto_battle_lord_rout_2()
@@ -7776,6 +7776,7 @@ states.assign_hits = {
 
 	regroup() {
 		push_undo()
+		game.battle.reroll = 0
 		game.who = NOBODY
 		goto_regroup()
 	},