Add shooting diceroll command and control

mwunsch · Jan 5, 2017 · bedd5c0 · bedd5c0
1 parent 34cd0fd
commit bedd5c0
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 1 deletion.
diff --git a/src/Campaign.elm b/src/Campaign.elm
@@ -82,6 +82,9 @@ update msg campaign =
         activePlayer =
             Game.activePlayer campaign.game
 
+        enemyPlayer =
+            Game.enemyPlayer campaign.game
+
         currentTurn =
             Game.turn campaign.game
     in
@@ -104,6 +107,33 @@ update msg campaign =
 
             Command action ->
                 case action of
+                    Action.Shoot weapon ->
+                        let
+                            maybeTarget : Maybe Model
+                            maybeTarget =
+                                Player.getSelectedGangMember activePlayer
+                                    |> Maybe.andThen
+                                        (Model.withinShootingRange (Gang.toList enemyPlayer.gang) weapon
+                                            >> List.head
+                                        )
+                        in
+                            ( { campaign
+                                | game =
+                                    campaign.game
+                                        |> Game.mapActivePlayer
+                                            (\player ->
+                                                { player
+                                                    | action = action
+                                                    , target = Maybe.map (.id) maybeTarget
+                                                }
+                                            )
+                                , rolling =
+                                    Player.getSelectedGangMember activePlayer
+                                        |> Maybe.map2 (\target attacker -> ( 1, 6, Player.Shooting attacker target weapon )) maybeTarget
+                              }
+                            , Cmd.none
+                            )
+
                     _ ->
                         ( { campaign
                             | game = Game.mapActivePlayer (\p -> { p | action = action }) campaign.game
@@ -446,7 +476,9 @@ view campaign =
         bottom =
             Html.div [ id "controls" ]
                 [ selectedFighterProfile
-                , Controls.view activePlayer (Game.turn game |> Turn.phase) Command
+                , campaign.rolling
+                    |> Maybe.map (\( num, val, instruction ) -> Controls.viewDice num val <| Roll instruction)
+                    |> Maybe.withDefault (Controls.view activePlayer (Game.turn game |> Turn.phase) Command)
                 , targetFighterProfile
                 ]
 

diff --git a/src/View/Controls.elm b/src/View/Controls.elm
@@ -74,6 +74,24 @@ viewControl key maybeAction msg =
                 ]
 
 
+viewDice : Int -> Int -> msg -> Html msg
+viewDice num val msg =
+    let
+        diceStr =
+            (toString num) ++ "D" ++ (toString val)
+    in
+        Html.div [ id "player-commands" ]
+            [ button
+                [ class "command diceroll"
+                , title diceStr
+                , onClickWithoutPropagation msg
+                ]
+                [ span [ class "command-symbol" ] [ text "🎲" ]
+                , span [ class "command-hotkey" ] [ text diceStr ]
+                ]
+            ]
+
+
 view : Player -> Phase -> (Action -> msg) -> Html msg
 view player phase msg =
     availableActions player phase