Prefer Players with Kick skill when automatically selecting the player to kick the ball

Author: cmelchior

modules/jervis-engine/src/commonMain/kotlin/com/jervisffb/engine/actions/GameActionDescriptor.kt

@@ -4,6 +4,7 @@ import com.jervisffb.engine.GameEngineController
 import com.jervisffb.engine.actions.SelectPlayer
 import com.jervisffb.engine.fsm.ActionNode
 import com.jervisffb.engine.model.Direction
+import com.jervisffb.engine.model.Game
 import com.jervisffb.engine.model.Player
 import com.jervisffb.engine.model.PlayerId
 import com.jervisffb.engine.model.SkillId
@@ -354,6 +355,8 @@ data class SelectPlayer private constructor(
     }
     override fun createAll(): List<GameAction> = players.map { PlayerSelected(it) }
 
+    fun getPlayers(state: Game): List<Player> = players.map { state.getPlayerById(it) }
+
     companion object {
         fun single(player: Player): SelectPlayer = SelectPlayer(listOf(player.id))
         fun fromPlayers(players: List<Player>): SelectPlayer {

modules/jervis-ui/src/commonMain/kotlin/com/jervisffb/ui/game/state/ManualActionProvider.kt

@@ -20,6 +20,7 @@ import com.jervisffb.engine.actions.GameAction
 import com.jervisffb.engine.actions.GameActionDescriptor
 import com.jervisffb.engine.actions.MoveTypeSelected
 import com.jervisffb.engine.actions.NoRerollSelected
+import com.jervisffb.engine.actions.PlayerSelected
 import com.jervisffb.engine.actions.Revert
 import com.jervisffb.engine.actions.SelectBlockType
 import com.jervisffb.engine.actions.SelectDicePoolResult
@@ -426,15 +427,21 @@ open class ManualActionProvider(
         }
 
         // Randomly select a kicking player
-        // TODO Should only do this if no-one has kick
         val currentNode = controller.currentProcedure()?.currentNode()
         if (currentNode == TheKickOff.NominateKickingPlayer && menuViewModel.isFeatureEnabled(
                 Feature.SELECT_KICKING_PLAYER
             )) {
             return (currentNode as ActionNode).getAvailableActions(controller.state, controller.rules)
                 .filterIsInstance<SelectPlayer>()
                 .single()
-                .createRandom()
+                .getPlayers(game.state).let {
+                    val playersWithKick = it.filter { it.isSkillAvailable(SkillType.KICK) }
+                    if (playersWithKick.isNotEmpty()) {
+                        PlayerSelected(playersWithKick.first())
+                    } else {
+                        PlayerSelected(it.random())
+                    }
+                }
         }
 
         // If a player action can only end, just end it immediately