Fix Blitz using BB2020 blocking procedures in BB2025.

Also added a smoke test for verifying that Blitz actions use the BB2025 procedures.

Author: cmelchior

modules/jervis-engine/src/commonMain/kotlin/com/jervisffb/engine/rules/bb2025/procedures/actions/block/BB2025Pow.kt

@@ -23,10 +23,8 @@ import com.jervisffb.engine.model.context.getContextOrNull
 import com.jervisffb.engine.model.context.hasContext
 import com.jervisffb.engine.reports.ReportPowResult
 import com.jervisffb.engine.rules.Rules
-import com.jervisffb.engine.rules.bb2020.procedures.actions.block.BB2020PushStepInitialMoveSequence
 import com.jervisffb.engine.rules.bb2020.procedures.actions.block.BB2020PushStepResolveSingleBlockPushChain
 import com.jervisffb.engine.rules.bb2025.procedures.actions.block.push.PushedBack
-import com.jervisffb.engine.rules.builder.GameVersion
 import com.jervisffb.engine.rules.common.procedures.tables.injury.RiskingInjuryContext
 import com.jervisffb.engine.rules.common.procedures.tables.injury.RiskingInjuryRoll
 
@@ -57,11 +55,7 @@ object BB2025Pow: Procedure() {
 
     object ResolveInitialPushSequence: ParentNode() {
         override fun getChildProcedure(state: Game, rules: Rules): Procedure {
-            return when (rules.baseVersion) {
-                GameVersion.BB2020 -> BB2020PushStepInitialMoveSequence
-                GameVersion.BB2025 -> PushedBack
-            }
-
+            return PushedBack
         }
         override fun onExitNode(state: Game, rules: Rules): Command {
             val blockContext = state.getContext<BlockContext>()

modules/jervis-engine/src/commonMain/kotlin/com/jervisffb/engine/rules/bb2025/procedures/actions/block/BlockAction.kt

@@ -32,7 +32,6 @@ import com.jervisffb.engine.model.isSkillAvailable
 import com.jervisffb.engine.rules.Rules
 import com.jervisffb.engine.rules.bb2020.procedures.actions.block.StandardBlockStep
 import com.jervisffb.engine.rules.bb2025.procedures.actions.block.singleblock.SingleStandardBlockStep
-import com.jervisffb.engine.rules.builder.GameVersion
 import com.jervisffb.engine.rules.common.actions.BlockType
 import com.jervisffb.engine.rules.common.procedures.getResetTemporaryModifiersCommands
 import com.jervisffb.engine.rules.common.skills.Duration
@@ -155,12 +154,7 @@ object BlockAction : Procedure() {
                 BlockType.MULTIPLE_BLOCK -> TODO()
                 BlockType.PROJECTILE_VOMIT -> TODO()
                 BlockType.STAB -> TODO()
-                BlockType.STANDARD -> {
-                    when (rules.baseVersion) {
-                        GameVersion.BB2020 -> StandardBlockStep
-                        GameVersion.BB2025 -> SingleStandardBlockStep
-                    }
-                }
+                BlockType.STANDARD -> SingleStandardBlockStep
             }
         }
 

modules/jervis-engine/src/commonMain/kotlin/com/jervisffb/engine/rules/common/procedures/actions/blitz/BlitzAction.kt

@@ -45,6 +45,8 @@ import com.jervisffb.engine.model.locations.OnFieldLocation
 import com.jervisffb.engine.rules.Rules
 import com.jervisffb.engine.rules.bb2020.procedures.actions.block.BlockAction
 import com.jervisffb.engine.rules.bb2020.procedures.actions.block.StandardBlockStep
+import com.jervisffb.engine.rules.bb2025.procedures.actions.block.singleblock.SingleStandardBlockStep
+import com.jervisffb.engine.rules.builder.GameVersion
 import com.jervisffb.engine.rules.common.actions.BlockType
 import com.jervisffb.engine.rules.common.procedures.actions.move.ResolveMoveTypeStep
 import com.jervisffb.engine.rules.common.procedures.actions.move.RushRoll
@@ -322,7 +324,12 @@ object BlitzAction : Procedure() {
                 BlockType.MULTIPLE_BLOCK -> TODO()
                 BlockType.PROJECTILE_VOMIT -> TODO()
                 BlockType.STAB -> TODO()
-                BlockType.STANDARD -> StandardBlockStep
+                BlockType.STANDARD -> {
+                    when (rules.baseVersion) {
+                        GameVersion.BB2020 -> StandardBlockStep
+                        GameVersion.BB2025 -> SingleStandardBlockStep
+                    }
+                }
             }
         }
         override fun onExitNode(state: Game, rules: Rules): Command {

modules/jervis-engine/src/commonTest/kotlin/com/jervisffb/test/bb2025/actions/PushbackTests.kt

@@ -4,6 +4,8 @@ import com.jervisffb.engine.actions.Cancel
 import com.jervisffb.engine.actions.Confirm
 import com.jervisffb.engine.actions.DiceRollResults
 import com.jervisffb.engine.actions.DirectionSelected
+import com.jervisffb.engine.actions.EndAction
+import com.jervisffb.engine.actions.PlayerSelected
 import com.jervisffb.engine.actions.SelectDirection
 import com.jervisffb.engine.commands.SetBallLocation
 import com.jervisffb.engine.commands.SetBallState
@@ -22,6 +24,7 @@ import com.jervisffb.engine.model.locations.FieldCoordinate
 import com.jervisffb.engine.rules.common.actions.PlayerStandardActionType
 import com.jervisffb.engine.utils.singleInstanceOf
 import com.jervisffb.test.JervisGameBB2025Test
+import com.jervisffb.test.SmartMoveTo
 import com.jervisffb.test.activatePlayer
 import com.jervisffb.test.catch
 import com.jervisffb.test.ext.rollForward
@@ -273,6 +276,31 @@ class PushbackTests: JervisGameBB2025Test() {
         assertEquals(FieldCoordinate(15, 0), awayTeam[7.playerNo].coordinates)
     }
 
+    @Test
+    fun pushOpponentPlayerWithBallIntoCrowdUsingBlitz() {
+        SetPlayerLocation(homeTeam[4.playerNo], FieldCoordinate(20, 0)).execute(state)
+        SetBallState.carried(state.singleBall(), homeTeam[4.playerNo]).execute(state)
+        controller.rollForward(
+            *activatePlayer("A10", PlayerStandardActionType.BLITZ),
+            PlayerSelected("H4".playerId),
+            SmartMoveTo(20, 1),
+            *standardBlock("H4", 4.dblock),
+            DirectionSelected(Direction.UP),
+            Confirm, // Follow up
+            DiceRollResults(1.d6, 1.d6), // Crowd Injury roll
+            2.d3, // Throw-in direction
+            DiceRollResults(1.d6, 2.d6), // Throw-in distance
+            7.d8, // Bounce
+            EndAction
+        )
+        assertNull(state.activePlayer)
+        assertEquals(awayTeam, state.activeTeam)
+        assertEquals(BallState.ON_GROUND, state.singleBall().state)
+        assertEquals(FieldCoordinate(20, 3), state.singleBall().location)
+        assertEquals(DogOut, homeTeam[4.playerNo].location)
+        assertEquals(FieldCoordinate(20, 0), awayTeam[10.playerNo].coordinates)
+    }
+
     @Test
     fun chainPushOwnPlayerWithBallIntoCrowd() {
         SetPlayerLocation(awayTeam[1.playerNo], FieldCoordinate(23, 0)).execute(state)