Parameterize Shoot action with Weapon

mwunsch · Nov 9, 2016 · ad59087 · ad59087
1 parent 7735a65
commit ad59087
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/Action.elm b/src/Action.elm
@@ -13,6 +13,7 @@ import Svg.Attributes exposing (..)
 import Tabletop exposing (Inch, posX, posY, transformTranslate)
 import Turn exposing (Turn, Phase(..))
 import Utilities exposing (onClickWithoutPropagation, textNode)
+import Weapons exposing (Weapon, autogun)
 
 
 type Action
@@ -22,7 +23,7 @@ type Action
     | Charge
     | Run
     | Hide
-    | Shoot
+    | Shoot Weapon
     | Fight
 
 
@@ -35,7 +36,7 @@ select phase =
 
         Shooting ->
             -- [ Cancel,
-            [ Shoot ]
+            [ Shoot autogun ]
 
         HandToHand ->
             [ Cancel ]
@@ -66,7 +67,7 @@ symbol action =
         Run ->
             "R"
 
-        Shoot ->
+        Shoot weapon ->
             "S"
 
         _ ->

diff --git a/src/Main.elm b/src/Main.elm
@@ -96,7 +96,7 @@ update msg game =
     case msg of
         Select model ->
             case game.player.action of
-                Action.Shoot ->
+                Action.Shoot _ ->
                     case Player.getSelectedGangMember game.player of
                         Just fighter ->
                             Player.execute (Player.Shooting fighter model) game.player
@@ -158,7 +158,7 @@ update msg game =
                         Action.Run ->
                             Just ( "lightblue", "Click to run to a point" )
 
-                        Action.Shoot ->
+                        Action.Shoot _ ->
                             Just ( "red", "Select a target" )
 
                         _ ->

diff --git a/src/Player.elm b/src/Player.elm
@@ -8,6 +8,7 @@ import Svg exposing (Svg, g)
 import Tabletop exposing (Tabletop, Position)
 import Task exposing (Task)
 import Turn exposing (Phase)
+import Weapons exposing (autogun)
 
 
 type alias Player =
@@ -110,7 +111,7 @@ execute instruction player =
 
         Shooting attacker target ->
             ( { player | target = Just target.id }
-            , Task.succeed Shoot
+            , Task.succeed (Shoot autogun)
             )