Move laser sound to where it is created

src/Dodge/Data/Item/Use.hs

@@ -93,9 +93,6 @@ data HeldParams
         , _weaponRepeat :: [Int]
         }
     | BeamShooterParams
-        { _bulGunSound :: Maybe (SoundID, Int) -- if the int is 0, play sound on new channel
-        -- TODO remove duplicate
-        }
     | BulletShooterParams
         { _muzVel :: GenFloat
         , _rifling :: GenFloat

src/Dodge/HeldUse.hs

@@ -8,7 +8,6 @@ module Dodge.HeldUse (
     mcUseHeld,
 ) where
 
-import Dodge.Inventory.Path
 import Color
 import Control.Applicative
 import Control.Monad
@@ -22,6 +21,7 @@ import Dodge.Data.MuzzleEffect
 import Dodge.Data.World
 import Dodge.Gas
 import Dodge.Inventory.Lock
+import Dodge.Inventory.Path
 import Dodge.Item.HeldOffset
 import Dodge.Item.Weapon.Bullet
 import Dodge.Item.Weapon.Shatter
@@ -63,7 +63,7 @@ heldEffect ::
     Creature ->
     World ->
     World
-heldEffect pt = hammerCheck pt heldEffectNoHammerCheck
+heldEffect = hammerCheck heldEffectNoHammerCheck
 
 heldEffectNoHammerCheck ::
     LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
@@ -77,16 +77,17 @@ type ChainEffect =
     World
 
 hammerCheck ::
-    PressType ->
     (LabelDoubleTree ComposeLinkType Item -> t1 -> t2 -> t2) ->
+    PressType ->
     LabelDoubleTree ComposeLinkType Item ->
     t1 ->
     t2 ->
     t2
-hammerCheck pt f it cr
+hammerCheck f pt it cr
     | Just HammerTrigger <- it ^? ldtValue . itUse . heldTriggerType
       , isNothing $ lookup MakeAutoLink (it ^. ldtRight)
-      , pt /= InitialPress = id
+      , pt /= InitialPress =
+        id
     | otherwise = f it cr
 
 -- | Applies a world effect after an item use cooldown check.
@@ -187,16 +188,15 @@ applyInvLock itm cr = case itm ^? itUse . heldParams . weaponInvLock of
 applySoundCME :: Item -> Creature -> World -> World
 applySoundCME itm cr = fromMaybe id $ do
     (soundid, x) <- itm ^? itUse . heldParams . bulGunSound . _Just
-    if x > 0
+    return $ if x > 0
-        then return $ soundContinue (CrWeaponSound (_crID cr) 0) (_crPos cr) soundid (Just x)
+        then soundContinue (CrWeaponSound cid 0) (_crPos cr) soundid (Just x)
-        else return $ soundMultiFrom [CrWeaponSound cid j | j <- [0 .. 5]] (_crPos cr) soundid Nothing
+        else soundMultiFrom [CrWeaponSound cid j | j <- [0 .. 5]] (_crPos cr) soundid Nothing
   where
     cid = _crID cr
 
 applyRecoil :: Item -> Creature -> World -> World
-applyRecoil itm cr = over (cWorld . lWorld . creatures . ix cid) pushback
+applyRecoil itm cr = cWorld . lWorld . creatures . ix (_crID cr) %~ pushback
   where
-    cid = _crID cr
     recoilAmount = fromMaybe 0 $ itm ^? itUse . heldParams . recoil
     pushback = over crPos (+.+ rotateV (_crDir cr) (V2 ((- recoilAmount) / _crMass cr) 0))
 
@@ -332,7 +332,7 @@ useLoadedAmmo _ _ (cme, w) (_, Nothing) = (cme, w)
 useLoadedAmmo itmtree cr (cme, w) (mzid, Just (mz, x, magtree)) = (,) (cme & cmeSound .~ True) $
     removeAmmoFromMag x mid cr . makeMuzzleFlare mz itmtree cr $ case _mzEffect mz of
         MuzzleShootBullet -> shootBullet itmtree cr (mz, x, magtree) w
-        MuzzleLaser -> shootLaser itmtree cr mz w
+        MuzzleLaser -> creatureShootLaser itmtree cr mz w
         MuzzleTesla -> shootTeslaArc itm cr mz w
         MuzzleTractor -> shootTractorBeam cr w
         MuzzleRLauncher -> createProjectileR itmtree magtree mz cr w
@@ -407,6 +407,7 @@ walkNozzle mzid mz itm cr w = fromMaybe w $ do
 
 shootTractorBeam :: Creature -> World -> World
 shootTractorBeam cr w = w & cWorld . lWorld . tractorBeams .:~ tractorBeamAt spos outpos dir power
+        & soundContinue (CrWeaponSound (_crID cr) 0) cpos tone440sawtoothquietS (Just 2)
   where
     cpos = _crPos cr
     spos = cpos +.+ (_crRad cr + 10) *.* unitVectorAtAngle dir
@@ -426,18 +427,24 @@ tractorBeamAt pos outpos dir power =
   where
     d = unitVectorAtAngle dir * power
 
-shootLaser :: LabelDoubleTree ComposeLinkType Item -> Creature -> Muzzle -> World -> World
+creatureShootLaser ::
-shootLaser itmtree cr mz w =
+    LabelDoubleTree ComposeLinkType Item ->
-    w
+    Creature ->
+    Muzzle ->
+    World ->
+    World
+creatureShootLaser itmtree cr mz w = w
         & randGen .~ g
-        & cWorld . lWorld . lasers
+        & shootLaser (CrWeaponSound (_crID cr) 0) (getLaserDamage itmtree)
-            .:~ Laser
+            (getLaserPhaseV itmtree) pos dir (getLaserColor itmtree)
-                { _lpType = getLaserDamage itmtree
+--        & cWorld . lWorld . lasers
-                , _lpPhaseV = getLaserPhaseV itmtree
+--            .:~ Laser
-                , _lpPos = pos
+--                { _lpType = getLaserDamage itmtree
-                , _lpDir = dir
+--                , _lpPhaseV = getLaserPhaseV itmtree
-                , _lpColor = getLaserColor itmtree
+--                , _lpPos = pos
-                }
+--                , _lpDir = dir
+--                , _lpColor = getLaserColor itmtree
+--                }
   where
     itm = itmtree ^. ldtValue
     (moff, mrot) = heldItemOrient2D itm cr (_mzPos mz) (_mzRot mz)
@@ -446,6 +453,24 @@ shootLaser itmtree cr mz w =
     (a, g) = randomR (- inacc, inacc) $ _randGen w
     inacc = _mzInaccuracy mz
 
+shootLaser ::
+    SoundOrigin ->
+    LaserType ->
+    Float ->
+    Point2 ->
+    Float ->
+    Color ->
+    World ->
+    World
+shootLaser so lt pv p dir col w = w & cWorld . lWorld . lasers .:~ Laser
+                { _lpType = lt
+                , _lpPhaseV = pv
+                , _lpPos = p
+                , _lpDir = dir
+                , _lpColor = col
+                }
+    & soundContinue so p tone440sawtoothquietS (Just 2)
+
 lasRayAt :: Color -> Int -> Float -> Point2 -> Float -> Laser
 lasRayAt col dam phasev pos dir =
     Laser
@@ -645,6 +670,7 @@ mcShootAuto itm mc w
 shootTeslaArc :: Item -> Creature -> Muzzle -> World -> World
 shootTeslaArc itm cr mz w =
     w' & cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix itRef . itParams .~ ip
+        & soundContinue (CrWeaponSound (_crID cr) 0) pos elecCrackleS (Just 2)
   where
     -- use items item location instead
     itRef = cr ^?! crManipulation . manObject . imRootSelectedItem -- unsafe!! TODO change

src/Dodge/Item/Held/BatteryGuns.hs

@@ -20,7 +20,7 @@ sparkGun =
 teslaGun :: Item
 teslaGun =
     defaultHeldItem
-        & itUse . heldParams .~ BeamShooterParams (Just (elecCrackleS, 2))
+        & itUse . heldParams .~ BeamShooterParams-- (Just (elecCrackleS, 2))
         & itParams .~ teslaParams
         & itUse . heldDelay .~ NoDelay
         & itUse . heldAim . aimWeight .~ 6
@@ -45,7 +45,8 @@ teslaParams =
 laser :: Item
 laser =
     defaultHeldItem
-        & itUse . heldParams .~ BeamShooterParams (Just (tone440sawtoothquietS, 2))
+--        & itUse . heldParams .~ BeamShooterParams (Just (tone440sawtoothquietS, 2))
+        & itUse . heldParams .~ BeamShooterParams-- Nothing
         & itAmmoSlots .~ singleAmmo ElectricalAmmo
         & itUse . heldDelay .~ NoDelay
         & itUse . heldTriggerType .~ AutoTrigger
@@ -68,7 +69,7 @@ laser =
 tractorGun :: Item
 tractorGun =
     defaultHeldItem
-        & itUse . heldParams .~ BeamShooterParams (Just (tone440sawtoothquietS, 2))
+        & itUse . heldParams .~ BeamShooterParams-- (Just (tone440sawtoothquietS, 2))
         & itAmmoSlots .~ singleAmmo ElectricalAmmo
         & itUse . heldTriggerType .~ AutoTrigger
         & itUse . heldAim . aimMuzzles . ix 0 . mzPos .~ V2 30 0

src/Dodge/Update/Camera.hs

@@ -143,11 +143,9 @@ rotateCamera cfig w
                 <$> (w ^. input . heldPos . at SDL.ButtonRight) =
         w & wCam . camRot -~ rotation
     | _gameplay_rotate_to_wall cfig
-      , isNothing $ pkeys ^? ix SDL.ButtonRight =
+      , isNothing $ w ^? input . mouseButtons . ix SDL.ButtonRight =
         rotateToOverlappingWall w
     | otherwise = w
-  where
-    pkeys = w ^. input . mouseButtons
 
 rotateToOverlappingWall :: World -> World
 rotateToOverlappingWall w =

tags

@@ -3387,7 +3387,7 @@ addToTrunk	src/TreeHelp.hs	156;"	f
 addWarningTerminal	src/Dodge/Room/Warning.hs	35;"	f
 addZ	src/Geometry/Vector3D.hs	89;"	f
 adjustIMZone	src/Dodge/Base.hs	81;"	f
-advanceScrollAmount	src/Dodge/Update.hs	412;"	f
+advanceScrollAmount	src/Dodge/Update.hs	410;"	f
 advanceSmoothScroll	src/Dodge/SmoothScroll.hs	33;"	f
 advanceStepCounter	src/Dodge/Creature/Impulse/Movement.hs	44;"	f
 aimDelaySweep	src/Dodge/Render/Picture.hs	265;"	f
@@ -3419,24 +3419,24 @@ 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	246;"	f
-applyCME	src/Dodge/HeldUse.hs	162;"	f
+applyCME	src/Dodge/HeldUse.hs	163;"	f
 applyCreatureDamage	src/Dodge/Creature/Damage.hs	14;"	f
 applyDamageEffect	src/Dodge/Creature/Damage.hs	31;"	f
 applyEventIO	src/Loop.hs	89;"	f
 applyGravityPU	src/Dodge/Projectile/Update.hs	56;"	f
 applyIndividualDamage	src/Dodge/Creature/Damage.hs	49;"	f
 applyIndividualDamage'	src/Dodge/Creature/Damage.hs	52;"	f
-applyInvLock	src/Dodge/HeldUse.hs	177;"	f
+applyInvLock	src/Dodge/HeldUse.hs	178;"	f
 applyMagnetsToBul	src/Dodge/Bullet.hs	28;"	f
 applyNoDamage	src/Dodge/Creature/Damage.hs	11;"	f
 applyPastDamages	src/Dodge/Creature/State.hs	142;"	f
 applyPiercingDamage	src/Dodge/Creature/Damage.hs	57;"	f
 applyPosition	src/Sound.hs	110;"	f
-applyRecoil	src/Dodge/HeldUse.hs	196;"	f
+applyRecoil	src/Dodge/HeldUse.hs	197;"	f
 applyResFactor	src/Dodge/Data/Config.hs	110;"	f
 applySetTerminalString	src/Dodge/Debug/Terminal.hs	81;"	f
-applySidePush	src/Dodge/HeldUse.hs	203;"	f
+applySidePush	src/Dodge/HeldUse.hs	204;"	f
-applySoundCME	src/Dodge/HeldUse.hs	187;"	f
+applySoundCME	src/Dodge/HeldUse.hs	188;"	f
 applyTerminalCommand	src/Dodge/Debug/Terminal.hs	28;"	f
 applyTerminalCommandArguments	src/Dodge/Debug/Terminal.hs	42;"	f
 applyTerminalString	src/Dodge/Debug/Terminal.hs	22;"	f
@@ -3444,7 +3444,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	214;"	f
+applyTorqueCME	src/Dodge/HeldUse.hs	215;"	f
 applyWorldConfig	src/Dodge/Config/Update.hs	38;"	f
 aquamarine	src/Color.hs	23;"	f
 arHUD	src/Dodge/Item/Scope.hs	135;"	f
@@ -3525,7 +3525,7 @@ basicDrawBeam	src/Dodge/Beam/Draw.hs	11;"	f
 basicItemDisplay	src/Dodge/Item/Display.hs	21;"	f
 basicMachineApplyDamage	src/Dodge/Machine/Damage.hs	6;"	f
 basicMachineUpdate	src/Dodge/Machine.hs	13;"	f
-basicMuzFlare	src/Dodge/HeldUse.hs	314;"	f
+basicMuzFlare	src/Dodge/HeldUse.hs	315;"	f
 basicTerminal	src/Dodge/Terminal.hs	35;"	f
 battery	src/Dodge/Item/Ammo.hs	87;"	f
 batteryPack	src/Dodge/Item/Equipment.hs	55;"	f
@@ -3627,7 +3627,7 @@ chaseCritVocalization	src/Dodge/Creature/ChaseCrit.hs	43;"	f
 checkCombineSelectionExists	src/Dodge/DisplayInventory.hs	100;"	f
 checkConnection	src/Dodge/Inventory/Swap.hs	64;"	f
 checkDeath	src/Dodge/Creature/State.hs	78;"	f
-checkEndGame	src/Dodge/Update.hs	709;"	f
+checkEndGame	src/Dodge/Update.hs	707;"	f
 checkErrorGL	src/Shader/Compile.hs	255;"	f
 checkFBO	src/Framebuffer/Check.hs	6;"	f
 checkGLError	src/GLHelp.hs	17;"	f
@@ -3656,7 +3656,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	760;"	f
+clClSpringVel	src/Dodge/Update.hs	758;"	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
@@ -3672,7 +3672,7 @@ click1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	434;"	f
 clickGetCreature	src/Dodge/Debug.hs	107;"	f
 clicker	src/Dodge/Item/Scope.hs	82;"	f
 clipV	src/Geometry/Vector.hs	47;"	f
-clipZoom	src/Dodge/Update/Camera.hs	180;"	f
+clipZoom	src/Dodge/Update/Camera.hs	175;"	f
 clockCycle	src/Dodge/Clock.hs	9;"	f
 closeButtonToSelectionItem	src/Dodge/Inventory/SelectionList.hs	217;"	f
 closeItemToSelectionItem	src/Dodge/Inventory/SelectionList.hs	202;"	f
@@ -3682,7 +3682,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	730;"	f
+cloudEffect	src/Dodge/Update.hs	728;"	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
@@ -3756,7 +3756,7 @@ crAwayFromPost	src/Dodge/Creature/Test.hs	79;"	f
 crBlips	src/Dodge/RadarSweep.hs	87;"	f
 crCamouflage	src/Dodge/Creature/Picture.hs	31;"	f
 crCanSeeCr	src/Dodge/Creature/Test.hs	48;"	f
-crCrSpring	src/Dodge/Update.hs	778;"	f
+crCrSpring	src/Dodge/Update.hs	776;"	f
 crCurrentEquipment	src/Dodge/Creature/Statistics.hs	26;"	f
 crDisplayAwareness	src/Dodge/Creature/Picture/Awareness.hs	37;"	f
 crDisplayVigilance	src/Dodge/Creature/Picture/Awareness.hs	51;"	f
@@ -3776,7 +3776,7 @@ crNumFreeSlots	src/Dodge/Inventory/CheckSlots.hs	22;"	f
 crOnWall	src/Dodge/WallCreatureCollisions.hs	85;"	f
 crSafeDistFromTarg	src/Dodge/Creature/Test.hs	69;"	f
 crSetRoots	src/Dodge/Inventory/Location.hs	48;"	f
-crSpring	src/Dodge/Update.hs	773;"	f
+crSpring	src/Dodge/Update.hs	771;"	f
 crStratConMatches	src/Dodge/Creature/Test.hs	74;"	f
 crUpdate	src/Dodge/Creature/State.hs	62;"	f
 crUpdateInvidLocations	src/Dodge/Inventory/Location.hs	61;"	f
@@ -3795,13 +3795,14 @@ createItemYou	src/Dodge/Inventory/Add.hs	95;"	f
 createLightMap	src/Render.hs	26;"	f
 createNewArc	src/Dodge/Tesla/Arc.hs	90;"	f
 createPathGrid	src/Dodge/Room/Path.hs	21;"	f
-createProjectile	src/Dodge/HeldUse.hs	708;"	f
+createProjectile	src/Dodge/HeldUse.hs	727;"	f
-createProjectileR	src/Dodge/HeldUse.hs	673;"	f
+createProjectileR	src/Dodge/HeldUse.hs	692;"	f
 createShell	src/Dodge/Projectile/Create.hs	22;"	f
 createShieldWall	src/Dodge/Euse.hs	107;"	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
+creatureShootLaser	src/Dodge/HeldUse.hs	430;"	f
 creatureTurnTo	src/Dodge/Creature/Impulse/Movement.hs	52;"	f
 creatureTurnToward	src/Dodge/Creature/Impulse/Movement.hs	73;"	f
 creatureTurnTowardDir	src/Dodge/Creature/Impulse/Movement.hs	62;"	f
@@ -3994,7 +3995,7 @@ detector	src/Dodge/Item/Held/Utility.hs	41;"	f
 detectorColor	src/Dodge/Item/Draw/SPic.hs	445;"	f
 detectorEffect	src/Dodge/Item/Weapon/Radar.hs	20;"	f
 detectorInfo	src/Dodge/Item/Info.hs	216;"	f
-determineProjectileTracking	src/Dodge/HeldUse.hs	656;"	f
+determineProjectileTracking	src/Dodge/HeldUse.hs	675;"	f
 diagonalLinesRect	src/Dodge/Room/Foreground.hs	52;"	f
 did	src/Dodge/Item/InvSize.hs	54;"	f
 diffAngles	src/Geometry.hs	204;"	f
@@ -4014,7 +4015,7 @@ displayFrameTicks	src/Dodge/Render/Picture.hs	46;"	f
 displayFreeSlots	src/Dodge/DisplayInventory.hs	198;"	f
 displayIndents	src/Dodge/DisplayInventory.hs	110;"	f
 displayPulse	src/Dodge/Inventory/SelectionList.hs	173;"	f
-displayTerminalLineString	src/Dodge/Update.hs	439;"	f
+displayTerminalLineString	src/Dodge/Update.hs	437;"	f
 dist	src/Geometry/Vector.hs	190;"	f
 dist3	src/Geometry/Vector3D.hs	101;"	f
 divTo	src/Geometry/Zone.hs	6;"	f
@@ -4059,9 +4060,9 @@ doDrag	src/Dodge/Update/Input/InGame.hs	107;"	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	596;"	f
+doGenFloat	src/Dodge/HeldUse.hs	615;"	f
 doGravityPU	src/Dodge/Projectile/Update.hs	50;"	f
-doHeldUseEffect	src/Dodge/HeldUse.hs	127;"	f
+doHeldUseEffect	src/Dodge/HeldUse.hs	128;"	f
 doInPlacements	src/Dodge/Layout.hs	92;"	f
 doIndividualPlacements	src/Dodge/Layout.hs	117;"	f
 doInputScreenInput	src/Dodge/Update/Input/ScreenLayer.hs	27;"	f
@@ -4106,14 +4107,14 @@ doThrust	src/Dodge/Projectile/Update.hs	149;"	f
 doTimeScroll	src/Dodge/Update.hs	200;"	f
 doTmTm	src/Dodge/TmTm.hs	6;"	f
 doTmWdWd	src/Dodge/WorldEffect.hs	99;"	f
-doWallRotate	src/Dodge/Update/Camera.hs	166;"	f
+doWallRotate	src/Dodge/Update/Camera.hs	161;"	f
 doWdBl	src/Dodge/WorldBool.hs	10;"	f
 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	28;"	f
-doWeaponRepetitions	src/Dodge/HeldUse.hs	151;"	f
+doWeaponRepetitions	src/Dodge/HeldUse.hs	152;"	f
-doWorldEvents	src/Dodge/Update.hs	422;"	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
@@ -4255,7 +4256,7 @@ drawZoneNearPointCursor	src/Dodge/Debug/Picture.hs	279;"	f
 droneLauncher	src/Dodge/Item/Weapon/Drone.hs	11;"	f
 dropByState	src/Dodge/Creature/State.hs	130;"	f
 dropExcept	src/Dodge/Creature/Action.hs	167;"	f
-dropInventoryPath	src/Dodge/HeldUse.hs	786;"	f
+dropInventoryPath	src/Dodge/HeldUse.hs	805;"	f
 dropItem	src/Dodge/Creature/Action.hs	173;"	f
 dropper	src/Dodge/Item/Scope.hs	76;"	f
 drumMag	src/Dodge/Item/Ammo.hs	42;"	f
@@ -4329,14 +4330,14 @@ fadeTLS	src/Dodge/LightSource/Update.hs	14;"	f
 fallSmallBounce	src/Dodge/Prop/Moving.hs	28;"	f
 fallSmallBounce'	src/Dodge/Prop/Moving.hs	33;"	f
 fallSmallBounceDamage	src/Dodge/Prop/Moving.hs	11;"	f
-farWallDistDirection	src/Dodge/Update/Camera.hs	191;"	f
+farWallDistDirection	src/Dodge/Update/Camera.hs	186;"	f
 fdiv	src/ShortShow.hs	26;"	f
 feet	src/Dodge/Creature/Picture.hs	53;"	f
 ffoldM	src/Framebuffer/Update.hs	79;"	f
 filter3	src/FoldableHelp.hs	76;"	f
 filterSectionsPair	src/Dodge/DisplayInventory.hs	167;"	f
 findBlips	src/Dodge/RadarSweep.hs	62;"	f
-findBoundDists	src/Dodge/Update/Camera.hs	198;"	f
+findBoundDists	src/Dodge/Update/Camera.hs	193;"	f
 findClosePoint	src/Dodge/LevelGen/StaticWalls.hs	155;"	f
 findClosePoint	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	74;"	f
 findIndex	src/IntMapHelp.hs	85;"	f
@@ -4359,7 +4360,7 @@ 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	379;"	f
-flareCircleAt	src/Dodge/HeldUse.hs	295;"	f
+flareCircleAt	src/Dodge/HeldUse.hs	296;"	f
 flatItemCombinations	src/Dodge/Combine/Combinations.hs	50;"	f
 flatLookupItems	src/Dodge/Combine.hs	38;"	f
 flatShield	src/Dodge/Item/Held/Utility.hs	20;"	f
@@ -4428,7 +4429,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	593;"	f
+gasCreate	src/Dodge/HeldUse.hs	612;"	f
 generateGenParams	src/Dodge/LevelGen/LevelStructure.hs	22;"	f
 generateGraphs	src/Dodge/LevelGen.hs	39;"	f
 generateLayout	src/Dodge/Layout/Generate.hs	10;"	f
@@ -4442,10 +4443,10 @@ geqConstr	src/SameConstr.hs	21;"	f
 getAmmoLinks	src/Dodge/Item/Grammar.hs	132;"	f
 getArguments	src/Dodge/Update/Scroll.hs	176;"	f
 getArguments'	src/Dodge/Update/Scroll.hs	164;"	f
-getAttachedSFLink	src/Dodge/HeldUse.hs	365;"	f
+getAttachedSFLink	src/Dodge/HeldUse.hs	366;"	f
 getAutoSpringLinks	src/Dodge/Item/Grammar.hs	112;"	f
 getAvailableListLines	src/Dodge/SelectionList.hs	10;"	f
-getBulletType	src/Dodge/HeldUse.hs	472;"	f
+getBulletType	src/Dodge/HeldUse.hs	491;"	f
 getCloseObj	src/Dodge/Update/Input/InGame.hs	514;"	f
 getCommands	src/Dodge/Terminal.hs	117;"	f
 getCommandsHelp	src/Dodge/Terminal.hs	75;"	f
@@ -4455,17 +4456,17 @@ getCrMoveSpeed	src/Dodge/Creature/Statistics.hs	14;"	f
 getDamageCoding	src/Dodge/Terminal.hs	177;"	f
 getDistortions	src/Dodge/Render.hs	383;"	f
 getEquipmentAllocation	src/Dodge/Inventory/RBList.hs	45;"	f
-getGrenadeHitEffect	src/Dodge/HeldUse.hs	701;"	f
+getGrenadeHitEffect	src/Dodge/HeldUse.hs	720;"	f
 getInventoryPath	src/Dodge/Inventory/Path.hs	8;"	f
 getItemValue	src/Dodge/Inventory/SelectionList.hs	141;"	f
-getLaserColor	src/Dodge/HeldUse.hs	311;"	f
+getLaserColor	src/Dodge/HeldUse.hs	312;"	f
-getLaserDamage	src/Dodge/HeldUse.hs	308;"	f
+getLaserDamage	src/Dodge/HeldUse.hs	309;"	f
-getLaserPhaseV	src/Dodge/HeldUse.hs	305;"	f
+getLaserPhaseV	src/Dodge/HeldUse.hs	306;"	f
 getLinksOfType	src/Dodge/RoomLink.hs	39;"	f
 getMaxLinesTM	src/Dodge/Terminal/Type.hs	11;"	f
-getMenuMouseContext	src/Dodge/Update.hs	382;"	f
+getMenuMouseContext	src/Dodge/Update.hs	380;"	f
 getNodePos	src/Dodge/Path.hs	31;"	f
-getPJStabiliser	src/Dodge/HeldUse.hs	693;"	f
+getPJStabiliser	src/Dodge/HeldUse.hs	712;"	f
 getPretty	src/AesonHelp.hs	8;"	f
 getPromptTM	src/Dodge/Terminal/Type.hs	8;"	f
 getRootItemBounds	src/Dodge/Render/HUD.hs	94;"	f
@@ -4552,7 +4553,7 @@ healthAnalyserByDoor	src/Dodge/Room/LasTurret.hs	74;"	f
 healthTest	src/Dodge/Room/LasTurret.hs	95;"	f
 heightWallPS	src/Dodge/Placement/Instance/Wall.hs	13;"	f
 heldEffect	src/Dodge/HeldUse.hs	60;"	f
-heldEffectMuzzles	src/Dodge/HeldUse.hs	117;"	f
+heldEffectMuzzles	src/Dodge/HeldUse.hs	118;"	f
 heldEffectNoHammerCheck	src/Dodge/HeldUse.hs	68;"	f
 heldInfo	src/Dodge/Item/Info.hs	84;"	f
 heldItemOffset	src/Dodge/Item/HeldOffset.hs	77;"	f
@@ -4675,7 +4676,7 @@ invertIntMap	src/Multiset.hs	67;"	f
 invertInventoryToMap	src/Dodge/Combine.hs	56;"	f
 invisibleChaseCrit	src/Dodge/Creature/ChaseCrit.hs	23;"	f
 invisibleWall	src/Dodge/Placement/Instance/Wall.hs	16;"	f
-isAmmoIntLink	src/Dodge/HeldUse.hs	321;"	f
+isAmmoIntLink	src/Dodge/HeldUse.hs	322;"	f
 isAnimate	src/Dodge/Creature/Test.hs	138;"	f
 isCognizant	src/Dodge/Creature/Perception.hs	105;"	f
 isConnected	src/Dodge/Inventory/Swap.hs	74;"	f
@@ -4690,7 +4691,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	393;"	f
+isOverTerminalScreen	src/Dodge/Update.hs	391;"	f
 isPutID	src/Dodge/Placement/Instance/Wall.hs	129;"	f
 isRHS	src/Geometry/LHS.hs	24;"	f
 isUnusedLnk	src/Dodge/PlacementSpot.hs	61;"	f
@@ -4708,7 +4709,7 @@ itemBaseName	src/Dodge/Item/Display.hs	57;"	f
 itemBlips	src/Dodge/RadarSweep.hs	93;"	f
 itemCombinations	src/Dodge/Combine/Combinations.hs	55;"	f
 itemCombinationsEdges	src/Dodge/Combine/Graph.hs	60;"	f
-itemDetectorEffect	src/Dodge/HeldUse.hs	371;"	f
+itemDetectorEffect	src/Dodge/HeldUse.hs	372;"	f
 itemDisplay	src/Dodge/Inventory/SelectionList.hs	47;"	f
 itemEquipPict	src/Dodge/Item/Draw.hs	16;"	f
 itemExternalValue	src/Dodge/Inventory/SelectionList.hs	82;"	f
@@ -4768,7 +4769,7 @@ lampCrSPic	src/Dodge/Render/ShapePicture.hs	56;"	f
 lasCenSensEdge	src/Dodge/Room/LasTurret.hs	114;"	f
 lasDronesPic	src/Dodge/Item/Weapon/Drone.hs	22;"	f
 lasGunPic	src/Dodge/Item/Draw/SPic.hs	405;"	f
-lasRayAt	src/Dodge/HeldUse.hs	449;"	f
+lasRayAt	src/Dodge/HeldUse.hs	468;"	f
 lasSensorTurretTest	src/Dodge/Room/LasTurret.hs	107;"	f
 lasTunnel	src/Dodge/Room/LasTurret.hs	126;"	f
 lasTunnelRunPast	src/Dodge/Room/LasTurret.hs	167;"	f
@@ -4827,7 +4828,7 @@ lnkMidPosInvSelsCol	src/Dodge/Render/HUD.hs	393;"	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	231;"	f
+loadMuzzle	src/Dodge/HeldUse.hs	232;"	f
 loadSaveSlot	src/Dodge/Save.hs	74;"	f
 loadSeed	src/Dodge/LoadSeed.hs	7;"	f
 loadSound	src/Dodge/SoundLogic/LoadSound.hs	11;"	f
@@ -4882,8 +4883,8 @@ makeAttach	src/Dodge/Item/Attach.hs	10;"	f
 makeBlip	src/Dodge/RadarSweep.hs	69;"	f
 makeBlockDebris	src/Dodge/Block/Debris.hs	28;"	f
 makeBoolOption	src/Dodge/Menu/OptionType.hs	8;"	f
-makeBullet	src/Dodge/HeldUse.hs	544;"	f
+makeBullet	src/Dodge/HeldUse.hs	563;"	f
-makeBullet'	src/Dodge/HeldUse.hs	530;"	f
+makeBullet'	src/Dodge/HeldUse.hs	549;"	f
 makeButton	src/Dodge/LevelGen/Switch.hs	16;"	f
 makeByteStringShaderUsingVAO	src/Shader/Compile.hs	128;"	f
 makeCloudAt	src/Dodge/WorldEvent/Cloud.hs	18;"	f
@@ -4909,7 +4910,7 @@ makeFragBullets	src/Dodge/Bullet.hs	122;"	f
 makeGasCloud	src/Dodge/WorldEvent/SpawnParticle.hs	80;"	f
 makeGrid	src/Grid.hs	46;"	f
 makeIntInterval	src/Dodge/Zoning/Base.hs	34;"	f
-makeMuzzleFlare	src/Dodge/HeldUse.hs	253;"	f
+makeMuzzleFlare	src/Dodge/HeldUse.hs	254;"	f
 makeParagraph	src/Justify.hs	6;"	f
 makePathBetween	src/Dodge/Path.hs	35;"	f
 makePathBetweenPs	src/Dodge/Path.hs	54;"	f
@@ -4965,11 +4966,11 @@ mcProximitySensorUpdate	src/Dodge/Machine/Update.hs	124;"	f
 mcSPic	src/Dodge/Render/ShapePicture.hs	120;"	f
 mcSensorTriggerUpdate	src/Dodge/Machine/Update.hs	87;"	f
 mcSensorUpdate	src/Dodge/Machine/Update.hs	119;"	f
-mcShootAuto	src/Dodge/HeldUse.hs	628;"	f
+mcShootAuto	src/Dodge/HeldUse.hs	647;"	f
-mcShootLaser	src/Dodge/HeldUse.hs	620;"	f
+mcShootLaser	src/Dodge/HeldUse.hs	639;"	f
 mcTriggerVal	src/Dodge/Machine/Update.hs	93;"	f
 mcTypeUpdate	src/Dodge/Machine/Update.hs	27;"	f
-mcUseHeld	src/Dodge/HeldUse.hs	563;"	f
+mcUseHeld	src/Dodge/HeldUse.hs	582;"	f
 mcUseItem	src/Dodge/Machine/Update.hs	79;"	f
 medkit	src/Dodge/Item/Consumable.hs	8;"	f
 megaBattery	src/Dodge/Item/Ammo.hs	76;"	f
@@ -5062,11 +5063,11 @@ 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	281;"	f
+muzFlareAt	src/Dodge/HeldUse.hs	282;"	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	721;"	f
+mvGust	src/Dodge/Update.hs	719;"	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
@@ -5330,7 +5331,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	688;"	f
+ppEvents	src/Dodge/Update.hs	686;"	f
 ppLevelReset	src/Dodge/PressPlate.hs	13;"	f
 preCritStart	src/Dodge/Room/Start.hs	82;"	f
 preloadRender	src/Preload/Render.hs	30;"	f
@@ -5434,7 +5435,7 @@ randPeakedParam	src/RandomHelp.hs	130;"	f
 randProb	src/RandomHelp.hs	68;"	f
 randSpark	src/Dodge/Spark.hs	74;"	f
 randWallReflect	src/Dodge/Tesla/Arc.hs	57;"	f
-randWallReflect	src/Dodge/Update.hs	580;"	f
+randWallReflect	src/Dodge/Update.hs	578;"	f
 randomChallenges	src/Dodge/Room/Start.hs	62;"	f
 randomCompass	src/Dodge/Layout.hs	59;"	f
 randomFourCornerRoom	src/Dodge/Room/Procedural.hs	266;"	f
@@ -5477,7 +5478,7 @@ rememberSounds	src/Dodge/Creature/Perception.hs	177;"	f
 remoteDetonator	src/Dodge/Item/Scope.hs	145;"	f
 remoteScreen	src/Dodge/Item/Scope.hs	140;"	f
 removeAimPosture	src/Dodge/Creature/YourControl.hs	142;"	f
-removeAmmoFromMag	src/Dodge/HeldUse.hs	459;"	f
+removeAmmoFromMag	src/Dodge/HeldUse.hs	478;"	f
 removeDot	src/ShortShow.hs	29;"	f
 removeInverseWalls	src/Dodge/LevelGen/StaticWalls.hs	25;"	f
 removeShieldWall	src/Dodge/Euse.hs	125;"	f
@@ -5567,7 +5568,7 @@ rotateSHq	src/Shape.hs	165;"	f
 rotateSHx	src/Shape.hs	264;"	f
 rotateSP	src/ShapePicture.hs	57;"	f
 rotateTo	src/Polyhedra/Geodesic.hs	64;"	f
-rotateToOverlappingWall	src/Dodge/Update/Camera.hs	155;"	f
+rotateToOverlappingWall	src/Dodge/Update/Camera.hs	150;"	f
 rotateToZ	src/Quaternion.hs	34;"	f
 rotateV	src/Geometry/Vector.hs	105;"	f
 rotateVAround	src/Geometry/Vector.hs	112;"	f
@@ -5682,7 +5683,7 @@ setLinkTypePD	src/Dodge/RoomLink.hs	67;"	f
 setMinInvSize	src/Dodge/Creature/Action.hs	145;"	f
 setMusicVolume	src/Sound.hs	161;"	f
 setMvPos	src/Dodge/Creature/ReaderUpdate.hs	51;"	f
-setOldPos	src/Dodge/Update.hs	462;"	f
+setOldPos	src/Dodge/Update.hs	460;"	f
 setOutLinks	src/Dodge/RoomLink.hs	48;"	f
 setOutLinksByType	src/Dodge/RoomLink.hs	57;"	f
 setOutLinksPD	src/Dodge/RoomLink.hs	77;"	f
@@ -5696,7 +5697,7 @@ setTargetMv	src/Dodge/Creature/ReaderUpdate.hs	74;"	f
 setTile	src/Dodge/Layout.hs	68;"	f
 setTiles	src/Dodge/Layout.hs	65;"	f
 setToggle	src/Dodge/Prop/Update.hs	46;"	f
-setViewDistance	src/Dodge/Update/Camera.hs	186;"	f
+setViewDistance	src/Dodge/Update/Camera.hs	181;"	f
 setViewPos	src/Dodge/Creature/ReaderUpdate.hs	61;"	f
 setViewport	src/Dodge/Render.hs	388;"	f
 setVol	src/Dodge/Config/Update.hs	30;"	f
@@ -5755,14 +5756,14 @@ shiftRoomShiftToLink	src/Dodge/Room/Link.hs	70;"	f
 shiftedGrid	src/Grid.hs	25;"	f
 shineTargetLaser	src/Dodge/Creature/State.hs	308;"	f
 shineTorch	src/Dodge/Creature/State.hs	350;"	f
-shootBullet	src/Dodge/HeldUse.hs	519;"	f
+shootBullet	src/Dodge/HeldUse.hs	538;"	f
 shootFirstMiss	src/Dodge/Creature/Volition.hs	33;"	f
-shootLaser	src/Dodge/HeldUse.hs	429;"	f
+shootLaser	src/Dodge/HeldUse.hs	454;"	f
 shootOutPassage	src/Dodge/Room/RezBox.hs	74;"	f
 shootShatter	src/Dodge/Item/Weapon/Shatter.hs	11;"	f
-shootTeslaArc	src/Dodge/HeldUse.hs	645;"	f
+shootTeslaArc	src/Dodge/HeldUse.hs	664;"	f
 shootTillEmpty	src/Dodge/Creature/Volition.hs	18;"	f
-shootTractorBeam	src/Dodge/HeldUse.hs	408;"	f
+shootTractorBeam	src/Dodge/HeldUse.hs	409;"	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
@@ -5788,7 +5789,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	769;"	f
+simpleCrSprings	src/Dodge/Update.hs	767;"	f
 simpleDamFL	src/Dodge/Flame.hs	40;"	f
 simpleTermMessage	src/Dodge/Terminal.hs	253;"	f
 sineRaisePitchOneSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	514;"	f
@@ -6026,7 +6027,7 @@ tinMag	src/Dodge/Item/Ammo.hs	27;"	f
 tinitusS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	422;"	f
 titleOptionsMenu	src/Dodge/Menu.hs	99;"	f
 titleOptionsNoWrite	src/Dodge/Menu.hs	102;"	f
-tmUpdate	src/Dodge/Update.hs	442;"	f
+tmUpdate	src/Dodge/Update.hs	440;"	f
 toBinary	src/Dodge/Inventory/SelectionList.hs	135;"	f
 toBothLnk	src/Dodge/RoomLink.hs	121;"	f
 toClosestMultiple	src/HelpNum.hs	3;"	f
@@ -6061,7 +6062,7 @@ torqueCr	src/Dodge/WorldEffect.hs	67;"	f
 torso	src/Dodge/Creature/Picture.hs	105;"	f
 tractCr	src/Dodge/TractorBeam/Update.hs	28;"	f
 tractFlIt	src/Dodge/TractorBeam/Update.hs	23;"	f
-tractorBeamAt	src/Dodge/HeldUse.hs	418;"	f
+tractorBeamAt	src/Dodge/HeldUse.hs	419;"	f
 tractorGun	src/Dodge/Item/Held/BatteryGuns.hs	68;"	f
 tractorGunPic	src/Dodge/Item/Draw/SPic.hs	429;"	f
 tractorPullPos	src/Dodge/TractorBeam/Update.hs	33;"	f
@@ -6175,40 +6176,40 @@ updateBackspaceRegex	src/Dodge/Update/Input/InGame.hs	453;"	f
 updateBarrel	src/Dodge/Barreloid.hs	45;"	f
 updateBarreloid	src/Dodge/Barreloid.hs	13;"	f
 updateBaseWheelEvent	src/Dodge/Update/Scroll.hs	28;"	f
-updateBounds	src/Dodge/Update/Camera.hs	208;"	f
+updateBounds	src/Dodge/Update/Camera.hs	203;"	f
 updateBulVel	src/Dodge/Bullet.hs	53;"	f
 updateBullet	src/Dodge/Bullet.hs	21;"	f
-updateBullets	src/Dodge/Update.hs	536;"	f
+updateBullets	src/Dodge/Update.hs	534;"	f
 updateCamera	src/Dodge/Update/Camera.hs	27;"	f
 updateCloseObjects	src/Dodge/Inventory.hs	111;"	f
-updateCloud	src/Dodge/Update.hs	735;"	f
+updateCloud	src/Dodge/Update.hs	733;"	f
-updateClouds	src/Dodge/Update.hs	610;"	f
+updateClouds	src/Dodge/Update.hs	608;"	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	508;"	f
+updateCreatureGroups	src/Dodge/Update.hs	506;"	f
-updateCreatureSoundPositions	src/Dodge/Update.hs	484;"	f
+updateCreatureSoundPositions	src/Dodge/Update.hs	482;"	f
 updateDebugMessageOffset	src/Dodge/Update.hs	94;"	f
-updateDelayedEvents	src/Dodge/Update.hs	798;"	f
+updateDelayedEvents	src/Dodge/Update.hs	796;"	f
 updateDisplaySections	src/Dodge/DisplayInventory.hs	116;"	f
 updateDistortion	src/Dodge/Distortion.hs	5;"	f
-updateDistortions	src/Dodge/Update.hs	529;"	f
+updateDistortions	src/Dodge/Update.hs	527;"	f
 updateEnergyBall	src/Dodge/EnergyBall.hs	45;"	f
-updateEnergyBalls	src/Dodge/Update.hs	598;"	f
+updateEnergyBalls	src/Dodge/Update.hs	596;"	f
 updateEnterRegex	src/Dodge/Update/Input/InGame.hs	480;"	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	70;"	f
-updateFlames	src/Dodge/Update.hs	595;"	f
+updateFlames	src/Dodge/Update.hs	593;"	f
 updateFloatingCamera	src/Dodge/Update/Camera.hs	32;"	f
 updateFunctionKey	src/Dodge/Update/Input/InGame.hs	364;"	f
 updateFunctionKeys	src/Dodge/Update/Input/InGame.hs	357;"	f
-updateGusts	src/Dodge/Update.hs	718;"	f
+updateGusts	src/Dodge/Update.hs	716;"	f
 updateHeldRootItem	src/Dodge/Creature/State.hs	259;"	f
 updateHumanoid	src/Dodge/Humanoid.hs	13;"	f
-updateIMl	src/Dodge/Update.hs	498;"	f
+updateIMl	src/Dodge/Update.hs	496;"	f
-updateIMl'	src/Dodge/Update.hs	503;"	f
+updateIMl'	src/Dodge/Update.hs	501;"	f
 updateInGameCamera	src/Dodge/Update/Camera.hs	76;"	f
 updateInitialPressInGame	src/Dodge/Update/Input/InGame.hs	400;"	f
 updateInventoryPositioning	src/Dodge/DisplayInventory.hs	86;"	f
@@ -6218,7 +6219,7 @@ 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	14;"	f
-updateLasers	src/Dodge/Update.hs	429;"	f
+updateLasers	src/Dodge/Update.hs	427;"	f
 updateLinearShockwave	src/Dodge/LinearShockwave/Update.hs	8;"	f
 updateLongPressInGame	src/Dodge/Update/Input/InGame.hs	413;"	f
 updateMachine	src/Dodge/Machine/Update.hs	19;"	f
@@ -6230,20 +6231,20 @@ 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
 updateMovement	src/Dodge/Creature/State.hs	429;"	f
-updateObjCatMaybes	src/Dodge/Update.hs	520;"	f
+updateObjCatMaybes	src/Dodge/Update.hs	518;"	f
-updateObjMapMaybe	src/Dodge/Update.hs	513;"	f
+updateObjMapMaybe	src/Dodge/Update.hs	511;"	f
-updatePastWorlds	src/Dodge/Update.hs	417;"	f
+updatePastWorlds	src/Dodge/Update.hs	415;"	f
 updatePosEvent	src/Dodge/PosEvent.hs	11;"	f
-updatePosEvents	src/Dodge/Update.hs	607;"	f
+updatePosEvents	src/Dodge/Update.hs	605;"	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
 updateRBList	src/Dodge/Inventory/RBList.hs	16;"	f
 updateRadarBlip	src/Dodge/RadarBlip.hs	11;"	f
-updateRadarBlips	src/Dodge/Update.hs	532;"	f
+updateRadarBlips	src/Dodge/Update.hs	530;"	f
 updateRadarSweep	src/Dodge/RadarSweep.hs	39;"	f
-updateRadarSweeps	src/Dodge/Update.hs	601;"	f
+updateRadarSweeps	src/Dodge/Update.hs	599;"	f
 updateRandNode	src/TreeHelp.hs	108;"	f
 updateRenderSplit	appDodge/Main.hs	108;"	f
 updateRootItemID	src/Dodge/Inventory/Location.hs	35;"	f
@@ -6252,18 +6253,18 @@ 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	12;"	f
-updateShockwaves	src/Dodge/Update.hs	592;"	f
+updateShockwaves	src/Dodge/Update.hs	590;"	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	604;"	f
+updateSparks	src/Dodge/Update.hs	602;"	f
 updateTempLightSource	src/Dodge/LightSource/Update.hs	7;"	f
 updateTeslaArc	src/Dodge/Tesla/Arc.hs	23;"	f
-updateTeslaArc	src/Dodge/Update.hs	546;"	f
+updateTeslaArc	src/Dodge/Update.hs	544;"	f
-updateTeslaArcs	src/Dodge/Update.hs	543;"	f
+updateTeslaArcs	src/Dodge/Update.hs	541;"	f
 updateTractorBeam	src/Dodge/TractorBeam/Update.hs	9;"	f
-updateTractorBeams	src/Dodge/Update.hs	589;"	f
+updateTractorBeams	src/Dodge/Update.hs	587;"	f
 updateTurret	src/Dodge/Machine/Update.hs	49;"	f
 updateUniverse	src/Dodge/Update.hs	72;"	f
 updateUniverseFirst	src/Dodge/Update.hs	84;"	f
@@ -6274,7 +6275,7 @@ updateUseInputOnScreen	src/Dodge/Update/Input/ScreenLayer.hs	22;"	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	407;"	f
+updateWheelEvents	src/Dodge/Update.hs	405;"	f
 updateWorldEventFlag	src/Dodge/Update.hs	119;"	f
 updateWorldEventFlags	src/Dodge/Update.hs	107;"	f
 upperBody	src/Dodge/Creature/Picture.hs	135;"	f
@@ -6301,26 +6302,26 @@ useBulletPayload	src/Dodge/Bullet.hs	111;"	f
 useC	src/Dodge/Cuse.hs	8;"	f
 useC'	src/Dodge/Cuse.hs	13;"	f
 useE	src/Dodge/Euse.hs	34;"	f
-useGasParams	src/Dodge/HeldUse.hs	568;"	f
+useGasParams	src/Dodge/HeldUse.hs	587;"	f
 useHotkey	src/Dodge/Creature/YourControl.hs	65;"	f
-useInventoryPath	src/Dodge/HeldUse.hs	811;"	f
+useInventoryPath	src/Dodge/HeldUse.hs	830;"	f
 useItem	src/Dodge/Creature/Impulse/UseItem.hs	20;"	f
 useItemLoc	src/Dodge/Creature/Impulse/UseItem.hs	27;"	f
 useLnkRoomPos	src/Dodge/PlacementSpot.hs	244;"	f
-useLoadedAmmo	src/Dodge/HeldUse.hs	325;"	f
+useLoadedAmmo	src/Dodge/HeldUse.hs	326;"	f
 useLocation	src/Dodge/Creature/Impulse/UseItem.hs	66;"	f
 useMagShield	src/Dodge/Euse.hs	46;"	f
 useNormalCamera	src/Dodge/Camera.hs	6;"	f
 usePayload	src/Dodge/Payload.hs	18;"	f
-useRewindGun	src/Dodge/HeldUse.hs	777;"	f
+useRewindGun	src/Dodge/HeldUse.hs	796;"	f
 useRewindGun	src/Dodge/Luse.hs	40;"	f
 useRoomPosCond	src/Dodge/PlacementSpot.hs	178;"	f
 useRoomPosRoomCond	src/Dodge/PlacementSpot.hs	181;"	f
-useStopWatch	src/Dodge/HeldUse.hs	758;"	f
+useStopWatch	src/Dodge/HeldUse.hs	777;"	f
 useStopWatch	src/Dodge/Luse.hs	21;"	f
-useTimeCheck	src/Dodge/HeldUse.hs	93;"	f
+useTimeCheck	src/Dodge/HeldUse.hs	94;"	f
 useTimeCheck	src/Dodge/Item/Weapon/TriggerType.hs	127;"	f
-useTimeScrollGun	src/Dodge/HeldUse.hs	766;"	f
+useTimeScrollGun	src/Dodge/HeldUse.hs	785;"	f
 useTimeScrollGun	src/Dodge/Luse.hs	29;"	f
 useUnusedLnk	src/Dodge/PlacementSpot.hs	169;"	f
 usedRoomInLinkPoss	src/Dodge/PlacementSpot.hs	196;"	f
@@ -6355,7 +6356,7 @@ vocalizationTest	src/Dodge/Creature/Vocalization.hs	8;"	f
 volleyGun	src/Dodge/Item/Held/Cane.hs	31;"	f
 volleyGunShape	src/Dodge/Item/Draw/SPic.hs	340;"	f
 waistSP	src/Dodge/Creature/HandPos.hs	173;"	f
-walkNozzle	src/Dodge/HeldUse.hs	386;"	f
+walkNozzle	src/Dodge/HeldUse.hs	387;"	f
 walkableNodeNear	src/Dodge/Path.hs	48;"	f
 wallBlips	src/Dodge/RadarSweep.hs	98;"	f
 wallBuffer	src/Dodge/WallCreatureCollisions.hs	51;"	f
@@ -6447,9 +6448,9 @@ 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	436;"	f
+zoneClouds	src/Dodge/Update.hs	434;"	f
 zoneCreature	src/Dodge/Zoning/Creature.hs	53;"	f
-zoneCreatures	src/Dodge/Update.hs	479;"	f
+zoneCreatures	src/Dodge/Update.hs	477;"	f
 zoneExtract	src/Dodge/Zoning/Base.hs	51;"	f
 zoneMonoid	src/Dodge/Zoning/Base.hs	81;"	f
 zoneOfCirc	src/Dodge/Zoning/Base.hs	23;"	f
@@ -6468,7 +6469,7 @@ zoneWall	src/Dodge/Zoning/Wall.hs	65;"	f
 zonesAroundPoint	src/Dodge/Zoning/Base.hs	90;"	f
 zonesExtract	src/Dodge/Zoning/Base.hs	55;"	f
 zoomFloatingCamera	src/Dodge/Update/Camera.hs	68;"	f
-zoomFromItem	src/Dodge/Update/Camera.hs	176;"	f
+zoomFromItem	src/Dodge/Update/Camera.hs	171;"	f
 zoomInLongGun	src/Dodge/Update/Scroll.hs	96;"	f
 zoomOutLongGun	src/Dodge/Update/Scroll.hs	104;"	f
 zoomScope	src/Dodge/Item/Scope.hs	33;"	f