#5 Render inventory when pressing i

lib/RPGEngine/Input/Core.hs

@@ -32,16 +32,16 @@ composeInputHandlers (ih:ihs) ev a = composeInputHandlers ihs ev (ih ev a)
 
 -- Handle any event
 handle :: Event -> (a -> a) -> InputHandler a
-handle (EventKey key _ _ _) = handleKey key
+handle (EventKey key state _ _) = handleKey key state
 -- handle (EventMotion _)      = undefined -- TODO
 -- handle (EventResize _)      = undefined -- TODO
-handle _                    = const (const id)
+handle _                        = const (const id)
 
 -- Handle a event by pressing a key
-handleKey :: Key -> (a -> a) -> InputHandler a
-handleKey (SpecialKey  sk) = handleSpecialKey sk
-handleKey (Char        c ) = handleCharKey c
-handleKey (MouseButton _ ) = const (const id)
+handleKey :: Key -> KeyState -> (a -> a) -> InputHandler a
+handleKey (SpecialKey  sk) s = handleSpecialKey sk s
+handleKey (Char        c ) s = handleCharKey c s
+handleKey (MouseButton _ ) _ = const (const id)
 
 -- Handle any key, equivalent to "Press any key to start"
 handleAnyKey :: (a -> a) -> InputHandler a
@@ -50,14 +50,14 @@ handleAnyKey _ _                     = id
 
 --------------------------- Help functions ---------------------------
 
-handleCharKey :: Char -> (a -> a) -> InputHandler a
-handleCharKey c1 f (EventKey (Char c2) Down _ _)
-    | c1 == c2  = f
-    | otherwise = id
-handleCharKey _  _ _ = id
+handleCharKey :: Char -> KeyState -> (a -> a) -> InputHandler a
+handleCharKey c1 s1 f (EventKey (Char c2) s2 _ _)
+    | c1 == c2 && s1 == s2 = f
+    | otherwise            = id
+handleCharKey _  _ _ _ = id
 
-handleSpecialKey :: SpecialKey -> (a -> a) -> InputHandler a
-handleSpecialKey sk1 f (EventKey (SpecialKey sk2) Down _ _)
-    | sk1 == sk2 = f
+handleSpecialKey :: SpecialKey -> KeyState -> (a -> a) -> InputHandler a
+handleSpecialKey sk1 s1 f (EventKey (SpecialKey sk2) s2 _ _)
+    | sk1 == sk2 && s1 == s2 = f
     | otherwise  = id
-handleSpecialKey _   _ _ = id
+handleSpecialKey _   _ _ _ = id

lib/RPGEngine/Input/LevelSelection.hs

@@ -6,7 +6,7 @@ import RPGEngine.Input.Core (InputHandler, composeInputHandlers, handleKey, List
 
 import RPGEngine.Data (Game (..), State (..), Direction (..))
 import Graphics.Gloss.Interface.IO.Game (Key(..))
-import Graphics.Gloss.Interface.IO.Interact (SpecialKey(..))
+import Graphics.Gloss.Interface.IO.Interact (SpecialKey(..), KeyState(..))
 import RPGEngine.Config (levelFolder)
 import RPGEngine.Parse (parse)
 
@@ -14,10 +14,10 @@ import RPGEngine.Parse (parse)
 
 handleInputLevelSelection :: InputHandler Game
 handleInputLevelSelection = composeInputHandlers [
-    handleKey (SpecialKey KeySpace) selectLevel,
+    handleKey (SpecialKey KeySpace) Down selectLevel,
 
-    handleKey (SpecialKey KeyUp)   $ moveSelector North,
-    handleKey (SpecialKey KeyDown) $ moveSelector South
+    handleKey (SpecialKey KeyUp)   Down $ moveSelector North,
+    handleKey (SpecialKey KeyDown) Down $ moveSelector South
     ]
 
 ----------------------------------------------------------------------

lib/RPGEngine/Input/Playing.hs

@@ -4,32 +4,36 @@ module RPGEngine.Input.Playing
 , spawnPlayer
 ) where
 
-import RPGEngine.Input.Core (InputHandler, handleKey, composeInputHandlers)
+import RPGEngine.Input.Core (InputHandler, handle, handleKey, composeInputHandlers)
 
 import RPGEngine.Data (Game (..), Layout(..), Level(..), Physical(..), Player(..), State(..), X, Y, Direction (..))
 import RPGEngine.Data.Game (isLegalMove, isPlayerDead, isPlayerAtExit)
 import RPGEngine.Data.Level (directionOffsets, findFirstOf)
+
 import Data.Maybe (fromJust, isNothing)
 import Graphics.Gloss.Interface.IO.Game (Key(..))
-import Graphics.Gloss.Interface.IO.Interact (SpecialKey(..))
+import Graphics.Gloss.Interface.IO.Interact (SpecialKey(..), KeyState(..), Event(..), KeyState(..))
 
 ------------------------------ Exported ------------------------------
 
 handleInputPlaying :: InputHandler Game
 handleInputPlaying = composeInputHandlers [
     -- Pause the game
-    handleKey (Char 'p') pauseGame,
+    handleKey (Char 'p') Down pauseGame,
 
     -- Player movement
-    handleKey (SpecialKey KeyUp)    $ movePlayer North,
-    handleKey (SpecialKey KeyRight) $ movePlayer East,
-    handleKey (SpecialKey KeyDown)  $ movePlayer South,
-    handleKey (SpecialKey KeyLeft)  $ movePlayer West,
+    handleKey (SpecialKey KeyUp)    Down $ movePlayer North,
+    handleKey (SpecialKey KeyRight) Down $ movePlayer East,
+    handleKey (SpecialKey KeyDown)  Down $ movePlayer South,
+    handleKey (SpecialKey KeyLeft)  Down $ movePlayer West,
 
-    handleKey (Char 'w') $ movePlayer North,
-    handleKey (Char 'd') $ movePlayer East,
-    handleKey (Char 's') $ movePlayer South,
-    handleKey (Char 'a') $ movePlayer West
+    handleKey (Char 'w') Down $ movePlayer North,
+    handleKey (Char 'd') Down $ movePlayer East,
+    handleKey (Char 's') Down $ movePlayer South,
+    handleKey (Char 'a') Down $ movePlayer West,
+
+    handleKey (Char 'i') Down $ toggleInventoryShown True,
+    handleKey (Char 'i') Up   $ toggleInventoryShown False
     ]
 
 ----------------------------------------------------------------------
@@ -76,6 +80,12 @@ movePlayer dir g@Game{ state = s@Playing{ player = p@Player{ position = (x, y) }
           (xD, yD)  = directionOffsets dir
 movePlayer _ g = g
 
+toggleInventoryShown :: Bool -> Game -> Game
+toggleInventoryShown shown g@Game{ state = s@Playing{ player = p }}= newGame
+    where newGame   = g{ state  = newState     }
+          newState  = s{ player = newPlayer    }
+          newPlayer = p{ showInventory = shown }
+
 -- Map all Physicals onto coordinates
 putCoords :: Level -> [(X, Y, Physical)]
 putCoords l@Level{ layout = lay } = concatMap (\(a, bs) -> map (\(b, c) -> (b, a, c)) bs) numberedList