Add hitpoints to player model

chendrix · Jul 3, 2015 · 9b5a404 · 9b5a404
1 parent 7d1feb1
commit 9b5a404
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/Rogue.elm b/src/Rogue.elm
@@ -6,6 +6,7 @@ import Numpad
 import Rogue.Model exposing (..)
 import Rogue.Update exposing (..)
 import Rogue.View exposing (..)
+import Signal exposing ((<~), (~), Signal)
 
 -- SIGNALS
 
@@ -18,8 +19,9 @@ gameState =
 
 input : Signal Input
 input =
-  Signal.map Input <| Signal.mergeMany
-    [ Keyboard.wasd
-    , Keyboard.arrows
-    , Numpad.numpad
-    ]
+  Input <~
+    Signal.mergeMany
+      [ Keyboard.wasd
+      , Keyboard.arrows
+      , Numpad.numpad
+      ]
diff --git a/src/Rogue/Model.elm b/src/Rogue/Model.elm
@@ -9,8 +9,10 @@ import Now
 
 type alias GameMap = Matrix Cell
 
+type alias HitPoints = Int
 type alias Player =
   { inventory : List Item
+  , hp : HitPoints
   }
 
 type alias Game =
@@ -39,7 +41,7 @@ type alias Input =
   }
 
 newPlayer : Player
-newPlayer = {inventory = []}
+newPlayer = {inventory = [], hp = 100}
 
 randomizeLocationsWithin : Int -> Int -> List Location
 randomizeLocationsWithin size numLocations =

diff --git a/src/Rogue/View.elm b/src/Rogue/View.elm
@@ -32,8 +32,12 @@ viewCell curLocation cellLocation c =
         Barrier _ -> barrier
 
 viewPlayer : Player -> Element
-viewPlayer {inventory} =
-  txt (String.join "" ["Item Count: ", List.length inventory |> toString ])
+viewPlayer {inventory, hp} =
+  flow down
+    [ txt (String.join "" ["Item Count: ", List.length inventory |> toString ])
+    , txt (String.join "" ["Current HP: ", hp |> toString ])
+    ]
+
 
 txt str =
   Text.fromString str