diff --git a/ghcidOutput b/ghcidOutput index 98c214d80..2b0d2bfbd 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1 +1 @@ -All good (594 modules, at 12:51:42) +All good (594 modules, at 21:29:46) diff --git a/src/Dodge/Creature/Action.hs b/src/Dodge/Creature/Action.hs index 187501da6..e2d142393 100644 --- a/src/Dodge/Creature/Action.hs +++ b/src/Dodge/Creature/Action.hs @@ -14,7 +14,7 @@ module Dodge.Creature.Action ( sizeSelf, youDropItem, pickUpItem, --- pickUpItemID, + -- pickUpItemID, ) where import Control.Applicative @@ -174,9 +174,12 @@ dropExcept cr invid w = foldr (dropItem cr) w . IM.keys $ invid `IM.delete` _crInv cr +-- why not a cid (Int)? dropItem :: Creature -> Int -> World -> World -dropItem cr invid = rmInvItem (_crID cr) invid . - copyItemToFloor (_crPos cr) itm -- . mayberemoveequip +dropItem cr invid = + rmInvItem (_crID cr) invid + . copyItemToFloor (_crPos cr) itm -- . mayberemoveequip + . soundStart (CrSound (_crID cr)) (_crPos cr) whiteNoiseFadeOutS Nothing where itm = fromMaybe (error "dropItem cannot find item") $ cr ^? crInv . ix invid @@ -190,8 +193,9 @@ youDropItem w = fromMaybe w $ do return $ w & dropItem cr curpos - & soundStart (CrSound (_crID cr)) (_crPos cr) whiteNoiseFadeOutS Nothing where + -- & soundStart (CrSound (_crID cr)) (_crPos cr) whiteNoiseFadeOutS Nothing + cr = you w sizeSelf :: Float -> Creature -> World -> Maybe World @@ -216,4 +220,3 @@ sizeSelf x cr w raddist = RadialDistortion cpos (cpos +.+ V2 distR 0) (cpos +.+ V2 0 distR) cid = _crID cr cpos = _crPos cr - diff --git a/src/Dodge/Data/Input.hs b/src/Dodge/Data/Input.hs index 0537735a9..b1d6c848a 100644 --- a/src/Dodge/Data/Input.hs +++ b/src/Dodge/Data/Input.hs @@ -22,7 +22,7 @@ data MouseContext | MouseInGame | MouseMenuClick {_mcoMenuClick :: Int} | MouseMenuCursor - | OverInvDrag + | OverInvDrag {_mcoDragPos :: Maybe Int} | OverInvDragSelect { _mcoSelStart :: (Int,Int), _mcoSelEnd :: Maybe (Int,Int) } | OverInvSelect { _mcoInvSelect :: (Int,Int)} | OverInvFilt { _mcoInvFilt :: (Int,Int)} diff --git a/src/Dodge/DisplayInventory.hs b/src/Dodge/DisplayInventory.hs index 87bb43007..d80e89e05 100644 --- a/src/Dodge/DisplayInventory.hs +++ b/src/Dodge/DisplayInventory.hs @@ -172,7 +172,7 @@ filterSectionsPair endstr filtfn itms filtdescription mfilt = , itms' ) where - filtsis = fromMaybe mempty $ do + filtsis = fold $ do str <- mfilt return $ IM.singleton diff --git a/src/Dodge/Item/Draw.hs b/src/Dodge/Item/Draw.hs index 52f29e0a0..d13321ac7 100644 --- a/src/Dodge/Item/Draw.hs +++ b/src/Dodge/Item/Draw.hs @@ -3,11 +3,11 @@ module Dodge.Item.Draw ( itemEquipPict, ) where +import Data.Foldable import Dodge.Data.ComposedItem import Dodge.Data.DoubleTree import Geometry.Data import Control.Lens -import Data.Maybe import Dodge.Creature.HandPos import Dodge.Data.Creature import Dodge.Item.Draw.SPic @@ -19,7 +19,7 @@ itemEquipPict cr itmtree = case itm ^. itUse of UseHeld{} | itm ^? itLocation . ilIsRoot == Just True && itm ^? itLocation . ilIsSelected == Just True -> overPosSP (heldItemOffset itm cr) (itemTreeSPic itmtree) - ituse -> fromMaybe mempty $ do + ituse -> fold $ do attachpos <- ituse ^? uequipEffect . eeAttachPos i <- itm ^? itLocation . ilInvID epos <- cr ^? crInvEquipped . ix i diff --git a/src/Dodge/Render/HUD.hs b/src/Dodge/Render/HUD.hs index a06f0aab8..ba94f4e31 100644 --- a/src/Dodge/Render/HUD.hs +++ b/src/Dodge/Render/HUD.hs @@ -66,10 +66,6 @@ drawInventory sss w cfig = <> drawRootCursor w sss (w ^? hud . hudElement . diSelection . _Just) ldp cfig <> iextra <> drawMouseOver cfig w --- <> translateScreenPos --- cfig --- (ldp ^. ldpPos) --- (drawDISelections w) where ldp = invDisplayParams w curs = invCursorParams w @@ -110,6 +106,7 @@ getRootItemBounds i inv = do y <- locLeftmost root ^? locLDT . ldtValue . cItem . itLocation . ilInvID return (x, y) +-- this should display while dragging a single inv item drawMouseOver :: Configuration -> World -> Picture drawMouseOver cfig w = concat (invsel <|> combinvsel <|> drawDragSelect cfig w) diff --git a/src/Dodge/Render/List.hs b/src/Dodge/Render/List.hs index ffbfeb08e..eb5bc8ff6 100644 --- a/src/Dodge/Render/List.hs +++ b/src/Dodge/Render/List.hs @@ -111,7 +111,7 @@ selSecDrawCursorAt :: IM.IntMap (SelectionSection a) -> (Int, Int) -> Picture -selSecDrawCursorAt xsize ldp curs sss (i, j) = fromMaybe mempty $ do +selSecDrawCursorAt xsize ldp curs sss (i, j) = fold $ do yint <- selSecYint i j sss xint <- sss ^? ix i . ssIndent si <- sss ^? ix i . ssItems . ix j diff --git a/src/Dodge/Render/Picture.hs b/src/Dodge/Render/Picture.hs index bb62e4f28..85c1f2c21 100644 --- a/src/Dodge/Render/Picture.hs +++ b/src/Dodge/Render/Picture.hs @@ -84,7 +84,8 @@ mouseCursorType u = case u ^. uvWorld . input . mouseContext of MouseMenuClick {} -> drawMenuClick 5 MouseMenuCursor -> drawMenuCursor 5 MouseInGame -> drawPlus 5 - OverInvDrag -> drawDrag 5 + OverInvDrag (Just _) -> drawDrag 5 + OverInvDrag Nothing -> drawDragDrop 5 OverInvDragSelect {} -> drawDragSelect 5 OverInvSelect {} -> drawSelect 5 OverInvFilt {} -> drawCombFilter 5 @@ -157,6 +158,12 @@ drawDragSelect x = polygonWire $ rectWH (0.5 * x) x drawDrag :: Float -> Picture drawDrag x = line [V2 0 x,V2 0 (-x)] +drawDragDrop :: Float -> Picture +drawDragDrop x = line [V2 (-x) x,V2 0 x,V2 0 (-x)] + <> line [V2 (-y) (y-x), V2 0 (-x), V2 y (y-x)] + where + y = 0.7 * x + drawSelect :: Float -> Picture drawSelect x = polygonWire $ rectWH x (0.5 * x) -- line [V2 (-x) 0, V2 0 0] @@ -188,7 +195,7 @@ drawGapPlus x = ] aimDelaySweep :: World -> Picture -aimDelaySweep w = fromMaybe mempty $ do +aimDelaySweep w = fold $ do cr <- w ^? cWorld . lWorld . creatures . ix 0 aimstatus <- cr ^? crStance . posture guard (aimstatus == Aiming) diff --git a/src/Dodge/Update.hs b/src/Dodge/Update.hs index a1ae392ac..b76f5a953 100644 --- a/src/Dodge/Update.hs +++ b/src/Dodge/Update.hs @@ -354,14 +354,13 @@ checkTermDist w = fromMaybe w $ do updateMouseContext :: Configuration -> Universe -> Universe updateMouseContext cfig u = case u ^. uvWorld . input . mouseContext of - OverInvDrag | lbheld -> u + OverInvDrag {} -> u & uvWorld . input . mouseContext .~ invdrag OverInvDragSelect{} -> u _ -> u & uvWorld . input . mouseContext .~ fromMaybe aimcontext (overmenu <|> overinv <|> overcomb <|> overterm) where - lbheld = ButtonLeft `M.member` (u ^. uvWorld . input . mouseButtons) overmenu = do screen <- u ^? uvScreenLayers . ix 0 return $ case screen ^. scOptions of @@ -384,6 +383,10 @@ updateMouseContext cfig u = case u ^. uvWorld . input . mouseContext of | ButtonRight `M.member` (w ^. input . mouseButtons) = MouseAiming | otherwise = MouseInGame mpos = w ^. input . mousePos + invdrag = fromMaybe (OverInvDrag Nothing) $ do + sss <- w ^? hud . hudElement . diSections + (0,j) <- inverseSelNumPos cfig (invDisplayParams w) sss mpos + return $ OverInvDrag $ Just j overinv = do sss <- w ^? hud . hudElement . diSections selpos <- inverseSelNumPos cfig (invDisplayParams w) sss mpos diff --git a/src/Dodge/Update/Input/InGame.hs b/src/Dodge/Update/Input/InGame.hs index 50a48c345..61ac526be 100644 --- a/src/Dodge/Update/Input/InGame.hs +++ b/src/Dodge/Update/Input/InGame.hs @@ -103,7 +103,8 @@ updateMouseHeldInGame cfig w = case w ^. input . mouseContext of sss <- w ^? hud . hudElement . diSections let msel = inverseSelNumPos cfig ldp sss (w ^. input . mousePos) return $ w & input . mouseContext . mcoSelEnd .~ msel - OverInvDrag -> fromMaybe w $ do + OverInvDrag Nothing -> w + OverInvDrag {} -> fromMaybe w $ do sss <- w ^? hud . hudElement . diSections let mpos = w ^. input . mousePos sel <- w ^? hud . hudElement . diSelection . _Just @@ -113,8 +114,18 @@ updateMouseHeldInGame cfig w = case w ^. input . mouseContext of where ldp = invDisplayParams w +dropSelected :: World -> World +dropSelected w = fromMaybe w $ do + cr <- w ^? cWorld . lWorld . creatures . ix 0 + (0,j) <- w ^? hud . hudElement . diSelection . _Just + x <- w ^? hud . hudElement . diSelectionExtra + return $ foldl' (flip $ dropItem cr) w (reverse [j .. j+x]) + updateMouseReleaseInGame :: World -> World updateMouseReleaseInGame w = case w ^. input . mouseContext of + OverInvDrag mpos -> fromMaybe (dropSelected w & input . mouseContext .~ MouseInGame) $ do + j <- mpos + return $ w & input . mouseContext .~ OverInvSelect (0,j) OverInvDragSelect ssel (Just esel) -> w & input . mouseContext .~ MouseInGame & hud . hudElement . diSelectionExtra @@ -174,7 +185,7 @@ startDrag (a, b) w = fromMaybe (augInvDirectSelect (a, b) $ setmichosen 0 w) $ d return $ setmichosen x w where setmichosen x = - (input . mouseContext .~ OverInvDrag) + (input . mouseContext .~ OverInvDrag (Just b)) . (hud . hudElement . diSelectionExtra .~ x) shiftInvItems :: diff --git a/tags b/tags index a151c1ae2..f87a9eeb0 100644 --- a/tags +++ b/tags @@ -2748,6 +2748,7 @@ _mcWallIDs src/Dodge/Data/Machine.hs 33;" f _mcWidth src/Dodge/Data/Machine.hs 44;" f _mcoCombCombine src/Dodge/Data/Input.hs 30;" f _mcoCombSelect src/Dodge/Data/Input.hs 29;" f +_mcoDragPos src/Dodge/Data/Input.hs 25;" f _mcoInvFilt src/Dodge/Data/Input.hs 28;" f _mcoInvSelect src/Dodge/Data/Input.hs 27;" f _mcoMenuClick src/Dodge/Data/Input.hs 23;" f @@ -3342,10 +3343,10 @@ addToTrunk src/TreeHelp.hs 156;" f addWarningTerminal src/Dodge/Room/Warning.hs 37;" f addZ src/Geometry/Vector3D.hs 89;" f adjustIMZone src/Dodge/Base.hs 77;" f -advanceScrollAmount src/Dodge/Update.hs 438;" f +advanceScrollAmount src/Dodge/Update.hs 442;" f advanceSmoothScroll src/Dodge/SmoothScroll.hs 29;" f advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 45;" f -aimDelaySweep src/Dodge/Render/Picture.hs 190;" f +aimDelaySweep src/Dodge/Render/Picture.hs 197;" f aimStanceInfo src/Dodge/Item/Info.hs 210;" f aimTurn src/Dodge/Creature/YourControl.hs 143;" f aimingMuzzleLength src/Dodge/Creature/HandPos.hs 46;" f @@ -3586,7 +3587,7 @@ chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 46;" f checkCombineSelectionExists src/Dodge/DisplayInventory.hs 99;" f checkConnection src/Dodge/Inventory.hs 233;" f checkDeath src/Dodge/Creature/State.hs 75;" f -checkEndGame src/Dodge/Update.hs 725;" f +checkEndGame src/Dodge/Update.hs 729;" f checkErrorGL src/Shader/Compile.hs 255;" f checkFBO src/Framebuffer/Check.hs 6;" f checkGLError src/GLHelp.hs 17;" f @@ -3613,7 +3614,7 @@ circle src/Picture/Base.hs 180;" f circleDecoration src/Dodge/Placement/TopDecoration.hs 56;" f circleSolid src/Picture/Base.hs 164;" f circleSolidCol src/Picture/Base.hs 168;" f -clClSpringVel src/Dodge/Update.hs 778;" f +clClSpringVel src/Dodge/Update.hs 782;" f clZoneSize src/Dodge/Zone/Size.hs 3;" f clZoneSize src/Dodge/Zoning/Cloud.hs 21;" f clampPath src/Dodge/Room/Procedural.hs 166;" f @@ -3633,14 +3634,14 @@ clipZoom src/Dodge/Update/Camera.hs 215;" f clockCycle src/Dodge/Clock.hs 9;" f closeObjEq src/Dodge/Inventory/CloseObject.hs 15;" f closeObjPos src/Dodge/Inventory/CloseObject.hs 10;" f -closeObjectInfo src/Dodge/Render/HUD.hs 224;" f +closeObjectInfo src/Dodge/Render/HUD.hs 225;" f closeObjectToSelectionItem src/Dodge/Inventory/SelectionList.hs 54;" f closeObjectToTextPictures src/Dodge/Inventory/SelectionList.hs 68;" f closestCreatureID src/Dodge/Debug.hs 92;" f closestPointOnLine src/Geometry/Intersect.hs 251;" f closestPointOnLineParam src/Geometry/Intersect.hs 267;" f closestPointOnSeg src/Geometry/Intersect.hs 282;" f -cloudEffect src/Dodge/Update.hs 748;" f +cloudEffect src/Dodge/Update.hs 752;" f cloudPoisonDamage src/Dodge/Update/Cloud.hs 9;" f clsNearCirc src/Dodge/Zoning/Cloud.hs 18;" f clsNearPoint src/Dodge/Zoning/Cloud.hs 9;" f @@ -3668,7 +3669,7 @@ combinationsOf src/Multiset.hs 46;" f combinationsTrie src/Dodge/Combine.hs 41;" f combineAwareness src/Dodge/Creature/Perception.hs 109;" f combineFloors src/Dodge/Room/Procedural.hs 172;" f -combineInventoryExtra src/Dodge/Render/HUD.hs 334;" f +combineInventoryExtra src/Dodge/Render/HUD.hs 335;" f combineItemListYouX src/Dodge/Combine.hs 33;" f combineList src/Dodge/Combine.hs 20;" f combineRooms src/Dodge/Room/Procedural.hs 152;" f @@ -3710,7 +3711,7 @@ crAdd src/Dodge/Room/RezBox.hs 104;" f crAwayFromPost src/Dodge/Creature/Test.hs 77;" f crBlips src/Dodge/RadarSweep.hs 69;" f crCanSeeCr src/Dodge/Creature/Test.hs 48;" f -crCrSpring src/Dodge/Update.hs 796;" f +crCrSpring src/Dodge/Update.hs 800;" f crCurrentEquipment src/Dodge/Creature/Statistics.hs 28;" f crDisplayAwareness src/Dodge/Creature/Picture/Awareness.hs 37;" f crDisplayVigilance src/Dodge/Creature/Picture/Awareness.hs 51;" f @@ -3731,7 +3732,7 @@ crNumFreeSlots src/Dodge/Inventory/CheckSlots.hs 35;" f crOnWall src/Dodge/WallCreatureCollisions.hs 84;" f crSafeDistFromTarg src/Dodge/Creature/Test.hs 67;" f crSetRoots src/Dodge/Inventory/Location.hs 48;" f -crSpring src/Dodge/Update.hs 791;" f +crSpring src/Dodge/Update.hs 795;" f crStratConMatches src/Dodge/Creature/Test.hs 72;" f crUpdate src/Dodge/Creature/State.hs 62;" f crUpdateInvidLocations src/Dodge/Inventory/Location.hs 61;" f @@ -3982,7 +3983,7 @@ displayConfig src/Dodge/Menu.hs 196;" f displayControls src/Dodge/Menu.hs 206;" f displayFrameTicks src/Dodge/Render/Picture.hs 39;" f displayFreeSlots src/Dodge/DisplayInventory.hs 197;" f -displayTerminalLineString src/Dodge/Update.hs 467;" f +displayTerminalLineString src/Dodge/Update.hs 471;" f dist src/Geometry/Vector.hs 179;" f dist3 src/Geometry/Vector3D.hs 101;" f divTo src/Geometry/Zone.hs 6;" f @@ -4039,7 +4040,7 @@ doPropUpdates src/Dodge/Prop/Update.hs 36;" f doQuickload src/Dodge/Save.hs 82;" f doQuicksave src/Dodge/Save.hs 77;" f doRandImpulse src/Dodge/RandImpulse.hs 7;" f -doRegexInput src/Dodge/Update/Input/InGame.hs 291;" f +doRegexInput src/Dodge/Update/Input/InGame.hs 295;" f doRoomInPlacements src/Dodge/Layout.hs 97;" f doRoomOutPlacements src/Dodge/Layout.hs 107;" f doRoomPlacements src/Dodge/Layout.hs 122;" f @@ -4065,7 +4066,7 @@ doWdCrCr src/Dodge/CreatureEffect.hs 12;" f doWdP2f src/Dodge/WdP2f.hs 12;" f doWdWd src/Dodge/WorldEffect.hs 26;" f doWeaponRepetitions src/Dodge/HeldUse.hs 56;" f -doWorldEvents src/Dodge/Update.hs 449;" f +doWorldEvents src/Dodge/Update.hs 453;" f doWorldPos src/Dodge/WorldPos.hs 7;" f door src/Dodge/Room/Door.hs 13;" f doorBetween src/Dodge/Placement/Instance/Door.hs 39;" f @@ -4092,9 +4093,9 @@ drawCPUShadows src/Dodge/Render/Shadow.hs 19;" f drawCarte src/Dodge/Render/HUD/Carte.hs 14;" f drawCircFlare src/Dodge/Flare.hs 25;" f drawCollisionTest src/Dodge/Debug/Picture.hs 103;" f -drawCombFilter src/Dodge/Render/Picture.hs 171;" f -drawCombFilterJump src/Dodge/Render/Picture.hs 150;" f -drawCombineInventory src/Dodge/Render/HUD.hs 184;" f +drawCombFilter src/Dodge/Render/Picture.hs 178;" f +drawCombFilterJump src/Dodge/Render/Picture.hs 151;" f +drawCombineInventory src/Dodge/Render/HUD.hs 185;" f drawConcurrentMessage src/Dodge/Render/Picture.hs 62;" f drawCorpse src/Dodge/Corpse/Draw.hs 6;" f drawCrInfo src/Dodge/Debug/Picture.hs 342;" f @@ -4104,24 +4105,24 @@ drawCross src/Dodge/Render/Label.hs 24;" f drawCrossCol src/Dodge/Render/Label.hs 21;" f drawCursorAt src/Dodge/Render/List.hs 70;" f drawDDATest src/Dodge/Debug/Picture.hs 256;" f -drawDISelections src/Dodge/Render/HUD.hs 143;" f drawDoorPaths src/Dodge/Debug/Picture.hs 217;" f drawDoubleLampCover src/Dodge/Prop/Draw.hs 81;" f -drawDrag src/Dodge/Render/Picture.hs 157;" f +drawDrag src/Dodge/Render/Picture.hs 158;" f +drawDragDrop src/Dodge/Render/Picture.hs 161;" f drawDragSelect src/Dodge/Render/HUD.hs 159;" f -drawDragSelect src/Dodge/Render/Picture.hs 154;" f -drawDragSelected src/Dodge/Render/HUD.hs 148;" f -drawEmptySet src/Dodge/Render/Picture.hs 105;" f +drawDragSelect src/Dodge/Render/Picture.hs 155;" f +drawDragSelected src/Dodge/Render/HUD.hs 147;" f +drawEmptySet src/Dodge/Render/Picture.hs 106;" f drawEnergyBall src/Dodge/EnergyBall/Draw.hs 8;" f drawEquipment src/Dodge/Creature/Picture.hs 140;" f -drawExamineInventory src/Dodge/Render/HUD.hs 198;" f +drawExamineInventory src/Dodge/Render/HUD.hs 199;" f drawFarWallDetect src/Dodge/Debug/Picture.hs 234;" f drawFlame src/Dodge/Flame/Draw.hs 7;" f drawFlamelet src/Dodge/EnergyBall/Draw.hs 23;" f drawFlare src/Dodge/Flare.hs 12;" f drawFooterText src/Dodge/Render/MenuScreen.hs 74;" f drawForceField src/Dodge/Wall/Draw.hs 11;" f -drawGapPlus src/Dodge/Render/Picture.hs 181;" f +drawGapPlus src/Dodge/Render/Picture.hs 188;" f drawGib src/Dodge/Prop/Draw.hs 28;" f drawHP src/Dodge/Render/HUD.hs 53;" f drawHUD src/Dodge/Render/HUD.hs 45;" f @@ -4140,12 +4141,12 @@ drawListYgapScaleYoff src/Dodge/Render/List.hs 98;" f drawListYoff src/Dodge/Render/List.hs 95;" f drawMachine src/Dodge/Machine/Draw.hs 17;" f drawMapWall src/Dodge/Render/HUD/Carte.hs 33;" f -drawMenuClick src/Dodge/Render/Picture.hs 125;" f -drawMenuCursor src/Dodge/Render/Picture.hs 138;" f +drawMenuClick src/Dodge/Render/Picture.hs 126;" f +drawMenuCursor src/Dodge/Render/Picture.hs 139;" f drawMenuOrHUD src/Dodge/Render/Picture.hs 57;" f drawMenuScreen src/Dodge/Render/MenuScreen.hs 15;" f drawMouseCursor src/Dodge/Render/Picture.hs 73;" f -drawMouseOver src/Dodge/Render/HUD.hs 113;" f +drawMouseOver src/Dodge/Render/HUD.hs 110;" f drawMousePosition src/Dodge/Debug/Picture.hs 319;" f drawMovingShape src/Dodge/Prop/Draw.hs 67;" f drawMovingShapeCol src/Dodge/Prop/Draw.hs 73;" f @@ -4154,19 +4155,19 @@ drawOptions src/Dodge/Render/MenuScreen.hs 35;" f drawPathBetween src/Dodge/Debug/Picture.hs 168;" f drawPathEdge src/Dodge/Debug/Picture.hs 222;" f drawPathing src/Dodge/Debug/Picture.hs 384;" f -drawPlus src/Dodge/Render/Picture.hs 122;" f +drawPlus src/Dodge/Render/Picture.hs 123;" f drawPointLabel src/Dodge/Render/Label.hs 13;" f drawProjectile src/Dodge/Projectile/Draw.hs 13;" f drawProp src/Dodge/Prop/Draw.hs 15;" f drawProp' src/Dodge/Prop/Draw.hs 12;" f -drawRBOptions src/Dodge/Render/HUD.hs 242;" f +drawRBOptions src/Dodge/Render/HUD.hs 243;" f drawRadarSweep src/Dodge/RadarSweep/Draw.hs 7;" f drawRemoteShell src/Dodge/Projectile/Draw.hs 30;" f -drawReturn src/Dodge/Render/Picture.hs 111;" f -drawRootCursor src/Dodge/Render/HUD.hs 81;" f +drawReturn src/Dodge/Render/Picture.hs 112;" f +drawRootCursor src/Dodge/Render/HUD.hs 77;" f drawSSCursor src/Dodge/SelectionSections/Draw.hs 30;" f drawSSMultiCursor src/Dodge/SelectionSections/Draw.hs 41;" f -drawSelect src/Dodge/Render/Picture.hs 160;" f +drawSelect src/Dodge/Render/Picture.hs 167;" f drawSelectionList src/Dodge/Render/List.hs 35;" f drawSelectionListBackground src/Dodge/Render/List.hs 51;" f drawSelectionSections src/Dodge/SelectionSections/Draw.hs 17;" f @@ -4178,13 +4179,13 @@ drawShell src/Dodge/Projectile/Draw.hs 20;" f drawShockwave src/Dodge/Shockwave/Draw.hs 7;" f drawSpark src/Dodge/Spark/Draw.hs 6;" f drawStaticBall src/Dodge/EnergyBall/Draw.hs 14;" f -drawSubInventory src/Dodge/Render/HUD.hs 176;" f -drawSweep src/Dodge/Render/Picture.hs 197;" f +drawSubInventory src/Dodge/Render/HUD.hs 177;" f +drawSweep src/Dodge/Render/Picture.hs 204;" f drawSwitch src/Dodge/Button/Draw.hs 15;" f drawSwitchWire src/Dodge/LevelGen/Switch.hs 28;" f drawTargetLaser src/Dodge/Particle/Draw.hs 6;" f drawTargeting src/Dodge/Targeting/Draw.hs 13;" f -drawTerminalDisplay src/Dodge/Render/HUD.hs 371;" f +drawTerminalDisplay src/Dodge/Render/HUD.hs 372;" f drawTeslaArc src/Dodge/Tesla/Arc/Draw.hs 7;" f drawText src/Picture/Base.hs 220;" f drawTitle src/Dodge/Render/MenuScreen.hs 57;" f @@ -4232,7 +4233,7 @@ encircleP src/Dodge/Creature/Boid.hs 27;" f enterCombineInv src/Dodge/DisplayInventory.hs 281;" f eqConstr src/SameConstr.hs 17;" f eqPosText src/Dodge/Equipment/Text.hs 6;" f -equipAllocString src/Dodge/Render/HUD.hs 300;" f +equipAllocString src/Dodge/Render/HUD.hs 301;" f equipInfo src/Dodge/Item/Info.hs 103;" f equipItemSPic src/Dodge/Item/Draw/SPic.hs 65;" f equipPosition src/Dodge/Item/Draw.hs 30;" f @@ -4325,7 +4326,7 @@ flockPointTarget src/Dodge/Creature/Boid.hs 199;" f flockPointTargetR src/Dodge/Creature/Boid.hs 266;" f flockToPointUsing src/Dodge/Creature/Boid.hs 214;" f flockToPointUsing' src/Dodge/Creature/Boid.hs 227;" f -floorItemPickupInfo src/Dodge/Render/HUD.hs 229;" f +floorItemPickupInfo src/Dodge/Render/HUD.hs 230;" f floorItemSPic src/Dodge/Render/ShapePicture.hs 119;" f floorWire src/Dodge/Wire.hs 13;" f foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 412;" f @@ -4408,7 +4409,7 @@ getNodePos src/Dodge/Path.hs 31;" f getPretty src/AesonHelp.hs 7;" f getPrettyShort src/AesonHelp.hs 10;" f getPromptTM src/Dodge/Terminal/Type.hs 8;" f -getRootItemBounds src/Dodge/Render/HUD.hs 104;" f +getRootItemBounds src/Dodge/Render/HUD.hs 100;" f getSensor src/Dodge/Terminal.hs 189;" f getSmoothScrollValue src/Dodge/SmoothScroll.hs 17;" f getSplitString src/Dodge/Debug/Terminal.hs 123;" f @@ -4593,7 +4594,7 @@ invAdj src/Dodge/Item/Grammar.hs 188;" f invCursorParams src/Dodge/ListDisplayParams.hs 38;" f invDimColor src/Dodge/DisplayInventory.hs 191;" f invDisplayParams src/Dodge/ListDisplayParams.hs 32;" f -invHead src/Dodge/Render/HUD.hs 408;" f +invHead src/Dodge/Render/HUD.hs 409;" f invLDT src/Dodge/Item/Grammar.hs 171;" f invRootMap src/Dodge/Item/Grammar.hs 180;" f invRootTrees src/Dodge/Item/Grammar.hs 210;" f @@ -4604,8 +4605,8 @@ invSideEff src/Dodge/Creature/State.hs 162;" f invSize src/Dodge/Inventory/CheckSlots.hs 41;" f invTrees src/Dodge/Item/Grammar.hs 198;" f invTrees' src/Dodge/Item/Grammar.hs 202;" f -inventoryExtra src/Dodge/Render/HUD.hs 309;" f -inventoryExtraH src/Dodge/Render/HUD.hs 320;" f +inventoryExtra src/Dodge/Render/HUD.hs 310;" f +inventoryExtraH src/Dodge/Render/HUD.hs 321;" f inventoryX src/Dodge/Creature.hs 115;" f inverseSelBoundaryDown src/Dodge/SelectionSections.hs 256;" f inverseSelBoundaryUp src/Dodge/SelectionSections.hs 243;" f @@ -4635,7 +4636,7 @@ isLeftOfA src/Geometry.hs 181;" f isNothing' src/MaybeHelp.hs 33;" f isOnSeg src/Geometry.hs 240;" f isOutLnk src/Dodge/PlacementSpot.hs 164;" f -isOverTerminalScreen src/Dodge/Update.hs 416;" f +isOverTerminalScreen src/Dodge/Update.hs 420;" f isPutID src/Dodge/Placement/Instance/Wall.hs 129;" f isRHS src/Geometry/LHS.hs 24;" f isUnusedLnk src/Dodge/PlacementSpot.hs 61;" f @@ -4772,7 +4773,7 @@ llleft src/Dodge/Item/Grammar.hs 107;" f llright src/Dodge/Item/Grammar.hs 114;" f lmt src/MatrixHelper.hs 43;" f lnkBothAnd src/Dodge/Room/Procedural.hs 121;" f -lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 397;" f +lnkMidPosInvSelsCol src/Dodge/Render/HUD.hs 398;" f lnkPosDir src/Dodge/RoomLink.hs 97;" f loadDodgeConfig src/Dodge/Config/Load.hs 9;" f loadMusic src/Dodge/SoundLogic/LoadSound.hs 21;" f @@ -4892,7 +4893,7 @@ makeTlsTimeRadColPos src/Dodge/LightSource.hs 88;" f makeTypeCraft src/Dodge/Item/Craftable.hs 13;" f makeTypeCraftNum src/Dodge/Item/Craftable.hs 7;" f mapOverlay src/Dodge/Render/HUD/Carte.hs 24;" f -markWallSeen src/Dodge/Update.hs 710;" f +markWallSeen src/Dodge/Update.hs 714;" f maxDamageType src/Dodge/Damage.hs 37;" f maxShowX src/Dodge/Combine/Graph.hs 49;" f maxViewDistance src/Dodge/Viewpoints.hs 26;" f @@ -4903,7 +4904,7 @@ maybeClearPath src/Dodge/Block.hs 77;" f maybeClearPaths src/Dodge/Block.hs 74;" f maybeDestroyBlock src/Dodge/Wall/Damage.hs 26;" f maybeDestroyDoor src/Dodge/Wall/Damage.hs 31;" f -maybeExitCombine src/Dodge/Update/Input/InGame.hs 453;" f +maybeExitCombine src/Dodge/Update/Input/InGame.hs 457;" f maybeOpenTerminal src/Dodge/Update.hs 123;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/RandomHelp.hs 111;" f @@ -5019,7 +5020,7 @@ mvBullet src/Dodge/Bullet.hs 33;" f mvButton src/Dodge/Placement/PlaceSpot.hs 176;" f mvCr src/Dodge/Placement/PlaceSpot.hs 186;" f mvFS src/Dodge/Placement/PlaceSpot.hs 189;" f -mvGust src/Dodge/Update.hs 739;" f +mvGust src/Dodge/Update.hs 743;" f mvLS src/Dodge/Placement/PlaceSpot.hs 217;" f mvP src/Dodge/Wall/Move.hs 54;" f mvPP src/Dodge/Placement/PlaceSpot.hs 183;" f @@ -5128,7 +5129,7 @@ parseNum src/Dodge/Debug/Terminal.hs 73;" f pathConnected src/Dodge/Room/CheckConsistency.hs 14;" f pathEdgeObstructed src/Dodge/Path.hs 43;" f pauseAndFloatCam src/Dodge/Camera.hs 10;" f -pauseGame src/Dodge/Update/Input/InGame.hs 388;" f +pauseGame src/Dodge/Update/Input/InGame.hs 392;" f pauseMenu src/Dodge/Menu.hs 53;" f pauseMenuOptions src/Dodge/Menu.hs 58;" f pauseSound src/Dodge/SoundLogic.hs 41;" f @@ -5287,7 +5288,7 @@ powlistUpToN src/Multiset.hs 23;" f powlistUpToN' src/Multiset.hs 12;" f powlistUpToN'' src/Multiset.hs 31;" f ppDraw src/Dodge/Render/ShapePicture.hs 116;" f -ppEvents src/Dodge/Update.hs 702;" f +ppEvents src/Dodge/Update.hs 706;" f ppLevelReset src/Dodge/PressPlate.hs 13;" f preCritStart src/Dodge/Room/Start.hs 82;" f preloadRender src/Preload/Render.hs 30;" f @@ -5589,11 +5590,11 @@ secondColumnParams src/Dodge/ListDisplayParams.hs 45;" f seedStartMenu src/Dodge/Menu.hs 79;" f seedStartOptions src/Dodge/Menu.hs 82;" f segOnCirc src/Geometry.hs 116;" f -selNumPos src/Dodge/Render/HUD.hs 468;" f -selNumPosCardinal src/Dodge/Render/HUD.hs 491;" f +selNumPos src/Dodge/Render/HUD.hs 469;" f +selNumPosCardinal src/Dodge/Render/HUD.hs 492;" f selSecDrawCursor src/Dodge/Render/List.hs 129;" f selSecDrawCursorAt src/Dodge/Render/List.hs 107;" f -selSecSelCol src/Dodge/Render/HUD.hs 514;" f +selSecSelCol src/Dodge/Render/HUD.hs 515;" f selSecSelSize src/Dodge/SelectionSections.hs 182;" f selSecYint src/Dodge/SelectionSections.hs 191;" f selectCreatureDebugItem src/Dodge/Debug.hs 39;" f @@ -5629,7 +5630,7 @@ setLinkTypePD src/Dodge/RoomLink.hs 67;" f setMinInvSize src/Dodge/Creature/Action.hs 150;" f setMusicVolume src/Sound.hs 161;" f setMvPos src/Dodge/Creature/ReaderUpdate.hs 51;" f -setOldPos src/Dodge/Update.hs 491;" f +setOldPos src/Dodge/Update.hs 495;" f setOutLinks src/Dodge/RoomLink.hs 48;" f setOutLinksByType src/Dodge/RoomLink.hs 57;" f setOutLinksPD src/Dodge/RoomLink.hs 77;" f @@ -5684,9 +5685,9 @@ shiftChildren src/Dodge/Tree/Compose.hs 43;" f shiftDraw src/Dodge/Render/ShapePicture.hs 66;" f shiftDraw' src/Dodge/Render/ShapePicture.hs 72;" f shiftInBy src/Dodge/PlacementSpot.hs 236;" f -shiftInvItems src/Dodge/Update/Input/InGame.hs 180;" f -shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 201;" f -shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 195;" f +shiftInvItems src/Dodge/Update/Input/InGame.hs 184;" f +shiftInvItemsDown src/Dodge/Update/Input/InGame.hs 205;" f +shiftInvItemsUp src/Dodge/Update/Input/InGame.hs 199;" f shiftLinkBy src/Dodge/Room/Link.hs 87;" f shiftPSBy src/Dodge/Placement/Shift.hs 12;" f shiftPathBy src/Dodge/Room/Link.hs 92;" f @@ -5736,7 +5737,7 @@ shuffleLinks src/Dodge/Room/Link.hs 30;" f shuffleRoomPos src/Dodge/Layout.hs 78;" f shuffleTail src/RandomHelp.hs 59;" f sigmoid src/Dodge/Base.hs 129;" f -simpleCrSprings src/Dodge/Update.hs 787;" f +simpleCrSprings src/Dodge/Update.hs 791;" f simpleDamFL src/Dodge/Flame.hs 41;" f simpleTermMessage src/Dodge/Terminal.hs 253;" f sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 504;" f @@ -5785,7 +5786,7 @@ soundToVol src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 4;" f soundWithStatus src/Dodge/SoundLogic.hs 98;" f soundWithStatusVolume src/Dodge/SoundLogic.hs 48;" f southPillarsRoom src/Dodge/Room/LongDoor.hs 85;" f -spaceAction src/Dodge/Update/Input/InGame.hs 391;" f +spaceAction src/Dodge/Update/Input/InGame.hs 395;" f spanColLightBlackI src/Dodge/Placement/Instance/LightSource.hs 186;" f spanColLightI src/Dodge/Placement/Instance/LightSource.hs 179;" f spanLS src/Dodge/Placement/Instance/LightSource.hs 171;" f @@ -5842,7 +5843,7 @@ stackText src/Picture/Base.hs 188;" f stackedInventory src/Dodge/Creature.hs 281;" f startCr src/Dodge/Creature.hs 91;" f startCrafts src/Dodge/Room/Start.hs 92;" f -startDrag src/Dodge/Update/Input/InGame.hs 169;" f +startDrag src/Dodge/Update/Input/InGame.hs 173;" f startInvList src/Dodge/Creature.hs 109;" f startInventory src/Dodge/Creature.hs 112;" f startNewGameInSlot src/Dodge/StartNewGame.hs 15;" f @@ -5964,7 +5965,7 @@ titleOptionsMenu src/Dodge/Menu.hs 99;" f titleOptionsNoWrite src/Dodge/Menu.hs 102;" f tlsTimeRadColPos src/Dodge/LightSource.hs 69;" f tlsTimeRadFunPos src/Dodge/LightSource.hs 26;" f -tmUpdate src/Dodge/Update.hs 471;" f +tmUpdate src/Dodge/Update.hs 475;" f toBothLnk src/Dodge/RoomLink.hs 121;" f toClosestMultiple src/HelpNum.hs 3;" f toColor8 src/Color.hs 148;" f @@ -5981,8 +5982,8 @@ toggleCombineInv src/Dodge/DisplayInventory.hs 31;" f toggleCommand src/Dodge/Terminal.hs 196;" f toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 79;" f toggleJust src/MaybeHelp.hs 41;" f -toggleMap src/Dodge/Update/Input/InGame.hs 415;" f -toggleTweakInv src/Dodge/Update/Input/InGame.hs 430;" f +toggleMap src/Dodge/Update/Input/InGame.hs 419;" f +toggleTweakInv src/Dodge/Update/Input/InGame.hs 434;" f togglesToEffects src/Dodge/Terminal.hs 248;" f tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 474;" f tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 444;" f @@ -6053,7 +6054,7 @@ trunkDepth src/TreeHelp.hs 161;" f tryAssignHotkey src/Dodge/Creature/YourControl.hs 85;" f tryAttachBulletBelt src/Dodge/Euse.hs 40;" f tryChargeBattery src/Dodge/Euse.hs 43;" f -tryCombine src/Dodge/Update/Input/InGame.hs 439;" f +tryCombine src/Dodge/Update/Input/InGame.hs 443;" f tryGetChannel src/Sound.hs 96;" f tryGetRootAttachedFromInvID src/Dodge/Inventory/Location.hs 20;" f tryGetRootItemInvID src/Dodge/Inventory/Location.hs 29;" f @@ -6099,82 +6100,82 @@ updateAllNodes src/TreeHelp.hs 85;" f updateArc src/Dodge/Tesla/Arc.hs 86;" f updateAttachedItems src/Dodge/Creature/State.hs 173;" f updateAutoRecharge src/Dodge/Creature/State.hs 324;" f -updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 326;" f +updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 330;" f updateBarrel src/Dodge/Barreloid.hs 45;" f updateBarreloid src/Dodge/Barreloid.hs 13;" f updateBounds src/Dodge/Update/Camera.hs 245;" f updateBulVel src/Dodge/Bullet.hs 50;" f updateBullet src/Dodge/Bullet.hs 28;" f -updateBullets src/Dodge/Update.hs 568;" f +updateBullets src/Dodge/Update.hs 572;" f updateCamera src/Dodge/Update/Camera.hs 31;" f updateCloseObjects src/Dodge/Inventory.hs 124;" f -updateCloud src/Dodge/Update.hs 753;" f -updateClouds src/Dodge/Update.hs 597;" f +updateCloud src/Dodge/Update.hs 757;" f +updateClouds src/Dodge/Update.hs 601;" f updateCombinePositioning src/Dodge/DisplayInventory.hs 38;" f updateCombineSections src/Dodge/DisplayInventory.hs 44;" f updateCreature src/Dodge/Creature/Update.hs 10;" f -updateCreatureGroups src/Dodge/Update.hs 537;" f -updateCreatureSoundPositions src/Dodge/Update.hs 513;" f +updateCreatureGroups src/Dodge/Update.hs 541;" f +updateCreatureSoundPositions src/Dodge/Update.hs 517;" f updateDebugMessageOffset src/Dodge/Update.hs 92;" f -updateDelayedEvents src/Dodge/Update.hs 816;" f +updateDelayedEvents src/Dodge/Update.hs 820;" f updateDisplaySections src/Dodge/DisplayInventory.hs 112;" f updateDistortion src/Dodge/Distortion.hs 5;" f -updateDistortions src/Dodge/Update.hs 558;" f +updateDistortions src/Dodge/Update.hs 562;" f updateEnergyBall src/Dodge/EnergyBall.hs 46;" f -updateEnergyBalls src/Dodge/Update.hs 585;" f -updateEnterRegex src/Dodge/Update/Input/InGame.hs 367;" f +updateEnergyBalls src/Dodge/Update.hs 589;" f +updateEnterRegex src/Dodge/Update/Input/InGame.hs 371;" f updateExpBarrel src/Dodge/Barreloid.hs 19;" f updateFBOTO src/Framebuffer/Update.hs 97;" f updateFBOTO3 src/Framebuffer/Update.hs 131;" f updateFlame src/Dodge/Flame.hs 71;" f -updateFlames src/Dodge/Update.hs 582;" f +updateFlames src/Dodge/Update.hs 586;" f updateFlare src/Dodge/Flare.hs 7;" f updateFloatingCamera src/Dodge/Update/Camera.hs 36;" f -updateFunctionKey src/Dodge/Update/Input/InGame.hs 218;" f -updateFunctionKeys src/Dodge/Update/Input/InGame.hs 211;" f -updateGusts src/Dodge/Update.hs 736;" f +updateFunctionKey src/Dodge/Update/Input/InGame.hs 222;" f +updateFunctionKeys src/Dodge/Update/Input/InGame.hs 215;" f +updateGusts src/Dodge/Update.hs 740;" f updateHeldRootItem src/Dodge/Creature/State.hs 167;" f updateHumanoid src/Dodge/Humanoid.hs 12;" f -updateIMl src/Dodge/Update.hs 527;" f -updateIMl' src/Dodge/Update.hs 532;" f +updateIMl src/Dodge/Update.hs 531;" f +updateIMl' src/Dodge/Update.hs 536;" f updateInGameCamera src/Dodge/Update/Camera.hs 70;" f -updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 270;" f -updateInstantBullets src/Dodge/Update.hs 674;" f +updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 274;" f +updateInstantBullets src/Dodge/Update.hs 678;" f updateInv src/Dodge/Creature/State.hs 152;" f updateInventoryPositioning src/Dodge/DisplayInventory.hs 85;" f updateItemTargeting src/Dodge/Creature/State.hs 268;" f updateItemWithOrientation src/Dodge/Creature/State.hs 194;" f -updateKeyInGame src/Dodge/Update/Input/InGame.hs 264;" f -updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 253;" f +updateKeyInGame src/Dodge/Update/Input/InGame.hs 268;" f +updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 257;" f updateLampoid src/Dodge/Lampoid.hs 12;" f updateLaser src/Dodge/Laser/Update.hs 13;" f -updateLasers src/Dodge/Update.hs 456;" f -updateLightSources src/Dodge/Update.hs 561;" f +updateLasers src/Dodge/Update.hs 460;" f +updateLightSources src/Dodge/Update.hs 565;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f -updateLongPressInGame src/Dodge/Update/Input/InGame.hs 285;" f -updateMIM src/Dodge/Update.hs 687;" f +updateLongPressInGame src/Dodge/Update/Input/InGame.hs 289;" f +updateMIM src/Dodge/Update.hs 691;" f updateMachine src/Dodge/Machine/Update.hs 19;" f -updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 125;" f +updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 129;" f updateMouseContext src/Dodge/Update.hs 355;" f updateMouseHeldInGame src/Dodge/Update/Input/InGame.hs 100;" f updateMouseInGame src/Dodge/Update/Input/InGame.hs 92;" f updateMouseReleaseInGame src/Dodge/Update/Input/InGame.hs 116;" f updateMovement src/Dodge/Creature/State.hs 331;" f -updateObjCatMaybes src/Dodge/Update.hs 549;" f -updateObjMapMaybe src/Dodge/Update.hs 542;" f -updatePastWorlds src/Dodge/Update.hs 444;" f +updateObjCatMaybes src/Dodge/Update.hs 553;" f +updateObjMapMaybe src/Dodge/Update.hs 546;" f +updatePastWorlds src/Dodge/Update.hs 448;" f updatePosEvent src/Dodge/PosEvent.hs 11;" f -updatePosEvents src/Dodge/Update.hs 594;" f +updatePosEvents src/Dodge/Update.hs 598;" f updatePreload src/Preload/Update.hs 20;" f -updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 228;" f -updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 231;" f +updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 232;" f +updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 235;" f updateProjectile src/Dodge/Projectile/Update.hs 23;" f updateProp src/Dodge/Prop/Update.hs 11;" f updateRBList src/Dodge/Inventory/RBList.hs 16;" f updateRadarBlip src/Dodge/RadarBlip.hs 8;" f -updateRadarBlips src/Dodge/Update.hs 564;" f +updateRadarBlips src/Dodge/Update.hs 568;" f updateRadarSweep src/Dodge/RadarSweep.hs 25;" f -updateRadarSweeps src/Dodge/Update.hs 588;" f +updateRadarSweeps src/Dodge/Update.hs 592;" f updateRandNode src/TreeHelp.hs 108;" f updateRenderSplit appDodge/Main.hs 106;" f updateRootItemID src/Dodge/Inventory/Location.hs 35;" f @@ -6183,19 +6184,19 @@ updateScopeZoom' src/Dodge/Update/Camera.hs 132;" f updateScrollTestValue src/Dodge/ScrollValue.hs 6;" f updateSection src/Dodge/DisplayInventory.hs 224;" f updateSectionsPositioning src/Dodge/DisplayInventory.hs 203;" f -updateSeenWalls src/Dodge/Update.hs 705;" f +updateSeenWalls src/Dodge/Update.hs 709;" f updateShockwave src/Dodge/Shockwave/Update.hs 12;" f -updateShockwaves src/Dodge/Update.hs 579;" f +updateShockwaves src/Dodge/Update.hs 583;" f updateSingleNodes src/TreeHelp.hs 97;" f updateSound src/Sound.hs 71;" f updateSounds src/Sound.hs 66;" f updateSpark src/Dodge/Spark.hs 19;" f -updateSparks src/Dodge/Update.hs 591;" f +updateSparks src/Dodge/Update.hs 595;" f updateTempLightSource src/Dodge/LightSource/Update.hs 7;" f updateTeslaArc src/Dodge/Tesla/Arc.hs 29;" f -updateTeslaArcs src/Dodge/Update.hs 573;" f +updateTeslaArcs src/Dodge/Update.hs 577;" f updateTractorBeam src/Dodge/TractorBeam/Update.hs 9;" f -updateTractorBeams src/Dodge/Update.hs 576;" f +updateTractorBeams src/Dodge/Update.hs 580;" f updateTurret src/Dodge/Machine/Update.hs 47;" f updateUniverse src/Dodge/Update.hs 71;" f updateUniverseFirst src/Dodge/Update.hs 83;" f @@ -6206,7 +6207,7 @@ updateUseInputOnScreen src/Dodge/Update/Input/ScreenLayer.hs 21;" f updateWalkCycle src/Dodge/Creature/State/WalkCycle.hs 12;" f updateWallDamages src/Dodge/Update/WallDamage.hs 10;" f updateWheelEvent src/Dodge/Update/Scroll.hs 19;" f -updateWheelEvents src/Dodge/Update.hs 431;" f +updateWheelEvents src/Dodge/Update.hs 435;" f updateWorldEventFlag src/Dodge/Update.hs 117;" f updateWorldEventFlags src/Dodge/Update.hs 105;" f upperBody src/Dodge/Creature/Picture.hs 133;" f @@ -6360,7 +6361,7 @@ yV2 src/Geometry/Vector.hs 203;" f yellow src/Color.hs 17;" f you src/Dodge/Base/You.hs 18;" f youDropItem src/Dodge/Creature/Action.hs 184;" f -yourAugmentedItem src/Dodge/Render/HUD.hs 236;" f +yourAugmentedItem src/Dodge/Render/HUD.hs 237;" f yourControl src/Dodge/Creature/YourControl.hs 22;" f yourDefaultSpeed src/Dodge/Default/Creature.hs 134;" f yourDefaultStrideLength src/Dodge/Default/Creature.hs 137;" f @@ -6378,9 +6379,9 @@ zipCount src/Dodge/Tree/Shift.hs 129;" f zipCountDown src/Dodge/Room/Procedural.hs 118;" f zipWithDefaults src/Dodge/Item/Display.hs 21;" f zoneCloud src/Dodge/Zoning/Cloud.hs 27;" f -zoneClouds src/Dodge/Update.hs 464;" f +zoneClouds src/Dodge/Update.hs 468;" f zoneCreature src/Dodge/Zoning/Creature.hs 52;" f -zoneCreatures src/Dodge/Update.hs 508;" f +zoneCreatures src/Dodge/Update.hs 512;" f zoneExtract src/Dodge/Zoning/Base.hs 50;" f zoneMonoid src/Dodge/Zoning/Base.hs 80;" f zoneOfCirc src/Dodge/Zoning/Base.hs 22;" f