Start to add respawn points, re-fix semi-auto triggers

src/Dodge/BaseTriggerType.hs

@@ -15,13 +15,13 @@ import Dodge.Data.TriggerType
 
 itemTriggerType :: LocationDT OItem -> TriggerType
 itemTriggerType loc 
-    | isPulseLaser loc = SemiAutoTrigger 9
+    | isPulseLaser loc = AutoTrigger 9
     | otherwise = baseItemTriggerType $ loc ^. locDT . dtValue . _1
 
 baseItemTriggerType :: Item -> TriggerType
 baseItemTriggerType itm = case itm ^. itType of
     HELD hit -> heldTriggerType hit
-    ATTACH CAPACITOR -> SemiAutoTrigger 10
+    ATTACH CAPACITOR -> AutoTrigger 10
     _ -> NoTrigger
 
 heldTriggerType :: HeldItemType -> TriggerType

src/Dodge/Data/LWorld.hs

@@ -151,6 +151,7 @@ data LWorld = LWorld
     , _imHotkeys :: NewIntMap ItmInt Hotkey
     , _lAimPos :: Point2
     , _lInvLock :: Bool
+    , _respawnPos :: Point2
     }
 
 --data WorldBeams = WorldBeams

src/Dodge/Data/World.hs

@@ -56,8 +56,8 @@ data World = World
     }
 
 data TimeFlowStatus
-    = DeathTime
+    = RespawnDelay
-        {_deathDelay :: Int}
+        {_respawnDelay :: Int}
     | NormalTimeFlow
     | ItemScrollTimeFlow
         { _scrollSmoothing :: Int

src/Dodge/Default/World.hs

@@ -156,6 +156,7 @@ defaultLWorld =
         , _imHotkeys = mempty
         , _lAimPos = 0
         , _lInvLock = False
+        , _respawnPos = 0
         }
 
 defaultHUD :: HUD

src/Dodge/HeldUse.hs

@@ -105,8 +105,7 @@ hammerCheck f pt loc cr w = case itemTriggerType loc of
     HammerTrigger t | timetest t , pt == 0 -> f loc cr w
     SemiAutoTrigger t
         | timetest t
-          , isJust (find ((== MakeAutoSF) . (^. dtValue . _2)) (loc ^. locDT . dtRight))
+          , pt < w ^. cWorld . lWorld . lClock - timelastused ->
-                || pt == 0 ->
             f loc cr w
     AutoTrigger t | timetest t -> f loc cr w
     NoTrigger -> f loc cr w

src/Dodge/Initialisation.hs

@@ -1,12 +1,11 @@
-module Dodge.Initialisation where
+module Dodge.Initialisation (initialWorld, splashScreen) where
 
 import Control.Lens
 import Dodge.Creature
 import Dodge.Data.World
 import Dodge.Default.World
-import Dodge.SoundLogic
-import Geometry.Data
 import qualified IntMapHelp as IM
+import Dodge.SpawnAt
 
 splashScreen :: World
 splashScreen = 
@@ -15,8 +14,9 @@ splashScreen =
 
 initialWorld :: World
 initialWorld =
-    defaultWorld
+    defaultWorld & spawnAt 0
-        & wCam . camZoom .~ 10
+--        & wCam . camZoom .~ 10
-        & cWorld . lWorld . creatures .~ IM.fromList [(0, startCr)]
+--        & cWorld . lWorld . creatures .~ IM.fromList [(0, startCr)]
-        & cWorld . lWorld . worldEvents .~ SoundStart BackgroundSound (V2 0 0) foamSprayFadeOutS Nothing :
+--        & cWorld . lWorld . worldEvents .~ SoundStart BackgroundSound (V2 0 0) foamSprayFadeOutS Nothing :
-        [MakeStartCloudAt (V3 x y 5) | x <- [-5, -4 .. 5], y <- [-5, -4 .. 5]]
+--        [MakeStartCloudAt (V3 x y 5) | x <- [-5, -4 .. 5], y <- [-5, -4 .. 5]]
+

src/Dodge/TestString.hs

@@ -28,10 +28,8 @@ import qualified IntMapHelp as IM
 import qualified Data.Map.Strict as M
 
 testStringInit :: Universe -> [String]
-testStringInit u =
+testStringInit u = [show $ u ^? uvWorld . cWorld . lWorld . creatures . ix 0 . crHP
-    map show (take 20 $ u ^.. uvWorld . cWorld . lWorld . energyBalls . each . ebPos . _z)
+    , show $ u ^? uvWorld . timeFlow . respawnDelay]
-    <> 
-    map show (take 20 $ u ^.. uvWorld . cWorld . lWorld . shockwaves . each . swPos . _z)
 -- map shortShow (u ^.. uvWorld . cWorld . lWorld . debris . each . to g)
 --  where
 --    g db = (pz,z,norm v)
@@ -89,7 +87,7 @@ showManObj (SelCloseButton x) = "CloseButton " ++ show x
 
 showTimeFlow :: TimeFlowStatus -> String
 showTimeFlow tfs = case tfs of
-    DeathTime i -> "DeathTime"++show i
+    RespawnDelay i -> "Respawndelay"++show i
     NormalTimeFlow -> "NormalTimeFlow"
     ItemScrollTimeFlow {_reverseAmount = ra } -> "ItemScrollTimeFlow" ++ show ra
     CameraScrollTimeFlow {_reverseAmount = ra } -> "CameraScrollTimeFlow" ++ show ra

src/Dodge/Update.hs

@@ -7,6 +7,7 @@ Description : Simulation update
 -}
 module Dodge.Update (updateUniverse) where
 
+import Dodge.SpawnAt
 import Dodge.Prop.Moving
 import Dodge.WorldEvent.Explosion
 import Dodge.Data.Object
@@ -39,7 +40,7 @@ import Dodge.Laser.Update
 import Dodge.LinearShockwave.Update
 import Dodge.ListDisplayParams
 import Dodge.Machine.Update
-import Dodge.Menu
+--import Dodge.Menu
 import Dodge.ModificationEffect
 import Dodge.PressPlate
 import Dodge.Projectile.Update
@@ -185,7 +186,7 @@ timeFlowUpdate u = case u ^. uvWorld . timeFlow of
     CameraScrollTimeFlow{} -> u
     RewindLeftClick 0 _ -> u & uvWorld . timeFlow .~ NormalTimeFlow
     RewindLeftClick _ _ -> over uvWorld scrollTimeBack u -- & uvWorld . cWorld . timeFlow .~ NormalTimeFlow
-    DeathTime{} -> u
+    RespawnDelay{} -> functionalUpdate u
     PausedTimeFlow _ itmloc -> over uvWorld (pauseTime itmloc) u
 
 pauseTime :: NewInt ItmInt -> World -> World
@@ -798,10 +799,12 @@ ppEvents w = IM.foldl' (flip $ \pp -> doPressPlateEvent (_ppEvent pp) pp) w $ w
 --markSeen wl = wl{_wlSeen = True}
 
 checkEndGame :: Universe -> Universe
-checkEndGame uv = case w ^? timeFlow . deathDelay of
+checkEndGame uv = case w ^? timeFlow . respawnDelay of
-    Just x | x < 0 -> uv & uvScreenLayers .~ [gameOverMenu uv]
+    Just x | x < 0 -> uv -- & uvScreenLayers .~ [gameOverMenu uv]
-    Just _ -> uv & uvWorld . timeFlow . deathDelay -~ 1
+        & uvWorld . timeFlow .~ NormalTimeFlow
-    _ | _crHP (you w) < 1 -> uv & uvWorld . timeFlow .~ DeathTime 50
+        & uvWorld %~ spawnAt (w ^. cWorld . lWorld . respawnPos)
+    Just _ -> uv & uvWorld . timeFlow . respawnDelay -~ 1
+    _ | _crHP (you w) < 1 -> uv & uvWorld . timeFlow .~ RespawnDelay 50
     _ -> uv
   where
     w = _uvWorld uv

tags

@@ -16,7 +16,7 @@
 <$>	src/Dodge/Data/CWorld.hs	47;"	o
 <$>	src/Dodge/Data/Camera.hs	39;"	o
 <$>	src/Dodge/Data/Creature.hs	80;"	o
-<$>	src/Dodge/Data/LWorld.hs	183;"	o
+<$>	src/Dodge/Data/LWorld.hs	184;"	o
 <$>	src/Dodge/Data/Terminal.hs	127;"	o
 ABSOLUTE	src/Dodge/Data/Item/Combine.hs	40;"	C
 AIUNIT	src/Dodge/Data/Item/Combine.hs	75;"	C
@@ -65,7 +65,7 @@ ArbitraryAction	src/Dodge/Data/ActionPlan.hs	166;"	C
 ArbitraryImpulse	src/Dodge/Data/ActionPlan.hs	47;"	C
 ArbitraryImpulseEffect	src/Dodge/Data/ActionPlan.hs	48;"	C
 ArbitraryImpulseFunction	src/Dodge/Data/ActionPlan.hs	46;"	C
-ArcNodeType	src/Dodge/Data/LWorld.hs	163;"	t
+ArcNodeType	src/Dodge/Data/LWorld.hs	164;"	t
 ArcShad	src/Picture/Data.hs	38;"	C
 ArcStep	src/Dodge/Data/ArcStep.hs	14;"	t
 Arcing	src/Dodge/Data/Item/Params.hs	17;"	C
@@ -258,7 +258,7 @@ Corpse	src/Dodge/Data/Corpse.hs	17;"	t
 CorpseResurrection	src/Dodge/Data/Corpse.hs	14;"	t
 Cosmic	src/Dodge/Data/Scenario.hs	74;"	C
 CrAc	src/Dodge/Data/CreatureEffect.hs	48;"	t
-CrArcNode	src/Dodge/Data/LWorld.hs	168;"	C
+CrArcNode	src/Dodge/Data/LWorld.hs	169;"	C
 CrBl	src/Dodge/Data/CreatureEffect.hs	39;"	t
 CrCanShoot	src/Dodge/Data/CreatureEffect.hs	40;"	C
 CrChasm	src/Dodge/Data/SoundOrigin.hs	19;"	C
@@ -321,7 +321,6 @@ DamageHitSound	src/Dodge/Data/SoundOrigin.hs	41;"	C
 DamageLaser	src/Dodge/Data/Laser.hs	17;"	C
 DamageSensor	src/Dodge/Data/Machine/Sensor.hs	20;"	C
 DamageType	src/Dodge/Data/Damage/Type.hs	3;"	t
-DeathTime	src/Dodge/Data/World.hs	59;"	C
 Debris	src/Dodge/Data/Prop.hs	48;"	t
 DebrisChunk	src/Dodge/Data/Prop.hs	48;"	C
 DebrisType	src/Dodge/Data/Prop.hs	42;"	t
@@ -1149,6 +1148,7 @@ RequireImpossible	src/Dodge/Data/Machine/Sensor.hs	39;"	C
 ResFactor	src/Dodge/Data/Config.hs	97;"	t
 ResearchFacility	src/Dodge/Data/Scenario.hs	62;"	C
 ResourceFailure	src/Dodge/Data/Scenario.hs	29;"	C
+RespawnDelay	src/Dodge/Data/World.hs	59;"	C
 RetailFacility	src/Dodge/Data/Scenario.hs	67;"	C
 RetiredProjectile	src/Dodge/Data/Projectile.hs	38;"	C
 Revenge	src/Dodge/Data/Scenario.hs	6;"	C
@@ -1489,7 +1489,7 @@ WRIST_ECG	src/Dodge/Data/Item/Combine.hs	137;"	C
 WaitThen	src/Dodge/Data/ActionPlan.hs	103;"	C
 Walking	src/Dodge/Data/Creature/Stance.hs	21;"	C
 Wall	src/Dodge/Data/Wall.hs	20;"	t
-WallArcNode	src/Dodge/Data/LWorld.hs	164;"	C
+WallArcNode	src/Dodge/Data/LWorld.hs	165;"	C
 WallDraw	src/Dodge/Data/Wall.hs	47;"	t
 WallObstacle	src/Dodge/Data/PathGraph.hs	52;"	C
 WallP	src/Dodge/LevelGen/StaticWalls.hs	23;"	t
@@ -1652,7 +1652,7 @@ _camRot	src/Dodge/Data/Camera.hs	25;"	f
 _camViewDistance	src/Dodge/Data/Camera.hs	30;"	f
 _camViewFrom	src/Dodge/Data/Camera.hs	29;"	f
 _camZoom	src/Dodge/Data/Camera.hs	26;"	f
-_canID	src/Dodge/Data/LWorld.hs	169;"	f
+_canID	src/Dodge/Data/LWorld.hs	170;"	f
 _carriage	src/Dodge/Data/Creature/Stance.hs	14;"	f
 _carteCenter	src/Dodge/Data/HUD.hs	46;"	f
 _carteRot	src/Dodge/Data/HUD.hs	48;"	f
@@ -1774,7 +1774,6 @@ _dbRot	src/Dodge/Data/Prop.hs	52;"	f
 _dbSpin	src/Dodge/Data/Prop.hs	53;"	f
 _dbType	src/Dodge/Data/Prop.hs	50;"	f
 _dbVel	src/Dodge/Data/Prop.hs	51;"	f
-_deathDelay	src/Dodge/Data/World.hs	60;"	f
 _debris	src/Dodge/Data/LWorld.hs	107;"	f
 _debugInfo	src/Dodge/Data/Universe.hs	54;"	f
 _debugInt	src/Dodge/Data/Universe.hs	62;"	f
@@ -2258,9 +2257,11 @@ _rbRad	src/Dodge/Data/RadarBlip.hs	18;"	f
 _rbTime	src/Dodge/Data/RadarBlip.hs	16;"	f
 _rboBaseBloom	src/Data/Preload/Render.hs	38;"	f
 _renderData	src/Data/Preload.hs	11;"	f
+_respawnDelay	src/Dodge/Data/World.hs	60;"	f
 _reverseAmount	src/Dodge/Data/World.hs	64;"	f
 _reverseAmount	src/Dodge/Data/World.hs	70;"	f
 _reverseAmount	src/Dodge/Data/World.hs	74;"	f
+_rezPos	src/Dodge/Data/LWorld.hs	154;"	f
 _rkHoming	src/Dodge/Data/Projectile.hs	35;"	f
 _rkSmoke	src/Dodge/Data/Projectile.hs	36;"	f
 _rlDir	src/Dodge/Data/Room.hs	26;"	f
@@ -2564,8 +2565,8 @@ _wallDamages	src/Dodge/Data/LWorld.hs	125;"	f
 _wallShader	src/Data/Preload/Render.hs	48;"	f
 _wallVBO	src/Data/Preload/Render.hs	47;"	f
 _walls	src/Dodge/Data/LWorld.hs	124;"	f
-_wanID	src/Dodge/Data/LWorld.hs	166;"	f
+_wanID	src/Dodge/Data/LWorld.hs	167;"	f
-_wanPos	src/Dodge/Data/LWorld.hs	165;"	f
+_wanPos	src/Dodge/Data/LWorld.hs	166;"	f
 _warmMax	src/Dodge/Data/TriggerType.hs	19;"	f
 _warmStart	src/Dodge/Data/TriggerType.hs	15;"	f
 _windowPosX	src/Dodge/Data/Config.hs	53;"	f
@@ -2679,16 +2680,16 @@ applyCreatureDamage	src/Dodge/Creature/Damage.hs	13;"	f
 applyEventIO	src/Loop.hs	89;"	f
 applyGravityPU	src/Dodge/Projectile/Update.hs	43;"	f
 applyIndividualDamage	src/Dodge/Creature/Damage.hs	16;"	f
-applyInvLock	src/Dodge/HeldUse.hs	434;"	f
+applyInvLock	src/Dodge/HeldUse.hs	427;"	f
 applyMagnetsToBul	src/Dodge/Bullet.hs	30;"	f
 applyPastDamages	src/Dodge/Creature/State.hs	47;"	f
 applyPiercingDamage	src/Dodge/Creature/Damage.hs	22;"	f
 applyPosition	src/Sound.hs	111;"	f
-applyRecoil	src/Dodge/HeldUse.hs	465;"	f
+applyRecoil	src/Dodge/HeldUse.hs	458;"	f
 applyResFactor	src/Dodge/Data/Config.hs	110;"	f
 applySetTerminalString	src/Dodge/Debug/Terminal.hs	81;"	f
-applySidePush	src/Dodge/HeldUse.hs	565;"	f
+applySidePush	src/Dodge/HeldUse.hs	558;"	f
-applySoundCME	src/Dodge/HeldUse.hs	455;"	f
+applySoundCME	src/Dodge/HeldUse.hs	448;"	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
@@ -2696,7 +2697,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	576;"	f
+applyTorqueCME	src/Dodge/HeldUse.hs	569;"	f
 applyWorldConfig	src/Dodge/Config/Update.hs	38;"	f
 aquamarine	src/Color.hs	23;"	f
 arHUD	src/Dodge/Item/Scope.hs	134;"	f
@@ -2776,7 +2777,7 @@ basicDrawBeam	src/Dodge/Beam/Draw.hs	11;"	f
 basicItemDisplay	src/Dodge/Item/Display.hs	23;"	f
 basicMachineApplyDamage	src/Dodge/Machine/Damage.hs	6;"	f
 basicMachineUpdate	src/Dodge/Machine.hs	13;"	f
-basicMuzFlare	src/Dodge/HeldUse.hs	716;"	f
+basicMuzFlare	src/Dodge/HeldUse.hs	710;"	f
 basicTerminal	src/Dodge/Terminal.hs	35;"	f
 battery	src/Dodge/Item/Ammo.hs	63;"	f
 batteryPack	src/Dodge/Item/Equipment.hs	46;"	f
@@ -2785,7 +2786,7 @@ beltMag	src/Dodge/Item/Ammo.hs	39;"	f
 bfsNodePoints	src/Dodge/Path.hs	58;"	f
 bfsThenReturn	src/Dodge/Creature/ReaderUpdate.hs	218;"	f
 bgateCalc	src/Dodge/Inventory/SelectionList.hs	115;"	f
-bgunSound	src/Dodge/HeldUse.hs	520;"	f
+bgunSound	src/Dodge/HeldUse.hs	513;"	f
 bindFBO	src/Render.hs	245;"	f
 bingate	src/Dodge/Item/Scope.hs	109;"	f
 black	src/Color.hs	27;"	f
@@ -2923,7 +2924,7 @@ circleDecoration	src/Dodge/Placement/TopDecoration.hs	56;"	f
 circleSolid	src/Picture/Base.hs	164;"	f
 circleSolidCol	src/Picture/Base.hs	168;"	f
 clAlt	src/Dodge/Cloud.hs	5;"	f
-clClSpringVel	src/Dodge/Update.hs	869;"	f
+clClSpringVel	src/Dodge/Update.hs	871;"	f
 clColor	src/Shader/Poke/Cloud.hs	35;"	f
 clZoneSize	src/Dodge/Zoning/Cloud.hs	21;"	f
 clampPath	src/Dodge/Room/Procedural.hs	166;"	f
@@ -2952,7 +2953,7 @@ closestCreatureID	src/Dodge/Debug.hs	116;"	f
 closestPointOnLine	src/Geometry/Intersect.hs	281;"	f
 closestPointOnLineParam	src/Geometry/Intersect.hs	297;"	f
 closestPointOnSeg	src/Geometry/Intersect.hs	312;"	f
-cloudEffect	src/Dodge/Update.hs	821;"	f
+cloudEffect	src/Dodge/Update.hs	823;"	f
 cloudPoisonDamage	src/Dodge/Update/Cloud.hs	10;"	f
 clsNearCirc	src/Dodge/Zoning/Cloud.hs	18;"	f
 clsNearPoint	src/Dodge/Zoning/Cloud.hs	9;"	f
@@ -3035,7 +3036,7 @@ crAwayFromPost	src/Dodge/Creature/Test.hs	82;"	f
 crBlips	src/Dodge/RadarSweep.hs	87;"	f
 crCamouflage	src/Dodge/Creature/Picture.hs	31;"	f
 crCanSeeCr	src/Dodge/Creature/Test.hs	51;"	f
-crCrSpring	src/Dodge/Update.hs	898;"	f
+crCrSpring	src/Dodge/Update.hs	900;"	f
 crCurrentEquipment	src/Dodge/Creature/Statistics.hs	57;"	f
 crDexterity	src/Dodge/Creature/Statistics.hs	14;"	f
 crDisplayAwareness	src/Dodge/Creature/Picture/Awareness.hs	38;"	f
@@ -3063,7 +3064,7 @@ crRad	src/Dodge/Creature/Radius.hs	7;"	f
 crSafeDistFromTarg	src/Dodge/Creature/Test.hs	72;"	f
 crSetRoots	src/Dodge/Inventory/Location.hs	48;"	f
 crShape	src/Dodge/Creature/Shape.hs	8;"	f
-crSpring	src/Dodge/Update.hs	893;"	f
+crSpring	src/Dodge/Update.hs	895;"	f
 crStratConMatches	src/Dodge/Creature/Test.hs	77;"	f
 crStrength	src/Dodge/Creature/Statistics.hs	24;"	f
 crUpdate'	src/Dodge/Creature/Update.hs	56;"	f
@@ -3083,16 +3084,16 @@ createHeadLamp	src/Dodge/Euse.hs	55;"	f
 createItemYou	src/Dodge/Inventory/Add.hs	95;"	f
 createLightMap	src/Render.hs	26;"	f
 createPathGrid	src/Dodge/Room/Path.hs	21;"	f
-createProjectile	src/Dodge/HeldUse.hs	1333;"	f
+createProjectile	src/Dodge/HeldUse.hs	1323;"	f
-createProjectileR	src/Dodge/HeldUse.hs	1282;"	f
+createProjectileR	src/Dodge/HeldUse.hs	1272;"	f
 createShell	src/Dodge/Projectile/Create.hs	21;"	f
 createShieldWall	src/Dodge/Item/BackgroundEffect.hs	39;"	f
 createUnusedLinkPos	src/Dodge/Tree/Shift.hs	117;"	f
 createWall	src/Dodge/Wall/Create.hs	8;"	f
 creatureDisplayText	src/Dodge/Creature/Picture/Awareness.hs	11;"	f
-creatureShootLaser	src/Dodge/HeldUse.hs	837;"	f
+creatureShootLaser	src/Dodge/HeldUse.hs	825;"	f
-creatureShootPulseBall	src/Dodge/HeldUse.hs	914;"	f
+creatureShootPulseBall	src/Dodge/HeldUse.hs	902;"	f
-creatureShootPulseLaser	src/Dodge/HeldUse.hs	881;"	f
+creatureShootPulseLaser	src/Dodge/HeldUse.hs	869;"	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
@@ -3211,14 +3212,14 @@ defaultCreatureMemory	src/Dodge/Default/Creature.hs	65;"	f
 defaultCrystalWall	src/Dodge/Default/Wall.hs	47;"	f
 defaultDirtBlock	src/Dodge/Default/Block.hs	19;"	f
 defaultDirtWall	src/Dodge/Default/Wall.hs	68;"	f
-defaultDisplayInventory	src/Dodge/Default/World.hs	172;"	f
+defaultDisplayInventory	src/Dodge/Default/World.hs	173;"	f
 defaultDoor	src/Dodge/Default/Door.hs	29;"	f
 defaultDoorWall	src/Dodge/Default/Wall.hs	39;"	f
 defaultDrawButton	src/Dodge/Button/Draw.hs	30;"	f
 defaultEquipment	src/Dodge/Default.hs	24;"	f
 defaultFlIt	src/Dodge/Default.hs	27;"	f
 defaultForeground	src/Dodge/Default/ForegroundShape.hs	5;"	f
-defaultHUD	src/Dodge/Default/World.hs	161;"	f
+defaultHUD	src/Dodge/Default/World.hs	162;"	f
 defaultHeldItem	src/Dodge/Default/Item.hs	9;"	f
 defaultInanimate	src/Dodge/Default/Creature.hs	62;"	f
 defaultInput	src/Dodge/Default/World.hs	14;"	f
@@ -3266,7 +3267,7 @@ detV	src/Geometry/Vector.hs	93;"	f
 detector	src/Dodge/Item/Held/Utility.hs	27;"	f
 detectorColor	src/Dodge/Item/Draw/SPic.hs	465;"	f
 detectorInfo	src/Dodge/Item/Info.hs	225;"	f
-determineProjectileTracking	src/Dodge/HeldUse.hs	1253;"	f
+determineProjectileTracking	src/Dodge/HeldUse.hs	1243;"	f
 diagonalLinesRect	src/Dodge/Room/Foreground.hs	52;"	f
 did	src/Dodge/Item/InvSize.hs	54;"	f
 diffAngles	src/Geometry.hs	208;"	f
@@ -3329,7 +3330,7 @@ doDrag	src/Dodge/Update/Input/InGame.hs	107;"	f
 doDrawing	src/Dodge/Render.hs	34;"	f
 doDrawing'	src/Dodge/Render.hs	45;"	f
 doFloatFloat	src/Dodge/FloatFunction.hs	5;"	f
-doGenFloat	src/Dodge/HeldUse.hs	1209;"	f
+doGenFloat	src/Dodge/HeldUse.hs	1199;"	f
 doGravityPU	src/Dodge/Projectile/Update.hs	37;"	f
 doHeldUseEffect	src/Dodge/HeldUse.hs	344;"	f
 doInPlacements	src/Dodge/Layout.hs	92;"	f
@@ -3342,7 +3343,6 @@ doMCrAc	src/Dodge/CreatureEffect.hs	57;"	f
 doMP2Ac	src/Dodge/CreatureEffect.hs	73;"	f
 doMagnetBuBu	src/Dodge/Bullet.hs	33;"	f
 doModificationEffect	src/Dodge/ModificationEffect.hs	7;"	f
-doMuzzleEffect	src/Dodge/HeldUse.hs	729;"	f
 doOutPlacements	src/Dodge/Layout.hs	102;"	f
 doP2Ac	src/Dodge/CreatureEffect.hs	69;"	f
 doP2Imp	src/Dodge/CreatureEffect.hs	33;"	f
@@ -3520,7 +3520,7 @@ drawZoneCol	src/Dodge/Debug/Picture.hs	147;"	f
 drawZoneNearPointCursor	src/Dodge/Debug/Picture.hs	284;"	f
 dropAll	src/Dodge/Creature/Update.hs	118;"	f
 dropExcept	src/Dodge/Creature/Action.hs	166;"	f
-dropInventoryPath	src/Dodge/HeldUse.hs	1426;"	f
+dropInventoryPath	src/Dodge/HeldUse.hs	1416;"	f
 dropItem	src/Dodge/Creature/Action.hs	172;"	f
 dropper	src/Dodge/Item/Scope.hs	76;"	f
 drumMag	src/Dodge/Item/Ammo.hs	34;"	f
@@ -3542,7 +3542,7 @@ dtToRootIntMap'	src/Dodge/DoubleTree.hs	153;"	f
 dtToUpDownAdj	src/Dodge/DoubleTree.hs	158;"	f
 dummyMenuOption	src/Dodge/Menu/Option.hs	74;"	f
 dustColor	src/Shader/Poke/Cloud.hs	71;"	f
-dustSpringVel	src/Dodge/Update.hs	880;"	f
+dustSpringVel	src/Dodge/Update.hs	882;"	f
 ebColor	src/Dodge/EnergyBall.hs	77;"	f
 ebDamage	src/Dodge/EnergyBall.hs	85;"	f
 ebEffect	src/Dodge/EnergyBall.hs	45;"	f
@@ -3640,7 +3640,7 @@ flameThrower	src/Dodge/Item/Held/SprayGuns.hs	64;"	f
 flameTorrent	src/Dodge/Item/Held/SprayGuns.hs	32;"	f
 flameWall	src/Dodge/Item/Held/SprayGuns.hs	48;"	f
 flamerPic	src/Dodge/Item/Draw/SPic.hs	406;"	f
-flareCircleAt	src/Dodge/HeldUse.hs	697;"	f
+flareCircleAt	src/Dodge/HeldUse.hs	691;"	f
 flatItemCombinations	src/Dodge/Combine/Combinations.hs	51;"	f
 flatLookupItems	src/Dodge/Combine.hs	37;"	f
 flatShield	src/Dodge/Item/Held/Utility.hs	17;"	f
@@ -3706,7 +3706,7 @@ gameRoomViewpoints	src/Dodge/Viewpoints.hs	35;"	f
 gameRoomsFromRooms	src/Dodge/Layout.hs	158;"	f
 gameplayMenu	src/Dodge/Menu.hs	134;"	f
 gameplayMenuOptions	src/Dodge/Menu.hs	137;"	f
-gasType	src/Dodge/HeldUse.hs	1166;"	f
+gasType	src/Dodge/HeldUse.hs	1156;"	f
 generateGenParams	src/Dodge/LevelGen/LevelStructure.hs	22;"	f
 generateGraphs	src/Dodge/LevelGen.hs	39;"	f
 generateLayout	src/Dodge/Layout/Generate.hs	10;"	f
@@ -3721,11 +3721,11 @@ getAimZoom	src/Dodge/Update/Camera.hs	136;"	f
 getAmmoLinks	src/Dodge/Item/Grammar.hs	103;"	f
 getArguments	src/Dodge/Update/Scroll.hs	178;"	f
 getArguments'	src/Dodge/Update/Scroll.hs	166;"	f
-getAttachedSFLink	src/Dodge/HeldUse.hs	777;"	f
+getAttachedSFLink	src/Dodge/HeldUse.hs	765;"	f
 getAutoSpringLinks	src/Dodge/Item/Grammar.hs	84;"	f
 getAvailableListLines	src/Dodge/SelectionList.hs	10;"	f
 getBulHitDams	src/Dodge/Bullet.hs	169;"	f
-getBulletType	src/Dodge/HeldUse.hs	954;"	f
+getBulletType	src/Dodge/HeldUse.hs	944;"	f
 getCloseObj	src/Dodge/Update/Input/InGame.hs	515;"	f
 getCommands	src/Dodge/Terminal.hs	117;"	f
 getCommandsHelp	src/Dodge/Terminal.hs	75;"	f
@@ -3733,17 +3733,17 @@ getCrMoveSpeed	src/Dodge/Creature/Statistics.hs	45;"	f
 getDamageCoding	src/Dodge/Terminal.hs	177;"	f
 getDistortions	src/Dodge/Render.hs	435;"	f
 getEquipmentAllocation	src/Dodge/Inventory/RBList.hs	47;"	f
-getGrenadeHitEffect	src/Dodge/HeldUse.hs	1321;"	f
+getGrenadeHitEffect	src/Dodge/HeldUse.hs	1311;"	f
 getInventoryPath	src/Dodge/Inventory/Path.hs	8;"	f
 getItemValue	src/Dodge/Inventory/SelectionList.hs	144;"	f
-getLaserColor	src/Dodge/HeldUse.hs	713;"	f
+getLaserColor	src/Dodge/HeldUse.hs	707;"	f
-getLaserDamage	src/Dodge/HeldUse.hs	710;"	f
+getLaserDamage	src/Dodge/HeldUse.hs	704;"	f
-getLaserPhaseV	src/Dodge/HeldUse.hs	707;"	f
+getLaserPhaseV	src/Dodge/HeldUse.hs	701;"	f
 getLinksOfType	src/Dodge/RoomLink.hs	39;"	f
 getMaxLinesTM	src/Dodge/Terminal/Type.hs	11;"	f
 getMenuMouseContext	src/Dodge/Update.hs	406;"	f
 getNodePos	src/Dodge/Path.hs	31;"	f
-getPJStabiliser	src/Dodge/HeldUse.hs	1308;"	f
+getPJStabiliser	src/Dodge/HeldUse.hs	1298;"	f
 getPretty	src/AesonHelp.hs	8;"	f
 getPromptTM	src/Dodge/Terminal/Type.hs	8;"	f
 getRootItemBounds	src/Dodge/Render/HUD.hs	95;"	f
@@ -3839,14 +3839,14 @@ heldHandlePos	src/Dodge/Item/HeldOffset.hs	89;"	f
 heldInfo	src/Dodge/Item/Info.hs	92;"	f
 heldItemAmmoSlots	src/Dodge/Item/AmmoSlots.hs	19;"	f
 heldItemBulkiness	src/Dodge/Creature/YourControl.hs	178;"	f
-heldItemInvLock	src/Dodge/HeldUse.hs	448;"	f
+heldItemInvLock	src/Dodge/HeldUse.hs	441;"	f
-heldItemMuzVel	src/Dodge/HeldUse.hs	1051;"	f
+heldItemMuzVel	src/Dodge/HeldUse.hs	1041;"	f
 heldItemMuzzles	src/Dodge/HeldUse.hs	183;"	f
-heldItemRifling	src/Dodge/HeldUse.hs	1094;"	f
+heldItemRifling	src/Dodge/HeldUse.hs	1084;"	f
 heldItemSPic	src/Dodge/Item/Draw/SPic.hs	247;"	f
 heldItemWeight	src/Dodge/Creature/Statistics.hs	72;"	f
 heldPositionInfo	src/Dodge/Item/Info.hs	241;"	f
-heldTorqueAmount	src/Dodge/HeldUse.hs	592;"	f
+heldTorqueAmount	src/Dodge/HeldUse.hs	585;"	f
 heldTriggerType	src/Dodge/BaseTriggerType.hs	27;"	f
 helpCommand	src/Dodge/Terminal.hs	66;"	f
 helpPoly3D	src/Polyhedra.hs	125;"	f
@@ -3892,7 +3892,7 @@ initTusItemLocations	src/Dodge/Item/Location/Initialize.hs	25;"	f
 initWallZoning	src/Dodge/Wall/Zone.hs	12;"	f
 initialAnoTree	src/Dodge/Floor.hs	29;"	f
 initialRoomTree	src/Dodge/Floor.hs	19;"	f
-initialWorld	src/Dodge/Initialisation.hs	16;"	f
+initialWorld	src/Dodge/Initialisation.hs	15;"	f
 initialisePlaying	src/Sound.hs	77;"	f
 initializeGLState	src/Preload/Render.hs	216;"	f
 initializeOptionMenu	src/Dodge/Menu/Option.hs	17;"	f
@@ -3965,7 +3965,7 @@ invertIntMap	src/Multiset.hs	67;"	f
 invertInventoryToMap	src/Dodge/Combine.hs	55;"	f
 invisibleChaseCrit	src/Dodge/Creature/ChaseCrit.hs	21;"	f
 invisibleWall	src/Dodge/Placement/Instance/Wall.hs	16;"	f
-isAmmoIntLink	src/Dodge/HeldUse.hs	723;"	f
+isAmmoIntLink	src/Dodge/HeldUse.hs	717;"	f
 isAnimate	src/Dodge/Creature/Test.hs	144;"	f
 isCognizant	src/Dodge/Creature/Perception.hs	106;"	f
 isConnected	src/Dodge/Inventory/Swap.hs	74;"	f
@@ -4006,7 +4006,7 @@ itemBlips	src/Dodge/RadarSweep.hs	93;"	f
 itemBulkiness	src/Dodge/Creature/YourControl.hs	172;"	f
 itemCombinations	src/Dodge/Combine/Combinations.hs	56;"	f
 itemCombinationsEdges	src/Dodge/Combine/Graph.hs	61;"	f
-itemDetectorEffect	src/Dodge/HeldUse.hs	783;"	f
+itemDetectorEffect	src/Dodge/HeldUse.hs	771;"	f
 itemDisplay	src/Dodge/Inventory/SelectionList.hs	50;"	f
 itemEquipPict	src/Dodge/Item/Draw.hs	19;"	f
 itemExternalValue	src/Dodge/Inventory/SelectionList.hs	85;"	f
@@ -4018,7 +4018,7 @@ itemFromHeldType	src/Dodge/Item/Held.hs	25;"	f
 itemInfo	src/Dodge/Item/Info.hs	20;"	f
 itemInternalValue	src/Dodge/Item/Display.hs	34;"	f
 itemInvColor	src/Dodge/Item/InventoryColor.hs	9;"	f
-itemInvLock	src/Dodge/HeldUse.hs	443;"	f
+itemInvLock	src/Dodge/HeldUse.hs	436;"	f
 itemMuzzles	src/Dodge/HeldUse.hs	162;"	f
 itemRooms	src/Dodge/LockAndKey.hs	39;"	f
 itemRotTreeSPic	src/Dodge/Item/Draw/SPic.hs	27;"	f
@@ -4027,7 +4027,7 @@ itemScan	src/Dodge/Item/Scope.hs	63;"	f
 itemScroll	src/Dodge/Update/Scroll.hs	52;"	f
 itemScrollDisplay	src/Dodge/Inventory/SelectionList.hs	121;"	f
 itemScrollValue	src/Dodge/Inventory/SelectionList.hs	148;"	f
-itemSidePush	src/Dodge/HeldUse.hs	391;"	f
+itemSidePush	src/Dodge/HeldUse.hs	384;"	f
 itemString	src/Dodge/Item/Display.hs	56;"	f
 itemToFunction	src/Dodge/Item/Grammar.hs	106;"	f
 itemTreeSPic	src/Dodge/Item/Draw/SPic.hs	24;"	f
@@ -4129,7 +4129,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	30;"	f
-loadMuzzle	src/Dodge/HeldUse.hs	635;"	f
+loadMuzzle	src/Dodge/HeldUse.hs	629;"	f
 loadSaveSlot	src/Dodge/Save.hs	74;"	f
 loadSeed	src/Dodge/LoadSeed.hs	7;"	f
 loadSound	src/Dodge/SoundLogic/LoadSound.hs	11;"	f
@@ -4179,7 +4179,7 @@ machineAddSound	src/Dodge/Machine.hs	49;"	f
 machinePistol	src/Dodge/Item/Held/Stick.hs	52;"	f
 machineUpdateDeathEff	src/Dodge/Machine.hs	34;"	f
 machineUpdateLiveDieEff	src/Dodge/Machine.hs	16;"	f
-magAmmoParams	src/Dodge/HeldUse.hs	975;"	f
+magAmmoParams	src/Dodge/HeldUse.hs	965;"	f
 magAmmoType	src/Dodge/Item/MagAmmoType.hs	11;"	f
 magShield	src/Dodge/Item/Equipment.hs	27;"	f
 magV	src/Geometry/Vector.hs	171;"	f
@@ -4194,7 +4194,7 @@ makeAttach	src/Dodge/Item/Attach.hs	10;"	f
 makeBlip	src/Dodge/RadarSweep.hs	69;"	f
 makeBlockDebris	src/Dodge/Block/Debris.hs	34;"	f
 makeBoolOption	src/Dodge/Menu/OptionType.hs	8;"	f
-makeBullet	src/Dodge/HeldUse.hs	1032;"	f
+makeBullet	src/Dodge/HeldUse.hs	1022;"	f
 makeButton	src/Dodge/LevelGen/Switch.hs	16;"	f
 makeByteStringShaderUsingVAO	src/Shader/Compile.hs	128;"	f
 makeCloudAt	src/Dodge/WorldEvent/Cloud.hs	7;"	f
@@ -4217,7 +4217,7 @@ makeGasCloud	src/Dodge/WorldEvent/SpawnParticle.hs	11;"	f
 makeGrid	src/Grid.hs	46;"	f
 makeIntInterval	src/Dodge/Zoning/Base.hs	35;"	f
 makeMovingEB	src/Dodge/EnergyBall.hs	60;"	f
-makeMuzzleFlare	src/Dodge/HeldUse.hs	657;"	f
+makeMuzzleFlare	src/Dodge/HeldUse.hs	651;"	f
 makeParagraph	src/Justify.hs	6;"	f
 makePathBetween	src/Dodge/Path.hs	35;"	f
 makePathBetweenPs	src/Dodge/Path.hs	54;"	f
@@ -4270,11 +4270,11 @@ mcProximitySensorUpdate	src/Dodge/Machine/Update.hs	130;"	f
 mcSPic	src/Dodge/Render/ShapePicture.hs	133;"	f
 mcSensorTriggerUpdate	src/Dodge/Machine/Update.hs	93;"	f
 mcSensorUpdate	src/Dodge/Machine/Update.hs	125;"	f
-mcShootAuto	src/Dodge/HeldUse.hs	1220;"	f
+mcShootAuto	src/Dodge/HeldUse.hs	1210;"	f
-mcShootLaser	src/Dodge/HeldUse.hs	1213;"	f
+mcShootLaser	src/Dodge/HeldUse.hs	1203;"	f
 mcTriggerVal	src/Dodge/Machine/Update.hs	99;"	f
 mcTypeUpdate	src/Dodge/Machine/Update.hs	28;"	f
-mcUseHeld	src/Dodge/HeldUse.hs	1137;"	f
+mcUseHeld	src/Dodge/HeldUse.hs	1127;"	f
 mcUseItem	src/Dodge/Machine/Update.hs	85;"	f
 megaBattery	src/Dodge/Item/Ammo.hs	55;"	f
 megaShellMag	src/Dodge/Item/Ammo.hs	44;"	f
@@ -4364,11 +4364,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	683;"	f
+muzFlareAt	src/Dodge/HeldUse.hs	677;"	f
 mvButton	src/Dodge/Placement/PlaceSpot.hs	177;"	f
 mvCr	src/Dodge/Placement/PlaceSpot.hs	187;"	f
 mvFS	src/Dodge/Placement/PlaceSpot.hs	190;"	f
-mvGust	src/Dodge/Update.hs	812;"	f
+mvGust	src/Dodge/Update.hs	814;"	f
 mvLS	src/Dodge/Placement/PlaceSpot.hs	218;"	f
 mvP	src/Dodge/Wall/Move.hs	54;"	f
 mvPP	src/Dodge/Placement/PlaceSpot.hs	184;"	f
@@ -4762,7 +4762,7 @@ randsOnCirc	src/RandomHelp.hs	127;"	f
 randsSpread	src/RandomHelp.hs	120;"	f
 ratIntersectLineLine	src/Geometry/Intersect.hs	225;"	f
 readSaveSlot	src/Dodge/Save.hs	45;"	f
-recoilAmount	src/Dodge/HeldUse.hs	473;"	f
+recoilAmount	src/Dodge/HeldUse.hs	466;"	f
 rectNSWE	src/Geometry/Polygon.hs	13;"	f
 rectVV	src/Geometry/Polygon.hs	38;"	f
 rectWH	src/Geometry/Polygon.hs	17;"	f
@@ -4792,7 +4792,7 @@ rememberSounds	src/Dodge/Creature/Perception.hs	178;"	f
 remoteDetonator	src/Dodge/Item/Scope.hs	144;"	f
 remoteScreen	src/Dodge/Item/Scope.hs	139;"	f
 removeAimPosture	src/Dodge/Creature/YourControl.hs	147;"	f
-removeAmmoFromMag	src/Dodge/HeldUse.hs	942;"	f
+removeAmmoFromMag	src/Dodge/HeldUse.hs	931;"	f
 removeDot	src/ShortShow.hs	29;"	f
 removeInverseWalls	src/Dodge/LevelGen/StaticWalls.hs	25;"	f
 removeShieldWall	src/Dodge/Item/BackgroundEffect.hs	57;"	f
@@ -5077,17 +5077,17 @@ shiftRoomShiftToLink	src/Dodge/Room/Link.hs	70;"	f
 shiftedGrid	src/Grid.hs	25;"	f
 shineTargetLaser	src/Dodge/Creature/State.hs	199;"	f
 shineTorch	src/Dodge/Creature/State.hs	238;"	f
-shootBullet	src/Dodge/HeldUse.hs	1017;"	f
+shootBullet	src/Dodge/HeldUse.hs	1007;"	f
-shootBullets	src/Dodge/HeldUse.hs	1007;"	f
+shootBullets	src/Dodge/HeldUse.hs	997;"	f
 shootFirstMiss	src/Dodge/Creature/Volition.hs	33;"	f
-shootLaser	src/Dodge/HeldUse.hs	860;"	f
+shootLaser	src/Dodge/HeldUse.hs	848;"	f
 shootOutPassage	src/Dodge/Room/RezBox.hs	74;"	f
-shootPulseBall	src/Dodge/HeldUse.hs	928;"	f
+shootPulseBall	src/Dodge/HeldUse.hs	916;"	f
-shootPulseLaser	src/Dodge/HeldUse.hs	901;"	f
+shootPulseLaser	src/Dodge/HeldUse.hs	889;"	f
 shootShatter	src/Dodge/Item/Weapon/Shatter.hs	11;"	f
-shootTeslaArc	src/Dodge/HeldUse.hs	1236;"	f
+shootTeslaArc	src/Dodge/HeldUse.hs	1226;"	f
 shootTillEmpty	src/Dodge/Creature/Volition.hs	18;"	f
-shootTractorBeam	src/Dodge/HeldUse.hs	816;"	f
+shootTractorBeam	src/Dodge/HeldUse.hs	804;"	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
@@ -5102,9 +5102,9 @@ showEquipItem	src/Dodge/Item/Display.hs	107;"	f
 showInt	src/Dodge/Item/Info.hs	75;"	f
 showIntsString	src/Dodge/Tree/Compose.hs	129;"	f
 showInventoryPathing	src/Dodge/Item/Display.hs	86;"	f
-showManObj	src/Dodge/TestString.hs	67;"	f
+showManObj	src/Dodge/TestString.hs	65;"	f
 showTerminalError	src/Dodge/Debug/Terminal.hs	78;"	f
-showTimeFlow	src/Dodge/TestString.hs	90;"	f
+showTimeFlow	src/Dodge/TestString.hs	88;"	f
 shrinkPolyOnEdges	src/Geometry/Polygon.hs	142;"	f
 shrinkVert	src/Geometry/Polygon.hs	146;"	f
 shuffle	src/RandomHelp.hs	49;"	f
@@ -5112,7 +5112,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	889;"	f
+simpleCrSprings	src/Dodge/Update.hs	891;"	f
 simpleTermMessage	src/Dodge/Terminal.hs	253;"	f
 sineRaisePitchOneSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	680;"	f
 sineRaisePitchTwoSecS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	472;"	f
@@ -5173,12 +5173,13 @@ sparkDam	src/Dodge/Spark.hs	36;"	f
 sparkGun	src/Dodge/Item/Held/BatteryGuns.hs	13;"	f
 sparkRandDir	src/Dodge/Spark.hs	116;"	f
 sparkToDamage	src/Dodge/Spark.hs	39;"	f
+spawnAt	src/Dodge/SpawnAt.hs	9;"	f
 spawnerCrit	src/Dodge/Creature.hs	57;"	f
 spawnerRoom	src/Dodge/Room/Room.hs	360;"	f
 speedLegs	src/Dodge/Item/Equipment.hs	90;"	f
 splashMenu	src/Dodge/Menu.hs	30;"	f
 splashMenuOptions	src/Dodge/Menu.hs	35;"	f
-splashScreen	src/Dodge/Initialisation.hs	11;"	f
+splashScreen	src/Dodge/Initialisation.hs	10;"	f
 splinterBlock	src/Dodge/Block.hs	26;"	f
 splitBezierquad	src/Geometry/Bezier.hs	15;"	f
 splitExtra	src/Justify.hs	21;"	f
@@ -5370,15 +5371,15 @@ tone440sawtoothquietS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	448;"	f
 topInvW	src/Dodge/ListDisplayParams.hs	51;"	f
 topPrismEdgeIndices	src/Shader/Poke.hs	335;"	f
 topPrismIndices	src/Shader/Poke.hs	410;"	f
-topTestPart	src/Dodge/TestString.hs	63;"	f
+topTestPart	src/Dodge/TestString.hs	61;"	f
 torch	src/Dodge/Item/Held/Utility.hs	23;"	f
 torchShape	src/Dodge/Item/Draw/SPic.hs	290;"	f
-torqueAmount	src/Dodge/HeldUse.hs	587;"	f
+torqueAmount	src/Dodge/HeldUse.hs	580;"	f
 torqueCr	src/Dodge/WorldEffect.hs	67;"	f
 torso	src/Dodge/Creature/Picture.hs	100;"	f
 tractCr	src/Dodge/TractorBeam/Update.hs	28;"	f
 tractFlIt	src/Dodge/TractorBeam/Update.hs	23;"	f
-tractorBeamAt	src/Dodge/HeldUse.hs	828;"	f
+tractorBeamAt	src/Dodge/HeldUse.hs	816;"	f
 tractorGun	src/Dodge/Item/Held/BatteryGuns.hs	53;"	f
 tractorGunPic	src/Dodge/Item/Draw/SPic.hs	449;"	f
 tractorPullPos	src/Dodge/TractorBeam/Update.hs	33;"	f
@@ -5493,7 +5494,7 @@ updateBullet	src/Dodge/Bullet.hs	20;"	f
 updateBullets	src/Dodge/Update.hs	594;"	f
 updateCamera	src/Dodge/Update/Camera.hs	30;"	f
 updateCloseObjects	src/Dodge/Inventory.hs	121;"	f
-updateCloud	src/Dodge/Update.hs	826;"	f
+updateCloud	src/Dodge/Update.hs	828;"	f
 updateClouds	src/Dodge/Update.hs	698;"	f
 updateCombinePositioning	src/Dodge/DisplayInventory.hs	37;"	f
 updateCombineSections	src/Dodge/DisplayInventory.hs	44;"	f
@@ -5504,12 +5505,12 @@ updateCreatureSoundPositions	src/Dodge/Update.hs	542;"	f
 updateDebris	src/Dodge/Update.hs	601;"	f
 updateDebrisChunk	src/Dodge/Prop/Moving.hs	16;"	f
 updateDebugMessageOffset	src/Dodge/Update.hs	100;"	f
-updateDelayedEvents	src/Dodge/Update.hs	918;"	f
+updateDelayedEvents	src/Dodge/Update.hs	920;"	f
 updateDisplaySections	src/Dodge/DisplayInventory.hs	116;"	f
 updateDistortion	src/Dodge/Distortion.hs	5;"	f
 updateDistortions	src/Dodge/Update.hs	587;"	f
 updateDoor	src/Dodge/Update.hs	326;"	f
-updateDust	src/Dodge/Update.hs	850;"	f
+updateDust	src/Dodge/Update.hs	852;"	f
 updateDusts	src/Dodge/Update.hs	701;"	f
 updateEnergyBall	src/Dodge/EnergyBall.hs	31;"	f
 updateEnergyBalls	src/Dodge/Update.hs	689;"	f
@@ -5522,7 +5523,7 @@ updateFlames	src/Dodge/Update.hs	686;"	f
 updateFloatingCamera	src/Dodge/Update/Camera.hs	35;"	f
 updateFunctionKey	src/Dodge/Update/Input/InGame.hs	364;"	f
 updateFunctionKeys	src/Dodge/Update/Input/InGame.hs	357;"	f
-updateGusts	src/Dodge/Update.hs	809;"	f
+updateGusts	src/Dodge/Update.hs	811;"	f
 updateHumanoid	src/Dodge/Humanoid.hs	13;"	f
 updateIMl	src/Dodge/Update.hs	556;"	f
 updateIMl'	src/Dodge/Update.hs	561;"	f
@@ -5613,21 +5614,21 @@ upperPrismPolySU	src/Shape.hs	114;"	f
 upperPrismPolyTS	src/Shape.hs	120;"	f
 upperRounded	src/Shape.hs	185;"	f
 useBulletPayload	src/Dodge/Bullet.hs	113;"	f
-useGasParams	src/Dodge/HeldUse.hs	1142;"	f
+useGasParams	src/Dodge/HeldUse.hs	1132;"	f
 useHotkey	src/Dodge/Creature/YourControl.hs	70;"	f
-useInventoryPath	src/Dodge/HeldUse.hs	1457;"	f
+useInventoryPath	src/Dodge/HeldUse.hs	1447;"	f
 useItem	src/Dodge/Creature/Impulse/UseItem.hs	18;"	f
 useItemLoc	src/Dodge/Creature/Impulse/UseItem.hs	24;"	f
 useLnkRoomPos	src/Dodge/PlacementSpot.hs	244;"	f
-useLoadedAmmo	src/Dodge/HeldUse.hs	733;"	f
+useLoadedAmmo	src/Dodge/HeldUse.hs	720;"	f
 useMagShield	src/Dodge/Euse.hs	27;"	f
 useNormalCamera	src/Dodge/Camera.hs	6;"	f
 usePayload	src/Dodge/Payload.hs	18;"	f
-useRewindGun	src/Dodge/HeldUse.hs	1417;"	f
+useRewindGun	src/Dodge/HeldUse.hs	1407;"	f
 useRoomPosCond	src/Dodge/PlacementSpot.hs	178;"	f
 useRoomPosRoomCond	src/Dodge/PlacementSpot.hs	181;"	f
-useStopWatch	src/Dodge/HeldUse.hs	1398;"	f
+useStopWatch	src/Dodge/HeldUse.hs	1388;"	f
-useTimeScrollGun	src/Dodge/HeldUse.hs	1406;"	f
+useTimeScrollGun	src/Dodge/HeldUse.hs	1396;"	f
 useUnusedLnk	src/Dodge/PlacementSpot.hs	169;"	f
 usedRoomInLinkPoss	src/Dodge/PlacementSpot.hs	196;"	f
 usedRoomLinkPoss	src/Dodge/PlacementSpot.hs	203;"	f
@@ -5661,7 +5662,7 @@ visionCheck	src/Dodge/Creature/Perception.hs	153;"	f
 vocalizationTest	src/Dodge/Creature/Vocalization.hs	42;"	f
 volleyGun	src/Dodge/Item/Held/Cane.hs	15;"	f
 volleyGunShape	src/Dodge/Item/Draw/SPic.hs	369;"	f
-walkNozzle	src/Dodge/HeldUse.hs	798;"	f
+walkNozzle	src/Dodge/HeldUse.hs	786;"	f
 walkableNodeNear	src/Dodge/Path.hs	48;"	f
 wallBlips	src/Dodge/RadarSweep.hs	98;"	f
 wallBuffer	src/Dodge/WallCreatureCollisions.hs	52;"	f
@@ -5670,7 +5671,7 @@ wallLine	src/Dodge/Placement/Instance/Wall.hs	71;"	f
 wallToSurface	src/Dodge/Base/Collide.hs	172;"	f
 wallsFromRooms	src/Dodge/Layout.hs	146;"	f
 wallsToDraw	src/Dodge/Render/Walls.hs	17;"	f
-warmupSound	src/Dodge/HeldUse.hs	1451;"	f
+warmupSound	src/Dodge/HeldUse.hs	1441;"	f
 warningRooms	src/Dodge/Room/Warning.hs	28;"	f
 wasdAim	src/Dodge/Creature/YourControl.hs	126;"	f
 wasdDir	src/Dodge/WASD.hs	17;"	f