Move in game key press input reaction to universe update

src/Dodge/Update/Camera.hs

@@ -14,7 +14,6 @@ import Control.Monad
 import Data.Foldable
 import qualified Data.Map.Strict as M
 import Data.Maybe
-import qualified Data.Set as Set
 import Dodge.Base
 import Dodge.Creature.Test
 import Dodge.Data.Config
@@ -193,8 +192,8 @@ rotateCamera cfig w
     | keyr = over cWorld (rotateCameraBy (-0.025)) w
     | otherwise = ifConfigWallRotate cfig w
   where
-    keyl = SDL.ScancodeQ `Set.member` _keys (_input w) && notAtTerminal w
-    keyr = SDL.ScancodeE `Set.member` _keys (_input w) && notAtTerminal w
+    keyl = SDL.ScancodeQ `M.member` _pressedKeys (_input w) && notAtTerminal w
+    keyr = SDL.ScancodeE `M.member` _pressedKeys (_input w) && notAtTerminal w
 
 -- TODO check where/how this is used
 notAtTerminal :: World -> Bool

src/Dodge/Update/Input.hs

@@ -0,0 +1,67 @@
+module Dodge.Update.Input 
+    ( updateKeyInGame
+    ) where
+
+import Dodge.WorldPos
+import Dodge.Button.Event
+import Dodge.Inventory
+import Dodge.Combine
+import Dodge.Event.Test
+import Dodge.Base.You
+import Dodge.Reloading
+import Dodge.Creature.Action
+import Dodge.Menu
+import Dodge.Data.Universe
+import SDL
+import LensHelp
+
+updateKeyInGame :: Universe -> Scancode -> PressType -> Universe
+updateKeyInGame  uv sc InitialPress = case sc of
+    ScancodeEscape -> pauseGame uv
+    ScancodeSpace -> over uvWorld spaceAction uv
+    ScancodeP -> pauseGame uv
+    ScancodeF -> over uvWorld youDropItem uv
+    ScancodeM -> over uvWorld toggleMap uv
+    ScancodeR -> over uvWorld (crToggleReloading (you w)) uv
+    ScancodeT -> over uvWorld testEvent uv
+    ScancodeX -> uv & uvWorld %~ toggleTweakInv
+    ScancodeC -> over uvWorld toggleCombineInv uv
+    ScancodeI -> uv & uvWorld . cWorld . lWorld . hud . hudElement %~ toggleInspectInv
+    _ -> uv
+  where
+    w = _uvWorld uv
+updateKeyInGame  uv _ _ = uv
+
+pauseGame :: Universe -> Universe
+pauseGame = uvScreenLayers .~ [pauseMenu]
+
+spaceAction :: World -> World
+spaceAction w = case w ^?! cWorld . lWorld . hud . hudElement of
+    DisplayCarte -> w & cWorld . lWorld . hud . carteCenter .~ theLoc
+    DisplayInventory NoSubInventory -> case selectedCloseObject w of
+        Just (_, Left flit) -> pickUpItem 0 flit w
+        Just (_, Right but) -> doButtonEvent (_btEvent but) but w
+        _ -> w
+    DisplayInventory DisplayTerminal{} -> w & cWorld . lWorld . hud . hudElement .~ DisplayInventory NoSubInventory
+    _ -> w & cWorld . lWorld . hud . hudElement .~ DisplayInventory NoSubInventory
+  where
+    --theLoc = doWorldPos (fst (_seenLocations (_cWorld w) IM.! _selLocation (_cWorld w))) w
+    theLoc = doWorldPos (w ^?! cWorld . lWorld . seenLocations . ix (w ^. cWorld . lWorld . selLocation) . _1) w
+
+toggleMap :: World -> World
+toggleMap w = case w ^?! cWorld . lWorld . hud . hudElement of
+    DisplayCarte -> w & cWorld . lWorld . hud . hudElement .~ DisplayInventory NoSubInventory
+    _ -> w & cWorld . lWorld . hud . hudElement .~ DisplayCarte
+
+toggleTweakInv :: World -> World
+toggleTweakInv w = case w ^. cWorld . lWorld . hud . hudElement of
+    DisplayInventory TweakInventory{} -> w & thepointer .~ DisplayInventory NoSubInventory
+    _ -> w & thepointer .~ DisplayInventory (TweakInventory mi)
+  where
+    thepointer = cWorld . lWorld . hud . hudElement
+    mi = 0 <$ (yourItem w >>= (^? itTweaks . tweakParams . ix 0))
+
+toggleInspectInv :: HUDElement -> HUDElement
+toggleInspectInv he = case he of
+    DisplayInventory InspectInventory -> DisplayInventory NoSubInventory
+    _ -> DisplayInventory InspectInventory

src/Dodge/Update/Scroll.hs

@@ -2,7 +2,6 @@ module Dodge.Update.Scroll where
 
 import qualified Data.Map.Strict as M
 import Data.Maybe
-import qualified Data.Set as S
 import qualified Data.Text as T
 import Dodge.Base
 import Dodge.Combine
@@ -74,7 +73,7 @@ updateWheelEvent yi w = case w ^. cWorld . lWorld . hud . hudElement of
     numLocs = (fst . IM.findMax $ (w ^. cWorld . lWorld . seenLocations)) + 1
     rbDown = ButtonRight `M.member` _mouseButtons (_input w)
     lbDown = ButtonLeft `M.member` _mouseButtons (_input w)
-    invKeyDown = ScancodeCapsLock `S.member` _keys (_input w)
+    invKeyDown = ScancodeCapsLock `M.member` _pressedKeys (_input w)
 
 scrollRBOption :: Float -> World -> World
 scrollRBOption y w