Add support for "Taunt" and "Fend" skills

- Support for both skills added during the follow up phase of a block
- Split logic for BB2020 and BB2025 with regard to push chain and follow up. I am not sure this is needed, but doing it now to be safe.
- Added UI Action Wheels and Game Status messages for using both Taunt and Fend
- For now, we first ask for Fend, then Taunt. This is done with the assumption that no players will have both skills (or rarely). Since they are mutually exclusive, a better UX would probably be to ask to choose between them, but it would require more UI work than what is worth to implement at this stage.

Author: cmelchior

docs/bb2025/rules-faq-bb2025.md

@@ -178,13 +178,27 @@ While this skill is optional, it only affects how many dice are rolled and not
 the final outcome. This combined with the fact that there are no scenario where
 you might want to _not_ use Guard, we always apply it.
 
+### Page 129 - Juggernaut
+Juggernaut cancels Fend, Stand Firm and Wrestle for both the blocked player
+and all other opponents in the push chain.
+
+This interpretation comes from the Juggernaut skill description: "..opposition 
+players cannot use..." (note plural and specifically mentioning opposition).
+
+In particular, this means that in a Chain Push scenario, a player with 
+Juggernaut will cancel Stand Firm for all opponent players, but not players on 
+their own team.
+
 ### Page 130 - Kick
 Jervis uses the NAF interpretation, which means that you are allowed to roll the
 deviate die (D6) and then choose to treat the roll as either a D6 or D3.
 
 In the rulebook, D3's are defined as Rolling a D6, taking half the value and 
 round up.
 
+### Page 132 - Multiple Block
+- Taunt: Multiple Block prevents follow-ups, so Taunt has no effect.
+
 ### Page 132 - No Ball
 Technically, you are allowed to user other skills like Extra Arms, but since 
 it would be pointless, Jervis just ignore these skills.

docs/bb2025/todo-skills-bb2025.md

@@ -82,7 +82,10 @@ a test class in `modules/jervis-engine/src/commonTest/kotlin/dk/ilios/jervis/bb2
   - [ ] Defender chooses bloc
 - [ ] Dauntless
 - [ ] Fend
-    - [ ] Prevents Frenzy from working
+    - [x] Prevent follow up
+    - [ ] Does not work against Ball & Chain
+    - [ ] Does not work against Juggernaut
+    - [x] Prevent follow up from Frenzy
 - [ ] Frenzy*
     - [ ] Must take two blocks if player if able
     - [ ] Works during Block and Blitz
@@ -112,6 +115,10 @@ a test class in `modules/jervis-engine/src/commonTest/kotlin/dk/ilios/jervis/bb2
   - [x] Only use Tackle if other player has Dodge
   - [x] Defender does not count as having dodge during a Block
 - [ ] Taunt
+  - [x] Pushed Back
+  - [x] Stumble with Dodge
+  - [x] Cannot use Taunt if Fend is selected
+  - [ ] Does not work against Rooted
 - [ ] Wrestle
 
 ## Mutations
@@ -213,7 +220,8 @@ a test class in `modules/jervis-engine/src/commonTest/kotlin/dk/ilios/jervis/bb2
 - [ ] Mighty Blow
 - [ ] Multiple Block
     - [ ] During Multiple Block: Scoring Turnovers will win over End-Turn turnovers.
-    - [ ] Tackle on both blocks
+    - [ ] Tackle is available for both blocks
+    - [ ] Taunt does not work against Multiple Block
 - [ ] Stand Firm
 - [ ] Strong Arm
 - [ ] Thick Skull

docs/bugs.md

@@ -3,6 +3,8 @@
 This file is just a temporary way to capture any bugs seen that I didn't have time to investigate yet.
 
 ## Known bugs
+- Move Counter is not updated on forced follow-up during a blitz, like when using Taunt
+- Move counter is wrong when using the first GFI to Blitz and then the 2nd GFI to move in another direction. 
 - Move counter on field squares does not reset when a players action ends immediately (like when using Safe Pass)
 - Action Wheel animation isn't correct when animating D6 rererolls when automatically selecting the reroll type.
   It looks like two animations are running over each other or that some positions are being reused.

modules/fumbbl-net/src/commonMain/kotlin/com/jervisffb/fumbbl/net/adapter/impl/InjuryRollMapper.kt

@@ -7,7 +7,7 @@ import com.jervisffb.engine.actions.DirectionSelected
 import com.jervisffb.engine.actions.SelectDirection
 import com.jervisffb.engine.model.Game
 import com.jervisffb.engine.rules.Rules
-import com.jervisffb.engine.rules.common.procedures.actions.block.PushStepInitialMoveSequence
+import com.jervisffb.engine.rules.bb2025.procedures.actions.block.BB2025PushStepInitialMoveSequence
 import com.jervisffb.engine.rules.common.procedures.tables.injury.ArmourRoll
 import com.jervisffb.engine.rules.common.procedures.tables.injury.CasualtyRoll
 import com.jervisffb.engine.rules.common.procedures.tables.injury.InjuryRoll
@@ -42,10 +42,10 @@ object InjuryRollMapper: CommandActionMapper {
             newActions.add(
                 action = { state: Game, rules: Rules ->
                     // Any of them will push the player of the field
-                    val action = PushStepInitialMoveSequence.SelectPushDirection.getAvailableActions(state, rules).single() as SelectDirection
+                    val action = BB2025PushStepInitialMoveSequence.SelectPushDirection.getAvailableActions(state, rules).single() as SelectDirection
                     DirectionSelected(action.directions.random())
                 },
-                expectedNode = PushStepInitialMoveSequence.SelectPushDirection
+                expectedNode = BB2025PushStepInitialMoveSequence.SelectPushDirection
             )
         }
 

modules/fumbbl-net/src/commonMain/kotlin/com/jervisffb/fumbbl/net/adapter/impl/block/FollowUpMapper.kt

@@ -3,7 +3,7 @@ package com.jervisffb.fumbbl.net.adapter.impl.blitz
 import com.jervisffb.engine.actions.Cancel
 import com.jervisffb.engine.actions.Confirm
 import com.jervisffb.engine.model.Game
-import com.jervisffb.engine.rules.common.procedures.actions.block.PushStepInitialMoveSequence
+import com.jervisffb.engine.rules.bb2025.procedures.actions.block.BB2025PushStepInitialMoveSequence
 import com.jervisffb.fumbbl.net.adapter.CommandActionMapper
 import com.jervisffb.fumbbl.net.adapter.JervisActionHolder
 import com.jervisffb.fumbbl.net.adapter.add
@@ -48,9 +48,9 @@ object FollowUpMapper: CommandActionMapper {
             (previousPreviousCommand is GameSetDialogParameter) &&
             previousPreviousCommand.value?.dialogId == com.jervisffb.fumbbl.net.model.DialogId.FOLLOWUP_CHOICE
         ) {
-            newActions.add(Confirm, PushStepInitialMoveSequence.DecideToFollowUp)
+            newActions.add(Confirm, BB2025PushStepInitialMoveSequence.ChooseToFollowUp)
         } else {
-            newActions.add(Cancel, PushStepInitialMoveSequence.DecideToFollowUp)
+            newActions.add(Cancel, BB2025PushStepInitialMoveSequence.ChooseToFollowUp)
         }
     }
 }

modules/fumbbl-net/src/commonMain/kotlin/com/jervisffb/fumbbl/net/adapter/impl/block/PushbackMapper.kt

@@ -2,7 +2,7 @@ package com.jervisffb.fumbbl.net.adapter.impl.blitz
 
 import com.jervisffb.engine.actions.DirectionSelected
 import com.jervisffb.engine.model.Game
-import com.jervisffb.engine.rules.common.procedures.actions.block.PushStepInitialMoveSequence
+import com.jervisffb.engine.rules.bb2025.procedures.actions.block.BB2025PushStepInitialMoveSequence
 import com.jervisffb.fumbbl.net.adapter.CommandActionMapper
 import com.jervisffb.fumbbl.net.adapter.JervisActionHolder
 import com.jervisffb.fumbbl.net.adapter.add
@@ -48,7 +48,7 @@ object PushbackMapper: CommandActionMapper {
         } as FieldModelRemovePushbackSquare
         newActions.add(
             DirectionSelected(cmd.value.direction.transformToJervisDirection()),
-            PushStepInitialMoveSequence.SelectPushDirection
+            BB2025PushStepInitialMoveSequence.SelectPushDirection
         )
     }
 }

modules/fumbbl-net/src/commonMain/kotlin/com/jervisffb/fumbbl/net/adapter/impl/block/PushbackUsingSideStepMapper.kt

@@ -3,7 +3,7 @@ package com.jervisffb.fumbbl.net.adapter.impl.blitz
 import com.jervisffb.engine.actions.Confirm
 import com.jervisffb.engine.actions.FieldSquareSelected
 import com.jervisffb.engine.model.Game
-import com.jervisffb.engine.rules.common.procedures.actions.block.PushStepInitialMoveSequence
+import com.jervisffb.engine.rules.bb2025.procedures.actions.block.BB2025PushStepInitialMoveSequence
 import com.jervisffb.fumbbl.net.adapter.CommandActionMapper
 import com.jervisffb.fumbbl.net.adapter.JervisActionHolder
 import com.jervisffb.fumbbl.net.adapter.add
@@ -39,7 +39,7 @@ object PushbackUsingSideStepMapper: CommandActionMapper {
         } as FieldModelRemovePushbackSquare
         val target = cmd.value.coordinate
 
-        newActions.add(Confirm, PushStepInitialMoveSequence.DecideToUseSidestep)
-        newActions.add(FieldSquareSelected(target.x, target.y), PushStepInitialMoveSequence.SelectPushDirection)
+        newActions.add(Confirm, BB2025PushStepInitialMoveSequence.DecideToUseSidestep)
+        newActions.add(FieldSquareSelected(target.x, target.y), BB2025PushStepInitialMoveSequence.SelectPushDirection)
     }
 }

modules/jervis-engine/src/commonMain/kotlin/com/jervisffb/engine/commands/context/SetContextProperty.kt

@@ -2,7 +2,6 @@ package com.jervisffb.engine.commands.context
 
 import com.jervisffb.engine.commands.Command
 import com.jervisffb.engine.model.Game
-import com.jervisffb.engine.rules.common.procedures.actions.block.PushContext
 import kotlin.reflect.KMutableProperty1
 
 /**
@@ -44,7 +43,6 @@ import kotlin.reflect.KMutableProperty1
  * scanning nodes. So it feels like hiding these behind helper functions
  * makes it a bit more readable.
  *
- * @see PushContext
  * @see com.jervisffb.engine.model.context.DodgeRollContext
  */
 class SetContextProperty<T, V>(

modules/jervis-engine/src/commonMain/kotlin/com/jervisffb/engine/model/context/MultipleBlockContext.kt

@@ -23,7 +23,6 @@ import com.jervisffb.engine.rules.common.actions.BlockType.STAB
 import com.jervisffb.engine.rules.common.actions.BlockType.STANDARD
 import com.jervisffb.engine.rules.common.procedures.DieRoll
 import com.jervisffb.engine.rules.common.procedures.actions.block.BlockContext
-import com.jervisffb.engine.rules.common.procedures.actions.block.PushContext
 import com.jervisffb.engine.rules.common.procedures.actions.block.standard.StandardBlockApplyResult
 import com.jervisffb.engine.rules.common.procedures.actions.block.standard.StandardBlockRerollDice
 import com.jervisffb.engine.rules.common.procedures.actions.block.standard.StandardBlockRollDice

modules/jervis-engine/src/commonMain/kotlin/com/jervisffb/engine/model/context/PushContext.kt

@@ -0,0 +1,67 @@
+package com.jervisffb.engine.model.context
+
+import com.jervisffb.engine.model.Ball
+import com.jervisffb.engine.model.Player
+import com.jervisffb.engine.model.hasSkill
+import com.jervisffb.engine.model.locations.FieldCoordinate
+import com.jervisffb.engine.rules.common.skills.SkillType
+
+data class PushContext(
+    // Player starting the first push
+    val firstPusher: Player,
+    // First player being pushed
+    val firstPushee: Player,
+    // Tracks if the attacker is using Juggernaut.
+    val isAttackerUsingJuggernaut: Boolean,
+    // firstPushee is knocked down after the pushback has resolved. So if they
+    // have the ball, it will bounce.
+    val isDefenderKnockedDown: Boolean,
+    // Is the push part of a multiple block
+    val isMultipleBlock: Boolean,
+    // Chain of pushes. For a single push, this contains one element
+    // Should only be modified from within the `PushStep` procedure.
+    val pushChain: MutableList<PushData>,
+    // If `true`, the `firstPusher` will use Fend, preventing follow-up
+    var defenderIsUsingFend: Boolean = false,
+    // If `true`, the `firstPusher` will use Taunt, forcing a follow-up
+    var defenderIsUsingTaunt: Boolean = false,
+    // If `true`, the `firstPusher` will follow up after resolving the rest of the chain.
+    var followsUp: Boolean = false,
+    // Temporary state tracking the current player being resolved for this push step.
+    var fullyResolveInProgress: Player? = null,
+    // Track any balls that must bounce after the push is resolved.
+    // Either because a player was pushed into it, or because a trapdoor
+    // swallowed a player with a ball. Balls should be added and resolved in
+    // order.
+    val looseBalls: MutableList<Ball> = mutableListOf(),
+) : ProcedureContext {
+
+    // Tracks if the attacker is using Juggernaut.
+    val isAttackerUsingFrenzy: Boolean = firstPusher.hasSkill(SkillType.FRENZY)
+
+    // Returns last "pusher" in the push chain
+    fun pusher(): Player {
+        return pushChain.last().pusher
+    }
+
+    // Returns the last "pushee" in the chain
+    fun pushee(): Player {
+        return pushChain.last().pushee
+    }
+
+    data class PushData(
+        val pusher: Player,
+        val pushee: Player,
+        // Where is the pushee being pushed from?
+        val from: FieldCoordinate,
+        // Where is the pushee being pushed to?
+        var to: FieldCoordinate? = null, // If `null` push direction has not been selected yet
+        val isBlitzing: Boolean = false, // If first pusher is doing a Blitz
+        val isChainPush: Boolean = false, // True for every push beyond the first
+        var usedGrab: Boolean = false,
+        var usedStandFirm: Boolean = false,
+        var usedSideStep: Boolean = false,
+        // Set to `true` if we checked the player in this step for scoring
+        var checkedForScoringAfterTrapdoors: Boolean = false,
+    )
+}