From 15077be7691bfc38f87c53f8c0a9a749ecf9838b Mon Sep 17 00:00:00 2001 From: justin Date: Tue, 29 Jul 2025 10:10:25 +0100 Subject: [PATCH] Cleanup --- src/Dodge/Data/Input.hs | 9 - src/Dodge/Data/WorldEffect.hs | 1 - src/Dodge/Event/Input.hs | 27 +-- src/Dodge/Update.hs | 12 +- tags | 403 +++++++++++++++++----------------- 5 files changed, 219 insertions(+), 233 deletions(-) diff --git a/src/Dodge/Data/Input.hs b/src/Dodge/Data/Input.hs index 6efd99a5b..cbd2e55e4 100644 --- a/src/Dodge/Data/Input.hs +++ b/src/Dodge/Data/Input.hs @@ -9,14 +9,6 @@ import Control.Lens import qualified Data.Map.Strict as M import Geometry.Data import SDL (MouseButton, Scancode) -import Data.Aeson -import Data.Aeson.TH - ---data PressType --- = InitialPress Int --- | ShortPress Int --- | LongPress Int --- deriving (Eq, Show) data MouseContext = NoMouseContext @@ -72,4 +64,3 @@ data TermSignal makeLenses ''Input makeLenses ''MouseContext ---deriveJSON defaultOptions ''PressType diff --git a/src/Dodge/Data/WorldEffect.hs b/src/Dodge/Data/WorldEffect.hs index a39c438a1..16c46cb1a 100644 --- a/src/Dodge/Data/WorldEffect.hs +++ b/src/Dodge/Data/WorldEffect.hs @@ -5,7 +5,6 @@ module Dodge.Data.WorldEffect where -import Dodge.Data.Input import Dodge.Data.LightSource import Data.Aeson import Data.Aeson.TH diff --git a/src/Dodge/Event/Input.hs b/src/Dodge/Event/Input.hs index d1d2fcdf2..1437cbd29 100644 --- a/src/Dodge/Event/Input.hs +++ b/src/Dodge/Event/Input.hs @@ -23,13 +23,8 @@ handleKeyboardEvent :: KeyboardEventData -> Input -> Input handleKeyboardEvent kev = case keyboardEventKeyMotion kev of Released -> pressedKeys . at scode .~ Nothing Pressed | keyboardEventRepeat kev -> addTermSignal scode - Pressed | not (keyboardEventRepeat kev) -> - (pressedKeys . at scode ?~ 0) - . addTermSignal scode + Pressed -> (pressedKeys . at scode ?~ 0) . addTermSignal scode where --- val --- | keyboardEventRepeat kev = LongPress 0 --- | otherwise = InitialPress 0 scode = (keysymScancode . keyboardEventKeysym) kev addTermSignal :: Scancode -> Input -> Input @@ -46,9 +41,7 @@ addTermSignal sc = case sc of _ -> id handleMouseMotionEvent :: MouseMotionEventData -> Configuration -> Input -> Input -handleMouseMotionEvent mmev cfig = - set mousePos themousepos - . set mouseMoving True +handleMouseMotionEvent mmev cfig = set mousePos themousepos . set mouseMoving True where P (V2 x y) = mouseMotionEventPos mmev themousepos = @@ -62,13 +55,13 @@ handleMouseWheelEvent mwev = scrollAmount +~ fromIntegral y V2 _ y = mouseWheelEventPos mwev handleMouseButtonEvent :: MouseButtonEventData -> Input -> Input -handleMouseButtonEvent mbev theinput = case mouseButtonEventMotion mbev of - Released -> theinput & mouseButtons . at thebutton .~ Nothing - & mouseButtonsReleased . at thebutton ?~ 0 - Pressed -> theinput - & mouseButtons . at thebutton ?~ 0 - & mouseButtonsReleased . at thebutton .~ Nothing - & clickPos . at thebutton ?~ (theinput ^. mousePos) +handleMouseButtonEvent mbev inp = case mouseButtonEventMotion mbev of + Released -> inp & mouseButtons . at but .~ Nothing + & mouseButtonsReleased . at but ?~ 0 + Pressed -> inp + & mouseButtons . at but ?~ 0 + & mouseButtonsReleased . at but .~ Nothing + & clickPos . at but ?~ (inp ^. mousePos) -- note that mouse button down events are NOT repeating where - thebutton = mouseButtonEventButton mbev + but = mouseButtonEventButton mbev diff --git a/src/Dodge/Update.hs b/src/Dodge/Update.hs index 663fa2005..fa82b3453 100644 --- a/src/Dodge/Update.hs +++ b/src/Dodge/Update.hs @@ -465,15 +465,19 @@ updatePulseLasers w = f w & cWorld . lWorld . pulseLasers .~ pzs updatePulseBall :: PulseBall -> World -> World updatePulseBall pb w | Just (_, ecrwl) <- thit = - w & cWorld . lWorld . pulseBalls . at (pb ^. pbID) .~ Nothing + w & cWorld . lWorld . pulseBalls . at (pb ^. pbID) .~ Nothing + & cWorld . lWorld %~ dodam ecrwl | pb ^. pbTimer <= 0 = - w & cWorld . lWorld . pulseBalls . at (pb ^. pbID) .~ Nothing + w & cWorld . lWorld . pulseBalls . at (pb ^. pbID) .~ Nothing | otherwise = - w - & cWorld . lWorld . pulseBalls . ix (pb ^. pbID) . pbTimer -~ 1 + w & cWorld . lWorld . pulseBalls . ix (pb ^. pbID) . pbTimer -~ 1 & cWorld . lWorld . pulseBalls . ix (pb ^. pbID) . pbPos .~ ep & pbFlicker pb where + dodam = \case + Left cr -> creatures . ix (_crID cr) . crDamage .:~ thedam + Right wl -> wallDamages . at (_wlID wl) . non mempty .:~ thedam + thedam = Lasering 100 ep (pb ^. pbVel) sp = pb ^. pbPos ep = sp + pb ^. pbVel thit = thingHit sp ep w diff --git a/tags b/tags index 7e9325d6d..f1fb0e629 100644 --- a/tags +++ b/tags @@ -35,7 +35,7 @@ AUTOAMR src/Dodge/Data/Item/Combine.hs 160;" C AUTOPISTOL src/Dodge/Data/Item/Combine.hs 146;" C AUTORIFLE src/Dodge/Data/Item/Combine.hs 155;" C AZURE src/Color/Data.hs 23;" C -AccessTerminal src/Dodge/Data/WorldEffect.hs 26;" C +AccessTerminal src/Dodge/Data/WorldEffect.hs 25;" C Action src/Dodge/Data/ActionPlan.hs 78;" t Action src/Dodge/Creature/Action.hs 4;" m ActionNothing src/Dodge/Data/ActionPlan.hs 83;" C @@ -246,7 +246,7 @@ CHARTREUSE src/Color/Data.hs 25;" C CHEMFUELPOUCH src/Dodge/Data/Item/Combine.hs 112;" C CHeal src/Dodge/Data/Item/HeldUse.hs 16;" C CIRCLE src/Dodge/Data/GenParams.hs 20;" C -CItem src/Dodge/Data/ComposedItem.hs 46;" t +CItem src/Dodge/Data/ComposedItem.hs 48;" t CLICKER src/Dodge/Data/Item/Combine.hs 28;" C CME src/Dodge/Data/MuzzleEffect.hs 14;" C COPIER src/Dodge/Data/Item/Combine.hs 29;" C @@ -272,7 +272,7 @@ CameraScrollTimeFlow src/Dodge/Data/World.hs 68;" C CamouflageStatus src/Dodge/Data/CamouflageStatus.hs 3;" m Cane src/Dodge/Item/Held/Cane.hs 1;" m CapacitorBelow src/Dodge/Data/Muzzle.hs 21;" C -CapacitorSF src/Dodge/Data/ComposedItem.hs 41;" C +CapacitorSF src/Dodge/Data/ComposedItem.hs 42;" C CapacitorSelf src/Dodge/Data/Muzzle.hs 21;" C CardinalCover src/Dodge/Data/CardinalPoint.hs 21;" t CardinalEightPoint src/Dodge/Data/CardinalPoint.hs 10;" t @@ -439,7 +439,7 @@ DRUMMAG src/Dodge/Data/Item/Combine.hs 108;" C DS src/DoubleStack.hs 3;" t DT src/Dodge/Data/DoubleTree.hs 31;" C DTBottomNode src/Dodge/Data/DoubleTree.hs 21;" C -DTComb src/Dodge/Item/Grammar.hs 156;" t +DTComb src/Dodge/Item/Grammar.hs 160;" t DTMidAboveNode src/Dodge/Data/DoubleTree.hs 19;" C DTMidBelowNode src/Dodge/Data/DoubleTree.hs 20;" C DTRootNode src/Dodge/Data/DoubleTree.hs 17;" C @@ -529,7 +529,7 @@ Door src/Dodge/Room/Door.hs 2;" m DoorClosed src/Dodge/Data/Door.hs 23;" C DoorHalfway src/Dodge/Data/Door.hs 23;" C DoorInt src/Dodge/Data/Door.hs 23;" C -DoorMechanism src/Dodge/Data/WorldEffect.hs 70;" C +DoorMechanism src/Dodge/Data/WorldEffect.hs 69;" C DoorObstacle src/Dodge/Data/PathGraph.hs 50;" C DoorOpen src/Dodge/Data/Door.hs 23;" C DoorPane src/Dodge/LevelGen/DoorPane.hs 1;" m @@ -540,10 +540,10 @@ DoubleStack src/DoubleStack.hs 1;" m DoubleTree src/Dodge/Data/DoubleTree.hs 7;" m DoubleTree src/Dodge/DoubleTree.hs 2;" m DoubleTreeNodeType src/Dodge/Data/DoubleTree.hs 16;" t -DrWdId src/Dodge/Data/WorldEffect.hs 67;" C -DrWdMakeDoorDebris src/Dodge/Data/WorldEffect.hs 68;" C -DrWdMechanismStepwise src/Dodge/Data/WorldEffect.hs 69;" C -DrWdWd src/Dodge/Data/WorldEffect.hs 66;" t +DrWdId src/Dodge/Data/WorldEffect.hs 66;" C +DrWdMakeDoorDebris src/Dodge/Data/WorldEffect.hs 67;" C +DrWdMechanismStepwise src/Dodge/Data/WorldEffect.hs 68;" C +DrWdWd src/Dodge/Data/WorldEffect.hs 65;" t DrWdWd src/Dodge/DrWdWd.hs 1;" m Draw src/Dodge/Beam/Draw.hs 1;" m Draw src/Dodge/Block/Draw.hs 1;" m @@ -886,10 +886,9 @@ Info src/Dodge/Creature/Info.hs 1;" m Info src/Dodge/Item/Info.hs 3;" m InfoBox src/Dodge/Render/InfoBox.hs 1;" m InheritFloor src/Data/Tile.hs 12;" C -InitialPress src/Dodge/Data/Input.hs 16;" C Initialisation src/Dodge/Initialisation.hs 1;" m Initialize src/Dodge/Item/Location/Initialize.hs 1;" m -Input src/Dodge/Data/Input.hs 44;" t +Input src/Dodge/Data/Input.hs 36;" t Input src/Dodge/Data/Input.hs 6;" m Input src/Dodge/Event/Input.hs 3;" m Input src/Dodge/Update/Input.hs 1;" m @@ -925,9 +924,9 @@ IsClose src/Dodge/Data/Machine/Sensor.hs 44;" C IsPulseLaser src/Dodge/IsPulseLaser.hs 1;" m IsolationUnitSS src/Dodge/Data/Scenario.hs 101;" C ItAmount src/Dodge/Data/Item/Use/Consumption.hs 38;" t -ItCrWdItemHeldEffect src/Dodge/Data/WorldEffect.hs 17;" C -ItCrWdItemHeldEffectNoHammer src/Dodge/Data/WorldEffect.hs 18;" C -ItCrWdWd src/Dodge/Data/WorldEffect.hs 17;" t +ItCrWdItemHeldEffect src/Dodge/Data/WorldEffect.hs 16;" C +ItCrWdItemHeldEffectNoHammer src/Dodge/Data/WorldEffect.hs 17;" C +ItCrWdWd src/Dodge/Data/WorldEffect.hs 16;" t ItDropEffect src/Dodge/Data/Item/Effect.hs 37;" t ItEffect src/Dodge/Data/Item/Effect.hs 16;" t ItEffect src/Dodge/ItEffect.hs 3;" m @@ -1070,7 +1069,6 @@ LockAndKey src/Dodge/LockAndKey.hs 1;" m LoneWolf src/Dodge/Data/Creature/State.hs 26;" C LongAI src/Dodge/Data/Creature/Misc.hs 50;" C LongDoor src/Dodge/Room/LongDoor.hs 2;" m -LongPress src/Dodge/Data/Input.hs 18;" C LongRoom src/Dodge/Room/LongRoom.hs 1;" m LookAround src/Dodge/Data/ActionPlan.hs 186;" C Loop src/Loop.hs 11;" m @@ -1129,8 +1127,8 @@ Main appDodge/Main.hs 1;" m Make src/Dodge/Corpse/Make.hs 1;" m MakeAutoSF src/Dodge/Data/ComposedItem.hs 35;" C MakeSound src/Dodge/Data/ActionPlan.hs 43;" C -MakeStartCloudAt src/Dodge/Data/WorldEffect.hs 29;" C -MakeTempLight src/Dodge/Data/WorldEffect.hs 33;" C +MakeStartCloudAt src/Dodge/Data/WorldEffect.hs 28;" C +MakeTempLight src/Dodge/Data/WorldEffect.hs 32;" C ManipulatedObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 20;" t Manipulation src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 14;" t Manipulator src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 15;" C @@ -1151,11 +1149,11 @@ McSensor src/Dodge/Data/Machine.hs 52;" C McStatic src/Dodge/Data/Machine.hs 50;" C McTerminal src/Dodge/Data/Machine.hs 51;" C McTurret src/Dodge/Data/Machine.hs 53;" C -MdFlickerUpdate src/Dodge/Data/WorldEffect.hs 48;" C -MdSetLSCol src/Dodge/Data/WorldEffect.hs 47;" C -MdTrigIf src/Dodge/Data/WorldEffect.hs 46;" C -MdWdId src/Dodge/Data/WorldEffect.hs 45;" C -MdWdWd src/Dodge/Data/WorldEffect.hs 44;" t +MdFlickerUpdate src/Dodge/Data/WorldEffect.hs 47;" C +MdSetLSCol src/Dodge/Data/WorldEffect.hs 46;" C +MdTrigIf src/Dodge/Data/WorldEffect.hs 45;" C +MdWdId src/Dodge/Data/WorldEffect.hs 44;" C +MdWdWd src/Dodge/Data/WorldEffect.hs 43;" t MedBaySS src/Dodge/Data/Scenario.hs 100;" C Medium src/Shape/Data.hs 30;" C Melee src/Dodge/Data/ActionPlan.hs 41;" C @@ -1195,12 +1193,12 @@ MountedLS src/Dodge/Data/MountedObject.hs 12;" C MountedObject src/Dodge/Data/MountedObject.hs 11;" t MountedObject src/Dodge/Data/MountedObject.hs 6;" m MountedProp src/Dodge/Data/MountedObject.hs 13;" C -MouseAiming src/Dodge/Data/Input.hs 23;" C -MouseContext src/Dodge/Data/Input.hs 21;" t -MouseGameRotate src/Dodge/Data/Input.hs 41;" C -MouseInGame src/Dodge/Data/Input.hs 24;" C -MouseMenuClick src/Dodge/Data/Input.hs 25;" C -MouseMenuCursor src/Dodge/Data/Input.hs 26;" C +MouseAiming src/Dodge/Data/Input.hs 15;" C +MouseContext src/Dodge/Data/Input.hs 13;" t +MouseGameRotate src/Dodge/Data/Input.hs 33;" C +MouseInGame src/Dodge/Data/Input.hs 16;" C +MouseMenuClick src/Dodge/Data/Input.hs 17;" C +MouseMenuCursor src/Dodge/Data/Input.hs 18;" C Mouse_position src/Dodge/Data/Config.hs 73;" C Move src/Dodge/Data/ActionPlan.hs 28;" C Move src/Dodge/Wall/Move.hs 3;" m @@ -1278,7 +1276,7 @@ NoItTargeting src/Dodge/Data/Item.hs 56;" C NoItemScroll src/Dodge/Data/Item.hs 52;" C NoLightFlare src/Dodge/Data/Muzzle.hs 27;" C NoLighting src/Dodge/Data/Config.hs 104;" C -NoMouseContext src/Dodge/Data/Input.hs 22;" C +NoMouseContext src/Dodge/Data/Input.hs 14;" C NoMvType src/Dodge/Data/Creature/Misc.hs 29;" C NoNeedWeapon src/Dodge/Room/NoNeedWeapon.hs 2;" m NoObjShads src/Dodge/Data/Config.hs 102;" C @@ -1291,7 +1289,7 @@ NoShadowFidelity src/Shape/Data.hs 25;" C NoShadows src/Dodge/Data/Config.hs 103;" C NoSubInventory src/Dodge/Data/HUD.hs 29;" C NoTrigger src/Dodge/Data/TriggerType.hs 10;" C -NoWorldEffect src/Dodge/Data/WorldEffect.hs 22;" C +NoWorldEffect src/Dodge/Data/WorldEffect.hs 21;" C Noclip src/Dodge/Data/Config.hs 70;" C NodeMTree src/Dodge/Data/MetaTree.hs 14;" C NodeMTree src/Dodge/Tree/Compose/Data.hs 9;" C @@ -1334,7 +1332,7 @@ NumShadowCasters7 src/Dodge/Data/Config.hs 22;" C NumShadowCasters8 src/Dodge/Data/Config.hs 23;" C NumShadowCasters9 src/Dodge/Data/Config.hs 24;" C OCreature src/Dodge/Data/Object.hs 12;" C -OItem src/Dodge/Data/ComposedItem.hs 48;" t +OItem src/Dodge/Data/ComposedItem.hs 50;" t OPulseBall src/Dodge/Data/Object.hs 11;" C ORANGE src/Color/Data.hs 26;" C OTButton src/Dodge/Data/ObjectType.hs 17;" C @@ -1382,16 +1380,16 @@ OutLink src/Dodge/Data/Room.hs 43;" C OutPlacement src/Dodge/Data/GenWorld.hs 126;" t Outline src/Dodge/Render/Outline.hs 1;" m OutwardShockwave src/Dodge/Data/Shockwave.hs 14;" C -OverCombCombine src/Dodge/Data/Input.hs 36;" C -OverCombEscape src/Dodge/Data/Input.hs 38;" C -OverCombFiltInv src/Dodge/Data/Input.hs 34;" C -OverCombFilter src/Dodge/Data/Input.hs 37;" C -OverCombSelect src/Dodge/Data/Input.hs 35;" C -OverInvDrag src/Dodge/Data/Input.hs 27;" C -OverInvDragSelect src/Dodge/Data/Input.hs 32;" C -OverInvSelect src/Dodge/Data/Input.hs 33;" C -OverTerminalEscape src/Dodge/Data/Input.hs 40;" C -OverTerminalReturn src/Dodge/Data/Input.hs 39;" C +OverCombCombine src/Dodge/Data/Input.hs 28;" C +OverCombEscape src/Dodge/Data/Input.hs 30;" C +OverCombFiltInv src/Dodge/Data/Input.hs 26;" C +OverCombFilter src/Dodge/Data/Input.hs 29;" C +OverCombSelect src/Dodge/Data/Input.hs 27;" C +OverInvDrag src/Dodge/Data/Input.hs 19;" C +OverInvDragSelect src/Dodge/Data/Input.hs 24;" C +OverInvSelect src/Dodge/Data/Input.hs 25;" C +OverTerminalEscape src/Dodge/Data/Input.hs 32;" C +OverTerminalReturn src/Dodge/Data/Input.hs 31;" C OverreachingAI src/Dodge/Data/Scenario.hs 31;" C Overstrung src/Dodge/Data/Creature/Perception.hs 57;" C P2Ac src/Dodge/Data/CreatureEffect.hs 53;" t @@ -1499,7 +1497,6 @@ PressPlate src/Dodge/Data/PressPlate.hs 6;" m PressPlate src/Dodge/PressPlate.hs 1;" m PressPlateEvent src/Dodge/Data/PressPlate.hs 14;" t PressPlateId src/Dodge/Data/PressPlate.hs 15;" C -PressType src/Dodge/Data/Input.hs 15;" t PrimitiveMode src/Shader/Data.hs 99;" t PrintMaterial src/Dodge/Data/AmmoType.hs 12;" C Prison src/Dodge/Data/Scenario.hs 65;" C @@ -1542,10 +1539,11 @@ ProximityRequirement src/Dodge/Data/Machine/Sensor.hs 36;" t ProximitySensor src/Dodge/Data/Machine/Sensor.hs 27;" C Pulse src/Dodge/Data/Creature/Misc.hs 54;" t PulseBall src/Dodge/Data/PulseLaser.hs 20;" t -PulseBallSF src/Dodge/Data/ComposedItem.hs 43;" C +PulseBallSF src/Dodge/Data/ComposedItem.hs 44;" C PulseLaser src/Dodge/Data/PulseLaser.hs 11;" t PulseLaser src/Dodge/Data/PulseLaser.hs 4;" m PulseLaser src/Dodge/PulseLaser.hs 1;" m +PulseLaserSF src/Dodge/Data/ComposedItem.hs 41;" C PulseStatus src/Dodge/Data/Creature/Misc.hs 54;" C PushPop src/Dodge/Menu/PushPop.hs 1;" m PushSource src/Dodge/Data/Door.hs 27;" t @@ -1747,9 +1745,9 @@ SensorDoor src/Dodge/Room/SensorDoor.hs 2;" m SensorType src/Dodge/Data/Machine/Sensor/Type.hs 10;" t SentinelAI src/Dodge/Creature/SentinelAI.hs 1;" m SentinelAt src/Dodge/Data/ActionPlan.hs 199;" C -SetLSCol src/Dodge/Data/WorldEffect.hs 25;" C +SetLSCol src/Dodge/Data/WorldEffect.hs 24;" C SetTarget src/Dodge/Creature/SetTarget.hs 2;" m -SetTrigger src/Dodge/Data/WorldEffect.hs 23;" C +SetTrigger src/Dodge/Data/WorldEffect.hs 22;" C Setup src/Framebuffer/Setup.hs 2;" m ShadNum src/Picture/Data.hs 35;" t Shader src/Shader/Data.hs 51;" t @@ -1779,7 +1777,6 @@ Shockwave src/Dodge/Data/Shockwave.hs 6;" m Shockwave src/Dodge/WorldEvent/Shockwave.hs 1;" m ShockwaveDirection src/Dodge/Data/Shockwave.hs 14;" t ShootAt src/Dodge/Data/ActionPlan.hs 181;" C -ShortPress src/Dodge/Data/Input.hs 17;" C ShortShow src/ShortShow.hs 8;" c ShortShow src/Dodge/ShortShow.hs 1;" m ShortShow src/ShortShow.hs 1;" m @@ -1826,7 +1823,7 @@ SoundID src/Sound/Data.hs 32;" t SoundLogic src/Dodge/SoundLogic.hs 7;" m SoundOrigin src/Dodge/Data/SoundOrigin.hs 12;" t SoundOrigin src/Dodge/Data/SoundOrigin.hs 6;" m -SoundStart src/Dodge/Data/WorldEffect.hs 28;" C +SoundStart src/Dodge/Data/WorldEffect.hs 27;" C SoundStatus src/Sound/Data.hs 16;" t South src/Dodge/Data/CardinalPoint.hs 6;" C South8 src/Dodge/Data/CardinalPoint.hs 15;" C @@ -1906,15 +1903,15 @@ TORCH src/Dodge/Data/Item/Combine.hs 176;" C TRACTORGUN src/Dodge/Data/Item/Combine.hs 170;" C TRANSFORMER src/Dodge/Data/Item/Combine.hs 64;" C TRANSMITTER src/Dodge/Data/Item/Combine.hs 70;" C -TSbackspace src/Dodge/Data/Input.hs 65;" C -TSdelete src/Dodge/Data/Input.hs 66;" C -TSdown src/Dodge/Data/Input.hs 71;" C -TSescape src/Dodge/Data/Input.hs 63;" C -TSleft src/Dodge/Data/Input.hs 68;" C -TSreturn src/Dodge/Data/Input.hs 64;" C -TSright src/Dodge/Data/Input.hs 69;" C -TStab src/Dodge/Data/Input.hs 67;" C -TSup src/Dodge/Data/Input.hs 70;" C +TSbackspace src/Dodge/Data/Input.hs 57;" C +TSdelete src/Dodge/Data/Input.hs 58;" C +TSdown src/Dodge/Data/Input.hs 63;" C +TSescape src/Dodge/Data/Input.hs 55;" C +TSleft src/Dodge/Data/Input.hs 60;" C +TSreturn src/Dodge/Data/Input.hs 56;" C +TSright src/Dodge/Data/Input.hs 61;" C +TStab src/Dodge/Data/Input.hs 59;" C +TSup src/Dodge/Data/Input.hs 62;" C TUBE src/Dodge/Data/Item/Combine.hs 51;" C Tank src/Dodge/Placement/Instance/Tank.hs 1;" m Tanks src/Dodge/Room/Tanks.hs 1;" m @@ -1927,7 +1924,7 @@ TargetingLaser src/Dodge/Data/Laser.hs 18;" C TargetingType src/Dodge/Data/Item/Targeting.hs 11;" t TeleSound src/Dodge/Data/SoundOrigin.hs 35;" C Teleport src/Dodge/Room/Teleport.hs 2;" m -TermSignal src/Dodge/Data/Input.hs 62;" t +TermSignal src/Dodge/Data/Input.hs 54;" t Terminal src/Dodge/Data/Terminal.hs 32;" t Terminal src/Dodge/Data/Terminal.hs 6;" m Terminal src/Dodge/Debug/Terminal.hs 3;" m @@ -1995,13 +1992,13 @@ TmTm src/Dodge/TmTm.hs 1;" m TmTmClearDisplayedLines src/Dodge/Data/Terminal.hs 62;" C TmTmSetPartialCommand src/Dodge/Data/Terminal.hs 64;" C TmTmSetStatus src/Dodge/Data/Terminal.hs 63;" C -TmWdId src/Dodge/Data/WorldEffect.hs 74;" C -TmWdWd src/Dodge/Data/WorldEffect.hs 73;" t +TmWdId src/Dodge/Data/WorldEffect.hs 73;" C +TmWdWd src/Dodge/Data/WorldEffect.hs 72;" t TmWdWd src/Dodge/TmWdWd.hs 1;" m -TmWdWdDisconnectTerminal src/Dodge/Data/WorldEffect.hs 75;" C -TmWdWdDoDeathTriggers src/Dodge/Data/WorldEffect.hs 78;" C -TmWdWdTermSound src/Dodge/Data/WorldEffect.hs 77;" C -TmWdWdfromWdWd src/Dodge/Data/WorldEffect.hs 76;" C +TmWdWdDisconnectTerminal src/Dodge/Data/WorldEffect.hs 74;" C +TmWdWdDoDeathTriggers src/Dodge/Data/WorldEffect.hs 77;" C +TmWdWdTermSound src/Dodge/Data/WorldEffect.hs 76;" C +TmWdWdfromWdWd src/Dodge/Data/WorldEffect.hs 75;" C ToContinueStart src/Sound/Data.hs 27;" C ToPlaySound src/Sound/Data.hs 35;" t ToStart src/Sound/Data.hs 26;" C @@ -2015,12 +2012,13 @@ TopDT src/Dodge/Data/DoubleTree.hs 85;" C TopDecoration src/Dodge/Placement/TopDecoration.hs 1;" m TopEscapeMenuOption src/Dodge/Data/Universe.hs 78;" C TopLDT src/Dodge/Data/DoubleTree.hs 43;" C +TorchSF src/Dodge/Data/ComposedItem.hs 45;" C TorpedoBaySS src/Dodge/Data/Scenario.hs 99;" C -TorqueCr src/Dodge/Data/WorldEffect.hs 30;" C +TorqueCr src/Dodge/Data/WorldEffect.hs 29;" C TractorBeam src/Dodge/Data/TractorBeam.hs 13;" t TractorBeam src/Dodge/Data/TractorBeam.hs 6;" m TrainingCamp src/Dodge/Data/Scenario.hs 63;" C -TransformerSF src/Dodge/Data/ComposedItem.hs 42;" C +TransformerSF src/Dodge/Data/ComposedItem.hs 43;" C Translate src/Dodge/Path/Translate.hs 1;" m TransporterSS src/Dodge/Data/Scenario.hs 114;" C Treasure src/Dodge/Room/Treasure.hs 5;" m @@ -2065,7 +2063,7 @@ Unimportant src/Shape/Data.hs 37;" C Universe src/Dodge/Data/Universe.hs 31;" t Universe src/Dodge/Data/Universe.hs 6;" m UnloadedWeaponSF src/Dodge/Data/ComposedItem.hs 13;" C -UnlockInv src/Dodge/Data/WorldEffect.hs 27;" C +UnlockInv src/Dodge/Data/WorldEffect.hs 26;" C UnusedLink src/Dodge/Data/Room.hs 65;" C Update src/Dodge/Config/Update.hs 4;" m Update src/Dodge/Creature/Update.hs 1;" m @@ -2096,7 +2094,7 @@ UseFromLocation src/Dodge/Data/UseCondition.hs 13;" C UseFromRoot src/Dodge/Data/UseCondition.hs 12;" C UseHeld src/Dodge/Data/Item/Use.hs 31;" C UseInt src/Dodge/Data/Item/Use.hs 33;" C -UseInvItem src/Dodge/Data/WorldEffect.hs 34;" C +UseInvItem src/Dodge/Data/WorldEffect.hs 33;" C UseItem src/Dodge/Data/ActionPlan.hs 37;" C UseItem src/Dodge/Creature/Impulse/UseItem.hs 3;" m UseItemWidth src/Dodge/Data/SelectionList.hs 41;" C @@ -2175,12 +2173,12 @@ WarningCry src/Dodge/Data/ActionPlan.hs 185;" C WasLeftForward src/Dodge/Data/Creature/Stance.hs 34;" C WasRightForward src/Dodge/Data/Creature/Stance.hs 35;" C WatchAndWait src/Dodge/Data/ActionPlan.hs 183;" C -WdBl src/Dodge/Data/WorldEffect.hs 51;" t -WdBlBtOn src/Dodge/Data/WorldEffect.hs 57;" C -WdBlConst src/Dodge/Data/WorldEffect.hs 54;" C -WdBlCrFilterNearPoint src/Dodge/Data/WorldEffect.hs 56;" C -WdBlDoorMoving src/Dodge/Data/WorldEffect.hs 53;" C -WdBlNegate src/Dodge/Data/WorldEffect.hs 55;" C +WdBl src/Dodge/Data/WorldEffect.hs 50;" t +WdBlBtOn src/Dodge/Data/WorldEffect.hs 56;" C +WdBlConst src/Dodge/Data/WorldEffect.hs 53;" C +WdBlCrFilterNearPoint src/Dodge/Data/WorldEffect.hs 55;" C +WdBlDoorMoving src/Dodge/Data/WorldEffect.hs 52;" C +WdBlNegate src/Dodge/Data/WorldEffect.hs 54;" C WdCrBl src/Dodge/Data/CreatureEffect.hs 31;" t WdCrBlfromCrBl src/Dodge/Data/CreatureEffect.hs 33;" C WdCrCr src/Dodge/Data/CreatureEffect.hs 11;" t @@ -2188,18 +2186,18 @@ WdCrLOSTarget src/Dodge/Data/CreatureEffect.hs 35;" C WdCrNegate src/Dodge/Data/CreatureEffect.hs 34;" C WdCrSafeDistFromTarget src/Dodge/Data/CreatureEffect.hs 36;" C WdCrTrue src/Dodge/Data/CreatureEffect.hs 32;" C -WdP2 src/Dodge/Data/WorldEffect.hs 39;" t +WdP2 src/Dodge/Data/WorldEffect.hs 38;" t WdP2 src/Dodge/WdP2.hs 1;" m -WdP2Const src/Dodge/Data/WorldEffect.hs 40;" C -WdP2f src/Dodge/Data/WorldEffect.hs 61;" t +WdP2Const src/Dodge/Data/WorldEffect.hs 39;" C +WdP2f src/Dodge/Data/WorldEffect.hs 60;" t WdP2f src/Dodge/WdP2f.hs 2;" m -WdP2f0 src/Dodge/Data/WorldEffect.hs 62;" C -WdP2fDoorPosition src/Dodge/Data/WorldEffect.hs 63;" C -WdTrig src/Dodge/Data/WorldEffect.hs 52;" C -WdWd src/Dodge/Data/WorldEffect.hs 21;" t -WdWdBurstFireRepetition src/Dodge/Data/WorldEffect.hs 35;" C -WdWdNegateTrig src/Dodge/Data/WorldEffect.hs 31;" C -WdYouPos src/Dodge/Data/WorldEffect.hs 41;" C +WdP2f0 src/Dodge/Data/WorldEffect.hs 61;" C +WdP2fDoorPosition src/Dodge/Data/WorldEffect.hs 62;" C +WdTrig src/Dodge/Data/WorldEffect.hs 51;" C +WdWd src/Dodge/Data/WorldEffect.hs 20;" t +WdWdBurstFireRepetition src/Dodge/Data/WorldEffect.hs 34;" C +WdWdNegateTrig src/Dodge/Data/WorldEffect.hs 30;" C +WdYouPos src/Dodge/Data/WorldEffect.hs 40;" C Weapon src/Dodge/Item/Weapon.hs 2;" m WeaponScopeSF src/Dodge/Data/ComposedItem.hs 19;" C WeaponTargetingSF src/Dodge/Data/ComposedItem.hs 20;" C @@ -2218,7 +2216,7 @@ World src/Dodge/Zoning/World.hs 1;" m WorldBool src/Dodge/WorldBool.hs 1;" m WorldEffect src/Dodge/Data/WorldEffect.hs 6;" m WorldEffect src/Dodge/WorldEffect.hs 1;" m -WorldEffects src/Dodge/Data/WorldEffect.hs 24;" C +WorldEffects src/Dodge/Data/WorldEffect.hs 23;" C WorldEvent src/Dodge/WorldEvent.hs 1;" m WorldEventFlag src/Dodge/Data/World.hs 30;" t WorldGovernment src/Dodge/Data/Scenario.hs 52;" C @@ -2387,8 +2385,8 @@ _cldtParent src/Dodge/Data/DoubleTree.hs 47;" f _cldtParent src/Dodge/Data/DoubleTree.hs 56;" f _cldtUp src/Dodge/Data/DoubleTree.hs 45;" f _cldtUp src/Dodge/Data/DoubleTree.hs 53;" f -_clickPos src/Dodge/Data/Input.hs 53;" f -_clickWorldPos src/Dodge/Data/Input.hs 55;" f +_clickPos src/Dodge/Data/Input.hs 45;" f +_clickWorldPos src/Dodge/Data/Input.hs 47;" f _closeButtons src/Dodge/Data/HUD.hs 50;" f _closeItems src/Dodge/Data/HUD.hs 49;" f _cloudEBO src/Data/Preload/Render.hs 49;" f @@ -2619,8 +2617,8 @@ _guVel src/Dodge/Data/Gust.hs 16;" f _gusts src/Dodge/Data/LWorld.hs 105;" f _gwWorld src/Dodge/Data/GenWorld.hs 24;" f _hammerPosition src/Dodge/Data/Hammer.hs 14;" f -_heldPos src/Dodge/Data/Input.hs 54;" f -_heldWorldPos src/Dodge/Data/Input.hs 56;" f +_heldPos src/Dodge/Data/Input.hs 46;" f +_heldWorldPos src/Dodge/Data/Input.hs 48;" f _hotkeys src/Dodge/Data/LWorld.hs 149;" f _hud src/Dodge/Data/World.hs 45;" f _hudElement src/Dodge/Data/HUD.hs 45;" f @@ -2754,18 +2752,18 @@ _mcPos src/Dodge/Data/Machine.hs 35;" f _mcType src/Dodge/Data/Machine.hs 40;" f _mcWallIDs src/Dodge/Data/Machine.hs 33;" f _mcWidth src/Dodge/Data/Machine.hs 44;" f -_mcoAboveSelect src/Dodge/Data/Input.hs 29;" f -_mcoBelowSelect src/Dodge/Data/Input.hs 30;" f -_mcoCombCombine src/Dodge/Data/Input.hs 36;" f -_mcoCombSelect src/Dodge/Data/Input.hs 35;" f -_mcoDragSection src/Dodge/Data/Input.hs 27;" f -_mcoInvFilt src/Dodge/Data/Input.hs 34;" f -_mcoInvSelect src/Dodge/Data/Input.hs 33;" f -_mcoMaybeSelect src/Dodge/Data/Input.hs 28;" f -_mcoMenuClick src/Dodge/Data/Input.hs 25;" f -_mcoSecSelStart src/Dodge/Data/Input.hs 32;" f -_mcoSelEnd src/Dodge/Data/Input.hs 32;" f -_mcoTermID src/Dodge/Data/Input.hs 39;" f +_mcoAboveSelect src/Dodge/Data/Input.hs 21;" f +_mcoBelowSelect src/Dodge/Data/Input.hs 22;" f +_mcoCombCombine src/Dodge/Data/Input.hs 28;" f +_mcoCombSelect src/Dodge/Data/Input.hs 27;" f +_mcoDragSection src/Dodge/Data/Input.hs 19;" f +_mcoInvFilt src/Dodge/Data/Input.hs 26;" f +_mcoInvSelect src/Dodge/Data/Input.hs 25;" f +_mcoMaybeSelect src/Dodge/Data/Input.hs 20;" f +_mcoMenuClick src/Dodge/Data/Input.hs 17;" f +_mcoSecSelStart src/Dodge/Data/Input.hs 24;" f +_mcoSelEnd src/Dodge/Data/Input.hs 24;" f +_mcoTermID src/Dodge/Data/Input.hs 31;" f _mctTurret src/Dodge/Data/Machine.hs 53;" f _mdBool src/Dodge/Data/Modification.hs 21;" f _mdExternalID src/Dodge/Data/Modification.hs 17;" f @@ -2789,11 +2787,11 @@ _moString src/Dodge/Data/Universe.hs 110;" f _modOption src/Dodge/Data/Universe.hs 100;" f _modString src/Dodge/Data/Universe.hs 98;" f _modifications src/Dodge/Data/LWorld.hs 134;" f -_mouseButtons src/Dodge/Data/Input.hs 49;" f -_mouseButtonsReleased src/Dodge/Data/Input.hs 50;" f -_mouseContext src/Dodge/Data/Input.hs 46;" f -_mouseMoving src/Dodge/Data/Input.hs 47;" f -_mousePos src/Dodge/Data/Input.hs 45;" f +_mouseButtons src/Dodge/Data/Input.hs 41;" f +_mouseButtonsReleased src/Dodge/Data/Input.hs 42;" f +_mouseContext src/Dodge/Data/Input.hs 38;" f +_mouseMoving src/Dodge/Data/Input.hs 39;" f +_mousePos src/Dodge/Data/Input.hs 37;" f _mtBranches src/Dodge/Data/MetaTree.hs 10;" f _mtBranches src/Dodge/Tree/Compose/Data.hs 8;" f _mtLabel src/Dodge/Data/MetaTree.hs 10;" f @@ -2915,7 +2913,7 @@ _prVel src/Dodge/Data/Prop.hs 24;" f _prVelZ src/Dodge/Data/Prop.hs 27;" f _preloadData src/Dodge/Data/Universe.hs 33;" f _pressPlates src/Dodge/Data/LWorld.hs 137;" f -_pressedKeys src/Dodge/Data/Input.hs 48;" f +_pressedKeys src/Dodge/Data/Input.hs 40;" f _projectiles src/Dodge/Data/LWorld.hs 107;" f _props src/Dodge/Data/LWorld.hs 106;" f _proxDist src/Dodge/Data/Machine/Sensor.hs 29;" f @@ -3032,14 +3030,14 @@ _scPositionedMenuOption src/Dodge/Data/Universe.hs 86;" f _scSelectionList src/Dodge/Data/Universe.hs 88;" f _scTitle src/Dodge/Data/Universe.hs 83;" f _screenTextureVAO src/Data/Preload/Render.hs 50;" f -_scrollAmount src/Dodge/Data/Input.hs 51;" f +_scrollAmount src/Dodge/Data/Input.hs 43;" f _scrollItemID src/Dodge/Data/World.hs 66;" f _scrollItemID src/Dodge/Data/World.hs 75;" f _scrollItemID src/Dodge/Data/World.hs 79;" f _scrollSmoothing src/Dodge/Data/World.hs 63;" f _scrollSmoothing src/Dodge/Data/World.hs 69;" f -_scrollTestFloat src/Dodge/Data/Input.hs 58;" f -_scrollTestInt src/Dodge/Data/Input.hs 59;" f +_scrollTestFloat src/Dodge/Data/Input.hs 50;" f +_scrollTestInt src/Dodge/Data/Input.hs 51;" f _scurColor src/Dodge/Data/SelectionList.hs 26;" f _scurPos src/Dodge/Data/SelectionList.hs 24;" f _scurSize src/Dodge/Data/SelectionList.hs 25;" f @@ -3090,7 +3088,7 @@ _skVel src/Dodge/Data/Spark.hs 15;" f _skinHead src/Dodge/Data/Creature/Misc.hs 78;" f _skinLower src/Dodge/Data/Creature/Misc.hs 80;" f _skinUpper src/Dodge/Data/Creature/Misc.hs 79;" f -_smoothScrollAmount src/Dodge/Data/Input.hs 52;" f +_smoothScrollAmount src/Dodge/Data/Input.hs 44;" f _soundAngDist src/Sound/Data.hs 49;" f _soundChannel src/Sound/Data.hs 48;" f _soundChunkID src/Sound/Data.hs 53;" f @@ -3146,7 +3144,7 @@ _termID src/Dodge/Data/HUD.hs 42;" f _terminals src/Dodge/Data/LWorld.hs 127;" f _teslaArcs src/Dodge/Data/LWorld.hs 115;" f _testFloat src/Dodge/Data/World.hs 43;" f -_textInput src/Dodge/Data/Input.hs 57;" f +_textInput src/Dodge/Data/Input.hs 49;" f _textureObject src/Shader/Data.hs 95;" f _tiSel src/Dodge/Data/Terminal.hs 22;" f _tiText src/Dodge/Data/Terminal.hs 21;" f @@ -3360,12 +3358,12 @@ addRandomGirderEW src/Dodge/Room/Girder.hs 9;" f addRandomGirderFrom src/Dodge/Room/Girder.hs 16;" f addSideEffect src/Dodge/Concurrent.hs 29;" f addSouthPillars src/Dodge/Room/LongDoor.hs 89;" f -addTermSignal src/Dodge/Event/Input.hs 34;" f +addTermSignal src/Dodge/Event/Input.hs 30;" f addToTrunk src/TreeHelp.hs 156;" f addWarningTerminal src/Dodge/Room/Warning.hs 36;" f addZ src/Geometry/Vector3D.hs 89;" f adjustIMZone src/Dodge/Base.hs 81;" f -advanceScrollAmount src/Dodge/Update.hs 436;" f +advanceScrollAmount src/Dodge/Update.hs 434;" f advanceSmoothScroll src/Dodge/SmoothScroll.hs 33;" f advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 44;" f aimDelaySweep src/Dodge/Render/Picture.hs 264;" f @@ -3480,7 +3478,7 @@ barrel src/Dodge/Creature/Inanimate.hs 17;" f barrelShape src/Dodge/Render/ShapePicture.hs 55;" f baseAMRShape src/Dodge/Item/Draw/SPic.hs 418;" f baseBlockPane src/Dodge/Placement/Instance/Wall.hs 86;" f -baseCI src/Dodge/Item/Grammar.hs 153;" f +baseCI src/Dodge/Item/Grammar.hs 157;" f baseCaneShape src/Dodge/Item/Draw/SPic.hs 335;" f baseDebris src/Dodge/Block/Debris.hs 122;" f baseFloorTileSize src/Tile.hs 45;" f @@ -3616,13 +3614,13 @@ chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 37;" f checkCombineSelectionExists src/Dodge/DisplayInventory.hs 100;" f checkConnection src/Dodge/Inventory/Swap.hs 64;" f checkDeath src/Dodge/Creature/State.hs 77;" f -checkEndGame src/Dodge/Update.hs 791;" f +checkEndGame src/Dodge/Update.hs 793;" f checkErrorGL src/Shader/Compile.hs 255;" f checkFBO src/Framebuffer/Check.hs 6;" f checkGLError src/GLHelp.hs 17;" f checkInvSlotsYou src/Dodge/Inventory/CheckSlots.hs 17;" f checkInventorySelectionExists src/Dodge/DisplayInventory.hs 93;" f -checkTermDist src/Dodge/Update.hs 334;" f +checkTermDist src/Dodge/Update.hs 332;" f checkWallLeft src/Dodge/LevelGen/StaticWalls/Deprecated.hs 29;" f checkWallRight src/Dodge/LevelGen/StaticWalls.hs 54;" f checkWallRight src/Dodge/LevelGen/StaticWalls/Deprecated.hs 59;" f @@ -3646,7 +3644,7 @@ circleDecoration src/Dodge/Placement/TopDecoration.hs 56;" f circleSolid src/Picture/Base.hs 164;" f circleSolidCol src/Picture/Base.hs 168;" f clAlt src/Dodge/Cloud.hs 5;" f -clClSpringVel src/Dodge/Update.hs 860;" f +clClSpringVel src/Dodge/Update.hs 862;" f clColor src/Shader/Poke/Cloud.hs 35;" f clZoneSize src/Dodge/Zone/Size.hs 3;" f clZoneSize src/Dodge/Zoning/Cloud.hs 21;" f @@ -3676,7 +3674,7 @@ closestCreatureID src/Dodge/Debug.hs 116;" 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 812;" f +cloudEffect src/Dodge/Update.hs 814;" f cloudPoisonDamage src/Dodge/Update/Cloud.hs 10;" f clsNearCirc src/Dodge/Zoning/Cloud.hs 18;" f clsNearPoint src/Dodge/Zoning/Cloud.hs 9;" f @@ -3752,7 +3750,7 @@ crAwayFromPost src/Dodge/Creature/Test.hs 82;" f crBlips src/Dodge/RadarSweep.hs 87;" f crCamouflage src/Dodge/Creature/Picture.hs 31;" f crCanSeeCr src/Dodge/Creature/Test.hs 51;" f -crCrSpring src/Dodge/Update.hs 889;" f +crCrSpring src/Dodge/Update.hs 891;" f crCurrentEquipment src/Dodge/Creature/Statistics.hs 57;" f crDexterity src/Dodge/Creature/Statistics.hs 14;" f crDisplayAwareness src/Dodge/Creature/Picture/Awareness.hs 38;" f @@ -3780,7 +3778,7 @@ crRad src/Dodge/Creature/Radius.hs 7;" f crSafeDistFromTarg src/Dodge/Creature/Test.hs 72;" f crSetRoots src/Dodge/Inventory/Location.hs 48;" f crShape src/Dodge/Creature/Shape.hs 8;" f -crSpring src/Dodge/Update.hs 884;" f +crSpring src/Dodge/Update.hs 886;" f crStratConMatches src/Dodge/Creature/Test.hs 77;" f crStrength src/Dodge/Creature/Statistics.hs 24;" f crUpdate src/Dodge/Creature/State.hs 64;" f @@ -4020,7 +4018,7 @@ displayFrameTicks src/Dodge/Render/Picture.hs 45;" f displayFreeSlots src/Dodge/DisplayInventory.hs 198;" f displayIndents src/Dodge/DisplayInventory.hs 110;" f displayPulse src/Dodge/Inventory/SelectionList.hs 176;" f -displayTerminalLineString src/Dodge/Update.hs 496;" f +displayTerminalLineString src/Dodge/Update.hs 498;" f dist src/Geometry/Vector.hs 190;" f dist3 src/Geometry/Vector3D.hs 101;" f divTo src/Geometry/Zone.hs 6;" f @@ -4073,7 +4071,7 @@ doIndividualPlacements src/Dodge/Layout.hs 117;" f doInputScreenInput src/Dodge/Update/Input/ScreenLayer.hs 28;" f doIntImp src/Dodge/CreatureEffect.hs 24;" f doInvEffect src/Dodge/ItEffect.hs 16;" f -doItemTimeScroll src/Dodge/Update.hs 204;" f +doItemTimeScroll src/Dodge/Update.hs 202;" f doLoop src/Loop.hs 60;" f doMCrAc src/Dodge/CreatureEffect.hs 57;" f doMP2Ac src/Dodge/CreatureEffect.hs 73;" f @@ -4107,7 +4105,7 @@ doTestDrawing src/Dodge/Render.hs 42;" f doTextInputOver src/Dodge/Update/Input/Text.hs 15;" f doTextInputOverUniverse src/Dodge/Update/Input/Text.hs 12;" f doThrust src/Dodge/Projectile/Update.hs 146;" f -doTimeScroll src/Dodge/Update.hs 209;" f +doTimeScroll src/Dodge/Update.hs 207;" f doTmTm src/Dodge/TmTm.hs 6;" f doTmWdWd src/Dodge/WorldEffect.hs 99;" f doWallRotate src/Dodge/Update/Camera.hs 212;" f @@ -4116,7 +4114,7 @@ doWdCrBl src/Dodge/CreatureEffect.hs 37;" f doWdCrCr src/Dodge/CreatureEffect.hs 12;" f doWdP2f src/Dodge/WdP2f.hs 12;" f doWdWd src/Dodge/WorldEffect.hs 27;" f -doWorldEvents src/Dodge/Update.hs 446;" f +doWorldEvents src/Dodge/Update.hs 444;" 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 @@ -4282,7 +4280,7 @@ dtToRootIntMap' src/Dodge/DoubleTree.hs 153;" f dtToUpDownAdj src/Dodge/DoubleTree.hs 158;" f dummyMenuOption src/Dodge/Menu/Option.hs 74;" f dustColor src/Shader/Poke/Cloud.hs 71;" f -dustSpringVel src/Dodge/Update.hs 871;" f +dustSpringVel src/Dodge/Update.hs 873;" f ebColor src/Dodge/EnergyBall.hs 94;" f ebDamage src/Dodge/EnergyBall.hs 102;" f ebEffect src/Dodge/EnergyBall.hs 49;" f @@ -4345,8 +4343,8 @@ extTrigLitPos src/Dodge/Placement/Instance/Button.hs 84;" f extendAway src/Dodge/Placement/Instance/LightSource.hs 200;" f extendConeToScreenEdge src/Dodge/Debug/Picture.hs 82;" f extraPics src/Dodge/Render/ShapePicture.hs 82;" f -extraWeaponLinks src/Dodge/Item/Grammar.hs 88;" f -extraWeaponLinksBelow src/Dodge/Item/Grammar.hs 97;" f +extraWeaponLinks src/Dodge/Item/Grammar.hs 89;" f +extraWeaponLinksBelow src/Dodge/Item/Grammar.hs 98;" f extractRoomPos src/Dodge/RoomPos.hs 6;" f faceEdges src/Polyhedra.hs 65;" f facesToVF src/Polyhedra/Geodesic.hs 69;" f @@ -4437,7 +4435,7 @@ fromV3 src/Geometry/Data.hs 63;" f frontArmour src/Dodge/Item/Equipment.hs 38;" f fstV2 src/Geometry/Data.hs 70;" f fuelPack src/Dodge/Item/Equipment.hs 53;" f -functionalUpdate src/Dodge/Update.hs 259;" f +functionalUpdate src/Dodge/Update.hs 257;" f fuseFunc src/Dodge/Path.hs 150;" f fusePairs src/Dodge/Path.hs 153;" f fusePoint src/Dodge/LevelGen/StaticWalls.hs 158;" f @@ -4465,11 +4463,11 @@ geometryTests test/Spec.hs 17;" f geometryUnitTests test/Spec.hs 22;" f geqConstr src/SameConstr.hs 21;" f getAimZoom src/Dodge/Update/Camera.hs 135;" f -getAmmoLinks src/Dodge/Item/Grammar.hs 102;" f +getAmmoLinks src/Dodge/Item/Grammar.hs 103;" f getArguments src/Dodge/Update/Scroll.hs 178;" f getArguments' src/Dodge/Update/Scroll.hs 166;" f getAttachedSFLink src/Dodge/HeldUse.hs 779;" f -getAutoSpringLinks src/Dodge/Item/Grammar.hs 83;" f +getAutoSpringLinks src/Dodge/Item/Grammar.hs 84;" f getAvailableListLines src/Dodge/SelectionList.hs 10;" f getBulHitDams src/Dodge/Bullet.hs 171;" f getBulletType src/Dodge/HeldUse.hs 956;" f @@ -4488,7 +4486,7 @@ getLaserDamage src/Dodge/HeldUse.hs 716;" f getLaserPhaseV src/Dodge/HeldUse.hs 713;" f getLinksOfType src/Dodge/RoomLink.hs 39;" f getMaxLinesTM src/Dodge/Terminal/Type.hs 11;" f -getMenuMouseContext src/Dodge/Update.hs 406;" f +getMenuMouseContext src/Dodge/Update.hs 404;" f getNodePos src/Dodge/Path.hs 31;" f getPJStabiliser src/Dodge/HeldUse.hs 1313;" f getPretty src/AesonHelp.hs 8;" f @@ -4556,9 +4554,9 @@ handOrient src/Dodge/Item/HeldOffset.hs 37;" f handleEvent src/Dodge/Event.hs 27;" f handleHotkeys src/Dodge/Creature/YourControl.hs 45;" f handleKeyboardEvent src/Dodge/Event/Input.hs 22;" f -handleMouseButtonEvent src/Dodge/Event/Input.hs 63;" f -handleMouseMotionEvent src/Dodge/Event/Input.hs 47;" f -handleMouseWheelEvent src/Dodge/Event/Input.hs 58;" f +handleMouseButtonEvent src/Dodge/Event/Input.hs 57;" f +handleMouseMotionEvent src/Dodge/Event/Input.hs 43;" f +handleMouseWheelEvent src/Dodge/Event/Input.hs 52;" f handleOrient src/Dodge/Item/HeldOffset.hs 31;" f handlePos src/Dodge/Item/HeldOffset.hs 83;" f handleResizeEvent src/Dodge/Event.hs 53;" f @@ -4684,18 +4682,18 @@ interweave src/Justify.hs 17;" f introScan src/Dodge/Item/Scope.hs 57;" f introScanValue src/Dodge/Inventory/SelectionList.hs 80;" f intsToPos src/Dodge/Room/Modify/Girder.hs 160;" f -invAdj src/Dodge/Item/Grammar.hs 228;" f +invAdj src/Dodge/Item/Grammar.hs 238;" f invCursorParams src/Dodge/ListDisplayParams.hs 36;" f invDP src/Dodge/ListDisplayParams.hs 30;" f -invDT src/Dodge/Item/Grammar.hs 205;" f -invDT' src/Dodge/Item/Grammar.hs 210;" f +invDT src/Dodge/Item/Grammar.hs 215;" f +invDT' src/Dodge/Item/Grammar.hs 220;" f invDimColor src/Dodge/DisplayInventory.hs 192;" f invHead src/Dodge/Render/HUD.hs 404;" f -invIMDT src/Dodge/Item/Grammar.hs 238;" f -invIndents src/Dodge/Item/Grammar.hs 245;" f +invIMDT src/Dodge/Item/Grammar.hs 248;" f +invIndents src/Dodge/Item/Grammar.hs 255;" f invItemEffs src/Dodge/Creature/State.hs 146;" f invItemLocUpdate src/Dodge/Creature/State.hs 153;" f -invRootMap src/Dodge/Item/Grammar.hs 217;" f +invRootMap src/Dodge/Item/Grammar.hs 227;" f invSelectionItem src/Dodge/Inventory/SelectionList.hs 32;" f invSetSelection src/Dodge/Inventory.hs 185;" f invSetSelectionPos src/Dodge/Inventory.hs 193;" f @@ -4726,7 +4724,7 @@ isLeftOfA src/Geometry.hs 192;" f isNothing' src/MaybeHelp.hs 33;" f isOnSeg src/Geometry.hs 236;" f isOutLnk src/Dodge/PlacementSpot.hs 164;" f -isOverTerminalScreen src/Dodge/Update.hs 417;" f +isOverTerminalScreen src/Dodge/Update.hs 415;" f isPulseLaser src/Dodge/IsPulseLaser.hs 10;" f isPulseLaser src/Dodge/PulseLaser.hs 8;" f isPutID src/Dodge/Placement/Instance/Wall.hs 129;" f @@ -4776,7 +4774,7 @@ itemScrollDisplay src/Dodge/Inventory/SelectionList.hs 121;" f itemScrollValue src/Dodge/Inventory/SelectionList.hs 148;" f itemSidePush src/Dodge/HeldUse.hs 396;" f itemString src/Dodge/Item/Display.hs 56;" f -itemToFunction src/Dodge/Item/Grammar.hs 105;" f +itemToFunction src/Dodge/Item/Grammar.hs 106;" f itemTreeSPic src/Dodge/Item/Draw/SPic.hs 24;" f itemTriggerType src/Dodge/BaseTriggerType.hs 16;" f itemWeight src/Dodge/Creature/Statistics.hs 66;" f @@ -4788,7 +4786,7 @@ itmSpaceInfo src/Dodge/Item/Info.hs 25;" f itmUsageInfo src/Dodge/Item/Info.hs 230;" f jShape src/Dodge/Placement/Instance/LightSource.hs 85;" f jaggedShape src/Dodge/Block/Debris.hs 191;" f -joinItemsInList src/Dodge/Item/Grammar.hs 195;" f +joinItemsInList src/Dodge/Item/Grammar.hs 205;" f joystick src/Dodge/Item/Scope.hs 149;" f jps0' src/Dodge/LevelGen/PlacementHelper.hs 60;" f jps0PushPS src/Dodge/LevelGen/PlacementHelper.hs 63;" f @@ -4839,10 +4837,10 @@ ldtToIM src/Dodge/DoubleTree.hs 218;" f ldtToIndentList src/Dodge/DoubleTree.hs 221;" f ldtToLoc src/Dodge/DoubleTree.hs 267;" f left src/DoubleStack.hs 16;" f -leftChildList src/Dodge/Item/Grammar.hs 174;" f -leftIsParentCombine src/Dodge/Item/Grammar.hs 158;" f +leftChildList src/Dodge/Item/Grammar.hs 184;" f +leftIsParentCombine src/Dodge/Item/Grammar.hs 162;" f leftPad src/Padding.hs 15;" f -leftRightCombine src/Dodge/Item/Grammar.hs 186;" f +leftRightCombine src/Dodge/Item/Grammar.hs 196;" f legsSPic src/Dodge/Item/Draw/SPic.hs 480;" f liShape src/Dodge/Placement/Instance/LightSource.hs 98;" f light src/Color.hs 104;" f @@ -5125,7 +5123,7 @@ muzFlareAt src/Dodge/HeldUse.hs 689;" 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 803;" f +mvGust src/Dodge/Update.hs 805;" 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 @@ -5237,8 +5235,8 @@ pauseGame src/Dodge/Update/Input/InGame.hs 501;" f pauseMenu src/Dodge/Menu.hs 56;" f pauseMenuOptions src/Dodge/Menu.hs 61;" f pauseSound src/Dodge/SoundLogic.hs 42;" f -pauseTime src/Dodge/Update.hs 192;" f -pbFlicker src/Dodge/Update.hs 483;" f +pauseTime src/Dodge/Update.hs 190;" f +pbFlicker src/Dodge/Update.hs 485;" f pbsHit src/Dodge/WorldEvent/ThingsHit.hs 62;" f peZoneSize src/Dodge/Zoning/Pathing.hs 46;" f pedestalRoom src/Dodge/Room/Containing.hs 50;" f @@ -5394,7 +5392,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 105;" f -ppEvents src/Dodge/Update.hs 770;" f +ppEvents src/Dodge/Update.hs 772;" f ppLevelReset src/Dodge/PressPlate.hs 13;" f preCritStart src/Dodge/Room/Start.hs 82;" f prePos src/Quaternion.hs 67;" f @@ -5501,7 +5499,7 @@ randProb src/RandomHelp.hs 68;" f randSpark src/Dodge/Spark.hs 69;" f randSparkExtraVel src/Dodge/Spark.hs 92;" f randWallReflect src/Dodge/Tesla/Arc.hs 57;" f -randWallReflect src/Dodge/Update.hs 663;" f +randWallReflect src/Dodge/Update.hs 665;" f randomChallenges src/Dodge/Room/Start.hs 62;" f randomCompass src/Dodge/Layout.hs 59;" f randomFourCornerRoom src/Dodge/Room/Procedural.hs 266;" f @@ -5592,8 +5590,8 @@ rezText' src/Dodge/Story.hs 17;" f rhombus src/Polyhedra.hs 72;" f rifle src/Dodge/Item/Held/Cane.hs 19;" f right src/DoubleStack.hs 16;" f -rightChildList src/Dodge/Item/Grammar.hs 180;" f -rightIsParentCombine src/Dodge/Item/Grammar.hs 163;" f +rightChildList src/Dodge/Item/Grammar.hs 190;" f +rightIsParentCombine src/Dodge/Item/Grammar.hs 173;" f rightPad src/Padding.hs 19;" f rightPadNoSquash src/Padding.hs 23;" f rlPosDir src/Dodge/RoomLink.hs 94;" f @@ -5699,8 +5697,8 @@ scrollCommands src/Dodge/Update/Scroll.hs 158;" f scrollDebugInfoInt src/Dodge/Debug.hs 71;" f scrollRBOption src/Dodge/Update/Scroll.hs 152;" f scrollSelectionSections src/Dodge/SelectionSections.hs 26;" f -scrollTimeBack src/Dodge/Update.hs 219;" f -scrollTimeForward src/Dodge/Update.hs 242;" f +scrollTimeBack src/Dodge/Update.hs 217;" f +scrollTimeForward src/Dodge/Update.hs 240;" f seagullBarkS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 567;" f seagullBarkTransformedS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 651;" f seagullChatter1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 663;" f @@ -5755,7 +5753,7 @@ setLinkType src/Dodge/RoomLink.hs 60;" f setLinkTypePD src/Dodge/RoomLink.hs 67;" f setMusicVolume src/Sound.hs 162;" f setMvPos src/Dodge/Creature/ReaderUpdate.hs 53;" f -setOldPos src/Dodge/Update.hs 519;" f +setOldPos src/Dodge/Update.hs 521;" f setOutLinks src/Dodge/RoomLink.hs 48;" f setOutLinksByType src/Dodge/RoomLink.hs 57;" f setOutLinksPD src/Dodge/RoomLink.hs 77;" f @@ -5855,9 +5853,9 @@ showEquipItem src/Dodge/Item/Display.hs 106;" f showInt src/Dodge/Item/Info.hs 73;" f showIntsString src/Dodge/Tree/Compose.hs 129;" f showInventoryPathing src/Dodge/Item/Display.hs 85;" f -showManObj src/Dodge/TestString.hs 61;" f +showManObj src/Dodge/TestString.hs 56;" f showTerminalError src/Dodge/Debug/Terminal.hs 78;" f -showTimeFlow src/Dodge/TestString.hs 84;" f +showTimeFlow src/Dodge/TestString.hs 79;" f shrinkPolyOnEdges src/Geometry/Polygon.hs 136;" f shrinkVert src/Geometry/Polygon.hs 140;" f shuffle src/RandomHelp.hs 49;" f @@ -5865,7 +5863,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 151;" f -simpleCrSprings src/Dodge/Update.hs 880;" f +simpleCrSprings src/Dodge/Update.hs 882;" f simpleTermMessage src/Dodge/Terminal.hs 253;" f sineRaisePitchOneSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 677;" f sineRaisePitchTwoSecS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 469;" f @@ -6089,7 +6087,7 @@ throwItem src/Dodge/Creature/Action.hs 205;" f tileTexCoords src/Tile.hs 11;" f tilesFromRooms src/Dodge/Layout.hs 205;" f tilesToLine src/Shader/AuxAddition.hs 66;" f -timeFlowUpdate src/Dodge/Update.hs 179;" f +timeFlowUpdate src/Dodge/Update.hs 177;" f timeScroller src/Dodge/Item/Held/Utility.hs 42;" f timeScroller src/Dodge/Item/Weapon/Utility.hs 47;" f timeStopper src/Dodge/Item/Held/Utility.hs 39;" f @@ -6105,7 +6103,7 @@ tingS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 571;" f tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 563;" f titleOptionsMenu src/Dodge/Menu.hs 102;" f titleOptionsNoWrite src/Dodge/Menu.hs 105;" f -tmUpdate src/Dodge/Update.hs 499;" f +tmUpdate src/Dodge/Update.hs 501;" f toBinary src/Dodge/Inventory/SelectionList.hs 138;" f toBothLnk src/Dodge/RoomLink.hs 121;" f toClosestMultiple src/HelpNum.hs 3;" f @@ -6133,7 +6131,7 @@ tone440sawtoothquietS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 445;" f topInvW src/Dodge/ListDisplayParams.hs 51;" f topPrismEdgeIndices src/Shader/Poke.hs 335;" f topPrismIndices src/Shader/Poke.hs 410;" f -topTestPart src/Dodge/TestString.hs 57;" f +topTestPart src/Dodge/TestString.hs 52;" f torch src/Dodge/Item/Held/Utility.hs 23;" f torchShape src/Dodge/Item/Draw/SPic.hs 290;" f torqueAmount src/Dodge/HeldUse.hs 595;" f @@ -6186,7 +6184,7 @@ treeMaxDepthFromTrunk src/Dodge/Layout/Generate.hs 21;" f treePath src/Dodge/Tree/GenerateStructure.hs 13;" f treePaths src/TreeHelp.hs 138;" f treePost src/TreeHelp.hs 45;" f -treeToPotentialFunction src/Dodge/Item/Grammar.hs 140;" f +treeToPotentialFunction src/Dodge/Item/Grammar.hs 142;" f triLootRoom src/Dodge/Room/Treasure.hs 22;" f triggerDoorRoom src/Dodge/Room/Door.hs 30;" f triggerSwitch src/Dodge/Placement/Instance/Button.hs 47;" f @@ -6249,7 +6247,7 @@ unusedSpotAwayFromInLink src/Dodge/PlacementSpot.hs 139;" f unusedSpotAwayFromLink src/Dodge/PlacementSpot.hs 122;" f unusedSpotNearInLink src/Dodge/PlacementSpot.hs 191;" f upProjectile src/Dodge/Projectile/Update.hs 35;" f -updateAimPos src/Dodge/Update.hs 321;" f +updateAimPos src/Dodge/Update.hs 319;" f updateAllNodes src/TreeHelp.hs 85;" f updateArc src/Dodge/Tesla.hs 44;" f updateArc src/Dodge/Tesla/Arc.hs 100;" f @@ -6260,39 +6258,39 @@ updateBaseWheelEvent src/Dodge/Update/Scroll.hs 29;" f updateBounds src/Dodge/Update/Camera.hs 250;" f updateBulVel src/Dodge/Bullet.hs 55;" f updateBullet src/Dodge/Bullet.hs 20;" f -updateBullets src/Dodge/Update.hs 592;" f +updateBullets src/Dodge/Update.hs 594;" f updateCamera src/Dodge/Update/Camera.hs 29;" f updateCloseObjects src/Dodge/Inventory.hs 116;" f -updateCloud src/Dodge/Update.hs 817;" f -updateClouds src/Dodge/Update.hs 689;" f +updateCloud src/Dodge/Update.hs 819;" f +updateClouds src/Dodge/Update.hs 691;" f updateCombinePositioning src/Dodge/DisplayInventory.hs 37;" f updateCombineSections src/Dodge/DisplayInventory.hs 44;" f updateCreature src/Dodge/Creature/Update.hs 13;" f -updateCreatureGroups src/Dodge/Update.hs 564;" f -updateCreatureSoundPositions src/Dodge/Update.hs 540;" f +updateCreatureGroups src/Dodge/Update.hs 566;" f +updateCreatureSoundPositions src/Dodge/Update.hs 542;" f updateDebugMessageOffset src/Dodge/Update.hs 99;" f -updateDelayedEvents src/Dodge/Update.hs 909;" f +updateDelayedEvents src/Dodge/Update.hs 911;" f updateDisplaySections src/Dodge/DisplayInventory.hs 116;" f updateDistortion src/Dodge/Distortion.hs 5;" f -updateDistortions src/Dodge/Update.hs 585;" f -updateDoor src/Dodge/Update.hs 326;" f -updateDust src/Dodge/Update.hs 841;" f -updateDusts src/Dodge/Update.hs 692;" f +updateDistortions src/Dodge/Update.hs 587;" f +updateDoor src/Dodge/Update.hs 324;" f +updateDust src/Dodge/Update.hs 843;" f +updateDusts src/Dodge/Update.hs 694;" f updateEnergyBall src/Dodge/EnergyBall.hs 35;" f -updateEnergyBalls src/Dodge/Update.hs 680;" f +updateEnergyBalls src/Dodge/Update.hs 682;" f updateEnterRegex src/Dodge/Update/Input/InGame.hs 480;" f updateExpBarrel src/Dodge/Barreloid.hs 20;" f updateFBOTO src/Framebuffer/Update.hs 97;" f updateFBOTO3 src/Framebuffer/Update.hs 131;" f updateFlame src/Dodge/Flame.hs 19;" f -updateFlames src/Dodge/Update.hs 677;" f +updateFlames src/Dodge/Update.hs 679;" f updateFloatingCamera src/Dodge/Update/Camera.hs 34;" f updateFunctionKey src/Dodge/Update/Input/InGame.hs 364;" f updateFunctionKeys src/Dodge/Update/Input/InGame.hs 357;" f -updateGusts src/Dodge/Update.hs 800;" f +updateGusts src/Dodge/Update.hs 802;" f updateHumanoid src/Dodge/Humanoid.hs 13;" f -updateIMl src/Dodge/Update.hs 554;" f -updateIMl' src/Dodge/Update.hs 559;" f +updateIMl src/Dodge/Update.hs 556;" f +updateIMl' src/Dodge/Update.hs 561;" f updateInGameCamera src/Dodge/Update/Camera.hs 78;" f updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 400;" f updateInt2Map src/Dodge/Zoning/Base.hs 92;" f @@ -6302,65 +6300,66 @@ updateKeyInGame src/Dodge/Update/Input/InGame.hs 394;" f updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 382;" f updateLampoid src/Dodge/Lampoid.hs 12;" f updateLaser src/Dodge/Laser/Update.hs 11;" f -updateLasers src/Dodge/Update.hs 453;" f +updateLasers src/Dodge/Update.hs 451;" f +updateLeftParentSF src/Dodge/Item/Grammar.hs 169;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f updateLongPressInGame src/Dodge/Update/Input/InGame.hs 413;" f updateMachine src/Dodge/Machine/Update.hs 20;" f -updateMagnets src/Dodge/Update.hs 329;" f +updateMagnets src/Dodge/Update.hs 327;" f updateMouseClickInGame src/Dodge/Update/Input/InGame.hs 197;" f -updateMouseContext src/Dodge/Update.hs 342;" f -updateMouseContextGame src/Dodge/Update.hs 347;" f +updateMouseContext src/Dodge/Update.hs 340;" f +updateMouseContextGame src/Dodge/Update.hs 345;" f updateMouseHeldInGame src/Dodge/Update/Input/InGame.hs 95;" f updateMouseInGame src/Dodge/Update/Input/InGame.hs 85;" f updateMouseReleaseInGame src/Dodge/Update/Input/InGame.hs 158;" f -updateObjCatMaybes src/Dodge/Update.hs 576;" f -updateObjMapMaybe src/Dodge/Update.hs 569;" f -updatePastWorlds src/Dodge/Update.hs 441;" f +updateObjCatMaybes src/Dodge/Update.hs 578;" f +updateObjMapMaybe src/Dodge/Update.hs 571;" f +updatePastWorlds src/Dodge/Update.hs 439;" f updatePosEvent src/Dodge/PosEvent.hs 10;" f updatePreload src/Preload/Update.hs 20;" f updateProjectile src/Dodge/Projectile/Update.hs 27;" f updateProp src/Dodge/Prop/Update.hs 11;" f updatePulse src/Dodge/Creature/Update.hs 22;" f -updatePulseBall src/Dodge/Update.hs 467;" f -updatePulseLaser src/Dodge/Update.hs 632;" f -updatePulseLasers src/Dodge/Update.hs 462;" f +updatePulseBall src/Dodge/Update.hs 465;" f +updatePulseLaser src/Dodge/Update.hs 634;" f +updatePulseLasers src/Dodge/Update.hs 460;" f updateRBList src/Dodge/Inventory/RBList.hs 18;" f updateRadarBlip src/Dodge/RadarBlip.hs 11;" f -updateRadarBlips src/Dodge/Update.hs 588;" f +updateRadarBlips src/Dodge/Update.hs 590;" f updateRadarSweep src/Dodge/RadarSweep.hs 39;" f -updateRadarSweeps src/Dodge/Update.hs 683;" f +updateRadarSweeps src/Dodge/Update.hs 685;" f updateRandNode src/TreeHelp.hs 108;" f updateRenderSplit appDodge/Main.hs 108;" f -updateRightParentSF src/Dodge/Item/Grammar.hs 170;" f +updateRightParentSF src/Dodge/Item/Grammar.hs 180;" f updateRootItemID src/Dodge/Inventory/Location.hs 35;" f updateScopeZoom src/Dodge/Update/Scroll.hs 72;" f updateScrollTestValue src/Dodge/ScrollValue.hs 6;" f updateSection src/Dodge/DisplayInventory.hs 264;" f updateSectionsPositioning src/Dodge/DisplayInventory.hs 243;" f updateShockwave src/Dodge/Shockwave/Update.hs 10;" f -updateShockwaves src/Dodge/Update.hs 674;" f +updateShockwaves src/Dodge/Update.hs 676;" f updateSingleNodes src/TreeHelp.hs 97;" f updateSound src/Sound.hs 72;" f updateSounds src/Sound.hs 67;" f updateSpark src/Dodge/Spark.hs 19;" f -updateSparks src/Dodge/Update.hs 686;" f +updateSparks src/Dodge/Update.hs 688;" f updateTempLightSource src/Dodge/LightSource/Update.hs 7;" f updateTeslaArc src/Dodge/Tesla/Arc.hs 23;" f -updateTeslaArc src/Dodge/Update.hs 602;" f -updateTeslaArcs src/Dodge/Update.hs 599;" f +updateTeslaArc src/Dodge/Update.hs 604;" f +updateTeslaArcs src/Dodge/Update.hs 601;" f updateTractorBeam src/Dodge/TractorBeam/Update.hs 9;" f -updateTractorBeams src/Dodge/Update.hs 671;" f +updateTractorBeams src/Dodge/Update.hs 673;" f updateTurret src/Dodge/Machine/Update.hs 50;" f updateUniverse src/Dodge/Update.hs 78;" f updateUniverseFirst src/Dodge/Update.hs 89;" f updateUniverseLast src/Dodge/Update.hs 140;" f -updateUniverseMid src/Dodge/Update.hs 162;" f +updateUniverseMid src/Dodge/Update.hs 160;" f updateUseInputInGame src/Dodge/Update/Input/InGame.hs 42;" f updateUseInputOnScreen src/Dodge/Update/Input/ScreenLayer.hs 23;" f updateWalkCycle src/Dodge/Creature/State/WalkCycle.hs 12;" f updateWallDamages src/Dodge/Update/WallDamage.hs 10;" f updateWheelEvent src/Dodge/Update/Scroll.hs 20;" f -updateWheelEvents src/Dodge/Update.hs 431;" f +updateWheelEvents src/Dodge/Update.hs 429;" f updateWorldEventFlag src/Dodge/Update.hs 124;" f updateWorldEventFlags src/Dodge/Update.hs 112;" f upperBody src/Dodge/Creature/Picture.hs 129;" f @@ -6541,11 +6540,11 @@ zipArcs src/Dodge/Tesla/Arc.hs 110;" f zipCount src/Dodge/Tree/Shift.hs 129;" f zipCountDown src/Dodge/Room/Procedural.hs 118;" f zoneCloud src/Dodge/Zoning/Cloud.hs 27;" f -zoneClouds src/Dodge/Update.hs 490;" f +zoneClouds src/Dodge/Update.hs 492;" f zoneCreature src/Dodge/Zoning/Creature.hs 54;" f -zoneCreatures src/Dodge/Update.hs 535;" f +zoneCreatures src/Dodge/Update.hs 537;" f zoneDust src/Dodge/Zoning/Cloud.hs 48;" f -zoneDusts src/Dodge/Update.hs 493;" f +zoneDusts src/Dodge/Update.hs 495;" f zoneExtract src/Dodge/Zoning/Base.hs 52;" f zoneMonoid src/Dodge/Zoning/Base.hs 83;" f zoneOfCirc src/Dodge/Zoning/Base.hs 24;" f