Move towards moving muzzles out of records

src/Dodge/Creature.hs

@@ -157,12 +157,13 @@ inventoryX c = case c of
         , detector WALLDETECTOR
         , battery
         ]
-    'E' -> fold
+    'E' -> [alteRifle
-        [ makeTypeCraftNum 3 PIPE
+        , tinMag
-        , makeTypeCraftNum 5 HARDWARE
+        , tinMag
-        , makeTypeCraftNum 1 TIN
+        ] <>
-        , makeTypeCraftNum 1 SPRING
+            fold
-        , makeTypeCraftNum 1 PLANK
+        [ makeTypeCraftNum 1 SPRING
+        , makeTypeCraftNum 1 HARDWARE
         , makeTypeCraftNum 1 PLATE
         , makeTypeCraftNum 1 STEELDRUM
         , makeTypeCraftNum 1 MOTOR

src/Dodge/Data/Item/Params.hs

@@ -15,10 +15,9 @@ data ItemParams
     | FlatShieldParams
         {_flatShieldWlMIX :: Maybe Int}
     | Arcing
-        { _currentArc :: [ArcStep]
+        { _currentArc :: [ArcStep]}
---        , _arcSize :: Float
+    | NozzleAngle {_nzAngle :: Float}
---        , _arcNumber :: Int
+    | VolleyUnfiredBarrels {_unfiredBarrels :: [Int]}
-        }
 
 data ShrinkGunStatus = FullSize | Shrunk
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)

src/Dodge/Data/Item/Use.hs

@@ -34,7 +34,6 @@ data ItemUse
         { _heldDelay :: UseDelay
         , _heldMuzzles :: [Muzzle]
         , _heldFrame :: Int
-        , _heldUseEffect :: HeldUseEffect
         }
     | UseEquip {_uequipEffect :: EquipEffect}
     | UseAttach {_uaParams :: AttachParams}
@@ -50,12 +49,6 @@ data ItemUse
         }
     deriving (Eq, Show, Read)
 
-data HeldUseEffect
-    = NoHeldUseEffect
-    | RandomiseMuzzleFrames Int
-    | SwitchAlteRifle
-    deriving (Eq, Show, Read)
-
 data UseFocus
     = UseFromRoot
     | UseFromLocation
@@ -99,7 +92,6 @@ data MuzzleEffect
     | MuzzleNozzle
         { _nzPressure :: GenFloat
         , _nzMaxWalkAngle :: Float
-        , _nzCurrentWalkAngle :: Float
         , _nzWalkSpeed :: Float
         }
     | MuzzleShatter
@@ -125,15 +117,6 @@ data Muzzle = Muzzle
     , _mzEffect :: MuzzleEffect
     , _mzAmmoPerShot :: AmmoPerShot
     , _mzFrame :: Int
-    --    , _mzChargeRequirement :: Maybe Int
-    --    , _mzRecoil :: Float
-    --    , _mzTorque :: Float
-    --    , _mzSidePush :: Float
-    --    , _mzRandomOffset :: Float
-    --    , _mzVel :: Float
-    --    , _mzRifling :: Float
-    --    , _mzAmmoSlot :: Either Int
-    --    , _mzAmmoPerShot :: Int
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
@@ -145,8 +128,6 @@ makeLenses ''MuzzleEffect
 makeLenses ''AmmoPerShot
 makeLenses ''UseCondition
 makeLenses ''UseFocus
-makeLenses ''HeldUseEffect
-deriveJSON defaultOptions ''HeldUseEffect
 deriveJSON defaultOptions ''UseFocus
 deriveJSON defaultOptions ''UseCondition
 deriveJSON defaultOptions ''MuzzleEffect

src/Dodge/Data/MuzzleEffect.hs

@@ -1,9 +1,12 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Data.MuzzleEffect where
+
 import Control.Lens
+
 --import Data.Aeson
 --import Data.Aeson.TH
 --import Dodge.Data.Item.Use.Consumption.Ammo
@@ -13,5 +16,6 @@ data CumulativeMuzzleEffect = CME
     , _cmeTorque :: Float
     , _cmeSound :: Bool
     }
-    deriving (Eq,Ord,Show,Read)
+    deriving (Eq, Ord, Show, Read)
+
 makeLenses ''CumulativeMuzzleEffect

src/Dodge/Data/WorldEffect.hs

@@ -35,7 +35,7 @@ data WdWd
     | WdWdFromItCrixWdWd (LabelDoubleTree ComposeLinkType Item) Int ItCrWdWd
     | MakeTempLight LSParam Int
     | UseInvItem Int PressType
-    | WdWdBurstFireRepeats Int Int
+    | WdWdBurstFireRepetition Int Int
     --deriving (Eq, Show, Read) --, Generic)
     --h--deriving (Eq, Show, Read) --Generic, Flat)
 

src/Dodge/Default/Item/Use.hs

@@ -31,5 +31,5 @@ defaultHeldUse = UseHeld
 --        { _weaponInvLock = 0
 --        }
     , _heldFrame = 0
-    , _heldUseEffect = NoHeldUseEffect
+--    , _heldUseEffect = NoHeldUseEffect
     }

src/Dodge/HeldUse.hs

@@ -107,7 +107,7 @@ hammerCheck f pt it cr
 --        it -- & ldtValue . itUse . heldParams . weaponRepeat .~ []
 --            & ldtValue . itUse . heldFrame .~ x
 
-    g x = (x, WdWdBurstFireRepeats (_crID cr) (it ^?! ldtValue . itLocation . ilInvID))
+    g x = (x, WdWdBurstFireRepetition (_crID cr) (it ^?! ldtValue . itLocation . ilInvID))
 
 -- | Applies a world effect after an item use cooldown check.
 useTimeCheck :: ChainEffect
@@ -136,26 +136,26 @@ useTimeCheck f item cr w = case item ^? ldtValue . itUse . heldDelay of
 
 heldEffectMuzzles :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
 heldEffectMuzzles t cr w =
-    doHeldUseEffect t cr $
+    doHeldUseEffect t cr .
-        uncurry (applyCME (_ldtValue t) cr) cmew
+        uncurry (applyCME (_ldtValue t) cr) .
+        foldl' (useLoadedAmmo t cr) (CME 0 0 False, w) $ zip [0 ..] loadedmuzzles
   where
     --            & doWeaponRepetitions upitm cr
 
     muzzles = t ^. ldtValue . itUse . heldMuzzles
     --(upitm, loadedmuzzles) = mapAccumR loadMuzzle t muzzles
     (_, loadedmuzzles) = mapAccumR loadMuzzle t muzzles
-    cmew = foldl' (useLoadedAmmo t cr) (CME 0 0 False, w) $ zip [0 ..] loadedmuzzles
 
 doHeldUseEffect :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
-doHeldUseEffect t cr w = case t ^? ldtValue . itUse . heldUseEffect of
+doHeldUseEffect t cr w = case t ^. ldtValue . itType of
-    Just (RandomiseMuzzleFrames x) -> fromMaybe w $ do
+    HELD (VOLLEYGUN x) -> fromMaybe w $ do
         i <- t ^? ldtValue . itLocation . ilInvID
         let g = w ^. randGen
             (is, g') = runState (shuffle [0 .. x -1]) g
         return $
             w & cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix i . itUse . heldMuzzles %~ zipWith (\j mz -> mz & mzFrame .~ j) is
                 & randGen .~ g'
-    Just SwitchAlteRifle -> fromMaybe w $ do
+    HELD ALTERIFLE -> fromMaybe w $ do
         i <- t ^? ldtValue . itLocation . ilInvID
         return $
             w
@@ -165,8 +165,27 @@ doHeldUseEffect t cr w = case t ^? ldtValue . itUse . heldUseEffect of
                     . ix 0
                     . mzAmmoSlot
                 %~ ((`mod` 2) . (+ 1))
-    Just NoHeldUseEffect -> w
+    _ -> w
-    Nothing -> w
+--doHeldUseEffect t cr w = case t ^? ldtValue . itUse . heldUseEffect of
+--    Just (RandomiseMuzzleFrames x) -> fromMaybe w $ do
+--        i <- t ^? ldtValue . itLocation . ilInvID
+--        let g = w ^. randGen
+--            (is, g') = runState (shuffle [0 .. x -1]) g
+--        return $
+--            w & cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix i . itUse . heldMuzzles %~ zipWith (\j mz -> mz & mzFrame .~ j) is
+--                & randGen .~ g'
+--    Just SwitchAlteRifle -> fromMaybe w $ do
+--        i <- t ^? ldtValue . itLocation . ilInvID
+--        return $
+--            w
+--                & cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix i
+--                    . itUse
+--                    . heldMuzzles
+--                    . ix 0
+--                    . mzAmmoSlot
+--                %~ ((`mod` 2) . (+ 1))
+--    Just NoHeldUseEffect -> w
+--    Nothing -> w
 
 ---- need to be careful about inventory lock or item ids here
 --doWeaponRepetitions :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
@@ -603,19 +622,21 @@ walkNozzle mzid mz itm cr w = fromMaybe w $ do
         w
             & cWorld . lWorld . creatures . ix (_crID cr) . crInv
                 . ix invid
-                . itUse
+                . itParams . nzAngle %~ f
-                . heldMuzzles
+--                . itUse
-                . ix mzid
+--                . heldMuzzles
-                . mzEffect
+--                . ix mzid
-                . nzCurrentWalkAngle
+--                . mzEffect
-                .~ wa
+--                . nzCurrentWalkAngle
+--                .~ wa
             & randGen .~ g
   where
     nz = _mzEffect mz
     (walkamount, g) = randomR (- aspeed, aspeed) (_randGen w)
     aspeed = _nzWalkSpeed nz
     maxa = _nzMaxWalkAngle nz
-    wa = min maxa $ max (negate maxa) (_nzCurrentWalkAngle nz + walkamount)
+    f x = min maxa $ max (negate maxa) (x + walkamount)
+--    wa = min maxa $ max (negate maxa) (_nzCurrentWalkAngle nz + walkamount)
 
 shootTractorBeam :: Creature -> World -> World
 shootTractorBeam cr w =
@@ -935,7 +956,8 @@ useGasParams mmagid mz itm cr w =
     pos = _crPos cr + rotateV (_crDir cr) moff
     (a, g') = randomR (- inacc, inacc) g
     inacc = _mzInaccuracy mz
-    dir = _crDir cr + mrot + a + _nzCurrentWalkAngle (_mzEffect mz)
+    --dir = _crDir cr + mrot + a + _nzCurrentWalkAngle (_mzEffect mz)
+    dir = _crDir cr + mrot + a + _nzAngle (_itParams itm)
 
 gasType :: HeldItemType -> GasFuel -> Maybe GasCreate
 gasType hit _ = case hit of

src/Dodge/Item/Held/Cane.hs

@@ -28,7 +28,6 @@ defaultBangCane =
 volleyGun :: Int -> Item
 volleyGun i =
     defaultBangCane
---        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
         & itUse . heldMuzzles .~ getZipList 
             (ZipList [Muzzle (V2 15 x) 0 0.01 | x <- spreadAroundCenter i 6]
             <*> ZipList [0..i-1] 
@@ -37,23 +36,19 @@ volleyGun i =
             <*> pure (UseExactly 1)
             <*> ZipList [0..i-1] 
             )
---        & itUse . heldParams . recoil .~ 30
         & itType .~ HELD (VOLLEYGUN i)
         & itAmmoSlots .~ IM.fromList (zip [0..i-1] $ repeat BulletAmmo)
---        & itUse . heldParams . weaponRepeat .~ [1..i-1]
+--        & itUse . heldUseEffect .~ RandomiseMuzzleFrames i
-        & itUse . heldUseEffect .~ RandomiseMuzzleFrames i
 
 rifle :: Item
 rifle =
     defaultBangCane
         & itType .~ HELD RIFLE
---        & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
         & itUse . heldMuzzles . ix 0 . mzPos .~ V2 25 0
 
 alteRifle :: Item
 alteRifle = rifle
     & itType .~ HELD ALTERIFLE
-    & itUse . heldUseEffect .~ SwitchAlteRifle
     & itAmmoSlots .~ IM.fromList (zip [0..1] $ repeat BulletAmmo)
 
 --repeater :: Item
@@ -73,10 +68,6 @@ burstRifle =
         & itType .~ HELD BURSTRIFLE
         & itUse . heldMuzzles . ix 0 . mzInaccuracy .~ 0.05
         & itUse . heldDelay . rateMax .~ 6
-        & itUse . heldMuzzles %~ doreplicate
-  where
-    doreplicate (x:_) = [x,x & mzFrame .~ 3,x & mzFrame .~ 6]
-    doreplicate [] = error "tried to replicate non-existing burstRifle muzzle"
 
 miniGunX :: Int -> Item
 miniGunX i =

src/Dodge/Item/Held/SprayGuns.hs

@@ -64,7 +64,7 @@ flameWall =
 flameThrower :: Item
 flameThrower =
     defaultHeldItem
-        & itParams .~ NoParams
+        & itParams .~ NozzleAngle 0
         & itUse . heldDelay .~ NoDelay
 --        & itUse . heldAim . aimZoom .~ defaultItZoom{_izMax = 5, _izMin = 1.5}
         & itUse . heldMuzzles .~ [Muzzle (V2 18 0) 0 0 0 NoFlare 
@@ -72,7 +72,7 @@ flameThrower =
                         { _nzPressure = ConstFloat 4
                         , _nzMaxWalkAngle = 0.2
                         , _nzWalkSpeed = 0.01
-                        , _nzCurrentWalkAngle = 0
+--                        , _nzCurrentWalkAngle = 0
                         }
             (UseExactly 1)
             0

src/Dodge/WorldEffect.hs

@@ -45,8 +45,7 @@ doWdWd we = case we of
     MakeTempLight x t -> (cWorld . lWorld . lights .:~ x)
         . (cWorld . lWorld . worldEvents .:~ MakeTempLight x (t-1))
     UseInvItem invid pt -> \w -> fromMaybe w (useItem invid pt w)
-    WdWdBurstFireRepeats cid invid -> \w -> fromMaybe w $ do
+    WdWdBurstFireRepetition cid invid -> \w -> fromMaybe w $ do
---        undefined
         cr <- w ^? cWorld . lWorld . creatures . ix cid
         itree <- bimap _iatType (^. _1) <$> 
             allInvLocs (cr ^. crInv) ^? ix invid . _2 . locLDT

tags

@@ -25,9 +25,9 @@ ALTERIFLE	src/Dodge/Data/Item/Combine.hs	152;"	C
 AMMOMAG	src/Dodge/Data/Item/Combine.hs	20;"	C
 AMR	src/Dodge/Data/Item/Combine.hs	157;"	C
 ANTIMATTER	src/Dodge/Data/Item/Combine.hs	67;"	C
-APInt	src/Dodge/Data/Item/Use.hs	71;"	C
+APInt	src/Dodge/Data/Item/Use.hs	64;"	C
-APNothing	src/Dodge/Data/Item/Use.hs	72;"	C
+APNothing	src/Dodge/Data/Item/Use.hs	65;"	C
-APProjectiles	src/Dodge/Data/Item/Use.hs	70;"	C
+APProjectiles	src/Dodge/Data/Item/Use.hs	63;"	C
 AQUAMARINE	src/Color/Data.hs	24;"	C
 ARHUD	src/Dodge/Data/Item/Combine.hs	34;"	C
 ARHUDSF	src/Dodge/Data/ComposedItem.hs	50;"	C
@@ -67,10 +67,10 @@ AmmoMagSF	src/Dodge/Data/ComposedItem.hs	51;"	C
 AmmoMagType	src/Dodge/Data/Item/Combine.hs	104;"	t
 AmmoModLink	src/Dodge/Data/ComposedItem.hs	19;"	C
 AmmoModifierSF	src/Dodge/Data/ComposedItem.hs	57;"	C
-AmmoParams	src/Dodge/Data/Item/Use.hs	75;"	t
+AmmoParams	src/Dodge/Data/Item/Use.hs	68;"	t
 AmmoPayloadLink	src/Dodge/Data/ComposedItem.hs	21;"	C
 AmmoPayloadSF	src/Dodge/Data/ComposedItem.hs	59;"	C
-AmmoPerShot	src/Dodge/Data/Item/Use.hs	114;"	t
+AmmoPerShot	src/Dodge/Data/Item/Use.hs	107;"	t
 AmmoTargetingLink	src/Dodge/Data/ComposedItem.hs	20;"	C
 AmmoTargetingSF	src/Dodge/Data/ComposedItem.hs	58;"	C
 AmmoType	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	24;"	t
@@ -99,7 +99,7 @@ AsteroidStrike	src/Dodge/Data/Scenario.hs	33;"	C
 AtEase	src/Dodge/Data/Creature/Stance.hs	40;"	C
 AtomicWaste	src/Dodge/Data/Scenario.hs	26;"	C
 Attach	src/Dodge/Item/Attach.hs	1;"	m
-AttachParams	src/Dodge/Data/Item/Use.hs	69;"	t
+AttachParams	src/Dodge/Data/Item/Use.hs	62;"	t
 AttachType	src/Dodge/Data/Item/Combine.hs	90;"	t
 Attention	src/Dodge/Data/Creature/Perception.hs	60;"	t
 AttentiveTo	src/Dodge/Data/Creature/Perception.hs	61;"	C
@@ -150,7 +150,7 @@ BaseTriggerType	src/Dodge/BaseTriggerType.hs	3;"	m
 BasicBeamDraw	src/Dodge/Data/Beam.hs	34;"	C
 BasicBulletTrajectory	src/Dodge/Data/Bullet.hs	50;"	C
 BasicBulletTrajectoryType	src/Dodge/Data/Bullet.hs	57;"	C
-BasicFlare	src/Dodge/Data/Item/Use.hs	84;"	C
+BasicFlare	src/Dodge/Data/Item/Use.hs	77;"	C
 BatteryGuns	src/Dodge/Item/Held/BatteryGuns.hs	1;"	m
 BatteryGuns	src/Dodge/Item/Weapon/BatteryGuns.hs	1;"	m
 Beam	src/Dodge/Data/Beam.hs	18;"	t
@@ -231,7 +231,7 @@ BulletMod	src/Dodge/Data/Item/BulletMod.hs	10;"	t
 BulletMod	src/Dodge/Data/Item/BulletMod.hs	3;"	m
 BulletModEffect	src/Dodge/Data/Item/BulletMod.hs	12;"	C
 BulletModPayload	src/Dodge/Data/Item/BulletMod.hs	11;"	C
-BulletParams	src/Dodge/Data/Item/Use.hs	76;"	C
+BulletParams	src/Dodge/Data/Item/Use.hs	69;"	C
 BulletPayload	src/Dodge/Data/Bullet.hs	41;"	t
 BulletTrajectory	src/Dodge/Data/Bullet.hs	49;"	t
 BulletTrajectoryType	src/Dodge/Data/Bullet.hs	56;"	t
@@ -254,7 +254,7 @@ CHEMFUELPOUCH	src/Dodge/Data/Item/Combine.hs	110;"	C
 CHeal	src/Dodge/Data/Item/HeldUse.hs	16;"	C
 CIRCLE	src/Dodge/Data/GenParams.hs	20;"	C
 CLICKER	src/Dodge/Data/Item/Combine.hs	27;"	C
-CME	src/Dodge/Data/MuzzleEffect.hs	11;"	C
+CME	src/Dodge/Data/MuzzleEffect.hs	14;"	C
 CONCUSSIVE	src/Dodge/Data/Damage/Type.hs	22;"	C
 COPIER	src/Dodge/Data/Item/Combine.hs	28;"	C
 CRAFT	src/Dodge/Data/Item/Combine.hs	18;"	C
@@ -287,7 +287,7 @@ CardinalPoint	src/Dodge/Base/CardinalPoint.hs	1;"	m
 CardinalPoint	src/Dodge/Data/CardinalPoint.hs	1;"	m
 Carriage	src/Dodge/Data/Creature/Stance.hs	20;"	t
 Carte	src/Dodge/Render/HUD/Carte.hs	1;"	m
-ChainEffect	src/Dodge/HeldUse.hs	75;"	t
+ChainEffect	src/Dodge/HeldUse.hs	76;"	t
 ChainEffect	src/Dodge/Item/Weapon/TriggerType.hs	43;"	t
 ChainUpdates	src/Dodge/Creature/ChainUpdates.hs	1;"	m
 ChangePosture	src/Dodge/Data/ActionPlan.hs	42;"	C
@@ -438,7 +438,7 @@ CreatureType	src/Dodge/Data/Creature/Misc.hs	69;"	t
 CryostatisSS	src/Dodge/Data/Scenario.hs	91;"	C
 Crystal	src/Dodge/Data/Material.hs	11;"	C
 Cull_more_lights	src/Dodge/Data/Config.hs	78;"	C
-CumulativeMuzzleEffect	src/Dodge/Data/MuzzleEffect.hs	11;"	t
+CumulativeMuzzleEffect	src/Dodge/Data/MuzzleEffect.hs	14;"	t
 CursorDisplay	src/Dodge/Data/SelectionList.hs	19;"	t
 Cuse	src/Dodge/Data/Item/HeldUse.hs	14;"	t
 Cuse	src/Dodge/Cuse.hs	1;"	m
@@ -687,7 +687,7 @@ FlameBeamCombine	src/Dodge/Data/Beam.hs	39;"	C
 FlameSound	src/Dodge/Data/SoundOrigin.hs	27;"	C
 Flamer	src/Dodge/Data/SoundOrigin.hs	25;"	C
 Flank	src/Dodge/Data/ActionPlan.hs	177;"	C
-FlareType	src/Dodge/Data/Item/Use.hs	82;"	t
+FlareType	src/Dodge/Data/Item/Use.hs	75;"	t
 FlashBall	src/Dodge/Data/Bullet.hs	32;"	C
 FlatFaces	src/Shape/Data.hs	17;"	C
 FlatShieldParams	src/Dodge/Data/Item/Params.hs	15;"	C
@@ -757,7 +757,7 @@ GasAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	30;"	C
 GasCloud	src/Dodge/Data/Cloud.hs	31;"	C
 GasCreate	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	41;"	t
 GasFuel	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	38;"	t
-GasParams	src/Dodge/Data/Item/Use.hs	78;"	C
+GasParams	src/Dodge/Data/Item/Use.hs	71;"	C
 GenCr	src/Dodge/Data/Creature/State.hs	31;"	C
 GenFloat	src/Dodge/Data/GenFloat.hs	11;"	t
 GenFloat	src/Dodge/Data/GenFloat.hs	5;"	m
@@ -825,7 +825,7 @@ HammerUp	src/Dodge/Data/Hammer.hs	20;"	C
 HandPos	src/Dodge/Creature/HandPos.hs	1;"	m
 HardQuit	src/Dodge/Data/Universe.hs	70;"	C
 HasHammer	src/Dodge/Data/Hammer.hs	14;"	C
-HeavySmokeFlare	src/Dodge/Data/Item/Use.hs	87;"	C
+HeavySmokeFlare	src/Dodge/Data/Item/Use.hs	80;"	C
 Held	src/Dodge/Item/Held.hs	1;"	m
 HeldDelay	src/Dodge/Data/Item/HeldDelay.hs	6;"	m
 HeldItemType	src/Dodge/Data/Item/Combine.hs	137;"	t
@@ -834,7 +834,6 @@ HeldPlatformSF	src/Dodge/Data/ComposedItem.hs	41;"	C
 HeldScroll	src/Dodge/HeldScroll.hs	1;"	m
 HeldUse	src/Dodge/Data/Item/HeldUse.hs	6;"	m
 HeldUse	src/Dodge/HeldUse.hs	5;"	m
-HeldUseEffect	src/Dodge/Data/Item/Use.hs	53;"	t
 HelpNum	src/HelpNum.hs	1;"	m
 HiddenGoal	src/Dodge/Data/Scenario.hs	14;"	C
 HomeUsingRemoteScreen	src/Dodge/Data/Projectile.hs	49;"	C
@@ -1014,7 +1013,7 @@ Lampoid	src/Dodge/Data/Creature/Misc.hs	83;"	C
 Lampoid	src/Dodge/Lampoid.hs	1;"	m
 Large	src/Shape/Data.hs	29;"	C
 LasBeamCombine	src/Dodge/Data/Beam.hs	40;"	C
-LasGunFlare	src/Dodge/Data/Item/Use.hs	88;"	C
+LasGunFlare	src/Dodge/Data/Item/Use.hs	81;"	C
 LasSound	src/Dodge/Data/SoundOrigin.hs	28;"	C
 LasTurret	src/Dodge/Room/LasTurret.hs	1;"	m
 Laser	src/Dodge/Data/Laser.hs	21;"	t
@@ -1185,7 +1184,7 @@ Metapysics	src/Dodge/Data/Scenario.hs	17;"	t
 Military	src/Dodge/Data/Scenario.hs	45;"	C
 Mine	src/Dodge/Data/Scenario.hs	64;"	C
 MiniGunAI	src/Dodge/Data/Creature/Misc.hs	58;"	C
-MiniGunFlare	src/Dodge/Data/Item/Use.hs	86;"	C
+MiniGunFlare	src/Dodge/Data/Item/Use.hs	79;"	C
 Misc	src/Dodge/Data/Creature/Misc.hs	6;"	m
 Misc	src/Dodge/Data/Equipment/Misc.hs	6;"	m
 Misc	src/Dodge/Data/Item/Misc.hs	6;"	m
@@ -1219,23 +1218,23 @@ Multiset	src/Multiset.hs	4;"	m
 Music	src/Music.hs	1;"	m
 MusicData	src/Music.hs	7;"	t
 Mute	src/Dodge/Data/Creature/Misc.hs	28;"	C
-Muzzle	src/Dodge/Data/Item/Use.hs	119;"	t
+Muzzle	src/Dodge/Data/Item/Use.hs	112;"	t
-MuzzleBlink	src/Dodge/Data/Item/Use.hs	107;"	C
+MuzzleBlink	src/Dodge/Data/Item/Use.hs	100;"	C
-MuzzleDetector	src/Dodge/Data/Item/Use.hs	106;"	C
+MuzzleDetector	src/Dodge/Data/Item/Use.hs	99;"	C
-MuzzleEffect	src/Dodge/Data/Item/Use.hs	92;"	t
+MuzzleEffect	src/Dodge/Data/Item/Use.hs	85;"	t
-MuzzleEffect	src/Dodge/Data/MuzzleEffect.hs	5;"	m
+MuzzleEffect	src/Dodge/Data/MuzzleEffect.hs	6;"	m
-MuzzleGLauncher	src/Dodge/Data/Item/Use.hs	98;"	C
+MuzzleGLauncher	src/Dodge/Data/Item/Use.hs	91;"	C
-MuzzleLaser	src/Dodge/Data/Item/Use.hs	94;"	C
+MuzzleLaser	src/Dodge/Data/Item/Use.hs	87;"	C
-MuzzleNozzle	src/Dodge/Data/Item/Use.hs	99;"	C
+MuzzleNozzle	src/Dodge/Data/Item/Use.hs	92;"	C
-MuzzleRLauncher	src/Dodge/Data/Item/Use.hs	97;"	C
+MuzzleRLauncher	src/Dodge/Data/Item/Use.hs	90;"	C
-MuzzleRewind	src/Dodge/Data/Item/Use.hs	109;"	C
+MuzzleRewind	src/Dodge/Data/Item/Use.hs	102;"	C
-MuzzleScroller	src/Dodge/Data/Item/Use.hs	111;"	C
+MuzzleScroller	src/Dodge/Data/Item/Use.hs	104;"	C
-MuzzleShatter	src/Dodge/Data/Item/Use.hs	105;"	C
+MuzzleShatter	src/Dodge/Data/Item/Use.hs	98;"	C
-MuzzleShootBullet	src/Dodge/Data/Item/Use.hs	93;"	C
+MuzzleShootBullet	src/Dodge/Data/Item/Use.hs	86;"	C
-MuzzleStopper	src/Dodge/Data/Item/Use.hs	110;"	C
+MuzzleStopper	src/Dodge/Data/Item/Use.hs	103;"	C
-MuzzleTesla	src/Dodge/Data/Item/Use.hs	95;"	C
+MuzzleTesla	src/Dodge/Data/Item/Use.hs	88;"	C
-MuzzleTractor	src/Dodge/Data/Item/Use.hs	96;"	C
+MuzzleTractor	src/Dodge/Data/Item/Use.hs	89;"	C
-MuzzleUnsafeBlink	src/Dodge/Data/Item/Use.hs	108;"	C
+MuzzleUnsafeBlink	src/Dodge/Data/Item/Use.hs	101;"	C
 MvForward	src/Dodge/Data/ActionPlan.hs	35;"	C
 MvTurnToward	src/Dodge/Data/ActionPlan.hs	34;"	C
 MvWalking	src/Dodge/Data/Creature/Misc.hs	39;"	C
@@ -1258,7 +1257,7 @@ NewIntMap	src/NewInt.hs	18;"	t
 NewSideEffect	src/Dodge/Data/Universe.hs	65;"	C
 Ngon	src/Dodge/Room/Ngon.hs	1;"	m
 NoAction	src/Dodge/Data/ActionPlan.hs	152;"	C
-NoAmmoParams	src/Dodge/Data/Item/Use.hs	79;"	C
+NoAmmoParams	src/Dodge/Data/Item/Use.hs	72;"	C
 NoArguments	src/Dodge/Data/Terminal.hs	91;"	C
 NoBeamCombine	src/Dodge/Data/Beam.hs	43;"	C
 NoConcurrentEffect	src/Loop/Data.hs	7;"	C
@@ -1273,15 +1272,14 @@ NoDropEffect	src/Dodge/Data/Item/Effect.hs	37;"	C
 NoEquipParams	src/Dodge/Data/Item/Use/Equipment.hs	36;"	C
 NoEscapeMenuOption	src/Dodge/Data/Universe.hs	79;"	C
 NoFaction	src/Dodge/Data/Creature/State.hs	40;"	C
-NoFlare	src/Dodge/Data/Item/Use.hs	83;"	C
+NoFlare	src/Dodge/Data/Item/Use.hs	76;"	C
 NoHammer	src/Dodge/Data/Hammer.hs	13;"	C
-NoHeldUseEffect	src/Dodge/Data/Item/Use.hs	54;"	C
 NoHoming	src/Dodge/Data/Projectile.hs	48;"	C
 NoIntImp	src/Dodge/Data/CreatureEffect.hs	20;"	C
 NoInvEffect	src/Dodge/Data/Item/Effect.hs	24;"	C
 NoItTargeting	src/Dodge/Data/Item.hs	60;"	C
 NoItemScroll	src/Dodge/Data/Item.hs	56;"	C
-NoLightFlare	src/Dodge/Data/Item/Use.hs	85;"	C
+NoLightFlare	src/Dodge/Data/Item/Use.hs	78;"	C
 NoLighting	src/Dodge/Data/Config.hs	104;"	C
 NoMouseContext	src/Dodge/Data/Input.hs	22;"	C
 NoMvType	src/Dodge/Data/Creature/Misc.hs	38;"	C
@@ -1499,7 +1497,7 @@ Procedural	src/Dodge/Room/Procedural.hs	2;"	m
 Projectile	src/Dodge/Data/Projectile.hs	17;"	t
 Projectile	src/Dodge/Data/Projectile.hs	6;"	m
 Projectile	src/Dodge/Projectile.hs	1;"	m
-ProjectileParams	src/Dodge/Data/Item/Use.hs	77;"	C
+ProjectileParams	src/Dodge/Data/Item/Use.hs	70;"	C
 ProjectileStabiliserLink	src/Dodge/Data/ComposedItem.hs	32;"	C
 ProjectileStabiliserSF	src/Dodge/Data/ComposedItem.hs	63;"	C
 ProjectileType	src/Dodge/Data/Projectile.hs	36;"	t
@@ -1601,7 +1599,6 @@ RandomHelp	src/RandomHelp.hs	3;"	m
 RandomImpulse	src/Dodge/Data/ActionPlan.hs	32;"	C
 RandomPlacement	src/Dodge/Data/GenWorld.hs	84;"	C
 RandomTurn	src/Dodge/Data/ActionPlan.hs	31;"	C
-RandomiseMuzzleFrames	src/Dodge/Data/Item/Use.hs	55;"	C
 ReactorSS	src/Dodge/Data/Scenario.hs	111;"	C
 ReaderUpdate	src/Dodge/Creature/ReaderUpdate.hs	1;"	m
 RecRoomSS	src/Dodge/Data/Scenario.hs	103;"	C
@@ -1877,7 +1874,6 @@ SwarmAI	src/Dodge/Data/Creature/Misc.hs	55;"	C
 SwarmCrit	src/Dodge/Creature/SwarmCrit.hs	1;"	m
 SwarmPlacement	src/Dodge/LevelGen/SwarmPlacement.hs	1;"	m
 Switch	src/Dodge/LevelGen/Switch.hs	1;"	m
-SwitchAlteRifle	src/Dodge/Data/Item/Use.hs	56;"	C
 SwitchToItem	src/Dodge/Data/ActionPlan.hs	38;"	C
 TAPE	src/Dodge/Data/Item/Combine.hs	54;"	C
 TARGETING	src/Dodge/Data/Item/Combine.hs	21;"	C
@@ -1957,7 +1953,7 @@ TeslaArc	src/Dodge/Data/TeslaArc.hs	17;"	t
 TeslaArc	src/Dodge/Data/TeslaArc.hs	6;"	m
 TeslaBall	src/Dodge/Data/Bullet.hs	31;"	C
 TeslaBeamCombine	src/Dodge/Data/Beam.hs	41;"	C
-TeslaGunFlare	src/Dodge/Data/Item/Use.hs	89;"	C
+TeslaGunFlare	src/Dodge/Data/Item/Use.hs	82;"	C
 Test	src/Dodge/Creature/Test.hs	8;"	m
 Test	src/Dodge/Event/Test.hs	1;"	m
 Test	src/Picture/Test.hs	1;"	m
@@ -2071,32 +2067,32 @@ Update	src/Preload/Update.hs	3;"	m
 Use	src/Dodge/Data/Item/Use.hs	6;"	m
 Use	src/Dodge/Default/Item/Use.hs	1;"	m
 UseAheadPos	src/Dodge/Data/ActionPlan.hs	160;"	C
-UseAttach	src/Dodge/Data/Item/Use.hs	40;"	C
+UseAttach	src/Dodge/Data/Item/Use.hs	39;"	C
-UseBulletMod	src/Dodge/Data/Item/Use.hs	45;"	C
+UseBulletMod	src/Dodge/Data/Item/Use.hs	44;"	C
-UseCondition	src/Dodge/Data/Item/Use.hs	64;"	t
+UseCondition	src/Dodge/Data/Item/Use.hs	57;"	t
 UseDelay	src/Dodge/Data/Item/HeldDelay.hs	13;"	t
-UseEquip	src/Dodge/Data/Item/Use.hs	39;"	C
+UseEquip	src/Dodge/Data/Item/Use.hs	38;"	C
-UseExactly	src/Dodge/Data/Item/Use.hs	115;"	C
+UseExactly	src/Dodge/Data/Item/Use.hs	108;"	C
-UseFocus	src/Dodge/Data/Item/Use.hs	59;"	t
+UseFocus	src/Dodge/Data/Item/Use.hs	52;"	t
-UseFromLocation	src/Dodge/Data/Item/Use.hs	61;"	C
+UseFromLocation	src/Dodge/Data/Item/Use.hs	54;"	C
-UseFromRoot	src/Dodge/Data/Item/Use.hs	60;"	C
+UseFromRoot	src/Dodge/Data/Item/Use.hs	53;"	C
 UseHeld	src/Dodge/Data/Item/Use.hs	33;"	C
-UseInt	src/Dodge/Data/Item/Use.hs	41;"	C
+UseInt	src/Dodge/Data/Item/Use.hs	40;"	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
-UseMapper	src/Dodge/Data/Item/Use.hs	47;"	C
+UseMapper	src/Dodge/Data/Item/Use.hs	46;"	C
 UseMvTargetPos	src/Dodge/Data/ActionPlan.hs	163;"	C
-UseNothing	src/Dodge/Data/Item/Use.hs	42;"	C
+UseNothing	src/Dodge/Data/Item/Use.hs	41;"	C
-UseScope	src/Dodge/Data/Item/Use.hs	44;"	C
+UseScope	src/Dodge/Data/Item/Use.hs	43;"	C
 UseSelf	src/Dodge/Data/ActionPlan.hs	157;"	C
 UseTarget	src/Dodge/Data/ActionPlan.hs	154;"	C
-UseToggle	src/Dodge/Data/Item/Use.hs	46;"	C
+UseToggle	src/Dodge/Data/Item/Use.hs	45;"	C
-UseUpTo	src/Dodge/Data/Item/Use.hs	116;"	C
+UseUpTo	src/Dodge/Data/Item/Use.hs	109;"	C
-UseValue	src/Dodge/Data/Item/Use.hs	43;"	C
+UseValue	src/Dodge/Data/Item/Use.hs	42;"	C
-UseableAnytime	src/Dodge/Data/Item/Use.hs	66;"	C
+UseableAnytime	src/Dodge/Data/Item/Use.hs	59;"	C
-UseableWhenAimed	src/Dodge/Data/Item/Use.hs	65;"	C
+UseableWhenAimed	src/Dodge/Data/Item/Use.hs	58;"	C
 UsedInLink	src/Dodge/Data/Room.hs	61;"	C
 UsedOutLink	src/Dodge/Data/Room.hs	56;"	C
 Utility	src/Dodge/Item/Held/Utility.hs	1;"	m
@@ -2178,7 +2174,7 @@ WdP2f0	src/Dodge/Data/WorldEffect.hs	65;"	C
 WdP2fDoorPosition	src/Dodge/Data/WorldEffect.hs	66;"	C
 WdTrig	src/Dodge/Data/WorldEffect.hs	55;"	C
 WdWd	src/Dodge/Data/WorldEffect.hs	24;"	t
-WdWdBurstFireRepeats	src/Dodge/Data/WorldEffect.hs	38;"	C
+WdWdBurstFireRepetition	src/Dodge/Data/WorldEffect.hs	38;"	C
 WdWdFromItCrixWdWd	src/Dodge/Data/WorldEffect.hs	35;"	C
 WdWdNegateTrig	src/Dodge/Data/WorldEffect.hs	34;"	C
 WdYouPos	src/Dodge/Data/WorldEffect.hs	44;"	C
@@ -2230,14 +2226,14 @@ _allocRemoveID	src/Dodge/Data/RightButtonOptions.hs	34;"	f
 _allocSwapID	src/Dodge/Data/RightButtonOptions.hs	30;"	f
 _alphaDivideShader	src/Data/Preload/Render.hs	18;"	f
 _ambushTarget	src/Dodge/Data/ActionPlan.hs	178;"	f
-_ampBullet	src/Dodge/Data/Item/Use.hs	76;"	f
+_ampBullet	src/Dodge/Data/Item/Use.hs	69;"	f
-_ampCreateGas	src/Dodge/Data/Item/Use.hs	78;"	f
+_ampCreateGas	src/Dodge/Data/Item/Use.hs	71;"	f
-_ampPayload	src/Dodge/Data/Item/Use.hs	77;"	f
+_ampPayload	src/Dodge/Data/Item/Use.hs	70;"	f
 _apAction	src/Dodge/Data/ActionPlan.hs	20;"	f
 _apGoal	src/Dodge/Data/ActionPlan.hs	22;"	f
 _apImpulse	src/Dodge/Data/ActionPlan.hs	19;"	f
-_apInt	src/Dodge/Data/Item/Use.hs	71;"	f
+_apInt	src/Dodge/Data/Item/Use.hs	64;"	f
-_apProjectiles	src/Dodge/Data/Item/Use.hs	70;"	f
+_apProjectiles	src/Dodge/Data/Item/Use.hs	63;"	f
 _apStrategy	src/Dodge/Data/ActionPlan.hs	21;"	f
 _arLoaded	src/Dodge/Data/Item/Use/Consumption.hs	28;"	f
 _arMax	src/Dodge/Data/Item/Use/Consumption.hs	29;"	f
@@ -2366,9 +2362,9 @@ _cloudShader	src/Data/Preload/Render.hs	48;"	f
 _cloudVBO	src/Data/Preload/Render.hs	47;"	f
 _clouds	src/Dodge/Data/LWorld.hs	102;"	f
 _cmdEffect	src/Dodge/Data/Terminal.hs	91;"	f
-_cmeRecoil	src/Dodge/Data/MuzzleEffect.hs	12;"	f
+_cmeRecoil	src/Dodge/Data/MuzzleEffect.hs	15;"	f
-_cmeSound	src/Dodge/Data/MuzzleEffect.hs	14;"	f
+_cmeSound	src/Dodge/Data/MuzzleEffect.hs	17;"	f
-_cmeTorque	src/Dodge/Data/MuzzleEffect.hs	13;"	f
+_cmeTorque	src/Dodge/Data/MuzzleEffect.hs	16;"	f
 _colorBlurShader	src/Data/Preload/Render.hs	22;"	f
 _coordinates	src/Dodge/Data/LWorld.hs	130;"	f
 _corpses	src/Dodge/Data/LWorld.hs	139;"	f
@@ -2610,7 +2606,6 @@ _heldDelay	src/Dodge/Data/Item/Use.hs	34;"	f
 _heldFrame	src/Dodge/Data/Item/Use.hs	36;"	f
 _heldMuzzles	src/Dodge/Data/Item/Use.hs	35;"	f
 _heldPos	src/Dodge/Data/Input.hs	54;"	f
-_heldUseEffect	src/Dodge/Data/Item/Use.hs	37;"	f
 _heldWorldPos	src/Dodge/Data/Input.hs	56;"	f
 _hotkeys	src/Dodge/Data/LWorld.hs	148;"	f
 _hud	src/Dodge/Data/World.hs	45;"	f
@@ -2803,14 +2798,14 @@ _mvSpeed	src/Dodge/Data/Creature/Misc.hs	39;"	f
 _mvToPoint	src/Dodge/Data/Creature.hs	78;"	f
 _mvTurnJit	src/Dodge/Data/Creature/Misc.hs	43;"	f
 _mvTurnRad	src/Dodge/Data/Creature/Misc.hs	42;"	f
-_mzAmmoPerShot	src/Dodge/Data/Item/Use.hs	126;"	f
+_mzAmmoPerShot	src/Dodge/Data/Item/Use.hs	119;"	f
-_mzAmmoSlot	src/Dodge/Data/Item/Use.hs	123;"	f
+_mzAmmoSlot	src/Dodge/Data/Item/Use.hs	116;"	f
-_mzEffect	src/Dodge/Data/Item/Use.hs	125;"	f
+_mzEffect	src/Dodge/Data/Item/Use.hs	118;"	f
-_mzFlareType	src/Dodge/Data/Item/Use.hs	124;"	f
+_mzFlareType	src/Dodge/Data/Item/Use.hs	117;"	f
-_mzFrame	src/Dodge/Data/Item/Use.hs	127;"	f
+_mzFrame	src/Dodge/Data/Item/Use.hs	120;"	f
-_mzInaccuracy	src/Dodge/Data/Item/Use.hs	122;"	f
+_mzInaccuracy	src/Dodge/Data/Item/Use.hs	115;"	f
-_mzPos	src/Dodge/Data/Item/Use.hs	120;"	f
+_mzPos	src/Dodge/Data/Item/Use.hs	113;"	f
-_mzRot	src/Dodge/Data/Item/Use.hs	121;"	f
+_mzRot	src/Dodge/Data/Item/Use.hs	114;"	f
 _nodeMetaTree	src/Dodge/Data/MetaTree.hs	14;"	f
 _nodeMetaTree	src/Dodge/Tree/Compose/Data.hs	9;"	f
 _nodeTree	src/Dodge/Data/MetaTree.hs	13;"	f
@@ -2819,10 +2814,10 @@ _nodesSearched	src/Dodge/Data/Creature/Memory.hs	15;"	f
 _numLinkEW	src/Dodge/Data/Room.hs	33;"	f
 _numLinkNS	src/Dodge/Data/Room.hs	34;"	f
 _numberFloorVerxs	src/Dodge/Data/CWorld.hs	29;"	f
-_nzCurrentWalkAngle	src/Dodge/Data/Item/Use.hs	102;"	f
+_nzCurrentWalkAngle	src/Dodge/Data/Item/Use.hs	95;"	f
-_nzMaxWalkAngle	src/Dodge/Data/Item/Use.hs	101;"	f
+_nzMaxWalkAngle	src/Dodge/Data/Item/Use.hs	94;"	f
-_nzPressure	src/Dodge/Data/Item/Use.hs	100;"	f
+_nzPressure	src/Dodge/Data/Item/Use.hs	93;"	f
-_nzWalkSpeed	src/Dodge/Data/Item/Use.hs	103;"	f
+_nzWalkSpeed	src/Dodge/Data/Item/Use.hs	96;"	f
 _offPathFromEdges	src/Dodge/Data/Room.hs	74;"	f
 _oldMagnets	src/Dodge/Data/LWorld.hs	127;"	f
 _onPathFromEdges	src/Dodge/Data/Room.hs	73;"	f
@@ -3196,12 +3191,12 @@ _tuFireTime	src/Dodge/Data/Machine.hs	60;"	f
 _tuTurnSpeed	src/Dodge/Data/Machine.hs	59;"	f
 _tuWeapon	src/Dodge/Data/Machine.hs	58;"	f
 _turnToPoint	src/Dodge/Data/ActionPlan.hs	92;"	f
-_uInt	src/Dodge/Data/Item/Use.hs	41;"	f
+_uInt	src/Dodge/Data/Item/Use.hs	40;"	f
-_uScope	src/Dodge/Data/Item/Use.hs	44;"	f
+_uScope	src/Dodge/Data/Item/Use.hs	43;"	f
-_uValue	src/Dodge/Data/Item/Use.hs	43;"	f
+_uValue	src/Dodge/Data/Item/Use.hs	42;"	f
-_uaParams	src/Dodge/Data/Item/Use.hs	40;"	f
+_uaParams	src/Dodge/Data/Item/Use.hs	39;"	f
-_ubMod	src/Dodge/Data/Item/Use.hs	45;"	f
+_ubMod	src/Dodge/Data/Item/Use.hs	44;"	f
-_uequipEffect	src/Dodge/Data/Item/Use.hs	39;"	f
+_uequipEffect	src/Dodge/Data/Item/Use.hs	38;"	f
 _unCombEdge	src/Dodge/Combine/Graph.hs	31;"	f
 _unCombNode	src/Dodge/Combine/Graph.hs	24;"	f
 _unFBO	src/Shader/Data.hs	57;"	f
@@ -3216,14 +3211,14 @@ _unTO	src/Shader/Data.hs	59;"	f
 _unpauseClock	src/Dodge/Data/World.hs	54;"	f
 _unputTerminal	src/Dodge/Data/GenWorld.hs	36;"	f
 _useAheadPos	src/Dodge/Data/ActionPlan.hs	161;"	f
-_useExactly	src/Dodge/Data/Item/Use.hs	115;"	f
+_useExactly	src/Dodge/Data/Item/Use.hs	108;"	f
-_useMapperLines	src/Dodge/Data/Item/Use.hs	48;"	f
+_useMapperLines	src/Dodge/Data/Item/Use.hs	47;"	f
-_useMapperPoints	src/Dodge/Data/Item/Use.hs	49;"	f
+_useMapperPoints	src/Dodge/Data/Item/Use.hs	48;"	f
 _useMvTargetPos	src/Dodge/Data/ActionPlan.hs	164;"	f
 _useSelf	src/Dodge/Data/ActionPlan.hs	158;"	f
 _useTarget	src/Dodge/Data/ActionPlan.hs	155;"	f
-_useToggle	src/Dodge/Data/Item/Use.hs	46;"	f
+_useToggle	src/Dodge/Data/Item/Use.hs	45;"	f
-_useUpTo	src/Dodge/Data/Item/Use.hs	116;"	f
+_useUpTo	src/Dodge/Data/Item/Use.hs	109;"	f
 _uvCanContinue	src/Dodge/Data/Universe.hs	39;"	f
 _uvConfig	src/Dodge/Data/Universe.hs	37;"	f
 _uvDebug	src/Dodge/Data/Universe.hs	44;"	f
@@ -3322,7 +3317,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	60;"	f
+accessTerminal	src/Dodge/WorldEffect.hs	59;"	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
@@ -3381,7 +3376,7 @@ airlockZ	src/Dodge/Room/Airlock.hs	91;"	f
 allInvLocs	src/Dodge/Item/Grammar.hs	313;"	f
 allVisibleWalls	src/Dodge/Base/Collide.hs	131;"	f
 alongSegBy	src/Geometry.hs	40;"	f
-alteRifle	src/Dodge/Item/Held/Cane.hs	53;"	f
+alteRifle	src/Dodge/Item/Held/Cane.hs	49;"	f
 ammoMagInfo	src/Dodge/Item/Info.hs	46;"	f
 ammoMagSPic	src/Dodge/Item/Draw/SPic.hs	124;"	f
 amr	src/Dodge/Item/Held/Rod.hs	34;"	f
@@ -3394,24 +3389,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	181;"	f
+applyCME	src/Dodge/HeldUse.hs	201;"	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	240;"	f
+applyInvLock	src/Dodge/HeldUse.hs	260;"	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	272;"	f
+applyRecoil	src/Dodge/HeldUse.hs	292;"	f
 applyResFactor	src/Dodge/Data/Config.hs	110;"	f
 applySetTerminalString	src/Dodge/Debug/Terminal.hs	81;"	f
-applySidePush	src/Dodge/HeldUse.hs	371;"	f
+applySidePush	src/Dodge/HeldUse.hs	391;"	f
-applySoundCME	src/Dodge/HeldUse.hs	262;"	f
+applySoundCME	src/Dodge/HeldUse.hs	282;"	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
@@ -3419,7 +3414,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	382;"	f
+applyTorqueCME	src/Dodge/HeldUse.hs	402;"	f
 applyWorldConfig	src/Dodge/Config/Update.hs	38;"	f
 aquamarine	src/Color.hs	23;"	f
 arHUD	src/Dodge/Item/Scope.hs	135;"	f
@@ -3461,7 +3456,7 @@ autoDetector	src/Dodge/Item/Weapon/Radar.hs	11;"	f
 autoEffect	src/Dodge/Item/Weapon/ExtraEffect.hs	18;"	f
 autoGunS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	532;"	f
 autoPistol	src/Dodge/Item/Held/Stick.hs	50;"	f
-autoRifle	src/Dodge/Item/Held/Cane.hs	65;"	f
+autoRifle	src/Dodge/Item/Held/Cane.hs	60;"	f
 awakeLevelPerception	src/Dodge/Creature/Perception.hs	162;"	f
 axisInt	src/Geometry/Intersect.hs	227;"	f
 azure	src/Color.hs	22;"	f
@@ -3502,7 +3497,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	526;"	f
+basicMuzFlare	src/Dodge/HeldUse.hs	546;"	f
 basicTerminal	src/Dodge/Terminal.hs	35;"	f
 battery	src/Dodge/Item/Ammo.hs	87;"	f
 batteryPack	src/Dodge/Item/Equipment.hs	55;"	f
@@ -3511,7 +3506,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	325;"	f
+bgunSound	src/Dodge/HeldUse.hs	345;"	f
 bindFBO	src/Render.hs	244;"	f
 bingate	src/Dodge/Item/Scope.hs	110;"	f
 black	src/Color.hs	27;"	f
@@ -3568,7 +3563,7 @@ bulletModule	src/Dodge/Item/Scope.hs	118;"	f
 bulletPayloadModule	src/Dodge/Item/Scope.hs	132;"	f
 bulletSynthesizer	src/Dodge/Item/Ammo.hs	117;"	f
 bulletWeapons	src/Dodge/Combine/Combinations.hs	247;"	f
-burstRifle	src/Dodge/Item/Held/Cane.hs	70;"	f
+burstRifle	src/Dodge/Item/Held/Cane.hs	65;"	f
 buzzS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	538;"	f
 cFilledRect	src/Dodge/CharacterEnums.hs	6;"	f
 cWireRect	src/Dodge/CharacterEnums.hs	10;"	f
@@ -3773,14 +3768,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	1075;"	f
+createProjectile	src/Dodge/HeldUse.hs	1095;"	f
-createProjectileR	src/Dodge/HeldUse.hs	1040;"	f
+createProjectileR	src/Dodge/HeldUse.hs	1060;"	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	642;"	f
+creatureShootLaser	src/Dodge/HeldUse.hs	662;"	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
@@ -3972,7 +3967,7 @@ detector	src/Dodge/Item/Held/Utility.hs	35;"	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	1023;"	f
+determineProjectileTracking	src/Dodge/HeldUse.hs	1043;"	f
 diagonalLinesRect	src/Dodge/Room/Foreground.hs	52;"	f
 did	src/Dodge/Item/InvSize.hs	54;"	f
 diffAngles	src/Geometry.hs	204;"	f
@@ -4022,8 +4017,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	99;"	f
+doDeathToggle	src/Dodge/WorldEffect.hs	98;"	f
-doDeathTriggers	src/Dodge/WorldEffect.hs	94;"	f
+doDeathTriggers	src/Dodge/WorldEffect.hs	93;"	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
@@ -4037,15 +4032,15 @@ 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	983;"	f
+doGenFloat	src/Dodge/HeldUse.hs	1003;"	f
 doGravityPU	src/Dodge/Projectile/Update.hs	50;"	f
-doHeldUseEffect	src/Dodge/HeldUse.hs	148;"	f
+doHeldUseEffect	src/Dodge/HeldUse.hs	149;"	f
 doInPlacements	src/Dodge/Layout.hs	92;"	f
 doIndividualPlacements	src/Dodge/Layout.hs	117;"	f
 doInputScreenInput	src/Dodge/Update/Input/ScreenLayer.hs	28;"	f
 doIntImp	src/Dodge/CreatureEffect.hs	24;"	f
 doInvEffect	src/Dodge/ItEffect.hs	16;"	f
-doItCrWdWd	src/Dodge/WorldEffect.hs	55;"	f
+doItCrWdWd	src/Dodge/WorldEffect.hs	54;"	f
 doItemTimeScroll	src/Dodge/Update.hs	195;"	f
 doItmCrWdWd	src/Dodge/Euse.hs	27;"	f
 doLoop	src/Loop.hs	60;"	f
@@ -4075,7 +4070,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	102;"	f
+doTerminalBootProgram	src/Dodge/WorldEffect.hs	101;"	f
 doTerminalCommandEffect	src/Dodge/Terminal.hs	135;"	f
 doTestDrawing	src/Dodge/Render.hs	42;"	f
 doTextInputOver	src/Dodge/Update/Input/Text.hs	15;"	f
@@ -4083,7 +4078,7 @@ 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	107;"	f
+doTmWdWd	src/Dodge/WorldEffect.hs	106;"	f
 doWallRotate	src/Dodge/Update/Camera.hs	211;"	f
 doWdBl	src/Dodge/WorldBool.hs	10;"	f
 doWdCrBl	src/Dodge/CreatureEffect.hs	37;"	f
@@ -4232,7 +4227,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	1153;"	f
+dropInventoryPath	src/Dodge/HeldUse.hs	1173;"	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
@@ -4336,7 +4331,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	507;"	f
+flareCircleAt	src/Dodge/HeldUse.hs	527;"	f
 flatItemCombinations	src/Dodge/Combine/Combinations.hs	50;"	f
 flatLookupItems	src/Dodge/Combine.hs	38;"	f
 flatShield	src/Dodge/Item/Held/Utility.hs	18;"	f
@@ -4398,14 +4393,14 @@ fuseWallsWith	src/Dodge/LevelGen/StaticWalls.hs	172;"	f
 g	src/ShortShow.hs	33;"	f
 gLauncher	src/Dodge/Item/Held/Launcher.hs	24;"	f
 gRandify	src/Dodge/Randify.hs	11;"	f
-gadgetEffect	src/Dodge/HeldUse.hs	43;"	f
+gadgetEffect	src/Dodge/HeldUse.hs	44;"	f
 gameOverMenu	src/Dodge/Menu.hs	187;"	f
 gameRoomFromRoom	src/Dodge/Layout.hs	161;"	f
 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	939;"	f
+gasType	src/Dodge/HeldUse.hs	959;"	f
 generateGenParams	src/Dodge/LevelGen/LevelStructure.hs	22;"	f
 generateGraphs	src/Dodge/LevelGen.hs	39;"	f
 generateLayout	src/Dodge/Layout/Generate.hs	10;"	f
@@ -4420,10 +4415,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	577;"	f
+getAttachedSFLink	src/Dodge/HeldUse.hs	597;"	f
 getAutoSpringLinks	src/Dodge/Item/Grammar.hs	116;"	f
 getAvailableListLines	src/Dodge/SelectionList.hs	10;"	f
-getBulletType	src/Dodge/HeldUse.hs	700;"	f
+getBulletType	src/Dodge/HeldUse.hs	720;"	f
 getCloseObj	src/Dodge/Update/Input/InGame.hs	515;"	f
 getCommands	src/Dodge/Terminal.hs	117;"	f
 getCommandsHelp	src/Dodge/Terminal.hs	75;"	f
@@ -4433,17 +4428,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	1068;"	f
+getGrenadeHitEffect	src/Dodge/HeldUse.hs	1088;"	f
 getInventoryPath	src/Dodge/Inventory/Path.hs	8;"	f
 getItemValue	src/Dodge/Inventory/SelectionList.hs	141;"	f
-getLaserColor	src/Dodge/HeldUse.hs	523;"	f
+getLaserColor	src/Dodge/HeldUse.hs	543;"	f
-getLaserDamage	src/Dodge/HeldUse.hs	520;"	f
+getLaserDamage	src/Dodge/HeldUse.hs	540;"	f
-getLaserPhaseV	src/Dodge/HeldUse.hs	517;"	f
+getLaserPhaseV	src/Dodge/HeldUse.hs	537;"	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	1060;"	f
+getPJStabiliser	src/Dodge/HeldUse.hs	1080;"	f
 getPretty	src/AesonHelp.hs	8;"	f
 getPromptTM	src/Dodge/Terminal/Type.hs	8;"	f
 getRootItemBounds	src/Dodge/Render/HUD.hs	94;"	f
@@ -4502,7 +4497,7 @@ hackOutline	src/Dodge/Render/Outline.hs	5;"	f
 halfHeight	src/Dodge/Base/Window.hs	48;"	f
 halfWidth	src/Dodge/Base/Window.hs	48;"	f
 haltSound	src/Dodge/SoundLogic.hs	38;"	f
-hammerCheck	src/Dodge/HeldUse.hs	82;"	f
+hammerCheck	src/Dodge/HeldUse.hs	83;"	f
 handleEvent	src/Dodge/Event.hs	27;"	f
 handleHotkeys	src/Dodge/Creature/YourControl.hs	43;"	f
 handleKeyboardEvent	src/Dodge/Event/Input.hs	22;"	f
@@ -4532,22 +4527,22 @@ healthTest	src/Dodge/Room/LasTurret.hs	95;"	f
 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
+heldEffect	src/Dodge/HeldUse.hs	64;"	f
-heldEffectMuzzles	src/Dodge/HeldUse.hs	136;"	f
+heldEffectMuzzles	src/Dodge/HeldUse.hs	137;"	f
-heldEffectNoHammerCheck	src/Dodge/HeldUse.hs	71;"	f
+heldEffectNoHammerCheck	src/Dodge/HeldUse.hs	72;"	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
-heldItemInvLock	src/Dodge/HeldUse.hs	255;"	f
+heldItemInvLock	src/Dodge/HeldUse.hs	275;"	f
-heldItemMuzVel	src/Dodge/HeldUse.hs	827;"	f
+heldItemMuzVel	src/Dodge/HeldUse.hs	847;"	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	871;"	f
+heldItemRifling	src/Dodge/HeldUse.hs	891;"	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	398;"	f
+heldTorqueAmount	src/Dodge/HeldUse.hs	418;"	f
 heldTriggerType	src/Dodge/BaseTriggerType.hs	17;"	f
 helpCommand	src/Dodge/Terminal.hs	66;"	f
 helpPoly3D	src/Polyhedra.hs	125;"	f
@@ -4664,7 +4659,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	533;"	f
+isAmmoIntLink	src/Dodge/HeldUse.hs	553;"	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
@@ -4698,7 +4693,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	583;"	f
+itemDetectorEffect	src/Dodge/HeldUse.hs	603;"	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
@@ -4710,8 +4705,8 @@ 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
-itemInvLock	src/Dodge/HeldUse.hs	250;"	f
+itemInvLock	src/Dodge/HeldUse.hs	270;"	f
-itemRandomOffset	src/Dodge/HeldUse.hs	764;"	f
+itemRandomOffset	src/Dodge/HeldUse.hs	784;"	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
@@ -4719,7 +4714,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	196;"	f
+itemSidePush	src/Dodge/HeldUse.hs	216;"	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
@@ -4799,7 +4794,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	82;"	f
+lineOutputTerminal	src/Dodge/WorldEffect.hs	81;"	f
 lineSplit	src/Justify.hs	26;"	f
 lineThick	src/Picture/Base.hs	234;"	f
 lineUp	src/Dodge/Creature/Boid.hs	147;"	f
@@ -4820,7 +4815,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	443;"	f
+loadMuzzle	src/Dodge/HeldUse.hs	463;"	f
 loadSaveSlot	src/Dodge/Save.hs	74;"	f
 loadSeed	src/Dodge/LoadSeed.hs	7;"	f
 loadSound	src/Dodge/SoundLogic/LoadSound.hs	11;"	f
@@ -4875,8 +4870,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	808;"	f
+makeBullet	src/Dodge/HeldUse.hs	828;"	f
-makeBullet'	src/Dodge/HeldUse.hs	750;"	f
+makeBullet'	src/Dodge/HeldUse.hs	770;"	f
 makeButton	src/Dodge/LevelGen/Switch.hs	16;"	f
 makeByteStringShaderUsingVAO	src/Shader/Compile.hs	128;"	f
 makeCloudAt	src/Dodge/WorldEvent/Cloud.hs	18;"	f
@@ -4902,7 +4897,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	465;"	f
+makeMuzzleFlare	src/Dodge/HeldUse.hs	485;"	f
 makeParagraph	src/Justify.hs	6;"	f
 makePathBetween	src/Dodge/Path.hs	35;"	f
 makePathBetweenPs	src/Dodge/Path.hs	54;"	f
@@ -4958,11 +4953,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	994;"	f
+mcShootAuto	src/Dodge/HeldUse.hs	1014;"	f
-mcShootLaser	src/Dodge/HeldUse.hs	987;"	f
+mcShootLaser	src/Dodge/HeldUse.hs	1007;"	f
 mcTriggerVal	src/Dodge/Machine/Update.hs	93;"	f
 mcTypeUpdate	src/Dodge/Machine/Update.hs	27;"	f
-mcUseHeld	src/Dodge/HeldUse.hs	915;"	f
+mcUseHeld	src/Dodge/HeldUse.hs	935;"	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
@@ -5003,7 +4998,7 @@ minCrIXOn	src/Dodge/Zoning/Creature.hs	46;"	f
 minOn	src/FoldableHelp.hs	35;"	f
 mini1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	346;"	f
 miniGunCrit	src/Dodge/Creature.hs	62;"	f
-miniGunX	src/Dodge/Item/Held/Cane.hs	81;"	f
+miniGunX	src/Dodge/Item/Held/Cane.hs	72;"	f
 miniGunXPict	src/Dodge/Item/Draw/SPic.hs	357;"	f
 miniGunXPictItem	src/Dodge/Item/Draw/SPic.hs	352;"	f
 miniS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	548;"	f
@@ -5055,7 +5050,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	493;"	f
+muzFlareAt	src/Dodge/HeldUse.hs	513;"	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
@@ -5444,7 +5439,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	277;"	f
+recoilAmount	src/Dodge/HeldUse.hs	297;"	f
 rectNSWE	src/Geometry/Polygon.hs	13;"	f
 rectVV	src/Geometry/Polygon.hs	38;"	f
 rectWH	src/Geometry/Polygon.hs	17;"	f
@@ -5471,7 +5466,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	687;"	f
+removeAmmoFromMag	src/Dodge/HeldUse.hs	707;"	f
 removeDot	src/ShortShow.hs	29;"	f
 removeInverseWalls	src/Dodge/LevelGen/StaticWalls.hs	25;"	f
 removeShieldWall	src/Dodge/Euse.hs	125;"	f
@@ -5513,7 +5508,7 @@ rezInvBox	src/Dodge/Room/RezBox.hs	134;"	f
 rezText	src/Dodge/Story.hs	4;"	f
 rezText'	src/Dodge/Story.hs	17;"	f
 rhombus	src/Polyhedra.hs	72;"	f
-rifle	src/Dodge/Item/Held/Cane.hs	46;"	f
+rifle	src/Dodge/Item/Held/Cane.hs	43;"	f
 right	src/DoubleStack.hs	16;"	f
 rightIsParentCombine	src/Dodge/Item/Grammar.hs	243;"	f
 rightPad	src/Padding.hs	19;"	f
@@ -5750,14 +5745,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	740;"	f
+shootBullet	src/Dodge/HeldUse.hs	760;"	f
 shootFirstMiss	src/Dodge/Creature/Volition.hs	33;"	f
-shootLaser	src/Dodge/HeldUse.hs	666;"	f
+shootLaser	src/Dodge/HeldUse.hs	686;"	f
 shootOutPassage	src/Dodge/Room/RezBox.hs	74;"	f
 shootShatter	src/Dodge/Item/Weapon/Shatter.hs	11;"	f
-shootTeslaArc	src/Dodge/HeldUse.hs	1011;"	f
+shootTeslaArc	src/Dodge/HeldUse.hs	1031;"	f
 shootTillEmpty	src/Dodge/Creature/Volition.hs	18;"	f
-shootTractorBeam	src/Dodge/HeldUse.hs	619;"	f
+shootTractorBeam	src/Dodge/HeldUse.hs	639;"	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
@@ -5890,7 +5885,7 @@ ssfold	src/FoldableHelp.hs	105;"	f
 stackPicturesAt	src/Dodge/Render/List.hs	98;"	f
 stackPicturesAtOff	src/Dodge/Render/List.hs	101;"	f
 stackText	src/Picture/Base.hs	188;"	f
-stackedInventory	src/Dodge/Creature.hs	308;"	f
+stackedInventory	src/Dodge/Creature.hs	309;"	f
 startCr	src/Dodge/Creature.hs	91;"	f
 startCrafts	src/Dodge/Room/Start.hs	92;"	f
 startDrag	src/Dodge/Update/Input/InGame.hs	279;"	f
@@ -5981,7 +5976,7 @@ teslaParams	src/Dodge/Item/Held/BatteryGuns.hs	32;"	f
 teslaParams	src/Dodge/Tesla/ItemParams.hs	6;"	f
 testCrossWalls	src/Dodge/Room/Path.hs	47;"	f
 testEvent	src/Dodge/Event/Test.hs	10;"	f
-testInventory	src/Dodge/Creature.hs	289;"	f
+testInventory	src/Dodge/Creature.hs	290;"	f
 testStringInit	src/Dodge/TestString.hs	28;"	f
 text	src/Picture/Base.hs	193;"	f
 textGrad	src/Picture/Text.hs	5;"	f
@@ -6053,12 +6048,12 @@ topPrismIndices	src/Shader/Poke.hs	410;"	f
 topTestPart	src/Dodge/TestString.hs	62;"	f
 torch	src/Dodge/Item/Held/Utility.hs	27;"	f
 torchShape	src/Dodge/Item/Draw/SPic.hs	264;"	f
-torqueAmount	src/Dodge/HeldUse.hs	393;"	f
+torqueAmount	src/Dodge/HeldUse.hs	413;"	f
-torqueCr	src/Dodge/WorldEffect.hs	75;"	f
+torqueCr	src/Dodge/WorldEffect.hs	74;"	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	631;"	f
+tractorBeamAt	src/Dodge/HeldUse.hs	651;"	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
@@ -6299,26 +6294,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	920;"	f
+useGasParams	src/Dodge/HeldUse.hs	940;"	f
 useHotkey	src/Dodge/Creature/YourControl.hs	68;"	f
-useInventoryPath	src/Dodge/HeldUse.hs	1178;"	f
+useInventoryPath	src/Dodge/HeldUse.hs	1198;"	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	537;"	f
+useLoadedAmmo	src/Dodge/HeldUse.hs	557;"	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	1144;"	f
+useRewindGun	src/Dodge/HeldUse.hs	1164;"	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	1125;"	f
+useStopWatch	src/Dodge/HeldUse.hs	1145;"	f
 useStopWatch	src/Dodge/Luse.hs	21;"	f
-useTimeCheck	src/Dodge/HeldUse.hs	112;"	f
+useTimeCheck	src/Dodge/HeldUse.hs	113;"	f
 useTimeCheck	src/Dodge/Item/Weapon/TriggerType.hs	127;"	f
-useTimeScrollGun	src/Dodge/HeldUse.hs	1133;"	f
+useTimeScrollGun	src/Dodge/HeldUse.hs	1153;"	f
 useTimeScrollGun	src/Dodge/Luse.hs	29;"	f
 useUnusedLnk	src/Dodge/PlacementSpot.hs	169;"	f
 usedRoomInLinkPoss	src/Dodge/PlacementSpot.hs	196;"	f
@@ -6353,7 +6348,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	598;"	f
+walkNozzle	src/Dodge/HeldUse.hs	618;"	f
 walkableNodeNear	src/Dodge/Path.hs	48;"	f
 wallBlips	src/Dodge/RadarSweep.hs	98;"	f
 wallBuffer	src/Dodge/WallCreatureCollisions.hs	51;"	f