Move weapon repetitions into trigger type

src/Dodge/Data/Item/Use.hs

@@ -75,15 +75,9 @@ data AttachParams
 
 data HeldParams
     = DefaultHeldParams
-    | GasSprayParams
+    | GasSprayParams { _weaponInvLock :: Int }
-        { _weaponInvLock :: Int
-        , _weaponRepeat :: [Int]
-        }
     | BeamShooterParams
-    | BulletShooterParams
+    | BulletShooterParams { _weaponInvLock :: Int }
-        { _weaponInvLock :: Int
-        , _weaponRepeat :: [Int]
-        }
     deriving (Eq, Show, Read) --Generic, Flat)
 
 data AmmoParams

src/Dodge/Data/WorldEffect.hs

@@ -18,6 +18,7 @@ import Geometry.Data
 import Sound.Data
 
 data ItCrWdWd = ItCrWdItemHeldEffect
+    | ItCrWdItemHeldEffectNoHammer
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data WdWd

src/Dodge/Default/Item/Use.hs

@@ -26,11 +26,9 @@ defaultEquipUse = UseEquip
 defaultHeldUse :: ItemUse
 defaultHeldUse = UseHeld
     { _heldDelay = FixedRate{_rateMax = 8, _rateTimeLastUsed = 0}
---    , _heldHammer = HammerUp
     , _heldMuzzles = defaultMuzzles
     , _heldParams = BulletShooterParams
         { _weaponInvLock = 0
-        , _weaponRepeat = []
         }
     , _heldFrame = 0
     , _heldUseEffect = NoHeldUseEffect

src/Dodge/HeldUse.hs

@@ -80,19 +80,28 @@ type ChainEffect =
     World
 
 hammerCheck ::
-    (LabelDoubleTree ComposeLinkType Item -> t1 -> t2 -> t2) ->
+    (LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World) ->
     PressType ->
     LabelDoubleTree ComposeLinkType Item ->
-    t1 ->
+    Creature ->
-    t2 ->
+    World ->
-    t2
+    World
 hammerCheck f pt it cr
+    | BurstTrigger is <- baseTriggerType (it ^. ldtValue)
+      , pt == InitialPress = f it cr
+            . (cWorld . lWorld . delayedEvents .++~ map g is)
     | t <- baseTriggerType (it ^. ldtValue)
       , t == HammerTrigger || t == AlwaysSingleTrigger
       , isNothing $ lookup MakeAutoLink (it ^. ldtRight)
       , pt /= InitialPress =
         id
     | otherwise = f it cr
+  where
+    g x = (x, WdWdFromItCrixWdWd (upitm x) (_crID cr) ItCrWdItemHeldEffectNoHammer)
+    upitm x =
+        it -- & ldtValue . itUse . heldParams . weaponRepeat .~ []
+            & ldtValue . itUse . heldFrame .~ x
+    
 
 -- | Applies a world effect after an item use cooldown check.
 useTimeCheck :: ChainEffect
@@ -123,7 +132,7 @@ heldEffectMuzzles :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -
 heldEffectMuzzles t cr w =
     doHeldUseEffect t cr $
         uncurry (applyCME (_ldtValue t) cr) cmew
-            & doWeaponRepetitions upitm cr
+--            & doWeaponRepetitions upitm cr
   where
     muzzles = t ^. ldtValue . itUse . heldMuzzles
     (upitm, loadedmuzzles) = mapAccumR loadMuzzle t muzzles
@@ -151,17 +160,16 @@ doHeldUseEffect t cr w = case t ^? ldtValue . itUse . heldUseEffect of
     Just NoHeldUseEffect -> w
     Nothing -> w
 
--- need to be careful about inventory lock or item ids here
+---- need to be careful about inventory lock or item ids here
-doWeaponRepetitions :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
+--doWeaponRepetitions :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
-doWeaponRepetitions itm cr = case itm ^? ldtValue . itUse . heldParams . weaponRepeat of
+--doWeaponRepetitions itm cr = case itm ^? ldtValue . itUse . heldParams . weaponRepeat of
-    Just xs -> cWorld . lWorld . delayedEvents .++~ map f xs
+--    Just xs -> cWorld . lWorld . delayedEvents .++~ map f xs
-    _ -> id
+--    _ -> id
-  where
+--  where
-    f x = (x, WdWdFromItCrixWdWd (upitm x) (_crID cr) ItCrWdItemHeldEffect)
+--    f x = (x, WdWdFromItCrixWdWd (upitm x) (_crID cr) ItCrWdItemHeldEffect)
-    upitm x =
+--    upitm x =
-        itm & ldtValue . itUse . heldParams . weaponRepeat .~ []
+--        itm & ldtValue . itUse . heldParams . weaponRepeat .~ []
-            --            & ldtValue . itUse . heldTriggerType .~ AutoTrigger
+--            & ldtValue . itUse . heldFrame .~ x
-            & ldtValue . itUse . heldFrame .~ x
 
 applyCME :: Item -> Creature -> CumulativeMuzzleEffect -> World -> World
 applyCME itm cr cme

src/Dodge/Item/Held/Cane.hs

@@ -41,7 +41,7 @@ volleyGun i =
 --        & itUse . heldParams . recoil .~ 30
         & itType .~ HELD (VOLLEYGUN i)
         & itAmmoSlots .~ IM.fromList (zip [0..i-1] $ repeat BulletAmmo)
-        & itUse . heldParams . weaponRepeat .~ [1..i-1]
+--        & itUse . heldParams . weaponRepeat .~ [1..i-1]
         & itUse . heldUseEffect .~ RandomiseMuzzleFrames i
 
 rifle :: Item
@@ -75,7 +75,6 @@ burstRifle =
         & itUse . heldMuzzles . ix 0 . mzInaccuracy .~ 0.05
         & itUse . heldDelay . rateMax .~ 6
         & itUse . heldParams . weaponInvLock .~ 7
-        & itUse . heldParams . weaponRepeat .~ [3,6]
         & itUse . heldMuzzles %~ doreplicate
   where
     doreplicate (x:_) = [x,x & mzFrame .~ 3,x & mzFrame .~ 6]

src/Dodge/Item/Held/SprayGuns.hs

@@ -26,7 +26,7 @@ flameSpitter =
         & itType .~ HELD FLAMESPITTER
         & itUse . heldDelay .~ FixedRate{_rateMax = 3, _rateTimeLastUsed = 0}
         & itUse . heldParams . weaponInvLock .~ 10
-        & itUse . heldParams . weaponRepeat .~ [1..9]
+--        & itUse . heldParams . weaponRepeat .~ [1..9]
         & itUse . heldMuzzles . ix 0 . mzEffect . nzPressure .~ UniRandFloat 3 4
 
 flameTorrent :: Item
@@ -81,5 +81,5 @@ flameThrower =
         & itType .~ HELD FLAMETHROWER
         & itUse . heldParams .~ GasSprayParams
             { _weaponInvLock = 0
-            , _weaponRepeat = mempty
+--            , _weaponRepeat = mempty
             }

src/Dodge/WorldEffect.hs

@@ -48,6 +48,7 @@ doWdWd we = case we of
 doItCrWdWd :: ItCrWdWd -> LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
 doItCrWdWd icww = case icww of
     ItCrWdItemHeldEffect -> heldEffect InitialPress
+    ItCrWdItemHeldEffectNoHammer -> heldEffectNoHammerCheck
 
 accessTerminal :: Maybe Int -> World -> World
 accessTerminal mtmid w = fromMaybe w $ do

tags

@@ -36,7 +36,7 @@ AUTOAMR	src/Dodge/Data/Item/Combine.hs	158;"	C
 AUTOPISTOL	src/Dodge/Data/Item/Combine.hs	144;"	C
 AUTORIFLE	src/Dodge/Data/Item/Combine.hs	153;"	C
 AZURE	src/Color/Data.hs	23;"	C
-AccessTerminal	src/Dodge/Data/WorldEffect.hs	28;"	C
+AccessTerminal	src/Dodge/Data/WorldEffect.hs	29;"	C
 Action	src/Dodge/Data/ActionPlan.hs	78;"	t
 Action	src/Dodge/Creature/Action.hs	4;"	m
 ActionNothing	src/Dodge/Data/ActionPlan.hs	83;"	C
@@ -55,7 +55,7 @@ AirFiltrationSS	src/Dodge/Data/Scenario.hs	95;"	C
 Airlock	src/Dodge/Room/Airlock.hs	4;"	m
 AlienContact	src/Dodge/Data/Scenario.hs	30;"	C
 AllRoomClipBoundaries	src/Dodge/Data/Config.hs	107;"	C
-AlwaysSingleTrigger	src/Dodge/Data/TriggerType.hs	9;"	C
+AlwaysSingleTrigger	src/Dodge/Data/TriggerType.hs	13;"	C
 Ambush	src/Dodge/Data/ActionPlan.hs	178;"	C
 Ammo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	6;"	m
 Ammo	src/Dodge/Item/Ammo.hs	1;"	m
@@ -108,7 +108,7 @@ AutoAI	src/Dodge/Data/Creature/Misc.hs	56;"	C
 AutoCrit	src/Dodge/Creature/AutoCrit.hs	1;"	m
 AutoDoorObstacle	src/Dodge/Data/PathGraph.hs	51;"	C
 AutoRecharging	src/Dodge/Data/Item/Use/Consumption.hs	27;"	C
-AutoTrigger	src/Dodge/Data/TriggerType.hs	9;"	C
+AutoTrigger	src/Dodge/Data/TriggerType.hs	10;"	C
 AuxAddition	src/Shader/AuxAddition.hs	1;"	m
 Avatar	src/Dodge/Data/Creature/Misc.hs	70;"	C
 Awareness	src/Dodge/Data/Creature/Perception.hs	65;"	t
@@ -237,6 +237,7 @@ BulletPayload	src/Dodge/Data/Bullet.hs	41;"	t
 BulletShooterParams	src/Dodge/Data/Item/Use.hs	83;"	C
 BulletTrajectory	src/Dodge/Data/Bullet.hs	49;"	t
 BulletTrajectoryType	src/Dodge/Data/Bullet.hs	56;"	t
+BurstTrigger	src/Dodge/Data/TriggerType.hs	14;"	C
 Button	src/Dodge/Data/Button.hs	48;"	t
 Button	src/Dodge/Data/Button.hs	6;"	m
 Button	src/Dodge/Placement/Instance/Button.hs	1;"	m
@@ -542,7 +543,7 @@ Door	src/Dodge/Room/Door.hs	2;"	m
 DoorClosed	src/Dodge/Data/Door.hs	23;"	C
 DoorHalfway	src/Dodge/Data/Door.hs	23;"	C
 DoorInt	src/Dodge/Data/Door.hs	23;"	C
-DoorMechanism	src/Dodge/Data/WorldEffect.hs	71;"	C
+DoorMechanism	src/Dodge/Data/WorldEffect.hs	72;"	C
 DoorObstacle	src/Dodge/Data/PathGraph.hs	50;"	C
 DoorOpen	src/Dodge/Data/Door.hs	23;"	C
 DoorPane	src/Dodge/LevelGen/DoorPane.hs	1;"	m
@@ -554,10 +555,10 @@ DoubleTree	src/Dodge/Data/DoubleTree.hs	30;"	t
 DoubleTree	src/Dodge/Data/DoubleTree.hs	6;"	m
 DoubleTree	src/Dodge/DoubleTree.hs	1;"	m
 DoubleTreeNodeType	src/Dodge/Data/DoubleTree.hs	15;"	t
-DrWdId	src/Dodge/Data/WorldEffect.hs	68;"	C
+DrWdId	src/Dodge/Data/WorldEffect.hs	69;"	C
-DrWdMakeDoorDebris	src/Dodge/Data/WorldEffect.hs	69;"	C
+DrWdMakeDoorDebris	src/Dodge/Data/WorldEffect.hs	70;"	C
-DrWdMechanismStepwise	src/Dodge/Data/WorldEffect.hs	70;"	C
+DrWdMechanismStepwise	src/Dodge/Data/WorldEffect.hs	71;"	C
-DrWdWd	src/Dodge/Data/WorldEffect.hs	67;"	t
+DrWdWd	src/Dodge/Data/WorldEffect.hs	68;"	t
 DrWdWd	src/Dodge/DrWdWd.hs	1;"	m
 Draw	src/Dodge/Beam/Draw.hs	1;"	m
 Draw	src/Dodge/Block/Draw.hs	1;"	m
@@ -822,7 +823,7 @@ Hammer	src/Dodge/Hammer.hs	1;"	m
 HammerDown	src/Dodge/Data/Hammer.hs	18;"	C
 HammerPosition	src/Dodge/Data/Hammer.hs	17;"	t
 HammerReleased	src/Dodge/Data/Hammer.hs	19;"	C
-HammerTrigger	src/Dodge/Data/TriggerType.hs	9;"	C
+HammerTrigger	src/Dodge/Data/TriggerType.hs	11;"	C
 HammerType	src/Dodge/Data/Hammer.hs	12;"	t
 HammerUp	src/Dodge/Data/Hammer.hs	20;"	C
 HandPos	src/Dodge/Creature/HandPos.hs	1;"	m
@@ -941,6 +942,7 @@ IsClose	src/Dodge/Data/Machine/Sensor.hs	39;"	C
 IsolationUnitSS	src/Dodge/Data/Scenario.hs	101;"	C
 ItAmount	src/Dodge/Data/Item/Use/Consumption.hs	39;"	t
 ItCrWdItemHeldEffect	src/Dodge/Data/WorldEffect.hs	20;"	C
+ItCrWdItemHeldEffectNoHammer	src/Dodge/Data/WorldEffect.hs	21;"	C
 ItCrWdWd	src/Dodge/Data/WorldEffect.hs	20;"	t
 ItDropEffect	src/Dodge/Data/Item/Effect.hs	37;"	t
 ItEffect	src/Dodge/Data/Item/Effect.hs	16;"	t
@@ -1142,8 +1144,8 @@ MakeAutoLink	src/Dodge/Data/ComposedItem.hs	31;"	C
 MakeAutoSF	src/Dodge/Data/ComposedItem.hs	62;"	C
 MakeDefaultCorpse	src/Dodge/Data/Creature.hs	72;"	C
 MakeSound	src/Dodge/Data/ActionPlan.hs	43;"	C
-MakeStartCloudAt	src/Dodge/Data/WorldEffect.hs	31;"	C
+MakeStartCloudAt	src/Dodge/Data/WorldEffect.hs	32;"	C
-MakeTempLight	src/Dodge/Data/WorldEffect.hs	35;"	C
+MakeTempLight	src/Dodge/Data/WorldEffect.hs	36;"	C
 ManipulatedObject	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	20;"	t
 Manipulation	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	14;"	t
 Manipulator	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	15;"	C
@@ -1160,11 +1162,11 @@ McSensor	src/Dodge/Data/Machine.hs	52;"	C
 McStatic	src/Dodge/Data/Machine.hs	50;"	C
 McTerminal	src/Dodge/Data/Machine.hs	51;"	C
 McTurret	src/Dodge/Data/Machine.hs	53;"	C
-MdFlickerUpdate	src/Dodge/Data/WorldEffect.hs	49;"	C
+MdFlickerUpdate	src/Dodge/Data/WorldEffect.hs	50;"	C
-MdSetLSCol	src/Dodge/Data/WorldEffect.hs	48;"	C
+MdSetLSCol	src/Dodge/Data/WorldEffect.hs	49;"	C
-MdTrigIf	src/Dodge/Data/WorldEffect.hs	47;"	C
+MdTrigIf	src/Dodge/Data/WorldEffect.hs	48;"	C
-MdWdId	src/Dodge/Data/WorldEffect.hs	46;"	C
+MdWdId	src/Dodge/Data/WorldEffect.hs	47;"	C
-MdWdWd	src/Dodge/Data/WorldEffect.hs	45;"	t
+MdWdWd	src/Dodge/Data/WorldEffect.hs	46;"	t
 MedBaySS	src/Dodge/Data/Scenario.hs	100;"	C
 Medium	src/Shape/Data.hs	30;"	C
 Melee	src/Dodge/Data/ActionPlan.hs	41;"	C
@@ -1298,8 +1300,8 @@ NoSF	src/Dodge/Data/ComposedItem.hs	56;"	C
 NoShadowFidelity	src/Shape/Data.hs	25;"	C
 NoShadows	src/Dodge/Data/Config.hs	103;"	C
 NoSubInventory	src/Dodge/Data/HUD.hs	29;"	C
-NoTrigger	src/Dodge/Data/TriggerType.hs	9;"	C
+NoTrigger	src/Dodge/Data/TriggerType.hs	12;"	C
-NoWorldEffect	src/Dodge/Data/WorldEffect.hs	24;"	C
+NoWorldEffect	src/Dodge/Data/WorldEffect.hs	25;"	C
 Noclip	src/Dodge/Data/Config.hs	70;"	C
 NodeMTree	src/Dodge/Data/MetaTree.hs	14;"	C
 NodeMTree	src/Dodge/Tree/Compose/Data.hs	9;"	C
@@ -1741,9 +1743,9 @@ Sensor	src/Dodge/Placement/Instance/Sensor.hs	1;"	m
 SensorDoor	src/Dodge/Room/SensorDoor.hs	2;"	m
 SentinelAI	src/Dodge/Creature/SentinelAI.hs	1;"	m
 SentinelAt	src/Dodge/Data/ActionPlan.hs	199;"	C
-SetLSCol	src/Dodge/Data/WorldEffect.hs	27;"	C
+SetLSCol	src/Dodge/Data/WorldEffect.hs	28;"	C
 SetTarget	src/Dodge/Creature/SetTarget.hs	2;"	m
-SetTrigger	src/Dodge/Data/WorldEffect.hs	25;"	C
+SetTrigger	src/Dodge/Data/WorldEffect.hs	26;"	C
 Setup	src/Framebuffer/Setup.hs	2;"	m
 ShadNum	src/Picture/Data.hs	35;"	t
 Shader	src/Shader/Data.hs	51;"	t
@@ -1818,7 +1820,7 @@ SoundID	src/Sound/Data.hs	32;"	t
 SoundLogic	src/Dodge/SoundLogic.hs	7;"	m
 SoundOrigin	src/Dodge/Data/SoundOrigin.hs	12;"	t
 SoundOrigin	src/Dodge/Data/SoundOrigin.hs	6;"	m
-SoundStart	src/Dodge/Data/WorldEffect.hs	30;"	C
+SoundStart	src/Dodge/Data/WorldEffect.hs	31;"	C
 SoundStatus	src/Sound/Data.hs	16;"	t
 South	src/Dodge/Data/CardinalPoint.hs	6;"	C
 South8	src/Dodge/Data/CardinalPoint.hs	15;"	C
@@ -1985,13 +1987,13 @@ TmTm	src/Dodge/TmTm.hs	1;"	m
 TmTmClearDisplayedLines	src/Dodge/Data/Terminal.hs	62;"	C
 TmTmSetPartialCommand	src/Dodge/Data/Terminal.hs	64;"	C
 TmTmSetStatus	src/Dodge/Data/Terminal.hs	63;"	C
-TmWdId	src/Dodge/Data/WorldEffect.hs	75;"	C
+TmWdId	src/Dodge/Data/WorldEffect.hs	76;"	C
-TmWdWd	src/Dodge/Data/WorldEffect.hs	74;"	t
+TmWdWd	src/Dodge/Data/WorldEffect.hs	75;"	t
 TmWdWd	src/Dodge/TmWdWd.hs	1;"	m
-TmWdWdDisconnectTerminal	src/Dodge/Data/WorldEffect.hs	76;"	C
+TmWdWdDisconnectTerminal	src/Dodge/Data/WorldEffect.hs	77;"	C
-TmWdWdDoDeathTriggers	src/Dodge/Data/WorldEffect.hs	79;"	C
+TmWdWdDoDeathTriggers	src/Dodge/Data/WorldEffect.hs	80;"	C
-TmWdWdTermSound	src/Dodge/Data/WorldEffect.hs	78;"	C
+TmWdWdTermSound	src/Dodge/Data/WorldEffect.hs	79;"	C
-TmWdWdfromWdWd	src/Dodge/Data/WorldEffect.hs	77;"	C
+TmWdWdfromWdWd	src/Dodge/Data/WorldEffect.hs	78;"	C
 ToContinueStart	src/Sound/Data.hs	27;"	C
 ToPlaySound	src/Sound/Data.hs	35;"	t
 ToStart	src/Sound/Data.hs	26;"	C
@@ -2005,7 +2007,7 @@ TopDecoration	src/Dodge/Placement/TopDecoration.hs	1;"	m
 TopEscapeMenuOption	src/Dodge/Data/Universe.hs	78;"	C
 TopLDT	src/Dodge/Data/DoubleTree.hs	49;"	C
 TorpedoBaySS	src/Dodge/Data/Scenario.hs	99;"	C
-TorqueCr	src/Dodge/Data/WorldEffect.hs	32;"	C
+TorqueCr	src/Dodge/Data/WorldEffect.hs	33;"	C
 TorqueDamage	src/Dodge/Data/Damage.hs	27;"	C
 TractorBeam	src/Dodge/Data/TractorBeam.hs	13;"	t
 TractorBeam	src/Dodge/Data/TractorBeam.hs	6;"	m
@@ -2055,7 +2057,7 @@ Unimportant	src/Shape/Data.hs	37;"	C
 Universe	src/Dodge/Data/Universe.hs	31;"	t
 Universe	src/Dodge/Data/Universe.hs	6;"	m
 UnloadedWeaponSF	src/Dodge/Data/ComposedItem.hs	40;"	C
-UnlockInv	src/Dodge/Data/WorldEffect.hs	29;"	C
+UnlockInv	src/Dodge/Data/WorldEffect.hs	30;"	C
 UnusedLink	src/Dodge/Data/Room.hs	65;"	C
 Update	src/Dodge/Config/Update.hs	4;"	m
 Update	src/Dodge/Creature/Update.hs	1;"	m
@@ -2085,7 +2087,7 @@ UseFromLocation	src/Dodge/Data/Item/Use.hs	62;"	C
 UseFromRoot	src/Dodge/Data/Item/Use.hs	61;"	C
 UseHeld	src/Dodge/Data/Item/Use.hs	33;"	C
 UseInt	src/Dodge/Data/Item/Use.hs	42;"	C
-UseInvItem	src/Dodge/Data/WorldEffect.hs	36;"	C
+UseInvItem	src/Dodge/Data/WorldEffect.hs	37;"	C
 UseItem	src/Dodge/Data/ActionPlan.hs	37;"	C
 UseItem	src/Dodge/Creature/Impulse/UseItem.hs	3;"	m
 UseItemWidth	src/Dodge/Data/SelectionList.hs	41;"	C
@@ -2158,13 +2160,13 @@ WarningCry	src/Dodge/Data/ActionPlan.hs	185;"	C
 WasLeftForward	src/Dodge/Data/Creature/Stance.hs	34;"	C
 WasRightForward	src/Dodge/Data/Creature/Stance.hs	35;"	C
 WatchAndWait	src/Dodge/Data/ActionPlan.hs	183;"	C
-WdBl	src/Dodge/Data/WorldEffect.hs	52;"	t
+WdBl	src/Dodge/Data/WorldEffect.hs	53;"	t
-WdBlBtNotOff	src/Dodge/Data/WorldEffect.hs	59;"	C
+WdBlBtNotOff	src/Dodge/Data/WorldEffect.hs	60;"	C
-WdBlBtOn	src/Dodge/Data/WorldEffect.hs	58;"	C
+WdBlBtOn	src/Dodge/Data/WorldEffect.hs	59;"	C
-WdBlConst	src/Dodge/Data/WorldEffect.hs	55;"	C
+WdBlConst	src/Dodge/Data/WorldEffect.hs	56;"	C
-WdBlCrFilterNearPoint	src/Dodge/Data/WorldEffect.hs	57;"	C
+WdBlCrFilterNearPoint	src/Dodge/Data/WorldEffect.hs	58;"	C
-WdBlDoorMoving	src/Dodge/Data/WorldEffect.hs	54;"	C
+WdBlDoorMoving	src/Dodge/Data/WorldEffect.hs	55;"	C
-WdBlNegate	src/Dodge/Data/WorldEffect.hs	56;"	C
+WdBlNegate	src/Dodge/Data/WorldEffect.hs	57;"	C
 WdCrBl	src/Dodge/Data/CreatureEffect.hs	31;"	t
 WdCrBlfromCrBl	src/Dodge/Data/CreatureEffect.hs	33;"	C
 WdCrCr	src/Dodge/Data/CreatureEffect.hs	11;"	t
@@ -2172,18 +2174,18 @@ WdCrLOSTarget	src/Dodge/Data/CreatureEffect.hs	35;"	C
 WdCrNegate	src/Dodge/Data/CreatureEffect.hs	34;"	C
 WdCrSafeDistFromTarget	src/Dodge/Data/CreatureEffect.hs	36;"	C
 WdCrTrue	src/Dodge/Data/CreatureEffect.hs	32;"	C
-WdP2	src/Dodge/Data/WorldEffect.hs	40;"	t
+WdP2	src/Dodge/Data/WorldEffect.hs	41;"	t
 WdP2	src/Dodge/WdP2.hs	1;"	m
-WdP2Const	src/Dodge/Data/WorldEffect.hs	41;"	C
+WdP2Const	src/Dodge/Data/WorldEffect.hs	42;"	C
-WdP2f	src/Dodge/Data/WorldEffect.hs	62;"	t
+WdP2f	src/Dodge/Data/WorldEffect.hs	63;"	t
 WdP2f	src/Dodge/WdP2f.hs	2;"	m
-WdP2f0	src/Dodge/Data/WorldEffect.hs	63;"	C
+WdP2f0	src/Dodge/Data/WorldEffect.hs	64;"	C
-WdP2fDoorPosition	src/Dodge/Data/WorldEffect.hs	64;"	C
+WdP2fDoorPosition	src/Dodge/Data/WorldEffect.hs	65;"	C
-WdTrig	src/Dodge/Data/WorldEffect.hs	53;"	C
+WdTrig	src/Dodge/Data/WorldEffect.hs	54;"	C
-WdWd	src/Dodge/Data/WorldEffect.hs	23;"	t
+WdWd	src/Dodge/Data/WorldEffect.hs	24;"	t
-WdWdFromItCrixWdWd	src/Dodge/Data/WorldEffect.hs	34;"	C
+WdWdFromItCrixWdWd	src/Dodge/Data/WorldEffect.hs	35;"	C
-WdWdNegateTrig	src/Dodge/Data/WorldEffect.hs	33;"	C
+WdWdNegateTrig	src/Dodge/Data/WorldEffect.hs	34;"	C
-WdYouPos	src/Dodge/Data/WorldEffect.hs	42;"	C
+WdYouPos	src/Dodge/Data/WorldEffect.hs	43;"	C
 Weapon	src/Dodge/Item/Weapon.hs	2;"	m
 WeaponScopeLink	src/Dodge/Data/ComposedItem.hs	23;"	C
 WeaponScopeSF	src/Dodge/Data/ComposedItem.hs	46;"	C
@@ -2204,7 +2206,7 @@ World	src/Dodge/Zoning/World.hs	1;"	m
 WorldBool	src/Dodge/WorldBool.hs	1;"	m
 WorldEffect	src/Dodge/Data/WorldEffect.hs	6;"	m
 WorldEffect	src/Dodge/WorldEffect.hs	1;"	m
-WorldEffects	src/Dodge/Data/WorldEffect.hs	26;"	C
+WorldEffects	src/Dodge/Data/WorldEffect.hs	27;"	C
 WorldEvent	src/Dodge/WorldEvent.hs	1;"	m
 WorldEventFlag	src/Dodge/Data/World.hs	30;"	t
 WorldGovernment	src/Dodge/Data/Scenario.hs	52;"	C
@@ -3329,7 +3331,7 @@ aSound	src/Dodge/SoundLogic.hs	74;"	f
 aStance	src/Dodge/Item/AimStance.hs	12;"	f
 aStaticBall	src/Dodge/WorldEvent/SpawnParticle.hs	41;"	f
 aTreeStrut	src/Dodge/Tree/GenerateStructure.hs	42;"	f
-accessTerminal	src/Dodge/WorldEffect.hs	52;"	f
+accessTerminal	src/Dodge/WorldEffect.hs	53;"	f
 activateDetonator	src/Dodge/Creature/Impulse/UseItem.hs	86;"	f
 activeTargetCursorPic	src/Dodge/Targeting/Draw.hs	31;"	f
 addArmour	src/Dodge/Creature.hs	83;"	f
@@ -3401,24 +3403,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	166;"	f
+applyCME	src/Dodge/HeldUse.hs	174;"	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	225;"	f
+applyInvLock	src/Dodge/HeldUse.hs	233;"	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	111;"	f
-applyRecoil	src/Dodge/HeldUse.hs	245;"	f
+applyRecoil	src/Dodge/HeldUse.hs	253;"	f
 applyResFactor	src/Dodge/Data/Config.hs	110;"	f
 applySetTerminalString	src/Dodge/Debug/Terminal.hs	81;"	f
-applySidePush	src/Dodge/HeldUse.hs	344;"	f
+applySidePush	src/Dodge/HeldUse.hs	352;"	f
-applySoundCME	src/Dodge/HeldUse.hs	235;"	f
+applySoundCME	src/Dodge/HeldUse.hs	243;"	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
@@ -3426,7 +3428,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	355;"	f
+applyTorqueCME	src/Dodge/HeldUse.hs	363;"	f
 applyWorldConfig	src/Dodge/Config/Update.hs	38;"	f
 aquamarine	src/Color.hs	23;"	f
 arHUD	src/Dodge/Item/Scope.hs	135;"	f
@@ -3509,7 +3511,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	504;"	f
+basicMuzFlare	src/Dodge/HeldUse.hs	512;"	f
 basicTerminal	src/Dodge/Terminal.hs	35;"	f
 battery	src/Dodge/Item/Ammo.hs	87;"	f
 batteryPack	src/Dodge/Item/Equipment.hs	55;"	f
@@ -3518,7 +3520,7 @@ beltMag	src/Dodge/Item/Ammo.hs	47;"	f
 bfsNodePoints	src/Dodge/Path.hs	58;"	f
 bfsThenReturn	src/Dodge/Creature/ReaderUpdate.hs	216;"	f
 bgateCalc	src/Dodge/Inventory/SelectionList.hs	112;"	f
-bgunSound	src/Dodge/HeldUse.hs	298;"	f
+bgunSound	src/Dodge/HeldUse.hs	306;"	f
 bindFBO	src/Render.hs	244;"	f
 bingate	src/Dodge/Item/Scope.hs	110;"	f
 black	src/Color.hs	27;"	f
@@ -3780,14 +3782,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	1093;"	f
+createProjectile	src/Dodge/HeldUse.hs	1101;"	f
-createProjectileR	src/Dodge/HeldUse.hs	1058;"	f
+createProjectileR	src/Dodge/HeldUse.hs	1066;"	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	620;"	f
+creatureShootLaser	src/Dodge/HeldUse.hs	628;"	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
@@ -3979,7 +3981,7 @@ detector	src/Dodge/Item/Held/Utility.hs	37;"	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	221;"	f
-determineProjectileTracking	src/Dodge/HeldUse.hs	1041;"	f
+determineProjectileTracking	src/Dodge/HeldUse.hs	1049;"	f
 diagonalLinesRect	src/Dodge/Room/Foreground.hs	52;"	f
 did	src/Dodge/Item/InvSize.hs	54;"	f
 diffAngles	src/Geometry.hs	204;"	f
@@ -4029,8 +4031,8 @@ doCrWdImp	src/Dodge/CreatureEffect.hs	16;"	f
 doCrWdWd	src/Dodge/CreatureEffect.hs	20;"	f
 doDamage	src/Dodge/Creature/State.hs	136;"	f
 doDamagesFL	src/Dodge/Flame.hs	57;"	f
-doDeathToggle	src/Dodge/WorldEffect.hs	91;"	f
+doDeathToggle	src/Dodge/WorldEffect.hs	92;"	f
-doDeathTriggers	src/Dodge/WorldEffect.hs	86;"	f
+doDeathTriggers	src/Dodge/WorldEffect.hs	87;"	f
 doDebugTest	src/Dodge/Update/Input/DebugTest.hs	22;"	f
 doDebugTest2	src/Dodge/Update/Input/DebugTest.hs	37;"	f
 doDebugTestF10	src/Dodge/Update/Input/DebugTest.hs	62;"	f
@@ -4044,9 +4046,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	980;"	f
+doGenFloat	src/Dodge/HeldUse.hs	988;"	f
 doGravityPU	src/Dodge/Projectile/Update.hs	50;"	f
-doHeldUseEffect	src/Dodge/HeldUse.hs	132;"	f
+doHeldUseEffect	src/Dodge/HeldUse.hs	141;"	f
 doInPlacements	src/Dodge/Layout.hs	92;"	f
 doIndividualPlacements	src/Dodge/Layout.hs	117;"	f
 doInputScreenInput	src/Dodge/Update/Input/ScreenLayer.hs	28;"	f
@@ -4082,7 +4084,7 @@ doSectionSize	src/Dodge/DisplayInventory.hs	217;"	f
 doSideEffects	appDodge/Main.hs	120;"	f
 doStep	src/Dodge/ArcStep.hs	9;"	f
 doStrategyActions	src/Dodge/Creature/ReaderUpdate.hs	164;"	f
-doTerminalBootProgram	src/Dodge/WorldEffect.hs	94;"	f
+doTerminalBootProgram	src/Dodge/WorldEffect.hs	95;"	f
 doTerminalCommandEffect	src/Dodge/Terminal.hs	135;"	f
 doTestDrawing	src/Dodge/Render.hs	42;"	f
 doTextInputOver	src/Dodge/Update/Input/Text.hs	15;"	f
@@ -4090,14 +4092,14 @@ doTextInputOverUniverse	src/Dodge/Update/Input/Text.hs	12;"	f
 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
+doTmWdWd	src/Dodge/WorldEffect.hs	100;"	f
 doWallRotate	src/Dodge/Update/Camera.hs	211;"	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	155;"	f
+doWeaponRepetitions	src/Dodge/HeldUse.hs	164;"	f
 doWorldEvents	src/Dodge/Update.hs	425;"	f
 doWorldPos	src/Dodge/WorldPos.hs	7;"	f
 door	src/Dodge/Room/Door.hs	13;"	f
@@ -4240,7 +4242,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	1171;"	f
+dropInventoryPath	src/Dodge/HeldUse.hs	1179;"	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
@@ -4344,7 +4346,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	379;"	f
-flareCircleAt	src/Dodge/HeldUse.hs	485;"	f
+flareCircleAt	src/Dodge/HeldUse.hs	493;"	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
@@ -4413,7 +4415,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	936;"	f
+gasType	src/Dodge/HeldUse.hs	944;"	f
 generateGenParams	src/Dodge/LevelGen/LevelStructure.hs	22;"	f
 generateGraphs	src/Dodge/LevelGen.hs	39;"	f
 generateLayout	src/Dodge/Layout/Generate.hs	10;"	f
@@ -4428,10 +4430,10 @@ getAimZoom	src/Dodge/Update/Camera.hs	134;"	f
 getAmmoLinks	src/Dodge/Item/Grammar.hs	137;"	f
 getArguments	src/Dodge/Update/Scroll.hs	176;"	f
 getArguments'	src/Dodge/Update/Scroll.hs	164;"	f
-getAttachedSFLink	src/Dodge/HeldUse.hs	555;"	f
+getAttachedSFLink	src/Dodge/HeldUse.hs	563;"	f
 getAutoSpringLinks	src/Dodge/Item/Grammar.hs	116;"	f
 getAvailableListLines	src/Dodge/SelectionList.hs	10;"	f
-getBulletType	src/Dodge/HeldUse.hs	688;"	f
+getBulletType	src/Dodge/HeldUse.hs	696;"	f
 getCloseObj	src/Dodge/Update/Input/InGame.hs	515;"	f
 getCommands	src/Dodge/Terminal.hs	117;"	f
 getCommandsHelp	src/Dodge/Terminal.hs	75;"	f
@@ -4441,17 +4443,17 @@ getCrMoveSpeed	src/Dodge/Creature/Statistics.hs	15;"	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	1086;"	f
+getGrenadeHitEffect	src/Dodge/HeldUse.hs	1094;"	f
 getInventoryPath	src/Dodge/Inventory/Path.hs	8;"	f
 getItemValue	src/Dodge/Inventory/SelectionList.hs	141;"	f
-getLaserColor	src/Dodge/HeldUse.hs	501;"	f
+getLaserColor	src/Dodge/HeldUse.hs	509;"	f
-getLaserDamage	src/Dodge/HeldUse.hs	498;"	f
+getLaserDamage	src/Dodge/HeldUse.hs	506;"	f
-getLaserPhaseV	src/Dodge/HeldUse.hs	495;"	f
+getLaserPhaseV	src/Dodge/HeldUse.hs	503;"	f
 getLinksOfType	src/Dodge/RoomLink.hs	39;"	f
 getMaxLinesTM	src/Dodge/Terminal/Type.hs	11;"	f
 getMenuMouseContext	src/Dodge/Update.hs	385;"	f
 getNodePos	src/Dodge/Path.hs	31;"	f
-getPJStabiliser	src/Dodge/HeldUse.hs	1078;"	f
+getPJStabiliser	src/Dodge/HeldUse.hs	1086;"	f
 getPretty	src/AesonHelp.hs	8;"	f
 getPromptTM	src/Dodge/Terminal/Type.hs	8;"	f
 getRootItemBounds	src/Dodge/Render/HUD.hs	94;"	f
@@ -4541,20 +4543,20 @@ heightWallPS	src/Dodge/Placement/Instance/Wall.hs	13;"	f
 heldAimStance	src/Dodge/Item/AimStance.hs	17;"	f
 heldAimZoom	src/Dodge/Update/Camera.hs	139;"	f
 heldEffect	src/Dodge/HeldUse.hs	63;"	f
-heldEffectMuzzles	src/Dodge/HeldUse.hs	122;"	f
+heldEffectMuzzles	src/Dodge/HeldUse.hs	131;"	f
 heldEffectNoHammerCheck	src/Dodge/HeldUse.hs	71;"	f
 heldHandlePos	src/Dodge/Item/HeldOffset.hs	94;"	f
 heldInfo	src/Dodge/Item/Info.hs	88;"	f
 heldItemBulkiness	src/Dodge/Creature/YourControl.hs	175;"	f
-heldItemMuzVel	src/Dodge/HeldUse.hs	818;"	f
+heldItemMuzVel	src/Dodge/HeldUse.hs	826;"	f
 heldItemOffset	src/Dodge/Item/HeldOffset.hs	71;"	f
 heldItemOrient2D	src/Dodge/Item/HeldOffset.hs	28;"	f
 heldItemRelativeOrient	src/Dodge/Item/HeldOffset.hs	33;"	f
-heldItemRifling	src/Dodge/HeldUse.hs	862;"	f
+heldItemRifling	src/Dodge/HeldUse.hs	870;"	f
 heldItemSPic	src/Dodge/Item/Draw/SPic.hs	220;"	f
 heldItemWeight	src/Dodge/Creature/Statistics.hs	41;"	f
 heldPositionInfo	src/Dodge/Item/Info.hs	237;"	f
-heldTorqueAmount	src/Dodge/HeldUse.hs	376;"	f
+heldTorqueAmount	src/Dodge/HeldUse.hs	384;"	f
 heldTriggerType	src/Dodge/BaseTriggerType.hs	17;"	f
 helpCommand	src/Dodge/Terminal.hs	66;"	f
 helpPoly3D	src/Polyhedra.hs	125;"	f
@@ -4671,7 +4673,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	511;"	f
+isAmmoIntLink	src/Dodge/HeldUse.hs	519;"	f
 isAnimate	src/Dodge/Creature/Test.hs	140;"	f
 isCognizant	src/Dodge/Creature/Perception.hs	105;"	f
 isConnected	src/Dodge/Inventory/Swap.hs	74;"	f
@@ -4705,7 +4707,7 @@ itemBlips	src/Dodge/RadarSweep.hs	93;"	f
 itemBulkiness	src/Dodge/Creature/YourControl.hs	170;"	f
 itemCombinations	src/Dodge/Combine/Combinations.hs	55;"	f
 itemCombinationsEdges	src/Dodge/Combine/Graph.hs	60;"	f
-itemDetectorEffect	src/Dodge/HeldUse.hs	561;"	f
+itemDetectorEffect	src/Dodge/HeldUse.hs	569;"	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
@@ -4717,7 +4719,7 @@ itemFromHeldType	src/Dodge/Item/Held.hs	25;"	f
 itemInfo	src/Dodge/Item/Info.hs	18;"	f
 itemInternalValue	src/Dodge/Item/Display.hs	32;"	f
 itemInvColor	src/Dodge/Item/InventoryColor.hs	9;"	f
-itemRandomOffset	src/Dodge/HeldUse.hs	754;"	f
+itemRandomOffset	src/Dodge/HeldUse.hs	762;"	f
 itemRooms	src/Dodge/LockAndKey.hs	39;"	f
 itemRotTreeSPic	src/Dodge/Item/Draw/SPic.hs	27;"	f
 itemSPic	src/Dodge/Item/Draw/SPic.hs	34;"	f
@@ -4725,7 +4727,7 @@ itemScan	src/Dodge/Item/Scope.hs	63;"	f
 itemScroll	src/Dodge/Update/Scroll.hs	50;"	f
 itemScrollDisplay	src/Dodge/Inventory/SelectionList.hs	118;"	f
 itemScrollValue	src/Dodge/Inventory/SelectionList.hs	145;"	f
-itemSidePush	src/Dodge/HeldUse.hs	181;"	f
+itemSidePush	src/Dodge/HeldUse.hs	189;"	f
 itemString	src/Dodge/Item/Display.hs	53;"	f
 itemToBreakLists	src/Dodge/Item/Grammar.hs	63;"	f
 itemToFunction	src/Dodge/Item/Grammar.hs	143;"	f
@@ -4805,7 +4807,7 @@ lineCol	src/Picture/Base.hs	230;"	f
 lineGeom	src/Dodge/Base.hs	32;"	f
 lineOnScreenCone	src/Dodge/Debug/Picture.hs	60;"	f
 lineOrth	src/Dodge/Creature/Boid.hs	125;"	f
-lineOutputTerminal	src/Dodge/WorldEffect.hs	74;"	f
+lineOutputTerminal	src/Dodge/WorldEffect.hs	75;"	f
 lineSplit	src/Justify.hs	26;"	f
 lineThick	src/Picture/Base.hs	234;"	f
 lineUp	src/Dodge/Creature/Boid.hs	147;"	f
@@ -4826,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	27;"	f
-loadMuzzle	src/Dodge/HeldUse.hs	421;"	f
+loadMuzzle	src/Dodge/HeldUse.hs	429;"	f
 loadSaveSlot	src/Dodge/Save.hs	74;"	f
 loadSeed	src/Dodge/LoadSeed.hs	7;"	f
 loadSound	src/Dodge/SoundLogic/LoadSound.hs	11;"	f
@@ -4881,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	799;"	f
+makeBullet	src/Dodge/HeldUse.hs	807;"	f
-makeBullet'	src/Dodge/HeldUse.hs	740;"	f
+makeBullet'	src/Dodge/HeldUse.hs	748;"	f
 makeButton	src/Dodge/LevelGen/Switch.hs	16;"	f
 makeByteStringShaderUsingVAO	src/Shader/Compile.hs	128;"	f
 makeCloudAt	src/Dodge/WorldEvent/Cloud.hs	18;"	f
@@ -4908,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	443;"	f
+makeMuzzleFlare	src/Dodge/HeldUse.hs	451;"	f
 makeParagraph	src/Justify.hs	6;"	f
 makePathBetween	src/Dodge/Path.hs	35;"	f
 makePathBetweenPs	src/Dodge/Path.hs	54;"	f
@@ -4964,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	1012;"	f
+mcShootAuto	src/Dodge/HeldUse.hs	1020;"	f
-mcShootLaser	src/Dodge/HeldUse.hs	1004;"	f
+mcShootLaser	src/Dodge/HeldUse.hs	1012;"	f
 mcTriggerVal	src/Dodge/Machine/Update.hs	93;"	f
 mcTypeUpdate	src/Dodge/Machine/Update.hs	27;"	f
-mcUseHeld	src/Dodge/HeldUse.hs	906;"	f
+mcUseHeld	src/Dodge/HeldUse.hs	914;"	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
@@ -5061,7 +5063,7 @@ 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	471;"	f
+muzFlareAt	src/Dodge/HeldUse.hs	479;"	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
@@ -5450,7 +5452,7 @@ randsOnCirc	src/RandomHelp.hs	127;"	f
 randsSpread	src/RandomHelp.hs	120;"	f
 ratIntersectLineLine	src/Geometry/Intersect.hs	195;"	f
 readSaveSlot	src/Dodge/Save.hs	45;"	f
-recoilAmount	src/Dodge/HeldUse.hs	250;"	f
+recoilAmount	src/Dodge/HeldUse.hs	258;"	f
 rectNSWE	src/Geometry/Polygon.hs	13;"	f
 rectVV	src/Geometry/Polygon.hs	38;"	f
 rectWH	src/Geometry/Polygon.hs	17;"	f
@@ -5477,7 +5479,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	145;"	f
-removeAmmoFromMag	src/Dodge/HeldUse.hs	675;"	f
+removeAmmoFromMag	src/Dodge/HeldUse.hs	683;"	f
 removeDot	src/ShortShow.hs	29;"	f
 removeInverseWalls	src/Dodge/LevelGen/StaticWalls.hs	25;"	f
 removeShieldWall	src/Dodge/Euse.hs	125;"	f
@@ -5756,14 +5758,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	730;"	f
+shootBullet	src/Dodge/HeldUse.hs	738;"	f
 shootFirstMiss	src/Dodge/Creature/Volition.hs	33;"	f
-shootLaser	src/Dodge/HeldUse.hs	644;"	f
+shootLaser	src/Dodge/HeldUse.hs	652;"	f
 shootOutPassage	src/Dodge/Room/RezBox.hs	74;"	f
 shootShatter	src/Dodge/Item/Weapon/Shatter.hs	11;"	f
-shootTeslaArc	src/Dodge/HeldUse.hs	1029;"	f
+shootTeslaArc	src/Dodge/HeldUse.hs	1037;"	f
 shootTillEmpty	src/Dodge/Creature/Volition.hs	18;"	f
-shootTractorBeam	src/Dodge/HeldUse.hs	597;"	f
+shootTractorBeam	src/Dodge/HeldUse.hs	605;"	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
@@ -6059,12 +6061,12 @@ topPrismIndices	src/Shader/Poke.hs	410;"	f
 topTestPart	src/Dodge/TestString.hs	62;"	f
 torch	src/Dodge/Item/Held/Utility.hs	29;"	f
 torchShape	src/Dodge/Item/Draw/SPic.hs	264;"	f
-torqueAmount	src/Dodge/HeldUse.hs	371;"	f
+torqueAmount	src/Dodge/HeldUse.hs	379;"	f
-torqueCr	src/Dodge/WorldEffect.hs	67;"	f
+torqueCr	src/Dodge/WorldEffect.hs	68;"	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	609;"	f
+tractorBeamAt	src/Dodge/HeldUse.hs	617;"	f
 tractorGun	src/Dodge/Item/Held/BatteryGuns.hs	60;"	f
 tractorGunPic	src/Dodge/Item/Draw/SPic.hs	429;"	f
 tractorPullPos	src/Dodge/TractorBeam/Update.hs	33;"	f
@@ -6305,26 +6307,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	911;"	f
+useGasParams	src/Dodge/HeldUse.hs	919;"	f
 useHotkey	src/Dodge/Creature/YourControl.hs	68;"	f
-useInventoryPath	src/Dodge/HeldUse.hs	1196;"	f
+useInventoryPath	src/Dodge/HeldUse.hs	1204;"	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	515;"	f
+useLoadedAmmo	src/Dodge/HeldUse.hs	523;"	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	1162;"	f
+useRewindGun	src/Dodge/HeldUse.hs	1170;"	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	1143;"	f
+useStopWatch	src/Dodge/HeldUse.hs	1151;"	f
 useStopWatch	src/Dodge/Luse.hs	21;"	f
-useTimeCheck	src/Dodge/HeldUse.hs	98;"	f
+useTimeCheck	src/Dodge/HeldUse.hs	107;"	f
 useTimeCheck	src/Dodge/Item/Weapon/TriggerType.hs	127;"	f
-useTimeScrollGun	src/Dodge/HeldUse.hs	1151;"	f
+useTimeScrollGun	src/Dodge/HeldUse.hs	1159;"	f
 useTimeScrollGun	src/Dodge/Luse.hs	29;"	f
 useUnusedLnk	src/Dodge/PlacementSpot.hs	169;"	f
 usedRoomInLinkPoss	src/Dodge/PlacementSpot.hs	196;"	f
@@ -6359,7 +6361,7 @@ vocalizationTest	src/Dodge/Creature/Vocalization.hs	8;"	f
 volleyGun	src/Dodge/Item/Held/Cane.hs	28;"	f
 volleyGunShape	src/Dodge/Item/Draw/SPic.hs	340;"	f
 waistSP	src/Dodge/Creature/HandPos.hs	173;"	f
-walkNozzle	src/Dodge/HeldUse.hs	576;"	f
+walkNozzle	src/Dodge/HeldUse.hs	584;"	f
 walkableNodeNear	src/Dodge/Path.hs	48;"	f
 wallBlips	src/Dodge/RadarSweep.hs	98;"	f
 wallBuffer	src/Dodge/WallCreatureCollisions.hs	51;"	f