Refactor menu

src/Dodge/Event/Keyboard.hs

@@ -1,3 +1,6 @@
+{- |
+Deals with keyboard events.
+-}
 module Dodge.Event.Keyboard
     ( handleKeyboardEvent
     )
@@ -21,6 +24,11 @@ import Control.Lens
 
 import Picture
 
+{- | Handles keyboard press and release.
+On release, remove scancode from the 'Set' of pressed keys.
+On press, adds the scancode, and perhaps applies a direct effect:
+see 'handlePressedKeyInGame'.
+ -}
 handleKeyboardEvent :: KeyboardEventData -> World -> Maybe World
 handleKeyboardEvent kev w = case keyboardEventKeyMotion kev of
     Released    -> Just $ w & keys %~ S.delete kcode
@@ -40,9 +48,8 @@ handlePressedKeyInGame scode w
     |  scode == reloadKey (_keyConfig w) = Just $ fromMaybe w $ reloadWeapon (_yourID w) w
     |  scode == testEventKey (_keyConfig w) = Just $ testEvent w
     |  scode == spaceActionKey (_keyConfig w) = Just $ spaceAction w
-    -- Rotation seems to be duplicated here and in Camera.hs ? why
-    |  scode == rotateCameraPlusKey (_keyConfig w) = Just $ w {_cameraRot = _cameraRot w + 0.01}
-    |  scode == rotateCameraMinusKey (_keyConfig w) = Just $ w {_cameraRot = _cameraRot w - 0.01}
+    |  scode == rotateCameraPlusKey (_keyConfig w)  = Just $ w & cameraRot +~ 0.01
+    |  scode == rotateCameraMinusKey (_keyConfig w) = Just $ w & cameraRot -~ 0.01
     |  scode ==   ScancodeF11      = Just $ w {_debugMode = not $ _debugMode w} 
     | _debugMode w = debugKey scode w
 handlePressedKeyInGame _ w = Just w
@@ -57,10 +64,10 @@ handlePressedKey _ _ w = Just w
 
 debugKey :: Scancode -> World -> Maybe World 
 debugKey scancode w
-    | scancode ==   ScancodeF7      = Just $ w {_varMovementSpeedModifier = _varMovementSpeedModifier w - 1}
-    | scancode ==   ScancodeF8      = Just $ w {_varMovementSpeedModifier = _varMovementSpeedModifier w + 1}
-    | scancode ==   ScancodeF5      = Just $ dropLight w 
-    | scancode ==   ScancodeF6      = Just $ dropLight' w 
+    | scancode == ScancodeF7 = Just $ w & varMovementSpeedModifier -~ 1
+    | scancode == ScancodeF8 = Just $ w & varMovementSpeedModifier +~ 1
+    | scancode == ScancodeF5 = Just $ dropLight w 
+    | scancode == ScancodeF6 = Just $ dropLight' w 
 debugKey _ w = Just w
 
 
@@ -78,7 +85,7 @@ escapeMap w = w & carteDisplay .~ False
 
 dropLight :: World -> World
 dropLight w = placeLS ls dec pos 0
-        -- $ over creatures IM.insert i (lamp)
+        --  $ over creatures IM.insert i (lamp)
         $ w
         --case yourItem w of
         --NoItem -> w