Make choosing action a player concern

src/Action.elm

@@ -5,12 +5,13 @@ import Model exposing (Model)
 import String
 import Svg exposing (..)
 import Svg.Attributes exposing (..)
-import Tabletop exposing (Inch, posX, posY)
+import Tabletop exposing (Inch, posX, posY, transformTranslate)
 import Turn exposing (Turn, Phase(..))
 
 
 type Action
     = Await
+    | Cancel
     | Move
     | Charge
     | Run
@@ -23,16 +24,16 @@ select : Phase -> Model -> List Action
 select phase fighter =
     case phase of
         Movement ->
-            [ Await, Move, Charge, Run, Hide ]
+            [ Move, Charge, Run, Hide, Cancel ]
 
         Shooting ->
-            [ Await, Shoot ]
+            [ Shoot, Cancel ]
 
         HandToHand ->
-            [ Fight ]
+            [ Cancel ]
 
         Recovery ->
-            [ Await ]
+            [ Cancel ]
 
 
 symbol : Action -> String
@@ -48,28 +49,40 @@ symbol action =
             String.fromChar '🔜'
 
 
+view : Action -> Phase -> Model -> Svg msg
+view action phase model =
+    case action of
+        Await ->
+            viewSelection phase model
+
+        _ ->
+            g [ transformTranslate model.position ]
+                [ circle
+                    [ r (Tabletop.millimeter 25 |> toString)
+                    , fill "red"
+                    , opacity "0.15"
+                    ]
+                    []
+                ]
+
+
 {-| TODO: Just drawing a circle for now until can come up with better HUD.
 -}
 viewSelection : Phase -> Model -> Svg msg
 viewSelection phase { position } =
-    let
-        translate : Tabletop.Position -> String
-        translate ( x, y ) =
-            String.concat
-                [ "translate"
-                , "("
-                , (String.join "," [ (toString x), (toString y) ])
-                , ")"
-                ]
-    in
-        g [ transform (translate position) ]
-            [ circle
-                [ r (Tabletop.millimeter 35 |> toString)
-                , fill "white"
-                , opacity "0.15"
-                ]
-                []
+    g [ transformTranslate position ]
+        [ circle
+            [ r (Tabletop.millimeter 35 |> toString)
+            , fill "white"
+            , opacity "0.15"
             ]
+            []
+        ]
+
+
+emptyView : Svg msg
+emptyView =
+    g [] []
 
 
 {-| TODO: Make the below `view` fn better.

src/Main.elm

@@ -200,9 +200,7 @@ view game =
                 |> Maybe.withDefault (g [] [])
 
         actionSelection =
-            Player.getSelectedGangMember game.player
-                |> Maybe.map (\fighter -> Action.viewSelection (Turn.phase game.turn) fighter)
-                |> Maybe.withDefault (g [] [])
+            Player.view game.player (Turn.phase game.turn)
 
         selectedFighterProfile =
             Player.getSelectedGangMember game.player

src/Player.elm

@@ -1,15 +1,19 @@
 module Player exposing (..)
 
+import Action exposing (Action(..))
 import Gang exposing (Gang)
 import Maybe exposing (andThen)
 import Model exposing (Model)
+import Svg exposing (Svg)
 import Tabletop exposing (Tabletop, Position)
+import Turn exposing (Phase)
 
 
 type alias Player =
     { gang : Gang
     , selection : Maybe Model.Id
     , movementIntention : Position
+    , action : Action
     }
 
 
@@ -18,6 +22,7 @@ init table =
     { gang = Gang.empty
     , selection = Nothing
     , movementIntention = Tabletop.center table
+    , action = Await
     }
 
 
@@ -44,3 +49,10 @@ deselectAll player =
 getSelectedGangMember : Player -> Maybe Model
 getSelectedGangMember player =
     player.selection `andThen` (flip Gang.get) player.gang
+
+
+view : Player -> Phase -> Svg msg
+view player phase =
+    getSelectedGangMember player
+        |> Maybe.map (Action.view player.action phase)
+        |> Maybe.withDefault (Action.emptyView)

src/Tabletop.elm

@@ -1,6 +1,7 @@
 module Tabletop exposing (..)
 
 import Random exposing (Generator)
+import String
 import Svg exposing (Svg, rect, g, line)
 import Svg.Attributes exposing (..)
 
@@ -24,7 +25,6 @@ type alias Position =
     ( Float, Float )
 
 
-
 posX : Position -> Float
 posX ( x', _ ) =
     x'
@@ -161,3 +161,11 @@ viewMeasuringTape start end range =
                 ]
                 []
             ]
+
+
+transformTranslate : Position -> Svg.Attribute msg
+transformTranslate ( x, y ) =
+    List.map toString [ x, y ]
+        |> String.join ","
+        |> (\str -> String.concat [ "translate(", str, ")" ])
+        |> transform