Remove default light sources

src/Dodge/Data/LightSource.hs

@@ -1,5 +1,5 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -23,8 +23,6 @@ data LSParam = LSParam -- LSPosRadCol
 data LightSource = LS
     { _lsID :: Int
     , _lsParam :: LSParam
---    , _lsDir :: Float
---    , _lsPict :: LightSourceDraw --LightSource -> Picture
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 

src/Dodge/Default.hs

@@ -7,7 +7,6 @@ This module contains prototypical data structures.
 module Dodge.Default (
     module Dodge.Default,
     module Dodge.Default.Item,
-    module Dodge.Default.LightSource,
     module Dodge.Default.Wall,
     module Dodge.Default.Creature,
     module Dodge.Default.Terminal,
@@ -17,7 +16,6 @@ import Control.Lens
 import Dodge.Data.World
 import Dodge.Default.Creature
 import Dodge.Default.Item
-import Dodge.Default.LightSource
 import Dodge.Default.Terminal
 import Dodge.Default.Wall
 import Dodge.SoundLogic

src/Dodge/Default/LightSource.hs

@@ -1,18 +0,0 @@
-module Dodge.Default.LightSource 
-    ( defaultLS
-    ) where
-
-import Dodge.Data.LightSource
-import Geometry
-
-defaultLS :: LightSource
-defaultLS =
-    LS
-        { _lsID = 0
-        , _lsParam =
-            LSParam
-                { _lsPos = V3 0 0 50
-                , _lsRad = 200
-                , _lsCol = 0.6
-                }
-        }

src/Dodge/LightSource.hs

@@ -1,18 +1,13 @@
 module Dodge.LightSource (
---    tlsTimeRadFunPos,
---    tlsTimeRadColPos,
-    lsRadCol,
     lsColPosRad,
     lsColPos,
     lsPosCol,
     lsPosRad,
     lsColPosID,
---    makeTlsTimeRadColPos,
     destroyLS,
 ) where
 
 import Dodge.Data.World
-import Dodge.Default.LightSource
 import Dodge.Material.Sound
 import Dodge.WorldEvent.Sound
 import Geometry.Data
@@ -54,17 +49,12 @@ lsPosCol :: Point3 -> Point3 -> LightSource
 lsPosCol pos col = lsColPos col pos
 
 lsColPosRad :: Point3 -> Point3 -> Float -> LightSource
-lsColPosRad col p r = 
-    defaultLS
-        & lsParam . lsPos .~ p
-        & lsParam . lsRad .~ r
-        & lsParam . lsCol .~ col
+lsColPosRad col p r = LS 0 $ LSParam p r col
 
-
-lsRadCol :: Float -> Point3 -> LightSource
-lsRadCol r col =
-    defaultLS & lsParam . lsRad .~ r
-        & lsParam . lsCol .~ col
+--lsRadCol :: Float -> Point3 -> LightSource
+--lsRadCol r col =
+--    defaultLS & lsParam . lsRad .~ r
+--        & lsParam . lsCol .~ col
 
 --tlsTimeRadColPos ::
 --    Int ->

src/Dodge/Placement/Instance/Button.hs

@@ -78,7 +78,7 @@ putLitButOnPos col theps subpl =
                     .~ _plSpot plmnt
   where
     changeLight lsid = SetLSCol (V3 0 0.5 0) lsid
-    ls = lsRadCol 50 (V3 0.5 0 0)
+    ls = lsColPosRad (V3 0.5 0 0) (V3 0 0 50) 50
 
 -- creates a lit external trigger, passes the trigger placement forward
 extTrigLitPos :: PlacementSpot -> (Placement -> Maybe Placement) -> Placement
@@ -128,4 +128,4 @@ putLitButOnPosExtTrig' col thePS cnt =
     trigid tp = fromJust $ _plMID tp
     oneff tid = SetTrigger True tid
     changeLight = SetLSCol (V3 0 0.5 0)
-    ls = lsRadCol 50 (V3 0.5 0 0)
+    ls = lsColPosRad (V3 0.5 0 0) (V3 0 0 50) 50

src/Dodge/Placement/Instance/LightSource.hs

@@ -5,7 +5,6 @@ import Control.Lens
 import Data.Maybe
 import Dodge.Creature.Inanimate
 import Dodge.Data.GenWorld
-import Dodge.Default
 import Dodge.LevelGen.PlacementHelper
 import Dodge.LightSource
 import Dodge.Room.Foreground
@@ -39,7 +38,7 @@ moveLSThen ::
 moveLSThen posf off sh = propLSThen (PropUpdatePosition posf) (PrWdLsSetPosition posf off) thels theprop
   where
     --lsupdate _ w = lsParam . lsPos .~ addZ 0 (fst (posf w)) +.+.+ rotate3z (snd (posf w)) off
-    thels = defaultLS
+    thels = LS 0 $ LSParam 0 200 0.6
     theprop =
         ShapeProp
             { _prPos = 0
@@ -123,9 +122,13 @@ vShape wallpos (V3 x y z) =
 
 mntLS :: (Point2 -> Point3 -> Shape) -> Point2 -> Point3 -> Placement
 mntLS shp wallp lampp = mntLSOn shp Nothing defaultLS wallp lampp (const Nothing)
+  where
+    defaultLS = LS 0 $ LSParam 0 200 0.6
 
 mntLSCol :: (Point2 -> Point3 -> Shape) -> Color -> Point2 -> Point3 -> Placement
 mntLSCol shp col wallp lampp = mntLSOn shp (Just col) defaultLS wallp lampp (const Nothing)
+  where
+    defaultLS = LS 0 $ LSParam 0 200 0.6
 
 mntLSLampCol :: (Point2 -> Point3 -> Shape) -> Color -> Point2 -> Point3 -> Placement
 mntLSLampCol shp (V4 x y z _) wallp lampp =
@@ -138,6 +141,7 @@ mntLSLampCol shp (V4 x y z _) wallp lampp =
         (const Nothing)
   where
     col = V3 x y z
+    defaultLS = LS 0 $ LSParam 0 200 0.6
 
 mntLSCond ::
     (Point2 -> Point3 -> Shape) ->

tags

@@ -977,8 +977,8 @@ LHS	src/Geometry/LHS.hs	1;"	m
 LIGHTER	src/Dodge/Data/Item/Combine.hs	44;"	C
 LIGHTSENSOR	src/Dodge/Data/Item/Combine.hs	58;"	C
 LRewind	src/Dodge/Data/Item/HeldUse.hs	40;"	C
-LS	src/Dodge/Data/LightSource.hs	34;"	C
-LSParam	src/Dodge/Data/LightSource.hs	27;"	t
+LS	src/Dodge/Data/LightSource.hs	23;"	C
+LSParam	src/Dodge/Data/LightSource.hs	16;"	t
 LTest	src/Dodge/Data/ComposedItem.hs	57;"	C
 LTimePause	src/Dodge/Data/Item/HeldUse.hs	41;"	C
 LTimeScroll	src/Dodge/Data/Item/HeldUse.hs	42;"	C
@@ -1027,7 +1027,7 @@ LevelStructure	src/Dodge/LevelGen/LevelStructure.hs	1;"	m
 LeverSound	src/Dodge/Data/SoundOrigin.hs	36;"	C
 LifeSupportSystemsRoomSS	src/Dodge/Data/Scenario.hs	113;"	C
 LifeboatBaySS	src/Dodge/Data/Scenario.hs	107;"	C
-LightSource	src/Dodge/Data/LightSource.hs	34;"	t
+LightSource	src/Dodge/Data/LightSource.hs	23;"	t
 LightSource	src/Dodge/Data/LightSource.hs	6;"	m
 LightSource	src/Dodge/Default/LightSource.hs	1;"	m
 LightSource	src/Dodge/LightSource.hs	1;"	m
@@ -2673,13 +2673,11 @@ _lpDir	src/Dodge/Data/Laser.hs	24;"	f
 _lpPhaseV	src/Dodge/Data/Laser.hs	22;"	f
 _lpPos	src/Dodge/Data/Laser.hs	23;"	f
 _lpType	src/Dodge/Data/Laser.hs	26;"	f
-_lsCol	src/Dodge/Data/LightSource.hs	30;"	f
-_lsDir	src/Dodge/Data/LightSource.hs	37;"	f
-_lsID	src/Dodge/Data/LightSource.hs	35;"	f
-_lsParam	src/Dodge/Data/LightSource.hs	36;"	f
-_lsPict	src/Dodge/Data/LightSource.hs	38;"	f
-_lsPos	src/Dodge/Data/LightSource.hs	28;"	f
-_lsRad	src/Dodge/Data/LightSource.hs	29;"	f
+_lsCol	src/Dodge/Data/LightSource.hs	19;"	f
+_lsID	src/Dodge/Data/LightSource.hs	24;"	f
+_lsParam	src/Dodge/Data/LightSource.hs	25;"	f
+_lsPos	src/Dodge/Data/LightSource.hs	17;"	f
+_lsRad	src/Dodge/Data/LightSource.hs	18;"	f
 _luChildUpdate	src/Dodge/Data/ComposedItem.hs	65;"	f
 _luLinkType	src/Dodge/Data/ComposedItem.hs	63;"	f
 _luParentUpdate	src/Dodge/Data/ComposedItem.hs	64;"	f
@@ -3255,7 +3253,7 @@ _xNum	src/Dodge/Data/Item/Combine.hs	137;"	f
 _xNum	src/Dodge/Data/Item/Combine.hs	158;"	f
 aDroneWithItemParams	src/Dodge/Item/Weapon/Drone.hs	30;"	f
 aFlame	src/Dodge/Gas.hs	18;"	f
-aFlameParticle	src/Dodge/Flame.hs	22;"	f
+aFlameParticle	src/Dodge/Flame.hs	21;"	f
 aGasCloud	src/Dodge/Gas.hs	13;"	f
 aGib	src/Dodge/Prop/Gib.hs	17;"	f
 aRadarPulse	src/Dodge/RadarSweep.hs	15;"	f
@@ -3303,7 +3301,7 @@ 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	411;"	f
+advanceScrollAmount	src/Dodge/Update.hs	409;"	f
 advanceSmoothScroll	src/Dodge/SmoothScroll.hs	29;"	f
 advanceStepCounter	src/Dodge/Creature/Impulse/Movement.hs	45;"	f
 aimDelaySweep	src/Dodge/Render/Picture.hs	239;"	f
@@ -3336,23 +3334,23 @@ angleVV3	src/Geometry/Vector3D.hs	122;"	f
 annoToRoomTree	src/Dodge/Annotation.hs	17;"	f
 anyUnusedSpot	src/Dodge/PlacementSpot.hs	66;"	f
 anythingHitCirc	src/Dodge/Base/Collide.hs	243;"	f
-applyCME	src/Dodge/HeldUse.hs	65;"	f
+applyCME	src/Dodge/HeldUse.hs	64;"	f
 applyCreatureDamage	src/Dodge/Creature/Damage.hs	14;"	f
 applyDamageEffect	src/Dodge/Creature/Damage.hs	31;"	f
 applyEventIO	src/Loop.hs	89;"	f
 applyIndividualDamage	src/Dodge/Creature/Damage.hs	49;"	f
 applyIndividualDamage'	src/Dodge/Creature/Damage.hs	52;"	f
-applyInvLock	src/Dodge/HeldUse.hs	75;"	f
+applyInvLock	src/Dodge/HeldUse.hs	74;"	f
 applyMagnetsToBul	src/Dodge/Bullet.hs	46;"	f
 applyNoDamage	src/Dodge/Creature/Damage.hs	11;"	f
-applyPastDamages	src/Dodge/Creature/State.hs	130;"	f
+applyPastDamages	src/Dodge/Creature/State.hs	129;"	f
 applyPiercingDamage	src/Dodge/Creature/Damage.hs	57;"	f
 applyPosition	src/Sound.hs	110;"	f
-applyRecoil	src/Dodge/HeldUse.hs	94;"	f
+applyRecoil	src/Dodge/HeldUse.hs	93;"	f
 applyResFactor	src/Dodge/Data/Config.hs	108;"	f
 applySetTerminalString	src/Dodge/Debug/Terminal.hs	79;"	f
-applySidePush	src/Dodge/HeldUse.hs	101;"	f
-applySoundCME	src/Dodge/HeldUse.hs	85;"	f
+applySidePush	src/Dodge/HeldUse.hs	100;"	f
+applySoundCME	src/Dodge/HeldUse.hs	84;"	f
 applyTerminalCommand	src/Dodge/Debug/Terminal.hs	28;"	f
 applyTerminalCommandArguments	src/Dodge/Debug/Terminal.hs	40;"	f
 applyTerminalString	src/Dodge/Debug/Terminal.hs	22;"	f
@@ -3360,7 +3358,7 @@ applyToNode	src/TreeHelp.hs	64;"	f
 applyToRandomNode	src/TreeHelp.hs	150;"	f
 applyToSubforest	src/TreeHelp.hs	77;"	f
 applyToSubtree	src/TreeHelp.hs	70;"	f
-applyTorqueCME	src/Dodge/HeldUse.hs	112;"	f
+applyTorqueCME	src/Dodge/HeldUse.hs	111;"	f
 applyWorldConfig	src/Dodge/Config/Update.hs	38;"	f
 aquamarine	src/Color.hs	23;"	f
 arc	src/Picture/Base.hs	287;"	f
@@ -3444,7 +3442,7 @@ basicDrawBeam	src/Dodge/Beam/Draw.hs	11;"	f
 basicItemDisplay	src/Dodge/Item/Display.hs	33;"	f
 basicMachineApplyDamage	src/Dodge/Machine/Damage.hs	6;"	f
 basicMachineUpdate	src/Dodge/Machine.hs	13;"	f
-basicMuzFlare	src/Dodge/HeldUse.hs	203;"	f
+basicMuzFlare	src/Dodge/HeldUse.hs	202;"	f
 basicTerminal	src/Dodge/Terminal.hs	35;"	f
 battery	src/Dodge/Item/Ammo.hs	96;"	f
 batteryPack	src/Dodge/Item/Equipment.hs	56;"	f
@@ -3529,7 +3527,7 @@ centerVaultRoom	src/Dodge/Room/Procedural.hs	289;"	f
 centroid	src/Geometry/Polygon.hs	130;"	f
 centroidNum	src/Geometry/Polygon.hs	133;"	f
 chainCreatureUpdates	src/Dodge/Creature/ChainUpdates.hs	6;"	f
-chainLinkOrientation	src/Dodge/Creature/State.hs	183;"	f
+chainLinkOrientation	src/Dodge/Creature/State.hs	182;"	f
 chainPairs	src/Geometry.hs	363;"	f
 changeSwapOther	src/Dodge/Inventory.hs	150;"	f
 changeSwapSel	src/Dodge/Inventory.hs	142;"	f
@@ -3546,14 +3544,14 @@ chaseCritPerceptionUpdate	src/Dodge/Creature/Perception.hs	30;"	f
 chaseCritVocalization	src/Dodge/Creature/ChaseCrit.hs	46;"	f
 checkCombineSelectionExists	src/Dodge/DisplayInventory.hs	101;"	f
 checkConnection	src/Dodge/Inventory/Swap.hs	80;"	f
-checkDeath	src/Dodge/Creature/State.hs	75;"	f
-checkEndGame	src/Dodge/Update.hs	698;"	f
+checkDeath	src/Dodge/Creature/State.hs	74;"	f
+checkEndGame	src/Dodge/Update.hs	693;"	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	16;"	f
 checkInventorySelectionExists	src/Dodge/DisplayInventory.hs	94;"	f
-checkTermDist	src/Dodge/Update.hs	304;"	f
+checkTermDist	src/Dodge/Update.hs	302;"	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
@@ -3574,7 +3572,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	751;"	f
+clClSpringVel	src/Dodge/Update.hs	746;"	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
@@ -3600,7 +3598,7 @@ 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	721;"	f
+cloudEffect	src/Dodge/Update.hs	716;"	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
@@ -3663,7 +3661,7 @@ copyItemToFloor	src/Dodge/FloorItem.hs	17;"	f
 copyItemToFloorID	src/Dodge/FloorItem.hs	21;"	f
 corDoor	src/Dodge/Room/Room.hs	376;"	f
 cornerList	src/Preload/Render.hs	195;"	f
-corpseOrGib	src/Dodge/Creature/State.hs	92;"	f
+corpseOrGib	src/Dodge/Creature/State.hs	91;"	f
 corridor	src/Dodge/Room/Corridor.hs	17;"	f
 corridorBoss	src/Dodge/LockAndKey.hs	134;"	f
 corridorN	src/Dodge/Room/Corridor.hs	52;"	f
@@ -3672,7 +3670,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	769;"	f
+crCrSpring	src/Dodge/Update.hs	764;"	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
@@ -3693,9 +3691,9 @@ crNumFreeSlots	src/Dodge/Inventory/CheckSlots.hs	24;"	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	764;"	f
+crSpring	src/Dodge/Update.hs	759;"	f
 crStratConMatches	src/Dodge/Creature/Test.hs	72;"	f
-crUpdate	src/Dodge/Creature/State.hs	62;"	f
+crUpdate	src/Dodge/Creature/State.hs	61;"	f
 crUpdateInvidLocations	src/Dodge/Inventory/Location.hs	61;"	f
 crUpdateItemLocations	src/Dodge/Inventory/Location.hs	42;"	f
 crZoneSize	src/Dodge/Zoning/Creature.hs	39;"	f
@@ -3706,14 +3704,14 @@ createBarrelSpark	src/Dodge/Spark.hs	44;"	f
 createFlIt	src/Dodge/Placement/PlaceSpot.hs	180;"	f
 createForceField	src/Dodge/ForceField.hs	7;"	f
 createGas	src/Dodge/Gas.hs	8;"	f
-createHeadLamp	src/Dodge/Euse.hs	159;"	f
+createHeadLamp	src/Dodge/Euse.hs	158;"	f
 createItemYou	src/Dodge/Inventory/Add.hs	94;"	f
 createLightMap	src/Render.hs	26;"	f
 createNewArc	src/Dodge/Tesla/Arc.hs	76;"	f
 createPathGrid	src/Dodge/Room/Path.hs	21;"	f
-createProjectile	src/Dodge/HeldUse.hs	501;"	f
+createProjectile	src/Dodge/HeldUse.hs	500;"	f
 createShell	src/Dodge/Projectile/Create.hs	19;"	f
-createShieldWall	src/Dodge/Euse.hs	134;"	f
+createShieldWall	src/Dodge/Euse.hs	133;"	f
 createUnusedLinkPos	src/Dodge/Tree/Shift.hs	117;"	f
 createWall	src/Dodge/Wall/Create.hs	8;"	f
 creatureDisplayText	src/Dodge/Creature/Picture/Awareness.hs	10;"	f
@@ -3819,7 +3817,7 @@ dededaS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	336;"	f
 dededumS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	462;"	f
 dedumS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	328;"	f
 defDamageMaterial	src/Dodge/Material/Damage.hs	17;"	f
-defLSPic	src/Dodge/LightSource/Draw.hs	11;"	f
+defLSPic	src/Dodge/LightSource/Draw.hs	10;"	f
 defSPic	src/Dodge/Item/Draw/SPic.hs	241;"	f
 defaultAimMvType	src/Dodge/Default/Creature.hs	122;"	f
 defaultAimParams	src/Dodge/Default/Item/Use/AimParams.hs	9;"	f
@@ -3870,7 +3868,7 @@ defaultInvSize	src/Dodge/Default/Creature.hs	79;"	f
 defaultItEffect	src/Dodge/Default/Item.hs	55;"	f
 defaultItZoom	src/Dodge/Default/Item/Use/AimParams.hs	30;"	f
 defaultItemDimension	src/Dodge/Default/Item.hs	17;"	f
-defaultLS	src/Dodge/Default/LightSource.hs	6;"	f
+defaultLS	src/Dodge/Default/LightSource.hs	8;"	f
 defaultLWorld	src/Dodge/Default/World.hs	94;"	f
 defaultLeftItem	src/Dodge/Default/Item.hs	38;"	f
 defaultLeftLoadable	src/Dodge/Default/Item/Use/Consumption.hs	8;"	f
@@ -3903,8 +3901,8 @@ destroyAt	src/Dodge/Bullet.hs	201;"	f
 destroyBlock	src/Dodge/Block.hs	56;"	f
 destroyDoor	src/Dodge/Block.hs	85;"	f
 destroyInvItem	src/Dodge/Inventory.hs	42;"	f
-destroyLS	src/Dodge/LightSource.hs	91;"	f
-destroyLSFlashAt	src/Dodge/LightSource.hs	101;"	f
+destroyLS	src/Dodge/LightSource.hs	86;"	f
+destroyLSFlashAt	src/Dodge/LightSource.hs	96;"	f
 destroyMachine	src/Dodge/Machine/Destroy.hs	12;"	f
 destroyMatS	src/Dodge/Material/Sound.hs	7;"	f
 destroyMcType	src/Dodge/Machine/Destroy.hs	21;"	f
@@ -3916,7 +3914,7 @@ detectorColor	src/Dodge/Item/Draw/SPic.hs	391;"	f
 detectorEffect	src/Dodge/Item/Weapon/Radar.hs	20;"	f
 detectorInfo	src/Dodge/Item/Info.hs	190;"	f
 determineInvSelCursorWidth	src/Dodge/ListDisplayParams.hs	56;"	f
-determineProjectileTracking	src/Dodge/HeldUse.hs	490;"	f
+determineProjectileTracking	src/Dodge/HeldUse.hs	489;"	f
 diagonalLinesRect	src/Dodge/Room/Foreground.hs	52;"	f
 diffAngles	src/Geometry.hs	196;"	f
 difference	src/Geometry.hs	130;"	f
@@ -3935,7 +3933,7 @@ displayFrameTicks	src/Dodge/Render/Picture.hs	39;"	f
 displayFreeSlots	src/Dodge/DisplayInventory.hs	211;"	f
 displayIndents	src/Dodge/DisplayInventory.hs	119;"	f
 displaySectionsSizes	src/Dodge/DisplayInventory.hs	114;"	f
-displayTerminalLineString	src/Dodge/Update.hs	440;"	f
+displayTerminalLineString	src/Dodge/Update.hs	438;"	f
 dist	src/Geometry/Vector.hs	179;"	f
 dist3	src/Geometry/Vector3D.hs	101;"	f
 divTo	src/Geometry/Zone.hs	6;"	f
@@ -3960,22 +3958,22 @@ doCrImp	src/Dodge/CreatureEffect.hs	28;"	f
 doCrWdAc	src/Dodge/CreatureEffect.hs	77;"	f
 doCrWdImp	src/Dodge/CreatureEffect.hs	16;"	f
 doCrWdWd	src/Dodge/CreatureEffect.hs	20;"	f
-doDamage	src/Dodge/Creature/State.hs	124;"	f
-doDamagesFL	src/Dodge/Flame.hs	58;"	f
+doDamage	src/Dodge/Creature/State.hs	123;"	f
+doDamagesFL	src/Dodge/Flame.hs	57;"	f
 doDeathToggle	src/Dodge/WorldEffect.hs	96;"	f
 doDeathTriggers	src/Dodge/WorldEffect.hs	91;"	f
 doDrWdWd	src/Dodge/DrWdWd.hs	16;"	f
 doDrawing	src/Dodge/Render.hs	35;"	f
 doDrawing'	src/Dodge/Render.hs	46;"	f
 doFloatFloat	src/Dodge/FloatFunction.hs	5;"	f
-doGenFloat	src/Dodge/HeldUse.hs	446;"	f
+doGenFloat	src/Dodge/HeldUse.hs	445;"	f
 doInPlacements	src/Dodge/Layout.hs	92;"	f
 doIndividualPlacements	src/Dodge/Layout.hs	117;"	f
 doInputScreenInput	src/Dodge/Update/Input/ScreenLayer.hs	26;"	f
 doIntImp	src/Dodge/CreatureEffect.hs	24;"	f
 doInvEffect	src/Dodge/ItEffect.hs	10;"	f
 doItCrWdWd	src/Dodge/WorldEffect.hs	52;"	f
-doItemTimeScroll	src/Dodge/Update.hs	200;"	f
+doItemTimeScroll	src/Dodge/Update.hs	199;"	f
 doLoop	src/Loop.hs	60;"	f
 doMCrAc	src/Dodge/CreatureEffect.hs	57;"	f
 doMP2Ac	src/Dodge/CreatureEffect.hs	73;"	f
@@ -4008,7 +4006,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	74;"	f
-doTimeScroll	src/Dodge/Update.hs	205;"	f
+doTimeScroll	src/Dodge/Update.hs	204;"	f
 doTmTm	src/Dodge/TmTm.hs	6;"	f
 doTmWdWd	src/Dodge/WorldEffect.hs	110;"	f
 doWallRotate	src/Dodge/Update/Camera.hs	188;"	f
@@ -4017,8 +4015,8 @@ 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	26;"	f
-doWeaponRepetitions	src/Dodge/HeldUse.hs	56;"	f
-doWorldEvents	src/Dodge/Update.hs	422;"	f
+doWeaponRepetitions	src/Dodge/HeldUse.hs	55;"	f
+doWorldEvents	src/Dodge/Update.hs	420;"	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
@@ -4033,7 +4031,7 @@ doublePairSet	src/Geometry.hs	153;"	f
 doubleTreeToIndentList	src/Dodge/DoubleTree.hs	72;"	f
 doubleV2	src/Geometry.hs	156;"	f
 drawAllShadows	src/Dodge/Shadows.hs	5;"	f
-drawAugmentedHUD	src/Dodge/Creature/State.hs	210;"	f
+drawAugmentedHUD	src/Dodge/Creature/State.hs	209;"	f
 drawBaseMachine	src/Dodge/Machine/Draw.hs	57;"	f
 drawBeam	src/Dodge/Beam/Draw.hs	6;"	f
 drawBlip	src/Dodge/RadarBlip.hs	13;"	f
@@ -4151,7 +4149,7 @@ drawWlIDs	src/Dodge/Debug/Picture.hs	329;"	f
 drawZoneCol	src/Dodge/Debug/Picture.hs	117;"	f
 drawZoneNearPointCursor	src/Dodge/Debug/Picture.hs	249;"	f
 droneLauncher	src/Dodge/Item/Weapon/Drone.hs	11;"	f
-dropByState	src/Dodge/Creature/State.hs	118;"	f
+dropByState	src/Dodge/Creature/State.hs	117;"	f
 dropExcept	src/Dodge/Creature/Action.hs	171;"	f
 dropItem	src/Dodge/Creature/Action.hs	177;"	f
 drumMag	src/Dodge/Item/Ammo.hs	48;"	f
@@ -4165,7 +4163,7 @@ dtToLRAdjEither	src/Dodge/DoubleTree.hs	114;"	f
 dtToRootIntMap'	src/Dodge/DoubleTree.hs	92;"	f
 dtToUpDownAdj	src/Dodge/DoubleTree.hs	96;"	f
 dummyMenuOption	src/Dodge/Menu/Option.hs	75;"	f
-ebFlicker	src/Dodge/EnergyBall.hs	94;"	f
+ebFlicker	src/Dodge/EnergyBall.hs	93;"	f
 edgeFormatting	src/Dodge/Combine/Graph.hs	130;"	f
 edgeToPic	src/Dodge/Debug/Picture.hs	393;"	f
 effectWhileAttached	src/Dodge/ItEffect.hs	27;"	f
@@ -4190,7 +4188,7 @@ equipPosition	src/Dodge/Item/Draw.hs	30;"	f
 equipSiteInfo	src/Dodge/Item/Info.hs	220;"	f
 equipSiteToPositions	src/Dodge/Inventory/RBList.hs	77;"	f
 equipSpeed	src/Dodge/Creature/Impulse/Movement.hs	99;"	f
-equipmentEffects	src/Dodge/Creature/State.hs	157;"	f
+equipmentEffects	src/Dodge/Creature/State.hs	156;"	f
 equipmentStrValue	src/Dodge/Creature/Statistics.hs	22;"	f
 errorAngleVV	src/Geometry.hs	62;"	f
 errorClosestPointOnLine	src/Geometry.hs	74;"	f
@@ -4208,7 +4206,7 @@ expandPolyByFixed	src/Dodge/LevelGen/StaticWalls.hs	97;"	f
 expandPolyCorners	src/Dodge/LevelGen/StaticWalls.hs	103;"	f
 expandToSquare	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	83;"	f
 expireAndDamage	src/Dodge/Bullet.hs	183;"	f
-expireAndDamageFL	src/Dodge/Flame.hs	48;"	f
+expireAndDamageFL	src/Dodge/Flame.hs	47;"	f
 explodeShell	src/Dodge/Projectile/Update.hs	154;"	f
 explosionS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	410;"	f
 explosiveBarrel	src/Dodge/Creature/Inanimate.hs	29;"	f
@@ -4245,15 +4243,15 @@ firstBreather	src/Dodge/Room/Breather.hs	9;"	f
 firstWorldLoad	appDodge/Main.hs	78;"	f
 fixedCoordPictures	src/Dodge/Render/Picture.hs	18;"	f
 fixedSizePicClampArrow	src/Dodge/Picture/SizeInvariant.hs	57;"	f
-flDamageInArea	src/Dodge/Flame.hs	110;"	f
-flFlicker	src/Dodge/Flame.hs	124;"	f
+flDamageInArea	src/Dodge/Flame.hs	109;"	f
+flFlicker	src/Dodge/Flame.hs	123;"	f
 flameShield	src/Dodge/Item/Equipment.hs	35;"	f
 flameSpitter	src/Dodge/Item/Held/SprayGuns.hs	29;"	f
 flameThrower	src/Dodge/Item/Held/SprayGuns.hs	72;"	f
 flameTorrent	src/Dodge/Item/Held/SprayGuns.hs	40;"	f
 flameWall	src/Dodge/Item/Held/SprayGuns.hs	56;"	f
 flamerPic	src/Dodge/Item/Draw/SPic.hs	328;"	f
-flareCircleAt	src/Dodge/HeldUse.hs	185;"	f
+flareCircleAt	src/Dodge/HeldUse.hs	184;"	f
 flatItemCombinations	src/Dodge/Combine/Combinations.hs	49;"	f
 flatLookupItems	src/Dodge/Combine.hs	36;"	f
 flatShield	src/Dodge/Item/Held/Utility.hs	9;"	f
@@ -4278,7 +4276,7 @@ floorItemSPic	src/Dodge/Render/ShapePicture.hs	119;"	f
 floorWire	src/Dodge/Wire.hs	13;"	f
 foamSprayFadeOutS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	412;"	f
 foamSprayLoopS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	408;"	f
-foldCr	src/Dodge/Creature/State.hs	44;"	f
+foldCr	src/Dodge/Creature/State.hs	43;"	f
 foldPairs	src/ListHelp.hs	37;"	f
 foldrWhileArb	src/ListHelp.hs	110;"	f
 followImpulse	src/Dodge/Creature/Impulse.hs	37;"	f
@@ -4306,7 +4304,7 @@ fromV3	src/Geometry/Data.hs	43;"	f
 frontArmour	src/Dodge/Item/Equipment.hs	41;"	f
 fstV2	src/Geometry/Data.hs	50;"	f
 fuelPack	src/Dodge/Item/Equipment.hs	64;"	f
-functionalUpdate	src/Dodge/Update.hs	251;"	f
+functionalUpdate	src/Dodge/Update.hs	250;"	f
 fuseFunc	src/Dodge/Path.hs	150;"	f
 fusePairs	src/Dodge/Path.hs	153;"	f
 fusePoint	src/Dodge/LevelGen/StaticWalls.hs	158;"	f
@@ -4320,7 +4318,7 @@ gameRoomViewpoints	src/Dodge/Viewpoints.hs	35;"	f
 gameRoomsFromRooms	src/Dodge/Layout.hs	158;"	f
 gameplayMenu	src/Dodge/Menu.hs	131;"	f
 gameplayMenuOptions	src/Dodge/Menu.hs	134;"	f
-gasCreate	src/Dodge/HeldUse.hs	443;"	f
+gasCreate	src/Dodge/HeldUse.hs	442;"	f
 generateGenParams	src/Dodge/LevelGen/LevelStructure.hs	22;"	f
 generateGraphs	src/Dodge/LevelGen.hs	39;"	f
 generateLayout	src/Dodge/Layout/Generate.hs	10;"	f
@@ -4335,8 +4333,8 @@ getAmmoLinks	src/Dodge/Item/Grammar.hs	73;"	f
 getArguments	src/Dodge/Update/Scroll.hs	152;"	f
 getArguments'	src/Dodge/Update/Scroll.hs	140;"	f
 getAvailableListLines	src/Dodge/SelectionList.hs	10;"	f
-getBulletTrajectory	src/Dodge/HeldUse.hs	352;"	f
-getBulletType	src/Dodge/HeldUse.hs	326;"	f
+getBulletTrajectory	src/Dodge/HeldUse.hs	351;"	f
+getBulletType	src/Dodge/HeldUse.hs	325;"	f
 getCommands	src/Dodge/Terminal.hs	117;"	f
 getCommandsHelp	src/Dodge/Terminal.hs	75;"	f
 getCrDexterity	src/Dodge/Creature/Statistics.hs	13;"	f
@@ -4347,12 +4345,12 @@ getDistortions	src/Dodge/Render.hs	383;"	f
 getEquipmentAllocation	src/Dodge/Inventory/RBList.hs	47;"	f
 getItem	src/Dodge/Item/Location.hs	15;"	f
 getLDPWidth	src/Dodge/Render/List.hs	91;"	f
-getLaserColor	src/Dodge/HeldUse.hs	200;"	f
-getLaserDamage	src/Dodge/HeldUse.hs	197;"	f
-getLaserPhaseV	src/Dodge/HeldUse.hs	194;"	f
+getLaserColor	src/Dodge/HeldUse.hs	199;"	f
+getLaserDamage	src/Dodge/HeldUse.hs	196;"	f
+getLaserPhaseV	src/Dodge/HeldUse.hs	193;"	f
 getLinksOfType	src/Dodge/RoomLink.hs	39;"	f
 getMaxLinesTM	src/Dodge/Terminal/Type.hs	11;"	f
-getMenuMouseContext	src/Dodge/Update.hs	369;"	f
+getMenuMouseContext	src/Dodge/Update.hs	367;"	f
 getNodePos	src/Dodge/Path.hs	31;"	f
 getPretty	src/AesonHelp.hs	7;"	f
 getPrettyShort	src/AesonHelp.hs	10;"	f
@@ -4383,7 +4381,7 @@ glassWallDamage	src/Dodge/Wall/DamageEffect.hs	48;"	f
 glushortSize	src/Shader/Parameters.hs	25;"	f
 goToPostStrat	src/Dodge/Creature/Strategy.hs	10;"	f
 goToTarget	src/Dodge/Creature/ReaderUpdate.hs	136;"	f
-gotoTerminal	src/Dodge/Update.hs	129;"	f
+gotoTerminal	src/Dodge/Update.hs	128;"	f
 grahamEliminate	src/Geometry/Polygon.hs	125;"	f
 grahamScan	src/Geometry/Polygon.hs	116;"	f
 grapeCannon	src/Dodge/Item/Held/Cone.hs	38;"	f
@@ -4412,7 +4410,7 @@ hackOutline	src/Dodge/Render/Outline.hs	5;"	f
 halfHeight	src/Dodge/Base/Window.hs	48;"	f
 halfWidth	src/Dodge/Base/Window.hs	48;"	f
 haltSound	src/Dodge/SoundLogic.hs	37;"	f
-hammerCheck	src/Dodge/HeldUse.hs	38;"	f
+hammerCheck	src/Dodge/HeldUse.hs	37;"	f
 hammerCheckL	src/Dodge/Item/Weapon/TriggerType.hs	151;"	f
 handleEvent	src/Dodge/Event.hs	27;"	f
 handleHotkeys	src/Dodge/Creature/YourControl.hs	41;"	f
@@ -4440,8 +4438,8 @@ healthAnalyserByDoor	src/Dodge/Room/LasTurret.hs	72;"	f
 healthTest	src/Dodge/Room/LasTurret.hs	93;"	f
 heavyBulDams	src/Dodge/Item/Weapon/Bullet.hs	38;"	f
 heightWallPS	src/Dodge/Placement/Instance/Wall.hs	13;"	f
-heldEffect	src/Dodge/HeldUse.hs	35;"	f
-heldEffectMuzzles	src/Dodge/HeldUse.hs	45;"	f
+heldEffect	src/Dodge/HeldUse.hs	34;"	f
+heldEffectMuzzles	src/Dodge/HeldUse.hs	44;"	f
 heldInfo	src/Dodge/Item/Info.hs	48;"	f
 heldItemOffset	src/Dodge/Item/HeldOffset.hs	58;"	f
 heldItemRelativeOrient	src/Dodge/Item/HeldOffset.hs	26;"	f
@@ -4475,7 +4473,7 @@ impulsiveAIBefore	src/Dodge/Creature/Impulse.hs	22;"	f
 inLink	src/Dodge/RoomLink.hs	113;"	f
 inSegArea	src/Geometry/Intersect.hs	298;"	f
 inTextInputFocus	src/Dodge/InputFocus.hs	10;"	f
-incBallAt	src/Dodge/EnergyBall.hs	54;"	f
+incBallAt	src/Dodge/EnergyBall.hs	53;"	f
 incidenceToFunction	src/Dodge/Graph.hs	26;"	f
 indefiniteExceptions	src/StringHelp.hs	29;"	f
 initCrItemLocation	src/Dodge/Item/Location/Initialize.hs	41;"	f
@@ -4513,7 +4511,7 @@ insertWall	src/Dodge/Placement/PlaceSpot/Block.hs	122;"	f
 insertWallInZones	src/Dodge/Wall/Zone.hs	20;"	f
 insertWalls	src/Dodge/Placement/PlaceSpot/Block.hs	117;"	f
 insertWithNewKeys	src/IntMapHelp.hs	70;"	f
-internalCreatureUpdate	src/Dodge/Creature/State.hs	108;"	f
+internalCreatureUpdate	src/Dodge/Creature/State.hs	107;"	f
 interpWith	src/Dodge/Creature/Boid.hs	10;"	f
 intersectCircSeg	src/Geometry/Intersect.hs	303;"	f
 intersectCircSegFirst	src/Geometry/Intersect.hs	314;"	f
@@ -4543,7 +4541,7 @@ invRootMap	src/Dodge/Item/Grammar.hs	180;"	f
 invRootTrees	src/Dodge/Item/Grammar.hs	210;"	f
 invSelectionItem	src/Dodge/Inventory/SelectionList.hs	21;"	f
 invShiftPointBy	src/Dodge/ShiftPoint.hs	8;"	f
-invSideEff	src/Dodge/Creature/State.hs	162;"	f
+invSideEff	src/Dodge/Creature/State.hs	161;"	f
 invSize	src/Dodge/Inventory/CheckSlots.hs	30;"	f
 invTrees	src/Dodge/Item/Grammar.hs	198;"	f
 invTrees'	src/Dodge/Item/Grammar.hs	202;"	f
@@ -4560,13 +4558,13 @@ invertIntMap	src/Multiset.hs	67;"	f
 invertInventoryToMap	src/Dodge/Combine.hs	54;"	f
 invisibleChaseCrit	src/Dodge/Creature/ChaseCrit.hs	25;"	f
 invisibleWall	src/Dodge/Placement/Instance/Wall.hs	16;"	f
-isAmmoIntLink	src/Dodge/HeldUse.hs	211;"	f
+isAmmoIntLink	src/Dodge/HeldUse.hs	210;"	f
 isAnimate	src/Dodge/Creature/Test.hs	136;"	f
 isCognizant	src/Dodge/Creature/Perception.hs	105;"	f
 isConnected	src/Dodge/Inventory/Swap.hs	90;"	f
 isElectrical	src/Dodge/Data/Damage.hs	42;"	f
-isFrictionless	src/Dodge/Creature/State.hs	342;"	f
-isGas	src/Dodge/Euse.hs	64;"	f
+isFrictionless	src/Dodge/Creature/State.hs	341;"	f
+isGas	src/Dodge/Euse.hs	63;"	f
 isGroupSelectableSection	src/Dodge/Update/Input/InGame.hs	159;"	f
 isInLnk	src/Dodge/PlacementSpot.hs	160;"	f
 isJust'	src/MaybeHelp.hs	29;"	f
@@ -4576,7 +4574,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	390;"	f
+isOverTerminalScreen	src/Dodge/Update.hs	388;"	f
 isPutID	src/Dodge/Placement/Instance/Wall.hs	129;"	f
 isRHS	src/Geometry/LHS.hs	24;"	f
 isUnusedLnk	src/Dodge/PlacementSpot.hs	61;"	f
@@ -4592,7 +4590,7 @@ itemBaseName	src/Dodge/Item/Display.hs	44;"	f
 itemBlips	src/Dodge/RadarSweep.hs	75;"	f
 itemCombinations	src/Dodge/Combine/Combinations.hs	54;"	f
 itemCombinationsEdges	src/Dodge/Combine/Graph.hs	60;"	f
-itemDetectorEffect	src/Dodge/HeldUse.hs	236;"	f
+itemDetectorEffect	src/Dodge/HeldUse.hs	235;"	f
 itemDisplay	src/Dodge/Item/Display.hs	15;"	f
 itemDisplayPad	src/Dodge/Item/Display.hs	28;"	f
 itemEquipPict	src/Dodge/Item/Draw.hs	17;"	f
@@ -4613,7 +4611,7 @@ itemString	src/Dodge/Item/Display.hs	41;"	f
 itemToBreakLists	src/Dodge/Item/Grammar.hs	47;"	f
 itemToFunction	src/Dodge/Item/Grammar.hs	79;"	f
 itemTreeSPic	src/Dodge/Item/Draw/SPic.hs	22;"	f
-itemUpdate	src/Dodge/Creature/State.hs	314;"	f
+itemUpdate	src/Dodge/Creature/State.hs	313;"	f
 itemUseEffect	src/Dodge/Creature/Impulse/UseItem.hs	59;"	f
 itemUseEffect'	src/Dodge/Creature/Impulse/UseItem.hs	34;"	f
 iterateUntil	src/MonadHelp.hs	23;"	f
@@ -4651,7 +4649,7 @@ lampCrSPic	src/Dodge/Render/ShapePicture.hs	57;"	f
 lasCenSensEdge	src/Dodge/Room/LasTurret.hs	112;"	f
 lasDronesPic	src/Dodge/Item/Weapon/Drone.hs	22;"	f
 lasGunPic	src/Dodge/Item/Draw/SPic.hs	351;"	f
-lasRayAt	src/Dodge/HeldUse.hs	303;"	f
+lasRayAt	src/Dodge/HeldUse.hs	302;"	f
 lasSensorTurretTest	src/Dodge/Room/LasTurret.hs	105;"	f
 lasTunnel	src/Dodge/Room/LasTurret.hs	124;"	f
 lasTunnelRunPast	src/Dodge/Room/LasTurret.hs	165;"	f
@@ -4716,7 +4714,7 @@ lnkMidPosInvSelsCol	src/Dodge/Render/HUD.hs	386;"	f
 lnkPosDir	src/Dodge/RoomLink.hs	97;"	f
 loadDodgeConfig	src/Dodge/Config/Load.hs	9;"	f
 loadMusic	src/Dodge/SoundLogic/LoadSound.hs	21;"	f
-loadMuzzle	src/Dodge/HeldUse.hs	129;"	f
+loadMuzzle	src/Dodge/HeldUse.hs	128;"	f
 loadSaveSlot	src/Dodge/Save.hs	74;"	f
 loadSeed	src/Dodge/LoadSeed.hs	7;"	f
 loadSound	src/Dodge/SoundLogic/LoadSound.hs	11;"	f
@@ -4751,7 +4749,7 @@ lsColPosID	src/Dodge/LightSource.hs	47;"	f
 lsColPosRad	src/Dodge/LightSource.hs	56;"	f
 lsPosCol	src/Dodge/LightSource.hs	53;"	f
 lsPosRad	src/Dodge/LightSource.hs	23;"	f
-lsRadCol	src/Dodge/LightSource.hs	64;"	f
+lsRadCol	src/Dodge/LightSource.hs	59;"	f
 ltAutoCrit	src/Dodge/Creature/LtAutoCrit.hs	13;"	f
 m	src/ShortShow.hs	34;"	f
 machineAddSound	src/Dodge/Machine.hs	49;"	f
@@ -4772,7 +4770,7 @@ makeAttach	src/Dodge/Item/Attach.hs	10;"	f
 makeBlip	src/Dodge/RadarSweep.hs	51;"	f
 makeBlockDebris	src/Dodge/Block/Debris.hs	28;"	f
 makeBoolOption	src/Dodge/Menu/OptionType.hs	8;"	f
-makeBullet	src/Dodge/HeldUse.hs	384;"	f
+makeBullet	src/Dodge/HeldUse.hs	383;"	f
 makeButton	src/Dodge/LevelGen/Switch.hs	16;"	f
 makeByteStringShaderUsingVAO	src/Shader/Compile.hs	128;"	f
 makeCloudAt	src/Dodge/WorldEvent/Cloud.hs	18;"	f
@@ -4786,23 +4784,23 @@ makeDebrisToHeight	src/Dodge/Block/Debris.hs	39;"	f
 makeDefaultCorpse	src/Dodge/Corpse/Make.hs	14;"	f
 makeDoorDebris	src/Dodge/Block/Debris.hs	18;"	f
 makeEnumOption	src/Dodge/Menu/OptionType.hs	13;"	f
-makeExplosionAt	src/Dodge/WorldEvent/Explosion.hs	74;"	f
+makeExplosionAt	src/Dodge/WorldEvent/Explosion.hs	73;"	f
 makeFlak	src/Dodge/Bullet.hs	131;"	f
-makeFlame	src/Dodge/Flame.hs	132;"	f
-makeFlameExplosionAt	src/Dodge/WorldEvent/Explosion.hs	57;"	f
-makeFlamelet	src/Dodge/EnergyBall.hs	16;"	f
+makeFlame	src/Dodge/Flame.hs	131;"	f
+makeFlameExplosionAt	src/Dodge/WorldEvent/Explosion.hs	56;"	f
+makeFlamelet	src/Dodge/EnergyBall.hs	15;"	f
 makeFlamerSmokeAt	src/Dodge/WorldEvent/Cloud.hs	68;"	f
-makeFlashBall	src/Dodge/EnergyBall.hs	74;"	f
+makeFlashBall	src/Dodge/EnergyBall.hs	73;"	f
 makeFootstepSound	src/Dodge/Creature/State/WalkCycle.hs	32;"	f
 makeFragBullets	src/Dodge/Bullet.hs	116;"	f
 makeGasCloud	src/Dodge/WorldEvent/SpawnParticle.hs	80;"	f
 makeGrid	src/Grid.hs	46;"	f
 makeIntInterval	src/Dodge/Zoning/Base.hs	33;"	f
-makeMuzzleFlare	src/Dodge/HeldUse.hs	145;"	f
+makeMuzzleFlare	src/Dodge/HeldUse.hs	144;"	f
 makeParagraph	src/Justify.hs	6;"	f
 makePathBetween	src/Dodge/Path.hs	35;"	f
 makePathBetweenPs	src/Dodge/Path.hs	54;"	f
-makePoisonExplosionAt	src/Dodge/WorldEvent/Explosion.hs	26;"	f
+makePoisonExplosionAt	src/Dodge/WorldEvent/Explosion.hs	25;"	f
 makeRect	src/Grid.hs	82;"	f
 makeSelectionListPictures	src/Dodge/Render/List.hs	65;"	f
 makeShaderEBO	src/Shader/Compile.hs	53;"	f
@@ -4821,14 +4819,14 @@ makeTermLine	src/Dodge/Terminal.hs	120;"	f
 makeTermPara	src/Dodge/Terminal.hs	123;"	f
 makeTeslaArc	src/Dodge/Tesla/Arc.hs	57;"	f
 makeTeslaBallAt	src/Dodge/Tesla/Ball.hs	6;"	f
-makeTeslaExplosionAt	src/Dodge/WorldEvent/Explosion.hs	41;"	f
+makeTeslaExplosionAt	src/Dodge/WorldEvent/Explosion.hs	40;"	f
 makeThickSmokeAt	src/Dodge/WorldEvent/Cloud.hs	54;"	f
 makeThinSmokeAt	src/Dodge/WorldEvent/Cloud.hs	57;"	f
 makeTileFromPoly	src/Tile.hs	34;"	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	683;"	f
+markWallSeen	src/Dodge/Update.hs	678;"	f
 maxDamageType	src/Dodge/Damage.hs	37;"	f
 maxShowX	src/Dodge/Combine/Graph.hs	49;"	f
 maxViewDistance	src/Dodge/Viewpoints.hs	26;"	f
@@ -4840,7 +4838,7 @@ 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	587;"	f
-maybeOpenTerminal	src/Dodge/Update.hs	124;"	f
+maybeOpenTerminal	src/Dodge/Update.hs	123;"	f
 maybeReadFile	src/Dodge/LoadSeed.hs	10;"	f
 maybeTakeOne	src/RandomHelp.hs	111;"	f
 maybeWarmupStatus	src/Dodge/Item/Display.hs	119;"	f
@@ -4853,10 +4851,10 @@ mcProximitySensorUpdate	src/Dodge/Machine/Update.hs	124;"	f
 mcSPic	src/Dodge/Render/ShapePicture.hs	131;"	f
 mcSensorTriggerUpdate	src/Dodge/Machine/Update.hs	87;"	f
 mcSensorUpdate	src/Dodge/Machine/Update.hs	119;"	f
-mcShootLaser	src/Dodge/HeldUse.hs	470;"	f
+mcShootLaser	src/Dodge/HeldUse.hs	469;"	f
 mcTriggerVal	src/Dodge/Machine/Update.hs	93;"	f
 mcTypeUpdate	src/Dodge/Machine/Update.hs	27;"	f
-mcUseHeld	src/Dodge/HeldUse.hs	409;"	f
+mcUseHeld	src/Dodge/HeldUse.hs	408;"	f
 mcUseItem	src/Dodge/Machine/Update.hs	79;"	f
 medkit	src/Dodge/Item/Consumable.hs	8;"	f
 megaBattery	src/Dodge/Item/Ammo.hs	84;"	f
@@ -4949,12 +4947,12 @@ multiArrow	src/Picture/Composite.hs	11;"	f
 multiLookupTrie	src/SimpleTrie.hs	34;"	f
 multiLookupTrieI	src/SimpleTrie.hs	43;"	f
 muout	src/Dodge/RoomLink.hs	129;"	f
-muzFlareAt	src/Dodge/HeldUse.hs	171;"	f
+muzFlareAt	src/Dodge/HeldUse.hs	170;"	f
 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	712;"	f
+mvGust	src/Dodge/Update.hs	707;"	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
@@ -5005,8 +5003,8 @@ numTraversable	src/TreeHelp.hs	183;"	f
 obstacleColor	src/Dodge/Debug/Picture.hs	227;"	f
 obstructPathsCrossing	src/Dodge/Path.hs	138;"	f
 oldMachineBootS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	516;"	f
-onEquipWristShield	src/Dodge/Euse.hs	83;"	f
-onRemoveWristShield	src/Dodge/Euse.hs	92;"	f
+onEquipWristShield	src/Dodge/Euse.hs	82;"	f
+onRemoveWristShield	src/Dodge/Euse.hs	91;"	f
 onXY	src/Geometry/Vector3D.hs	130;"	f
 oneH	src/Dodge/Creature/Test.hs	95;"	f
 openCursorAt	src/Dodge/Render/HUD/Carte.hs	54;"	f
@@ -5033,7 +5031,7 @@ orthogonalPointOnSeg	src/Geometry/Intersect.hs	291;"	f
 outLink	src/Dodge/RoomLink.hs	105;"	f
 outsideScreenPolygon	src/Dodge/Debug/Picture.hs	44;"	f
 outwardIntegers	src/Dodge/Base.hs	159;"	f
-overCID	src/Dodge/Euse.hs	173;"	f
+overCID	src/Dodge/Euse.hs	172;"	f
 overCol	src/Picture/Base.hs	308;"	f
 overColObj	src/Shape.hs	271;"	f
 overColSH	src/Shape.hs	239;"	f
@@ -5067,7 +5065,7 @@ pauseGame	src/Dodge/Update/Input/InGame.hs	507;"	f
 pauseMenu	src/Dodge/Menu.hs	53;"	f
 pauseMenuOptions	src/Dodge/Menu.hs	58;"	f
 pauseSound	src/Dodge/SoundLogic.hs	41;"	f
-pauseTime	src/Dodge/Update.hs	191;"	f
+pauseTime	src/Dodge/Update.hs	190;"	f
 pciToCI	src/Dodge/Item/Grammar.hs	96;"	f
 peZoneSize	src/Dodge/Zoning/Pathing.hs	46;"	f
 pedestalRoom	src/Dodge/Room/Containing.hs	50;"	f
@@ -5158,7 +5156,7 @@ pointerToItemLocation	src/Dodge/Item/Location.hs	25;"	f
 pointerYourRootItem	src/Dodge/Item/Location.hs	42;"	f
 pointerYourSelectedItem	src/Dodge/Item/Location.hs	36;"	f
 pointsToPoly	src/Geometry/ConvexPoly.hs	39;"	f
-poisonSPic	src/Dodge/Creature/State.hs	105;"	f
+poisonSPic	src/Dodge/Creature/State.hs	104;"	f
 poisonSprayer	src/Dodge/Item/Held/SprayGuns.hs	17;"	f
 poke34	src/Shader/Poke.hs	516;"	f
 pokeArrayOff	src/Shader/Poke.hs	527;"	f
@@ -5222,7 +5220,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	675;"	f
+ppEvents	src/Dodge/Update.hs	670;"	f
 ppLevelReset	src/Dodge/PressPlate.hs	13;"	f
 preCritStart	src/Dodge/Room/Start.hs	82;"	f
 preloadRender	src/Preload/Render.hs	30;"	f
@@ -5356,11 +5354,11 @@ reloadS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	440;"	f
 rememberSounds	src/Dodge/Creature/Perception.hs	177;"	f
 remoteScreen	src/Dodge/Item/Scope.hs	50;"	f
 remoteShellShape	src/Dodge/Projectile/Draw.hs	42;"	f
-removeAmmoFromMag	src/Dodge/HeldUse.hs	313;"	f
+removeAmmoFromMag	src/Dodge/HeldUse.hs	312;"	f
 removeDot	src/ShortShow.hs	30;"	f
 removeHotkey	src/Dodge/Hotkey.hs	41;"	f
 removeInverseWalls	src/Dodge/LevelGen/StaticWalls.hs	25;"	f
-removeShieldWall	src/Dodge/Euse.hs	152;"	f
+removeShieldWall	src/Dodge/Euse.hs	151;"	f
 removeWallsInPolygon	src/Dodge/LevelGen/StaticWalls.hs	182;"	f
 renderDataResizeUpdate	src/Preload/Update.hs	26;"	f
 renderFlatLighting	src/Render.hs	104;"	f
@@ -5490,7 +5488,7 @@ scaleSH	src/Shape.hs	267;"	f
 scalp	src/Dodge/Creature/Picture.hs	94;"	f
 scancodeToHotkey	src/Dodge/Creature/YourControl.hs	69;"	f
 scodeToChar	src/Dodge/ScodeToChar.hs	6;"	f
-scorchSPic	src/Dodge/Creature/State.hs	102;"	f
+scorchSPic	src/Dodge/Creature/State.hs	101;"	f
 screenBox	src/Dodge/Base/Window.hs	53;"	f
 screenPolygon	src/Dodge/Base/Window.hs	17;"	f
 screenPolygonBord	src/Dodge/Base/Window.hs	27;"	f
@@ -5503,8 +5501,8 @@ scrollCommands	src/Dodge/Update/Scroll.hs	132;"	f
 scrollDebugInfoInt	src/Dodge/Debug.hs	47;"	f
 scrollRBOption	src/Dodge/Update/Scroll.hs	109;"	f
 scrollSelectionSections	src/Dodge/SelectionSections.hs	26;"	f
-scrollTimeBack	src/Dodge/Update.hs	215;"	f
-scrollTimeForward	src/Dodge/Update.hs	235;"	f
+scrollTimeBack	src/Dodge/Update.hs	214;"	f
+scrollTimeForward	src/Dodge/Update.hs	234;"	f
 scrollWatch	src/Dodge/Item/Weapon/Utility.hs	30;"	f
 seagullBarkS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	420;"	f
 seagullBarkTransformedS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	486;"	f
@@ -5544,7 +5542,7 @@ sentinelAI	src/Dodge/Creature/SentinelAI.hs	20;"	f
 sentinelExtraWatchUpdate	src/Dodge/Creature/SentinelAI.hs	83;"	f
 sentinelFireType	src/Dodge/Creature/SentinelAI.hs	50;"	f
 setChannelPos	src/Sound.hs	149;"	f
-setClickWorldPos	src/Dodge/Update.hs	99;"	f
+setClickWorldPos	src/Dodge/Update.hs	98;"	f
 setClusterID	src/Dodge/Combine/Graph.hs	115;"	f
 setDepth	src/Picture/Base.hs	128;"	f
 setDirPS	src/Dodge/PlacementSpot.hs	49;"	f
@@ -5562,11 +5560,11 @@ setLinkTypePD	src/Dodge/RoomLink.hs	67;"	f
 setMinInvSize	src/Dodge/Creature/Action.hs	149;"	f
 setMusicVolume	src/Sound.hs	161;"	f
 setMvPos	src/Dodge/Creature/ReaderUpdate.hs	51;"	f
-setOldPos	src/Dodge/Update.hs	464;"	f
+setOldPos	src/Dodge/Update.hs	462;"	f
 setOutLinks	src/Dodge/RoomLink.hs	48;"	f
 setOutLinksByType	src/Dodge/RoomLink.hs	57;"	f
 setOutLinksPD	src/Dodge/RoomLink.hs	77;"	f
-setRBCreatureTargeting	src/Dodge/Creature/State.hs	293;"	f
+setRBCreatureTargeting	src/Dodge/Creature/State.hs	292;"	f
 setSelWhileDragging	src/Dodge/Update/Input/InGame.hs	306;"	f
 setSelectionListRestriction	src/Dodge/Update/Input/ScreenLayer.hs	85;"	f
 setShaderSource	src/Shader/Compile.hs	290;"	f
@@ -5580,7 +5578,7 @@ setViewDistance	src/Dodge/Update/Camera.hs	221;"	f
 setViewPos	src/Dodge/Creature/ReaderUpdate.hs	61;"	f
 setViewport	src/Dodge/Render.hs	388;"	f
 setVol	src/Dodge/Config/Update.hs	30;"	f
-setWristShieldPos	src/Dodge/Euse.hs	100;"	f
+setWristShieldPos	src/Dodge/Euse.hs	99;"	f
 setupConLoop	src/Loop.hs	102;"	f
 setupConLoop'	src/Loop.hs	192;"	f
 setupEBO	src/Shader/Compile.hs	188;"	f
@@ -5612,7 +5610,7 @@ shellCollisionEffect	src/Dodge/Projectile/Update.hs	48;"	f
 shellMag	src/Dodge/Item/Ammo.hs	67;"	f
 shellShape	src/Dodge/Projectile/Draw.hs	27;"	f
 shellTrailCloud	src/Dodge/WorldEvent/Cloud.hs	65;"	f
-shieldWall	src/Dodge/Euse.hs	114;"	f
+shieldWall	src/Dodge/Euse.hs	113;"	f
 shiftByV2	src/Dodge/PlacementSpot.hs	239;"	f
 shiftChildren	src/Dodge/Tree/Compose.hs	43;"	f
 shiftDraw	src/Dodge/Render/ShapePicture.hs	66;"	f
@@ -5633,17 +5631,17 @@ shiftRoomBy	src/Dodge/Room/Link.hs	37;"	f
 shiftRoomShiftBy	src/Dodge/Room/Link.hs	81;"	f
 shiftRoomShiftToLink	src/Dodge/Room/Link.hs	70;"	f
 shiftedGrid	src/Grid.hs	25;"	f
-shineTargetLaser	src/Dodge/Creature/State.hs	215;"	f
-shineTorch	src/Dodge/Creature/State.hs	247;"	f
-shootBullet	src/Dodge/HeldUse.hs	371;"	f
+shineTargetLaser	src/Dodge/Creature/State.hs	214;"	f
+shineTorch	src/Dodge/Creature/State.hs	246;"	f
+shootBullet	src/Dodge/HeldUse.hs	370;"	f
 shootFirstMiss	src/Dodge/Creature/Volition.hs	33;"	f
 shootL	src/Dodge/Item/Weapon/TriggerType.hs	165;"	f
-shootLaser	src/Dodge/HeldUse.hs	284;"	f
+shootLaser	src/Dodge/HeldUse.hs	283;"	f
 shootOutPassage	src/Dodge/Room/RezBox.hs	74;"	f
 shootShatter	src/Dodge/Item/Weapon/Shatter.hs	12;"	f
-shootTeslaArc	src/Dodge/HeldUse.hs	479;"	f
+shootTeslaArc	src/Dodge/HeldUse.hs	478;"	f
 shootTillEmpty	src/Dodge/Creature/Volition.hs	18;"	f
-shootTractorBeam	src/Dodge/HeldUse.hs	263;"	f
+shootTractorBeam	src/Dodge/HeldUse.hs	262;"	f
 shootersRoom	src/Dodge/Room/Room.hs	315;"	f
 shootersRoom'	src/Dodge/Room/Room.hs	280;"	f
 shootersRoom1	src/Dodge/Room/Room.hs	305;"	f
@@ -5670,8 +5668,8 @@ 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	760;"	f
-simpleDamFL	src/Dodge/Flame.hs	41;"	f
+simpleCrSprings	src/Dodge/Update.hs	755;"	f
+simpleDamFL	src/Dodge/Flame.hs	40;"	f
 simpleTermMessage	src/Dodge/Terminal.hs	253;"	f
 sineRaisePitchOneSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	504;"	f
 sineRaisePitchTwoSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	352;"	f
@@ -5889,14 +5887,14 @@ threeLineDecoration	src/Dodge/Placement/TopDecoration.hs	61;"	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	178;"	f
+timeFlowUpdate	src/Dodge/Update.hs	177;"	f
 timeModule	src/Dodge/Item/Craftable.hs	33;"	f
 timerTLS	src/Dodge/LightSource/Update.hs	22;"	f
 tinMag	src/Dodge/Item/Ammo.hs	27;"	f
 tinitusS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	416;"	f
 titleOptionsMenu	src/Dodge/Menu.hs	99;"	f
 titleOptionsNoWrite	src/Dodge/Menu.hs	102;"	f
-tmUpdate	src/Dodge/Update.hs	444;"	f
+tmUpdate	src/Dodge/Update.hs	442;"	f
 toBothLnk	src/Dodge/RoomLink.hs	121;"	f
 toClosestMultiple	src/HelpNum.hs	3;"	f
 toColor8	src/Color.hs	148;"	f
@@ -5929,7 +5927,7 @@ torqueCr	src/Dodge/WorldEffect.hs	72;"	f
 torso	src/Dodge/Creature/Picture.hs	103;"	f
 tractCr	src/Dodge/TractorBeam/Update.hs	28;"	f
 tractFlIt	src/Dodge/TractorBeam/Update.hs	23;"	f
-tractorBeamAt	src/Dodge/HeldUse.hs	273;"	f
+tractorBeamAt	src/Dodge/HeldUse.hs	272;"	f
 tractorGun	src/Dodge/Item/Held/BatteryGuns.hs	64;"	f
 tractorGunPic	src/Dodge/Item/Draw/SPic.hs	375;"	f
 tractorPullPos	src/Dodge/TractorBeam/Update.hs	33;"	f
@@ -5983,8 +5981,8 @@ truncFaces	src/Polyhedra/Geodesic.hs	53;"	f
 truncate	src/Polyhedra/Geodesic.hs	38;"	f
 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
+tryAttachBulletBelt	src/Dodge/Euse.hs	39;"	f
+tryChargeBattery	src/Dodge/Euse.hs	42;"	f
 tryCombine	src/Dodge/Update/Input/InGame.hs	573;"	f
 tryDropSelected	src/Dodge/Update/Input/InGame.hs	104;"	f
 tryGetChannel	src/Sound.hs	96;"	f
@@ -5997,7 +5995,7 @@ tryPutFloorItemIDInInv	src/Dodge/Inventory/Add.hs	26;"	f
 tryPutItemInInv	src/Dodge/Inventory/Add.hs	42;"	f
 tryPutItemInInvAt	src/Dodge/Inventory/Add.hs	32;"	f
 trySeedFromClipboard	src/Dodge/Menu.hs	88;"	f
-trySiphonFuel	src/Dodge/Euse.hs	46;"	f
+trySiphonFuel	src/Dodge/Euse.hs	45;"	f
 trySpinByCID	src/Dodge/Projectile/Update.hs	95;"	f
 turnTo	src/Dodge/Movement/Turn.hs	4;"	f
 turnToAmount	src/Dodge/Movement/Turn.hs	15;"	f
@@ -6032,74 +6030,73 @@ upHammer	src/Dodge/Default.hs	77;"	f
 upProjectile	src/Dodge/Projectile/Update.hs	26;"	f
 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	325;"	f
+updateAttachedItems	src/Dodge/Creature/State.hs	172;"	f
+updateAutoRecharge	src/Dodge/Creature/State.hs	324;"	f
 updateBackspaceRegex	src/Dodge/Update/Input/InGame.hs	445;"	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	541;"	f
+updateBullets	src/Dodge/Update.hs	536;"	f
 updateCamera	src/Dodge/Update/Camera.hs	31;"	f
 updateCloseObjects	src/Dodge/Inventory.hs	113;"	f
-updateCloud	src/Dodge/Update.hs	726;"	f
-updateClouds	src/Dodge/Update.hs	570;"	f
+updateCloud	src/Dodge/Update.hs	721;"	f
+updateClouds	src/Dodge/Update.hs	565;"	f
 updateCombinePositioning	src/Dodge/DisplayInventory.hs	40;"	f
 updateCombineSections	src/Dodge/DisplayInventory.hs	46;"	f
 updateCreature	src/Dodge/Creature/Update.hs	10;"	f
-updateCreatureGroups	src/Dodge/Update.hs	510;"	f
-updateCreatureSoundPositions	src/Dodge/Update.hs	486;"	f
-updateDebugMessageOffset	src/Dodge/Update.hs	93;"	f
-updateDelayedEvents	src/Dodge/Update.hs	789;"	f
+updateCreatureGroups	src/Dodge/Update.hs	508;"	f
+updateCreatureSoundPositions	src/Dodge/Update.hs	484;"	f
+updateDebugMessageOffset	src/Dodge/Update.hs	92;"	f
+updateDelayedEvents	src/Dodge/Update.hs	784;"	f
 updateDisplaySections	src/Dodge/DisplayInventory.hs	126;"	f
 updateDistortion	src/Dodge/Distortion.hs	5;"	f
-updateDistortions	src/Dodge/Update.hs	531;"	f
-updateEnergyBall	src/Dodge/EnergyBall.hs	46;"	f
-updateEnergyBalls	src/Dodge/Update.hs	558;"	f
+updateDistortions	src/Dodge/Update.hs	529;"	f
+updateEnergyBall	src/Dodge/EnergyBall.hs	45;"	f
+updateEnergyBalls	src/Dodge/Update.hs	553;"	f
 updateEnterRegex	src/Dodge/Update/Input/InGame.hs	486;"	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	555;"	f
+updateFlame	src/Dodge/Flame.hs	70;"	f
+updateFlames	src/Dodge/Update.hs	550;"	f
 updateFloatingCamera	src/Dodge/Update/Camera.hs	36;"	f
 updateFunctionKey	src/Dodge/Update/Input/InGame.hs	336;"	f
 updateFunctionKeys	src/Dodge/Update/Input/InGame.hs	329;"	f
-updateGusts	src/Dodge/Update.hs	709;"	f
-updateHeldRootItem	src/Dodge/Creature/State.hs	167;"	f
+updateGusts	src/Dodge/Update.hs	704;"	f
+updateHeldRootItem	src/Dodge/Creature/State.hs	166;"	f
 updateHumanoid	src/Dodge/Humanoid.hs	12;"	f
-updateIMl	src/Dodge/Update.hs	500;"	f
-updateIMl'	src/Dodge/Update.hs	505;"	f
+updateIMl	src/Dodge/Update.hs	498;"	f
+updateIMl'	src/Dodge/Update.hs	503;"	f
 updateInGameCamera	src/Dodge/Update/Camera.hs	70;"	f
 updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	389;"	f
-updateInstantBullets	src/Dodge/Update.hs	647;"	f
-updateInv	src/Dodge/Creature/State.hs	152;"	f
+updateInstantBullets	src/Dodge/Update.hs	642;"	f
+updateInv	src/Dodge/Creature/State.hs	151;"	f
 updateInventoryPositioning	src/Dodge/DisplayInventory.hs	87;"	f
-updateItemTargeting	src/Dodge/Creature/State.hs	269;"	f
-updateItemWithOrientation	src/Dodge/Creature/State.hs	194;"	f
+updateItemTargeting	src/Dodge/Creature/State.hs	268;"	f
+updateItemWithOrientation	src/Dodge/Creature/State.hs	193;"	f
 updateKeyInGame	src/Dodge/Update/Input/InGame.hs	383;"	f
 updateKeysInTerminal	src/Dodge/Update/Input/InGame.hs	371;"	f
 updateLampoid	src/Dodge/Lampoid.hs	12;"	f
 updateLaser	src/Dodge/Laser/Update.hs	13;"	f
-updateLasers	src/Dodge/Update.hs	429;"	f
-updateLightSources	src/Dodge/Update.hs	534;"	f
+updateLasers	src/Dodge/Update.hs	427;"	f
 updateLinearShockwave	src/Dodge/LinearShockwave/Update.hs	8;"	f
 updateLongPressInGame	src/Dodge/Update/Input/InGame.hs	404;"	f
-updateMIM	src/Dodge/Update.hs	660;"	f
+updateMIM	src/Dodge/Update.hs	655;"	f
 updateMachine	src/Dodge/Machine/Update.hs	19;"	f
 updateMouseClickInGame	src/Dodge/Update/Input/InGame.hs	165;"	f
-updateMouseContext	src/Dodge/Update.hs	312;"	f
-updateMouseContextGame	src/Dodge/Update.hs	317;"	f
+updateMouseContext	src/Dodge/Update.hs	310;"	f
+updateMouseContextGame	src/Dodge/Update.hs	315;"	f
 updateMouseHeldInGame	src/Dodge/Update/Input/InGame.hs	86;"	f
 updateMouseInGame	src/Dodge/Update/Input/InGame.hs	78;"	f
 updateMouseReleaseInGame	src/Dodge/Update/Input/InGame.hs	132;"	f
-updateMovement	src/Dodge/Creature/State.hs	332;"	f
-updateObjCatMaybes	src/Dodge/Update.hs	522;"	f
-updateObjMapMaybe	src/Dodge/Update.hs	515;"	f
-updatePastWorlds	src/Dodge/Update.hs	417;"	f
+updateMovement	src/Dodge/Creature/State.hs	331;"	f
+updateObjCatMaybes	src/Dodge/Update.hs	520;"	f
+updateObjMapMaybe	src/Dodge/Update.hs	513;"	f
+updatePastWorlds	src/Dodge/Update.hs	415;"	f
 updatePosEvent	src/Dodge/PosEvent.hs	11;"	f
-updatePosEvents	src/Dodge/Update.hs	567;"	f
+updatePosEvents	src/Dodge/Update.hs	562;"	f
 updatePreload	src/Preload/Update.hs	20;"	f
 updatePressedButtonsCarte	src/Dodge/Update/Input/InGame.hs	346;"	f
 updatePressedButtonsCarte'	src/Dodge/Update/Input/InGame.hs	349;"	f
@@ -6107,9 +6104,9 @@ 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	537;"	f
+updateRadarBlips	src/Dodge/Update.hs	532;"	f
 updateRadarSweep	src/Dodge/RadarSweep.hs	25;"	f
-updateRadarSweeps	src/Dodge/Update.hs	561;"	f
+updateRadarSweeps	src/Dodge/Update.hs	556;"	f
 updateRandNode	src/TreeHelp.hs	108;"	f
 updateRenderSplit	appDodge/Main.hs	106;"	f
 updateRootItemID	src/Dodge/Inventory/Location.hs	35;"	f
@@ -6118,32 +6115,32 @@ updateScopeZoom'	src/Dodge/Update/Camera.hs	132;"	f
 updateScrollTestValue	src/Dodge/ScrollValue.hs	6;"	f
 updateSection	src/Dodge/DisplayInventory.hs	286;"	f
 updateSectionsPositioning	src/Dodge/DisplayInventory.hs	259;"	f
-updateSeenWalls	src/Dodge/Update.hs	678;"	f
+updateSeenWalls	src/Dodge/Update.hs	673;"	f
 updateShockwave	src/Dodge/Shockwave/Update.hs	12;"	f
-updateShockwaves	src/Dodge/Update.hs	552;"	f
+updateShockwaves	src/Dodge/Update.hs	547;"	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	564;"	f
+updateSparks	src/Dodge/Update.hs	559;"	f
 updateTempLightSource	src/Dodge/LightSource/Update.hs	7;"	f
 updateTeslaArc	src/Dodge/Tesla/Arc.hs	29;"	f
-updateTeslaArcs	src/Dodge/Update.hs	546;"	f
+updateTeslaArcs	src/Dodge/Update.hs	541;"	f
 updateTractorBeam	src/Dodge/TractorBeam/Update.hs	9;"	f
-updateTractorBeams	src/Dodge/Update.hs	549;"	f
+updateTractorBeams	src/Dodge/Update.hs	544;"	f
 updateTurret	src/Dodge/Machine/Update.hs	49;"	f
-updateUniverse	src/Dodge/Update.hs	72;"	f
-updateUniverseFirst	src/Dodge/Update.hs	84;"	f
-updateUniverseLast	src/Dodge/Update.hs	134;"	f
-updateUniverseMid	src/Dodge/Update.hs	156;"	f
+updateUniverse	src/Dodge/Update.hs	71;"	f
+updateUniverseFirst	src/Dodge/Update.hs	83;"	f
+updateUniverseLast	src/Dodge/Update.hs	133;"	f
+updateUniverseMid	src/Dodge/Update.hs	155;"	f
 updateUseInputInGame	src/Dodge/Update/Input/InGame.hs	38;"	f
 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	404;"	f
-updateWorldEventFlag	src/Dodge/Update.hs	118;"	f
-updateWorldEventFlags	src/Dodge/Update.hs	106;"	f
+updateWheelEvents	src/Dodge/Update.hs	402;"	f
+updateWorldEventFlag	src/Dodge/Update.hs	117;"	f
+updateWorldEventFlags	src/Dodge/Update.hs	105;"	f
 upperBody	src/Dodge/Creature/Picture.hs	133;"	f
 upperBox	src/Shape.hs	154;"	f
 upperBoxHalf	src/Shape.hs	220;"	f
@@ -6167,17 +6164,17 @@ useBreakListsLinkTest	src/Dodge/Item/Grammar.hs	32;"	f
 useBulletPayload	src/Dodge/Bullet.hs	105;"	f
 useC	src/Dodge/Cuse.hs	8;"	f
 useC'	src/Dodge/Cuse.hs	13;"	f
-useE	src/Dodge/Euse.hs	24;"	f
-useEquipment	src/Dodge/Creature/State.hs	146;"	f
-useGasParams	src/Dodge/HeldUse.hs	420;"	f
+useE	src/Dodge/Euse.hs	23;"	f
+useEquipment	src/Dodge/Creature/State.hs	145;"	f
+useGasParams	src/Dodge/HeldUse.hs	419;"	f
 useHotKey	src/Dodge/Creature/YourControl.hs	48;"	f
 useItemHotkey	src/Dodge/Creature/Impulse/UseItem.hs	150;"	f
 useItemLeftClick	src/Dodge/Creature/Impulse/UseItem.hs	124;"	f
 useItemLeftClick'	src/Dodge/Creature/Impulse/UseItem.hs	137;"	f
 useL	src/Dodge/Luse.hs	11;"	f
 useLnkRoomPos	src/Dodge/PlacementSpot.hs	244;"	f
-useLoadedAmmo	src/Dodge/HeldUse.hs	215;"	f
-useMagShield	src/Dodge/Euse.hs	69;"	f
+useLoadedAmmo	src/Dodge/HeldUse.hs	214;"	f
+useMagShield	src/Dodge/Euse.hs	68;"	f
 useNormalCamera	src/Dodge/Camera.hs	6;"	f
 usePayload	src/Dodge/Payload.hs	7;"	f
 useRewindGun	src/Dodge/Luse.hs	39;"	f
@@ -6188,7 +6185,7 @@ useStopWatch	src/Dodge/Luse.hs	21;"	f
 useTimeCheck	src/Dodge/Item/Weapon/TriggerType.hs	127;"	f
 useTimeScrollGun	src/Dodge/Luse.hs	29;"	f
 useUnusedLnk	src/Dodge/PlacementSpot.hs	169;"	f
-useUpdate	src/Dodge/Creature/State.hs	317;"	f
+useUpdate	src/Dodge/Creature/State.hs	316;"	f
 usedRoomInLinkPoss	src/Dodge/PlacementSpot.hs	196;"	f
 usedRoomLinkPoss	src/Dodge/PlacementSpot.hs	203;"	f
 v2z	src/Geometry/Vector3D.hs	93;"	f
@@ -6220,7 +6217,7 @@ vocalizationTest	src/Dodge/Creature/Vocalization.hs	8;"	f
 volleyGun	src/Dodge/Item/Held/Cane.hs	32;"	f
 volleyGunShape	src/Dodge/Item/Draw/SPic.hs	289;"	f
 waistSP	src/Dodge/Creature/HandPos.hs	199;"	f
-walkNozzle	src/Dodge/HeldUse.hs	241;"	f
+walkNozzle	src/Dodge/HeldUse.hs	240;"	f
 walkableNodeNear	src/Dodge/Path.hs	48;"	f
 wallBlips	src/Dodge/RadarSweep.hs	80;"	f
 wallBuffer	src/Dodge/WallCreatureCollisions.hs	50;"	f
@@ -6313,9 +6310,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	437;"	f
+zoneClouds	src/Dodge/Update.hs	435;"	f
 zoneCreature	src/Dodge/Zoning/Creature.hs	52;"	f
-zoneCreatures	src/Dodge/Update.hs	481;"	f
+zoneCreatures	src/Dodge/Update.hs	479;"	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