Implement burstRifle using attachment weapon chain

ghcidOutput

@@ -1 +1 @@
-All good (617 modules, at 09:15:30)
+All good (617 modules, at 11:03:32)

src/Dodge/Data/Item/HeldUse.hs

@@ -85,12 +85,12 @@ data HeldMod
 --    | VolleyGunMod
 --    | MultiGunMod
 --    | AutoRifleMod
-    | BangRodMod
+--    | BangRodMod
-    | ElephantGunMod
+--    | ElephantGunMod
-    | AutoAmrMod
+--    | AutoAmrMod
     | MachineGunMod
 --    | ModWithDirectedTeleport HeldMod
-    | BangStickMod
+--    | BangStickMod
     | PistolMod
 --    | AutoPistolMod
 --    | MachinePistolMod

src/Dodge/Data/Item/Use.hs

@@ -83,6 +83,8 @@ data HeldParams
         , _randomOffset :: Float
         , _sidePush :: Float
         , _bulGunSound :: SoundID
+        , _weaponInvLock :: Int
+        , _weaponRepeat :: [Int]
         }
     deriving (Eq, Show, Read) --Generic, Flat)
 
@@ -128,6 +130,7 @@ data AimParams = AimParams
 
 data FlareType = DefaultFlareType
     | PistolFlare
+    | HeavySmokeFlare
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Muzzle = Muzzle

src/Dodge/Default/Item/Use.hs

@@ -43,6 +43,8 @@ defaultHeldUse =
             , _randomOffset = 0
             , _sidePush = 0
             , _bulGunSound = tap3S
+            , _weaponInvLock = 0
+            , _weaponRepeat = []
             }
         , _heldTriggerType = HammerTrigger
         }

src/Dodge/HeldUse.hs

@@ -1,9 +1,11 @@
+{-# LANGUAGE TupleSections #-}
 module Dodge.HeldUse 
 --    ( heldEffect
 --    , mcUseHeld
 --    ) 
     where
 
+import Dodge.Inventory.Lock
 import Dodge.WorldEvent.Cloud
 import Dodge.LightSource
 import qualified SDL
@@ -172,41 +174,41 @@ heldEffect effecttype = case effecttype of
 --        , useTimeCheck
 --        , ammoCheckI
 --        ]
-    BangRodMod -> bulletGunEffect
+--    BangRodMod -> bulletGunEffect
-        [ withRecoil
+--        [ withRecoil
-        , withFlare
+--        , withFlare
-        , withThickSmokeI
+--        , withThickSmokeI
-        , duplicateLoadedBarrels
+--        , duplicateLoadedBarrels
-        , withTorqueAfter
+--        , withTorqueAfter
-        , useAmmoAmount 1
+--        , useAmmoAmount 1
-        , withSoundStart bangEchoS
+--        , withSoundStart bangEchoS
-        , useTimeCheck
+--        , useTimeCheck
-        , ammoCheckI
+--        , ammoCheckI
-        , blCheck
+--        , blCheck
-        ]
+--        ]
-    ElephantGunMod -> bulletGunEffect
+--    ElephantGunMod -> bulletGunEffect
-        [ withRecoil
+--        [ withRecoil
-        , withFlare
+--        , withFlare
-        , withThickSmokeI
+--        , withThickSmokeI
-        , duplicateLoadedBarrels
+--        , duplicateLoadedBarrels
-        , withTorqueAfter
+--        , withTorqueAfter
-        , useAmmoAmount 1
+--        , useAmmoAmount 1
-        , withSoundStart bangEchoS
+--        , withSoundStart bangEchoS
-        , useTimeCheck
+--        , useTimeCheck
-        , ammoCheckI
+--        , ammoCheckI
-        , blCheck
+--        , blCheck
-        ]
+--        ]
-    AutoAmrMod -> bulletGunEffect
+--    AutoAmrMod -> bulletGunEffect
-        [ withRecoil
+--        [ withRecoil
-        , withFlare
+--        , withFlare
-        , withThickSmokeI
+--        , withThickSmokeI
-        , duplicateLoadedBarrels
+--        , duplicateLoadedBarrels
-        , withTorqueAfter
+--        , withTorqueAfter
-        , useAmmoAmount 1
+--        , useAmmoAmount 1
-        , withSoundStart bangEchoS
+--        , withSoundStart bangEchoS
-        , useTimeCheck
+--        , useTimeCheck
-        , ammoCheckI -- cf ElephantGun
+--        , ammoCheckI -- cf ElephantGun
-        ]
+--        ]
     MachineGunMod -> bulletGunEffect
         [ withFlare
         , withThinSmokeI
@@ -214,17 +216,17 @@ heldEffect effecttype = case effecttype of
         , rateIncAB (torqueBeforeAtLeast 0.1 0.1) withTorqueAfter
         , ammoCheckI
         ]
-    BangStickMod -> bulletGunEffect
+--    BangStickMod -> bulletGunEffect
-        [ withRecoil
+--        [ withRecoil
-        , useAllAmmo
+--        , useAllAmmo
-        , withSoundItemChoiceStart bangStickSoundChoice
+--        , withSoundItemChoiceStart bangStickSoundChoice
-        , duplicateLoadedBarrels
+--        , duplicateLoadedBarrels
-        , withTorqueAfter
+--        , withTorqueAfter
-        , withFlare
+--        , withFlare
-        , useTimeCheck
+--        , useTimeCheck
-        , ammoCheckI
+--        , ammoCheckI
-        , blCheck
+--        , blCheck
-        ]
+--        ]
     PistolMod -> bulGunEffect
 --    AutoPistolMod -> bulletGunEffect
 --        [ withFlare
@@ -354,14 +356,23 @@ bulGunEffect = hammerCheck $ useTimeCheck bulGunEffect'
 bulGunEffect' :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
 bulGunEffect' t cr w = fromMaybe (error "error in bulGunEffect") $ do
     muzzles <- t ^? ldtValue . itUse . heldAim . aimMuzzles
-    let (_,loadedmuzzles) = mapAccumR loadMuzzle t muzzles
+    let (upitm,loadedmuzzles) = mapAccumR loadMuzzle t muzzles
         cmew = foldl' (useLoadedAmmo (_ldtValue t) cr) (CME 0 0 False,w) $ loadedmuzzles
     return $ uncurry (applyCME (_ldtValue t) cr) cmew
         & cWorld . lWorld . lTestString .~ map (show . _mzAmmoSlot) muzzles
+        & doWeaponRepetitions upitm cr
+
+doWeaponRepetitions :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World
+doWeaponRepetitions itm cr = case itm ^? ldtValue . itUse . heldParams . weaponRepeat of
+    Just (x:xs) -> cWorld . lWorld . delayedEvents .++~ ((x:xs) <&> (,WdWdFromItCrixWdWd upitm (_crID cr) ItCrWdItemEffect))
+    _ -> id
+  where
+    upitm = itm & ldtValue . itUse . heldParams . weaponRepeat .~ []
+        & ldtValue . itUse . heldTriggerType .~ AutoTrigger
 
 applyCME :: Item -> Creature -> CumulativeMuzzleEffect -> World -> World
 applyCME itm cr cme 
-    | _cmeSound cme = applySoundCME itm cr . applySidePush spush cr . applyTorqueCME itm cr . applyRecoil itm cr
+    | _cmeSound cme = applyInvLock itm cr . applySoundCME itm cr . applySidePush spush cr . applyTorqueCME itm cr . applyRecoil itm cr
     | otherwise = failsound
   where
     spush = fromMaybe 0 $ itm ^? itUse . heldParams . sidePush
@@ -369,6 +380,14 @@ applyCME itm cr cme
         Just 0 -> soundStart (CrWeaponSound (_crID cr) 0) (_crPos cr) click1S Nothing w
         _ -> soundContinue (CrWeaponSound (_crID cr) 0) (_crPos cr) click1S Nothing w
 
+applyInvLock :: Item -> Creature -> World -> World
+applyInvLock itm cr = case itm ^? itUse . heldParams . weaponInvLock of
+    Just i | i > 0 -> (cWorld . lWorld . delayedEvents .:~ (i, UnlockInv cid))
+                        . lockInv cid
+    _ -> id
+  where
+    cid = _crID cr
+
 applySoundCME :: Item -> Creature -> World -> World
 applySoundCME itm cr = fromMaybe id $ do
     soundid <- itm ^? itUse . heldParams . bulGunSound
@@ -427,21 +446,26 @@ loadMuzzle t@(LDT _ l _) mz = fromMaybe (t,(mz, 0,Nothing)) $ do
 makeMuzzleFlare :: Muzzle -> Item -> Creature -> World -> World
 makeMuzzleFlare mz itm cr = case mz ^. mzFlareType of
     DefaultFlareType -> id
-    PistolFlare -> makeTlsTimeRadColPos 2 100 (V3 1 1 0.5) (pos `v2z` 20)
+    PistolFlare -> basicMuzFlare pos dir
-        . muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir
+    HeavySmokeFlare -> basicMuzFlare pos dir
-        . muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir
-        . muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir
   where
     pos = _crPos cr + rotateV (_crDir cr) (_mzPos mz + aimingWeaponZeroPos cr itm)
     dir = _crDir cr + _mzRot mz
 
+basicMuzFlare :: Point2 -> Float -> World -> World
+basicMuzFlare pos dir = makeTlsTimeRadColPos 2 100 (V3 1 1 0.5) (pos `v2z` 20)
+        . muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir
+        . muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir
+        . muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir 
+
 makeMuzzleSmoke :: Muzzle -> Item -> Creature -> World -> World
 makeMuzzleSmoke mz itm cr w = case mz ^. mzFlareType of
     DefaultFlareType -> w
     PistolFlare -> foldl' (flip $ smokeCloudAt (greyN 0.5) 20 400 5 . (+.+.+ pos) . (* 8)) w ps
-
+    HeavySmokeFlare -> foldl' (flip $ smokeCloudAt black 20 400 5 . (+.+.+ pos) . (* 8)) w ps'
   where
     ps = replicateM 2 randOnUnitSphere & evalState $ _randGen w
+    ps' = replicateM 4 randOnUnitSphere & evalState $ _randGen w
     pos = addZ 10 $ _crPos cr + rotateV (_crDir cr) (_mzPos mz + aimingWeaponZeroPos cr itm)
 --        , withSmoke 1 black 20 200 5
 
@@ -662,41 +686,41 @@ useMod hm = case hm of
 --        , useTimeCheck
 --        , ammoCheckI
 --        ]
-    BangRodMod ->
+--    BangRodMod ->
-        [ withRecoil
+--        [ withRecoil
-        , withFlare
+--        , withFlare
-        , withThickSmokeI
+--        , withThickSmokeI
-        , duplicateLoadedBarrels
+--        , duplicateLoadedBarrels
-        , withTorqueAfter
+--        , withTorqueAfter
-        , useAmmoAmount 1
+--        , useAmmoAmount 1
-        , withSoundStart bangEchoS
+--        , withSoundStart bangEchoS
-        , useTimeCheck
+--        , useTimeCheck
-        , ammoCheckI
+--        , ammoCheckI
-        , blCheck
+--        , blCheck
-        ]
+--        ]
-    ElephantGunMod ->
+--    ElephantGunMod ->
-        [ withRecoil
+--        [ withRecoil
-        , withFlare
+--        , withFlare
-        , withThickSmokeI
+--        , withThickSmokeI
-        , duplicateLoadedBarrels
+--        , duplicateLoadedBarrels
-        , withTorqueAfter
+--        , withTorqueAfter
-        , useAmmoAmount 1
+--        , useAmmoAmount 1
-        , withSoundStart bangEchoS
+--        , withSoundStart bangEchoS
-        , useTimeCheck
+--        , useTimeCheck
-        , ammoCheckI
+--        , ammoCheckI
-        , blCheck
+--        , blCheck
-        ]
+--        ]
-    AutoAmrMod ->
+--    AutoAmrMod ->
-        [ withRecoil
+--        [ withRecoil
-        , withFlare
+--        , withFlare
-        , withThickSmokeI
+--        , withThickSmokeI
-        , duplicateLoadedBarrels
+--        , duplicateLoadedBarrels
-        , withTorqueAfter
+--        , withTorqueAfter
-        , useAmmoAmount 1
+--        , useAmmoAmount 1
-        , withSoundStart bangEchoS
+--        , withSoundStart bangEchoS
-        , useTimeCheck
+--        , useTimeCheck
-        , ammoCheckI -- cf ElephantGun
+--        , ammoCheckI -- cf ElephantGun
-        ]
+--        ]
     MachineGunMod ->
         [ withFlare
         , withThinSmokeI
@@ -706,17 +730,17 @@ useMod hm = case hm of
         ]
 --    ModWithDirectedTeleport hm' ->
 --        reverse $ withPosDirWallCheck directedTelPos : useMod hm'
-    BangStickMod ->
+--    BangStickMod ->
-        [ withRecoil
+--        [ withRecoil
-        , useAllAmmo
+--        , useAllAmmo
-        , withSoundItemChoiceStart bangStickSoundChoice
+--        , withSoundItemChoiceStart bangStickSoundChoice
-        , duplicateLoadedBarrels
+--        , duplicateLoadedBarrels
-        , withTorqueAfter
+--        , withTorqueAfter
-        , withFlare
+--        , withFlare
-        , useTimeCheck
+--        , useTimeCheck
-        , ammoCheckI
+--        , ammoCheckI
-        , blCheck
+--        , blCheck
-        ]
+--        ]
     PistolMod ->
         [ withSidePushI 50
         , withRecoil

src/Dodge/Item/Held/Cane.hs

@@ -6,7 +6,6 @@ module Dodge.Item.Held.Cane (
     miniGunX,
 ) where
 
-import Dodge.SoundLogic.ExternallyGeneratedSounds
 import Dodge.Base
 import Dodge.Data.Item
 import Dodge.Default
@@ -19,16 +18,9 @@ import Control.Applicative
 defaultBangCane :: Item
 defaultBangCane =
     defaultBulletWeapon
-        & itUse . heldParams
+        & itUse . heldParams . rifling .~ ConstFloat 0.9
-            .~ BulletShooterParams
+        & itUse . heldParams . recoil .~ 50
-                { _muzVel = ConstFloat 0.8
+        & itUse . heldParams . torqueAfter .~ 0.1
-                , _rifling = ConstFloat 0.9
-                , _recoil = 50
-                , _torqueAfter = 0.1
-                , _randomOffset = 0
-                , _sidePush = 0
-                , _bulGunSound = tap3S
-                }
         & itDimension . dimRad .~ 8
         & itDimension . dimCenter .~ V3 5 0 0
         & itUse . heldDelay . rateMax .~ 6
@@ -86,8 +78,11 @@ burstRifle =
     rifle
         & itType . iyBase .~ HELD BURSTRIFLE
         & itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0.05
-        & itUse . heldDelay . rateMax .~ 18
+        -- & itUse . heldDelay . rateMax .~ 18
-        & itUse . heldMods .~ BurstRifleMod
+        & itUse . heldDelay . rateMax .~ 6
+--        & itUse . heldMods .~ BurstRifleMod
+        & itUse . heldParams . weaponInvLock .~ 7
+        & itUse . heldParams . weaponRepeat .~ [3,6]
 
 miniGunUse :: Int -> ItemUse
 miniGunUse i =

src/Dodge/Item/Held/Cone.hs

@@ -17,15 +17,12 @@ bangCone =
         & itUse . heldMods .~ PistolMod
         -- & itUse . heldAim . aimHandlePos .~ 5
         & itUse . heldAim . aimMuzzles .~ replicate 15 (Muzzle (V2 15 0) 0 0.5 0 DefaultFlareType)
-        & itUse . heldParams .~ BulletShooterParams
+        & itUse . heldParams . muzVel .~ UniRandFloat 0.5 0.8
-                { _muzVel = UniRandFloat 0.5 0.8
+        & itUse . heldParams . rifling .~ UniRandFloat 0.3 0.8
-                , _rifling = UniRandFloat 0.3 0.9
+        & itUse . heldParams . recoil .~ 150
-                , _recoil = 150
+        & itUse . heldParams . torqueAfter .~ 0.1
-                , _torqueAfter = 0.1
+        & itUse . heldParams . randomOffset .~ 12
-                , _randomOffset = 12
+        & itUse . heldParams . bulGunSound .~ bangEchoS
-                , _sidePush = 0
-                , _bulGunSound = bangEchoS
-                }
         & itType . iyBase .~ HELD BANGCONE
 
 blunderbuss :: Item

src/Dodge/Item/Held/Rod.hs

@@ -18,18 +18,11 @@ import LensHelp
 bangRod :: Item
 bangRod =
     defaultBulletWeapon
-        & itUse . heldParams
+        & itUse . heldParams . rifling .~ ConstFloat 1
-            .~ BulletShooterParams
+        & itUse . heldParams . recoil .~ 50
-                { _muzVel = ConstFloat 0.8
+        & itUse . heldParams . torqueAfter .~ 0.3
-                , _rifling = ConstFloat 1
+        & itUse . heldParams . bulGunSound .~ bangEchoS
-                , _recoil = 50
-                , _torqueAfter = 0.3
-                , _randomOffset = 0
-                , _sidePush = 0
-                , _bulGunSound = bangEchoS
-                }
         & itUse . heldDelay . rateMax .~ 12
-        & itUse . heldMods .~ BangRodMod
         & itDimension . dimRad .~ 12
         & itDimension . dimCenter .~ V3 5 0 0
         & itType . iyBase .~ HELD BANGROD
@@ -38,7 +31,7 @@ bangRod =
         & itUse . heldAim . aimStance .~ OneHand
         & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
         -- & itUse . heldAim . aimHandlePos .~ 5
-        & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 30 0) 0 0.1 0 DefaultFlareType]
+        & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 30 0) 0 0.1 0 HeavySmokeFlare]
 --        & itUse . heldConsumption . laAmmoType .~ hvBulletAmmo
 
 elephantGun :: Item
@@ -47,7 +40,6 @@ elephantGun =
         & itType . iyBase .~ HELD ELEPHANTGUN
         & itUse . heldAim . aimStance .~ TwoHandUnder
         & itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0.05
-        & itUse . heldMods .~ ElephantGunMod
         & itUse . heldParams . recoil .~ 50
 
 amr :: Item
@@ -59,7 +51,6 @@ autoAmr :: Item
 autoAmr =
     amr
         & itType . iyBase .~ HELD AUTOAMR
-        & itUse . heldMods .~ AutoAmrMod
 
 sniperRifle :: Item
 sniperRifle =

src/Dodge/Item/Held/Stick.hs

@@ -17,22 +17,15 @@ import LensHelp
 bangStick :: Int -> Item
 bangStick i =
     defaultBulletWeapon
-        & itUse . heldParams
+        & itUse . heldParams . recoil .~ 25
-            .~ BulletShooterParams
+        & itUse . heldParams . torqueAfter .~ 0.18 + 0.02 * fromIntegral i
-                { _muzVel = ConstFloat 0.8
-                , _rifling = ConstFloat 0.8
-                , _recoil = 25
-                , _torqueAfter = 0.18 + 0.02 * fromIntegral i
-                , _randomOffset = 0
-                , _sidePush = 0
-                , _bulGunSound = tap3S
-                }
         & itType . iyBase .~ HELD (BANGSTICK i)
         & itInvSize .~ fromIntegral i / 3
         & itDimension . dimRad .~ 5
         & itDimension . dimCenter .~ V3 5 0 0
         & itUse . heldDelay . rateMax .~ 8
-        & itUse . heldMods .~ BangStickMod
+--        & itUse . heldMods .~ BangStickMod
+        & itUse . heldMods .~ PistolMod
         & itUse . heldAim . aimMuzzles 
             .~ [Muzzle (V2 10 0) a 0.01 0 DefaultFlareType | a <- spreadAroundCenter i baseStickSpread]
 

tags

@@ -54,11 +54,11 @@ AddGoal	src/Dodge/Data/ActionPlan.hs	45;"	C
 AddTile	src/Dodge/Room/AddTile.hs	1;"	m
 AesonHelp	src/AesonHelp.hs	1;"	m
 AimAt	src/Dodge/Data/ActionPlan.hs	84;"	C
-AimParams	src/Dodge/Data/Item/Use.hs	116;"	t
+AimParams	src/Dodge/Data/Item/Use.hs	119;"	t
 AimParams	src/Dodge/Default/AimParams.hs	1;"	m
 AimParams	src/Dodge/Default/Item/Held/AimParams.hs	1;"	m
 AimParams	src/Dodge/Default/Item/Use/AimParams.hs	1;"	m
-AimStance	src/Dodge/Data/Item/Use.hs	150;"	t
+AimStance	src/Dodge/Data/Item/Use.hs	154;"	t
 Aiming	src/Dodge/Creature/Stance/Data.hs	42;"	C
 Aiming	src/Dodge/Data/Creature/Stance.hs	39;"	C
 AirFiltrationSS	src/Dodge/Data/Scenario.hs	95;"	C
@@ -75,10 +75,10 @@ Ammo	src/Dodge/Item/Ammo.hs	1;"	m
 AmmoCI	src/Dodge/Data/ComposedItem.hs	21;"	C
 AmmoInLink	src/Dodge/Data/ComposedItem.hs	14;"	C
 AmmoMagType	src/Dodge/Data/Item/Combine.hs	109;"	t
-AmmoMagUse	src/Dodge/Data/Item/Use.hs	62;"	C
+AmmoMagUse	src/Dodge/Data/Item/Use.hs	63;"	C
 AmmoModLink	src/Dodge/Data/ComposedItem.hs	15;"	C
 AmmoModifierCI	src/Dodge/Data/ComposedItem.hs	20;"	C
-AmmoParams	src/Dodge/Data/Item/Use.hs	94;"	t
+AmmoParams	src/Dodge/Data/Item/Use.hs	97;"	t
 AmmoParams	src/Dodge/Item/Weapon/AmmoParams.hs	1;"	m
 AmmoPosition	src/Dodge/Item/AmmoPosition.hs	8;"	t
 AmmoPosition	src/Dodge/Item/AmmoPosition.hs	2;"	m
@@ -126,11 +126,11 @@ AttachInt	src/Dodge/Item/Attachment/Data.hs	16;"	C
 AttachMInt	src/Dodge/Data/Item/Attachment.hs	15;"	C
 AttachMInt	src/Dodge/Item/Attachment/Data.hs	17;"	C
 AttachMode	src/Dodge/Item/Attachment/Data.hs	13;"	C
-AttachParams	src/Dodge/Data/Item/Use.hs	88;"	t
+AttachParams	src/Dodge/Data/Item/Use.hs	91;"	t
 AttachTargetPos	src/Dodge/Data/Item/Attachment.hs	13;"	C
 AttachTargetPos	src/Dodge/Item/Attachment/Data.hs	15;"	C
 AttachType	src/Dodge/Data/Item/Combine.hs	97;"	t
-AttachUse	src/Dodge/Data/Item/Use.hs	60;"	C
+AttachUse	src/Dodge/Data/Item/Use.hs	61;"	C
 Attachment	src/Dodge/Data/Item/Attachment.hs	4;"	m
 Attachment	src/Dodge/Item/Attachment.hs	1;"	m
 Attention	src/Dodge/Creature/Perception/Data.hs	65;"	t
@@ -143,14 +143,13 @@ Attracting	src/Dodge/Data/Item/Params.hs	46;"	C
 Audition	src/Dodge/Creature/Perception/Data.hs	48;"	t
 Audition	src/Dodge/Data/Creature/Perception.hs	47;"	t
 AutoAI	src/Dodge/Data/Creature/Misc.hs	57;"	C
-AutoAmrMod	src/Dodge/Data/Item/HeldUse.hs	90;"	C
 AutoCrit	src/Dodge/Creature/AutoCrit.hs	1;"	m
 AutoDoor	src/Dodge/LevelGen/AutoDoor.hs	5;"	m
 AutoDoorObstacle	src/Dodge/Data/PathGraph.hs	51;"	C
 AutoGun	src/Dodge/Item/Weapon/AutoGun.hs	1;"	m
 AutoRecharging	src/Dodge/Data/Item/Consumption.hs	23;"	C
 AutoRecharging	src/Dodge/Data/Item/Use/Consumption.hs	28;"	C
-AutoTrigger	src/Dodge/Data/Item/Use.hs	69;"	C
+AutoTrigger	src/Dodge/Data/Item/Use.hs	70;"	C
 AuxAddition	src/Shader/AuxAddition.hs	1;"	m
 AwakeLevel	src/Dodge/Creature/AlertLevel/Data.hs	14;"	t
 Awareness	src/Dodge/Creature/Perception/Data.hs	72;"	t
@@ -200,8 +199,6 @@ BURSTRIFLE	src/Dodge/Combine/Data.hs	152;"	C
 BURSTRIFLE	src/Dodge/Data/Item/Combine.hs	174;"	C
 BackgroundSound	src/Dodge/Data/SoundOrigin.hs	14;"	C
 Ball	src/Dodge/Tesla/Ball.hs	1;"	m
-BangRodMod	src/Dodge/Data/Item/HeldUse.hs	88;"	C
-BangStickMod	src/Dodge/Data/Item/HeldUse.hs	93;"	C
 Bark	src/Dodge/Data/ActionPlan.hs	40;"	C
 Barrel	src/Dodge/Creature/State/Data.hs	23;"	C
 Barrel	src/Dodge/Data/Creature/State.hs	30;"	C
@@ -306,8 +303,8 @@ BulletClipAttachment	src/Dodge/Data/Item.hs	51;"	C
 BulletEffect	src/Dodge/Data/Bullet.hs	36;"	t
 BulletGun	src/Dodge/Item/Held/BulletGun.hs	1;"	m
 BulletGuns	src/Dodge/Item/Weapon/BulletGuns.hs	1;"	m
-BulletParams	src/Dodge/Data/Item/Use.hs	94;"	C
+BulletParams	src/Dodge/Data/Item/Use.hs	97;"	C
-BulletShooterParams	src/Dodge/Data/Item/Use.hs	77;"	C
+BulletShooterParams	src/Dodge/Data/Item/Use.hs	78;"	C
 BulletSpawn	src/Dodge/Data/Bullet.hs	42;"	t
 BulletTrajectory	src/Dodge/Data/Bullet.hs	50;"	t
 BulletTrajectoryType	src/Dodge/Data/Bullet.hs	57;"	t
@@ -383,7 +380,7 @@ ChainEffect	src/Dodge/ChainEffect.hs	1;"	m
 ChainUpdates	src/Dodge/Creature/ChainUpdates.hs	1;"	m
 ChangePosture	src/Dodge/Data/ActionPlan.hs	42;"	C
 ChangeStrategy	src/Dodge/Data/ActionPlan.hs	44;"	C
-CharScrollParams	src/Dodge/Data/Item/Use.hs	112;"	C
+CharScrollParams	src/Dodge/Data/Item/Use.hs	115;"	C
 ChargeIfEquipped	src/Dodge/Data/Item/Effect.hs	22;"	C
 ChargeIfInInventory	src/Dodge/Data/Item/Effect.hs	23;"	C
 ChargeableAmmo	src/Dodge/Data/Item/Consumption.hs	29;"	C
@@ -470,7 +467,7 @@ ConstantIntensity	src/Dodge/Data/LightSource.hs	17;"	C
 Consumable	src/Dodge/Item/Consumable.hs	1;"	m
 ConsumableFamily	src/Dodge/Item/Family.hs	7;"	C
 ConsumableItemType	src/Dodge/Data/Item/Combine.hs	119;"	t
-ConsumeUse	src/Dodge/Data/Item/Use.hs	50;"	C
+ConsumeUse	src/Dodge/Data/Item/Use.hs	51;"	C
 Consumption	src/Dodge/Data/Item/Consumption.hs	5;"	m
 Consumption	src/Dodge/Data/Item/Use/Consumption.hs	8;"	m
 Consumption	src/Dodge/Default/Item/Held/Consumption.hs	1;"	m
@@ -533,7 +530,7 @@ Cr_status	src/Dodge/Data/Config.hs	71;"	C
 CraftClust	src/Dodge/Combine/Graph.hs	17;"	C
 CraftType	src/Dodge/Combine/Data.hs	26;"	t
 CraftType	src/Dodge/Data/Item/Combine.hs	29;"	t
-CraftUse	src/Dodge/Data/Item/Use.hs	58;"	C
+CraftUse	src/Dodge/Data/Item/Use.hs	59;"	C
 Craftable	src/Dodge/Item/Craftable.hs	1;"	m
 CraftingFamily	src/Dodge/Item/Family.hs	4;"	C
 Create	src/Dodge/Projectile/Create.hs	1;"	m
@@ -673,9 +670,9 @@ DefaultArcStep	src/Dodge/Data/ArcStep.hs	23;"	C
 DefaultCrGroupUpdate	src/Dodge/Data/CrGroupParams.hs	22;"	C
 DefaultDrawButton	src/Dodge/Data/Button.hs	17;"	C
 DefaultDrawSwitch	src/Dodge/Data/Button.hs	18;"	C
-DefaultFlareType	src/Dodge/Data/Item/Use.hs	128;"	C
+DefaultFlareType	src/Dodge/Data/Item/Use.hs	131;"	C
 DefaultForceField	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	46;"	C
-DefaultHeldParams	src/Dodge/Data/Item/Use.hs	74;"	C
+DefaultHeldParams	src/Dodge/Data/Item/Use.hs	75;"	C
 DefaultLightSourceDraw	src/Dodge/Data/LightSource.hs	13;"	C
 DefaultRoomType	src/Dodge/Data/Room.hs	31;"	C
 Delete	src/Dodge/Wall/Delete.hs	1;"	m
@@ -837,7 +834,6 @@ Either	src/Dodge/Layout/Tree/Either.hs	4;"	m
 Eldritch	src/Dodge/Data/Scenario.hs	34;"	C
 ElectricalAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	41;"	C
 Electronics	src/Dodge/Data/Material.hs	11;"	C
-ElephantGunMod	src/Dodge/Data/Item/HeldUse.hs	89;"	C
 EllShad	src/Picture/Data.hs	41;"	C
 Enable_debug	src/Dodge/Data/Config.hs	68;"	C
 EncircleFlock	src/Dodge/Creature/State/Data.hs	32;"	C
@@ -863,7 +859,7 @@ EquipPosition	src/Dodge/Data/Equipment/Misc.hs	20;"	t
 EquipPosition	src/Dodge/Equipment/Data.hs	17;"	t
 EquipSite	src/Dodge/Data/Equipment/Misc.hs	11;"	t
 EquipSite	src/Dodge/Equipment/Data.hs	6;"	t
-EquipUse	src/Dodge/Data/Item/Use.hs	54;"	C
+EquipUse	src/Dodge/Data/Item/Use.hs	55;"	C
 Equipment	src/Dodge/Data/Equipment.hs	12;"	t
 Equipment	src/Dodge/Data/Equipment.hs	3;"	m
 Equipment	src/Dodge/Data/Item/Use/Equipment.hs	5;"	m
@@ -960,7 +956,7 @@ Flank	src/Dodge/Data/ActionPlan.hs	177;"	C
 Flare	src/Dodge/Data/Flare.hs	14;"	t
 Flare	src/Dodge/Data/Flare.hs	6;"	m
 Flare	src/Dodge/Flare.hs	1;"	m
-FlareType	src/Dodge/Data/Item/Use.hs	128;"	t
+FlareType	src/Dodge/Data/Item/Use.hs	131;"	t
 Flash	src/Dodge/WorldEvent/Flash.hs	11;"	m
 FlashBall	src/Dodge/Data/Bullet.hs	33;"	C
 FlatFaces	src/Shape/Data.hs	17;"	C
@@ -1036,8 +1032,8 @@ GasAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	43;"	C
 GasCloud	src/Dodge/Data/Cloud.hs	31;"	C
 GasCreate	src/Dodge/Data/Gas.hs	6;"	t
 GasCreate	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	49;"	t
-GasParams	src/Dodge/Data/Item/Use.hs	100;"	C
+GasParams	src/Dodge/Data/Item/Use.hs	103;"	C
-GasSprayParams	src/Dodge/Data/Item/Use.hs	75;"	C
+GasSprayParams	src/Dodge/Data/Item/Use.hs	76;"	C
 GenCr	src/Dodge/Creature/State/Data.hs	24;"	C
 GenCr	src/Dodge/Data/Creature/State.hs	31;"	C
 GenFloat	src/Dodge/Data/GenFloat.hs	11;"	t
@@ -1115,12 +1111,13 @@ 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/Item/Use.hs	70;"	C
+HammerTrigger	src/Dodge/Data/Item/Use.hs	71;"	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
 HardQuit	src/Dodge/Data/Universe.hs	66;"	C
 HasHammer	src/Dodge/Data/Hammer.hs	14;"	C
+HeavySmokeFlare	src/Dodge/Data/Item/Use.hs	133;"	C
 Held	src/Dodge/Default/Held.hs	1;"	m
 Held	src/Dodge/Default/Item/Held.hs	1;"	m
 Held	src/Dodge/Item/Held.hs	1;"	m
@@ -1142,7 +1139,7 @@ HeldOffset	src/Dodge/Item/HeldOffset.hs	1;"	m
 HeldOverNozzlesUseGasParams	src/Dodge/Data/Item/HeldUse.hs	18;"	C
 HeldPJCreation	src/Dodge/Data/Item/HeldUse.hs	19;"	C
 HeldPJCreationX	src/Dodge/Data/Item/HeldUse.hs	20;"	C
-HeldParams	src/Dodge/Data/Item/Use.hs	73;"	t
+HeldParams	src/Dodge/Data/Item/Use.hs	74;"	t
 HeldScroll	src/Dodge/Data/Item/HeldScroll.hs	13;"	t
 HeldScroll	src/Dodge/Data/Item/HeldScroll.hs	6;"	m
 HeldScroll	src/Dodge/HeldScroll.hs	1;"	m
@@ -1152,7 +1149,7 @@ HeldScrollZoom	src/Dodge/Data/Item/HeldScroll.hs	15;"	C
 HeldShatter	src/Dodge/Data/Item/HeldUse.hs	30;"	C
 HeldTeslaArc	src/Dodge/Data/Item/HeldUse.hs	24;"	C
 HeldTractor	src/Dodge/Data/Item/HeldUse.hs	28;"	C
-HeldUse	src/Dodge/Data/Item/Use.hs	32;"	C
+HeldUse	src/Dodge/Data/Item/Use.hs	33;"	C
 HeldUse	src/Dodge/Data/Item/HeldUse.hs	6;"	m
 HeldUse	src/Dodge/HeldUse.hs	1;"	m
 HeldUseAmmoParams	src/Dodge/Data/Item/HeldUse.hs	17;"	C
@@ -1299,7 +1296,7 @@ ItInvEffect	src/Dodge/Data/ItEffect.hs	13;"	C
 ItInvEffectDrop	src/Dodge/Data/ItEffect.hs	29;"	C
 ItInvEffectID	src/Dodge/Data/ItEffect.hs	25;"	C
 ItRewindEffect	src/Dodge/Data/ItEffect.hs	17;"	C
-ItZoom	src/Dodge/Data/Item/Use.hs	159;"	t
+ItZoom	src/Dodge/Data/Item/Use.hs	163;"	t
 Item	src/Dodge/Data/Item.hs	33;"	t
 Item	src/Dodge/Base/Item.hs	1;"	m
 Item	src/Dodge/Data/Item.hs	6;"	m
@@ -1324,7 +1321,7 @@ ItemTweaks	src/Dodge/Data/Item/Tweak.hs	13;"	t
 ItemType	src/Dodge/Combine/Data.hs	12;"	t
 ItemType	src/Dodge/Data/Item/Combine.hs	16;"	t
 ItemUnlocker	src/Dodge/Lock/Data.hs	13;"	C
-ItemUse	src/Dodge/Data/Item/Use.hs	31;"	t
+ItemUse	src/Dodge/Data/Item/Use.hs	32;"	t
 JETPACK	src/Dodge/Combine/Data.hs	116;"	C
 JETPACK	src/Dodge/Data/Item/Combine.hs	139;"	C
 JGK	src/Control/Foldl/JGK.hs	1;"	m
@@ -1435,7 +1432,7 @@ LeftForward	src/Dodge/Creature/Stance/Data.hs	34;"	C
 LeftForward	src/Dodge/Data/Creature/Stance.hs	32;"	C
 LeftItemType	src/Dodge/Combine/Data.hs	122;"	t
 LeftItemType	src/Dodge/Data/Item/Combine.hs	149;"	t
-LeftUse	src/Dodge/Data/Item/Use.hs	43;"	C
+LeftUse	src/Dodge/Data/Item/Use.hs	44;"	C
 LensHelp	src/LensHelp.hs	1;"	m
 Lethargic	src/Dodge/Creature/AlertLevel/Data.hs	17;"	C
 Lethargic	src/Dodge/Creature/Perception/Data.hs	58;"	C
@@ -1675,7 +1672,7 @@ Music	src/Music.hs	1;"	m
 MusicData	src/Music.hs	7;"	t
 Mute	src/Dodge/Data/Creature/Misc.hs	28;"	C
 MuzFlare	src/Dodge/Data/Flare.hs	15;"	C
-Muzzle	src/Dodge/Data/Item/Use.hs	132;"	t
+Muzzle	src/Dodge/Data/Item/Use.hs	136;"	t
 MuzzleEffect	src/Dodge/Data/MuzzleEffect.hs	5;"	m
 MvForward	src/Dodge/Data/ActionPlan.hs	35;"	C
 MvPt	src/Dodge/MvPt.hs	1;"	m
@@ -1700,7 +1697,7 @@ Ngon	src/Dodge/Room/Ngon.hs	1;"	m
 NoAction	src/Dodge/Data/ActionPlan.hs	152;"	C
 NoAmmoPosition	src/Dodge/Item/AmmoPosition.hs	11;"	C
 NoArguments	src/Dodge/Data/Terminal.hs	93;"	C
-NoAttachParams	src/Dodge/Data/Item/Use.hs	91;"	C
+NoAttachParams	src/Dodge/Data/Item/Use.hs	94;"	C
 NoBeamCombine	src/Dodge/Data/Beam.hs	43;"	C
 NoConcurrentEffect	src/Loop/Data.hs	7;"	C
 NoConsumption	src/Dodge/Data/Item/Consumption.hs	33;"	C
@@ -1840,7 +1837,7 @@ OnSpecial	src/Dodge/Equipment/Data.hs	24;"	C
 OnTurret	src/Dodge/Data/Item/Location.hs	13;"	C
 OnceSound	src/Dodge/Data/SoundOrigin.hs	15;"	C
 OneArgument	src/Dodge/Data/Terminal.hs	94;"	C
-OneHand	src/Dodge/Data/Item/Use.hs	154;"	C
+OneHand	src/Dodge/Data/Item/Use.hs	158;"	C
 OnwardCluster	src/Dodge/Data/RoomCluster.hs	14;"	C
 OnwardCluster	src/Dodge/RoomCluster/Data.hs	12;"	C
 OnwardList	src/Dodge/Annotation/Data.hs	15;"	C
@@ -1961,7 +1958,7 @@ Pillar	src/Dodge/Room/Pillar.hs	1;"	m
 Pipe	src/Dodge/Placement/Instance/Pipe.hs	1;"	m
 PistolAI	src/Dodge/Data/Creature/Misc.hs	53;"	C
 PistolCrit	src/Dodge/Creature/PistolCrit.hs	1;"	m
-PistolFlare	src/Dodge/Data/Item/Use.hs	129;"	C
+PistolFlare	src/Dodge/Data/Item/Use.hs	132;"	C
 PistolMod	src/Dodge/Data/Item/HeldUse.hs	94;"	C
 PlaceSpot	src/Dodge/Placement/PlaceSpot.hs	4;"	m
 Placement	src/Dodge/Data/GenWorld.hs	77;"	t
@@ -2030,7 +2027,7 @@ ProjectileCreate	src/Dodge/Data/Ammo.hs	17;"	t
 ProjectileCreate	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	21;"	t
 ProjectileDraw	src/Dodge/Data/Ammo.hs	14;"	t
 ProjectileDraw	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	18;"	t
-ProjectileParams	src/Dodge/Data/Item/Use.hs	95;"	C
+ProjectileParams	src/Dodge/Data/Item/Use.hs	98;"	C
 ProjectileUpdate	src/Dodge/Data/Ammo.hs	20;"	t
 ProjectileUpdate	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	24;"	t
 Prop	src/Dodge/Data/Prop.hs	18;"	t
@@ -2293,8 +2290,8 @@ ScreenPos	src/Dodge/Data/ScreenPos.hs	9;"	t
 ScreenPos	src/Dodge/Data/ScreenPos.hs	3;"	m
 ScreenPos	src/Dodge/ScreenPos.hs	1;"	m
 Scroll	src/Dodge/Update/Scroll.hs	1;"	m
-ScrollAttachParams	src/Dodge/Data/Item/Use.hs	103;"	t
+ScrollAttachParams	src/Dodge/Data/Item/Use.hs	106;"	t
-ScrollAttachParams	src/Dodge/Data/Item/Use.hs	89;"	C
+ScrollAttachParams	src/Dodge/Data/Item/Use.hs	92;"	C
 ScrollAttachType	src/Dodge/Data/Item/Combine.hs	105;"	t
 ScrollValue	src/Dodge/ScrollValue.hs	1;"	m
 SecretCabal	src/Dodge/Data/Scenario.hs	44;"	C
@@ -2565,7 +2562,7 @@ TUBE	src/Dodge/Data/Item/Combine.hs	31;"	C
 Tank	src/Dodge/Placement/Instance/Tank.hs	1;"	m
 Tanks	src/Dodge/Room/Tanks.hs	1;"	m
 Tap	src/Dodge/Data/SoundOrigin.hs	36;"	C
-TargetAttachParams	src/Dodge/Data/Item/Use.hs	90;"	C
+TargetAttachParams	src/Dodge/Data/Item/Use.hs	93;"	C
 TargetCursor	src/Dodge/Data/Item/Targeting.hs	16;"	C
 TargetCursorUpdate	src/Dodge/Data/Targeting.hs	26;"	C
 TargetDistanceDraw	src/Dodge/Data/Targeting.hs	32;"	C
@@ -2702,7 +2699,7 @@ Trie	src/SimpleTrie.hs	5;"	t
 Trie	src/Dodge/Combine/Trie.hs	1;"	m
 TriggerDoor	src/Dodge/LevelGen/TriggerDoor.hs	2;"	m
 TriggerDoor	src/Dodge/Placement/PlaceSpot/TriggerDoor.hs	1;"	m
-TriggerType	src/Dodge/Data/Item/Use.hs	69;"	t
+TriggerType	src/Dodge/Data/Item/Use.hs	70;"	t
 TriggerType	src/Dodge/Item/Weapon/TriggerType.hs	6;"	m
 Tuple	src/Tuple.hs	1;"	m
 TurbineBaySS	src/Dodge/Data/Scenario.hs	110;"	C
@@ -2728,9 +2725,9 @@ TweakTractionPower	src/Dodge/Data/Item/Tweak.hs	22;"	C
 TweakType	src/Dodge/Data/Item/Tweak.hs	20;"	t
 Tweakable	src/Dodge/Data/Item/Tweak.hs	15;"	C
 TwistGoal	src/Dodge/Data/Scenario.hs	15;"	C
-TwoHandFlat	src/Dodge/Data/Item/Use.hs	153;"	C
+TwoHandFlat	src/Dodge/Data/Item/Use.hs	157;"	C
-TwoHandOver	src/Dodge/Data/Item/Use.hs	152;"	C
+TwoHandOver	src/Dodge/Data/Item/Use.hs	156;"	C
-TwoHandUnder	src/Dodge/Data/Item/Use.hs	151;"	C
+TwoHandUnder	src/Dodge/Data/Item/Use.hs	155;"	C
 Type	src/Dodge/Data/Damage/Type.hs	6;"	m
 Typical	src/Shape/Data.hs	36;"	C
 UPtLayer	src/Dodge/Picture/Layer/Data.hs	16;"	C
@@ -2744,7 +2741,7 @@ UndroppableIdentified	src/Dodge/Data/Item/CurseStatus.hs	13;"	C
 UndroppableIdentified	src/Dodge/Item/Data.hs	9;"	C
 UndroppableUnidentified	src/Dodge/Data/Item/CurseStatus.hs	14;"	C
 UndroppableUnidentified	src/Dodge/Item/Data.hs	10;"	C
-UnifRandFloat	src/Dodge/Data/GenFloat.hs	12;"	C
+UniRandFloat	src/Dodge/Data/GenFloat.hs	12;"	C
 Unimportant	src/Shape/Data.hs	37;"	C
 Universe	src/Dodge/Data/Universe.hs	30;"	t
 Universe	src/Dodge/Data/Universe.hs	6;"	m
@@ -2944,7 +2941,7 @@ Zoning	src/Dodge/Zoning.hs	1;"	m
 ZoomScope	src/Dodge/Data/Item/Attachment.hs	30;"	C
 ZoomScope	src/Dodge/Item/Attachment/Data.hs	31;"	C
 ZoomScope	src/Dodge/Item/Weapon/ZoomScope.hs	1;"	m
-ZoomScrollParams	src/Dodge/Data/Item/Use.hs	104;"	C
+ZoomScrollParams	src/Dodge/Data/Item/Use.hs	107;"	C
 __Just'	src/MaybeHelp.hs	13;"	f
 _actAction	src/Dodge/Data/ActionPlan.hs	81;"	f
 _actLabel	src/Dodge/Data/ActionPlan.hs	80;"	f
@@ -2954,13 +2951,13 @@ _actionSound	src/Dodge/Data/LoadAction.hs	11;"	f
 _actionSound	src/Dodge/Data/LoadAction.hs	14;"	f
 _actionTime	src/Dodge/Data/LoadAction.hs	11;"	f
 _actionTime	src/Dodge/Data/LoadAction.hs	14;"	f
-_aimHandlePos	src/Dodge/Data/Item/Use.hs	122;"	f
+_aimHandlePos	src/Dodge/Data/Item/Use.hs	125;"	f
-_aimMuzzles	src/Dodge/Data/Item/Use.hs	123;"	f
+_aimMuzzles	src/Dodge/Data/Item/Use.hs	126;"	f
-_aimRange	src/Dodge/Data/Item/Use.hs	119;"	f
+_aimRange	src/Dodge/Data/Item/Use.hs	122;"	f
-_aimStance	src/Dodge/Data/Item/Use.hs	121;"	f
+_aimStance	src/Dodge/Data/Item/Use.hs	124;"	f
-_aimTurnSpeed	src/Dodge/Data/Item/Use.hs	118;"	f
+_aimTurnSpeed	src/Dodge/Data/Item/Use.hs	121;"	f
-_aimWeight	src/Dodge/Data/Item/Use.hs	117;"	f
+_aimWeight	src/Dodge/Data/Item/Use.hs	120;"	f
-_aimZoom	src/Dodge/Data/Item/Use.hs	120;"	f
+_aimZoom	src/Dodge/Data/Item/Use.hs	123;"	f
 _allocNewPos	src/Dodge/Data/RightButtonOptions.hs	21;"	f
 _allocNewPos	src/Dodge/Data/RightButtonOptions.hs	24;"	f
 _allocNewPos	src/Dodge/Data/RightButtonOptions.hs	28;"	f
@@ -2981,15 +2978,15 @@ _amPosDirs	src/Dodge/Item/AmmoPosition.hs	10;"	f
 _amString	src/Dodge/Data/Ammo.hs	33;"	f
 _amString	src/Dodge/Data/Ammo.hs	38;"	f
 _amString	src/Dodge/Data/Ammo.hs	42;"	f
-_amagLoadStatus	src/Dodge/Data/Item/Use.hs	63;"	f
+_amagLoadStatus	src/Dodge/Data/Item/Use.hs	64;"	f
-_amagParams	src/Dodge/Data/Item/Use.hs	64;"	f
+_amagParams	src/Dodge/Data/Item/Use.hs	65;"	f
-_amagType	src/Dodge/Data/Item/Use.hs	65;"	f
+_amagType	src/Dodge/Data/Item/Use.hs	66;"	f
 _ambushTarget	src/Dodge/Data/ActionPlan.hs	178;"	f
-_ampBullet	src/Dodge/Data/Item/Use.hs	94;"	f
+_ampBullet	src/Dodge/Data/Item/Use.hs	97;"	f
-_ampCreateGas	src/Dodge/Data/Item/Use.hs	100;"	f
+_ampCreateGas	src/Dodge/Data/Item/Use.hs	103;"	f
-_ampPayload	src/Dodge/Data/Item/Use.hs	96;"	f
+_ampPayload	src/Dodge/Data/Item/Use.hs	99;"	f
-_ampPjCreation	src/Dodge/Data/Item/Use.hs	98;"	f
+_ampPjCreation	src/Dodge/Data/Item/Use.hs	101;"	f
-_ampPjDraw	src/Dodge/Data/Item/Use.hs	97;"	f
+_ampPjDraw	src/Dodge/Data/Item/Use.hs	100;"	f
 _amposDir	src/Dodge/Item/AmmoPosition.hs	9;"	f
 _amposPos	src/Dodge/Item/AmmoPosition.hs	9;"	f
 _apAction	src/Dodge/Data/ActionPlan.hs	20;"	f
@@ -3026,7 +3023,7 @@ _atMInt	src/Dodge/Item/Attachment/Data.hs	17;"	f
 _atMode	src/Dodge/Item/Attachment/Data.hs	13;"	f
 _atTargetPos	src/Dodge/Data/Item/Attachment.hs	13;"	f
 _atTargetPos	src/Dodge/Item/Attachment/Data.hs	15;"	f
-_attachParams	src/Dodge/Data/Item/Use.hs	61;"	f
+_attachParams	src/Dodge/Data/Item/Use.hs	62;"	f
 _attractionPower	src/Dodge/Data/Item/Params.hs	46;"	f
 _auDist	src/Dodge/Creature/Perception/Data.hs	49;"	f
 _auDist	src/Dodge/Data/Creature/Perception.hs	48;"	f
@@ -3095,11 +3092,11 @@ _buTimer	src/Dodge/Data/Bullet.hs	27;"	f
 _buTrajectory	src/Dodge/Data/Bullet.hs	21;"	f
 _buVel	src/Dodge/Data/Bullet.hs	22;"	f
 _buWidth	src/Dodge/Data/Bullet.hs	26;"	f
-_bulGunSound	src/Dodge/Data/Item/Use.hs	84;"	f
+_bulGunSound	src/Dodge/Data/Item/Use.hs	85;"	f
 _bullets	src/Dodge/Data/LWorld.hs	106;"	f
 _buttons	src/Dodge/Data/LWorld.hs	136;"	f
 _cClock	src/Dodge/Data/CWorld.hs	28;"	f
-_cUse	src/Dodge/Data/Item/Use.hs	51;"	f
+_cUse	src/Dodge/Data/Item/Use.hs	52;"	f
 _cWorld	src/Dodge/Data/World.hs	37;"	f
 _camBoundBox	src/Dodge/Data/CamPos.hs	20;"	f
 _camBoundBox	src/Dodge/Data/Camera.hs	25;"	f
@@ -3358,9 +3355,9 @@ _eqParams	src/Dodge/Data/Equipment.hs	17;"	f
 _eqSite	src/Dodge/Data/Equipment.hs	16;"	f
 _eqUse	src/Dodge/Data/Equipment.hs	13;"	f
 _eqViewDist	src/Dodge/Data/Equipment.hs	18;"	f
-_equipEffect	src/Dodge/Data/Item/Use.hs	47;"	f
+_equipEffect	src/Dodge/Data/Item/Use.hs	48;"	f
-_equipEffect	src/Dodge/Data/Item/Use.hs	55;"	f
+_equipEffect	src/Dodge/Data/Item/Use.hs	56;"	f
-_equipTargeting	src/Dodge/Data/Item/Use.hs	56;"	f
+_equipTargeting	src/Dodge/Data/Item/Use.hs	57;"	f
 _euseAmmoAmount	src/Dodge/Data/Item/HeldUse.hs	50;"	f
 _euseAmmoLink	src/Dodge/Data/Item/HeldUse.hs	53;"	f
 _euseAmmoMax	src/Dodge/Data/Item/HeldUse.hs	51;"	f
@@ -3416,7 +3413,7 @@ _futureWorlds	src/Dodge/Data/World.hs	64;"	f
 _futureWorlds	src/Dodge/Data/World.hs	70;"	f
 _gameplay_rotate_to_wall	src/Dodge/Config/Data.hs	25;"	f
 _gameplay_rotate_to_wall	src/Dodge/Data/Config.hs	55;"	f
-_gasCreation	src/Dodge/Data/Item/Use.hs	76;"	f
+_gasCreation	src/Dodge/Data/Item/Use.hs	77;"	f
 _genPlacements	src/Dodge/Data/GenWorld.hs	26;"	f
 _genRooms	src/Dodge/Data/GenWorld.hs	27;"	f
 _getAttentiveTo	src/Dodge/Creature/AlertLevel/Data.hs	22;"	f
@@ -3459,14 +3456,14 @@ _guVel	src/Dodge/Data/Gust.hs	16;"	f
 _gusts	src/Dodge/Data/LWorld.hs	102;"	f
 _gwWorld	src/Dodge/Data/GenWorld.hs	25;"	f
 _hammerPosition	src/Dodge/Data/Hammer.hs	14;"	f
-_heldAim	src/Dodge/Data/Item/Use.hs	37;"	f
+_heldAim	src/Dodge/Data/Item/Use.hs	38;"	f
-_heldAmmoTypes	src/Dodge/Data/Item/Use.hs	38;"	f
+_heldAmmoTypes	src/Dodge/Data/Item/Use.hs	39;"	f
-_heldDelay	src/Dodge/Data/Item/Use.hs	34;"	f
+_heldDelay	src/Dodge/Data/Item/Use.hs	35;"	f
-_heldHammer	src/Dodge/Data/Item/Use.hs	36;"	f
+_heldHammer	src/Dodge/Data/Item/Use.hs	37;"	f
-_heldMods	src/Dodge/Data/Item/Use.hs	35;"	f
+_heldMods	src/Dodge/Data/Item/Use.hs	36;"	f
-_heldParams	src/Dodge/Data/Item/Use.hs	39;"	f
+_heldParams	src/Dodge/Data/Item/Use.hs	40;"	f
 _heldPos	src/Dodge/Data/Input.hs	27;"	f
-_heldTriggerType	src/Dodge/Data/Item/Use.hs	40;"	f
+_heldTriggerType	src/Dodge/Data/Item/Use.hs	41;"	f
 _heldWorldPos	src/Dodge/Data/Input.hs	29;"	f
 _hsCharMode	src/Dodge/Data/Item/HeldScroll.hs	17;"	f
 _hud	src/Dodge/Data/World.hs	46;"	f
@@ -3551,9 +3548,9 @@ _iyBase	src/Dodge/Data/Item/Combine.hs	17;"	f
 _iyModules	src/Dodge/Combine/Data.hs	14;"	f
 _iyModules	src/Dodge/Data/Item/Combine.hs	18;"	f
 _iyStack	src/Dodge/Combine/Data.hs	15;"	f
-_izFac	src/Dodge/Data/Item/Use.hs	162;"	f
+_izFac	src/Dodge/Data/Item/Use.hs	166;"	f
-_izMax	src/Dodge/Data/Item/Use.hs	160;"	f
+_izMax	src/Dodge/Data/Item/Use.hs	164;"	f
-_izMin	src/Dodge/Data/Item/Use.hs	161;"	f
+_izMin	src/Dodge/Data/Item/Use.hs	165;"	f
 _killTarget	src/Dodge/Data/ActionPlan.hs	198;"	f
 _lClock	src/Dodge/Data/LWorld.hs	145;"	f
 _lTestString	src/Dodge/Data/LWorld.hs	146;"	f
@@ -3588,10 +3585,10 @@ _ldtLeft	src/Dodge/Data/DoubleTree.hs	39;"	f
 _ldtRight	src/Dodge/Data/DoubleTree.hs	40;"	f
 _ldtValue	src/Dodge/Data/DoubleTree.hs	39;"	f
 _leadTargetBy	src/Dodge/Data/ActionPlan.hs	150;"	f
-_leftConsumption	src/Dodge/Data/Item/Use.hs	48;"	f
+_leftConsumption	src/Dodge/Data/Item/Use.hs	49;"	f
-_leftDelay	src/Dodge/Data/Item/Use.hs	45;"	f
+_leftDelay	src/Dodge/Data/Item/Use.hs	46;"	f
-_leftHammer	src/Dodge/Data/Item/Use.hs	46;"	f
+_leftHammer	src/Dodge/Data/Item/Use.hs	47;"	f
-_leftUse	src/Dodge/Data/Item/Use.hs	44;"	f
+_leftUse	src/Dodge/Data/Item/Use.hs	45;"	f
 _lightBeams	src/Dodge/Data/LWorld.hs	150;"	f
 _lightSources	src/Dodge/Data/LWorld.hs	140;"	f
 _lightingCapShader	src/Data/Preload/Render.hs	16;"	f
@@ -3676,17 +3673,17 @@ _mtBranches	src/Dodge/Tree/Compose/Data.hs	8;"	f
 _mtLabel	src/Dodge/Tree/Compose/Data.hs	8;"	f
 _mtTree	src/Dodge/Tree/Compose/Data.hs	8;"	f
 _musicData	src/Data/Preload.hs	13;"	f
-_muzVel	src/Dodge/Data/Item/Use.hs	78;"	f
+_muzVel	src/Dodge/Data/Item/Use.hs	79;"	f
 _mvAimSpeed	src/Dodge/Data/Creature/Misc.hs	44;"	f
 _mvSpeed	src/Dodge/Data/Creature/Misc.hs	39;"	f
 _mvToPoint	src/Dodge/Data/Creature.hs	98;"	f
 _mvTurnJit	src/Dodge/Data/Creature/Misc.hs	43;"	f
 _mvTurnRad	src/Dodge/Data/Creature/Misc.hs	42;"	f
-_mzAmmoSlot	src/Dodge/Data/Item/Use.hs	136;"	f
+_mzAmmoSlot	src/Dodge/Data/Item/Use.hs	140;"	f
-_mzFlareType	src/Dodge/Data/Item/Use.hs	137;"	f
+_mzFlareType	src/Dodge/Data/Item/Use.hs	141;"	f
-_mzInaccuracy	src/Dodge/Data/Item/Use.hs	135;"	f
+_mzInaccuracy	src/Dodge/Data/Item/Use.hs	139;"	f
-_mzPos	src/Dodge/Data/Item/Use.hs	133;"	f
+_mzPos	src/Dodge/Data/Item/Use.hs	137;"	f
-_mzRot	src/Dodge/Data/Item/Use.hs	134;"	f
+_mzRot	src/Dodge/Data/Item/Use.hs	138;"	f
 _newArcStep	src/Dodge/Data/Item/Params.hs	57;"	f
 _newBeams	src/Dodge/Data/LWorld.hs	114;"	f
 _noClip	src/Dodge/Debug/Flag/Data.hs	7;"	f
@@ -3710,9 +3707,9 @@ _opPlacement	src/Dodge/Data/GenWorld.hs	129;"	f
 _opPlacementID	src/Dodge/Data/GenWorld.hs	130;"	f
 _opSel	src/Dodge/Data/RightButtonOptions.hs	15;"	f
 _opTexture	src/Dodge/Data/Wall.hs	42;"	f
-_opticDefaultZoom	src/Dodge/Data/Item/Use.hs	110;"	f
+_opticDefaultZoom	src/Dodge/Data/Item/Use.hs	113;"	f
-_opticPos	src/Dodge/Data/Item/Use.hs	106;"	f
+_opticPos	src/Dodge/Data/Item/Use.hs	109;"	f
-_opticZoom	src/Dodge/Data/Item/Use.hs	109;"	f
+_opticZoom	src/Dodge/Data/Item/Use.hs	112;"	f
 _paramMID	src/Dodge/Data/Item/Params.hs	60;"	f
 _partialAction	src/Dodge/Data/ActionPlan.hs	145;"	f
 _pastWorlds	src/Dodge/Data/World.hs	38;"	f
@@ -3861,7 +3858,7 @@ _pyFaces	src/Polyhedra/Data.hs	14;"	f
 _radarBlips	src/Dodge/Data/LWorld.hs	112;"	f
 _radarSweeps	src/Dodge/Data/LWorld.hs	107;"	f
 _randGen	src/Dodge/Data/World.hs	40;"	f
-_randomOffset	src/Dodge/Data/Item/Use.hs	82;"	f
+_randomOffset	src/Dodge/Data/Item/Use.hs	83;"	f
 _rateMax	src/Dodge/Data/Item/HeldDelay.hs	15;"	f
 _rateMax	src/Dodge/Data/Item/HeldDelay.hs	19;"	f
 _rateMax	src/Dodge/Data/Item/Use/Delay.hs	13;"	f
@@ -3887,7 +3884,7 @@ _rbPos	src/Dodge/Data/RadarBlip.hs	19;"	f
 _rbRad	src/Dodge/Data/RadarBlip.hs	18;"	f
 _rbTime	src/Dodge/Data/RadarBlip.hs	16;"	f
 _rboBaseBloom	src/Data/Preload/Render.hs	38;"	f
-_recoil	src/Dodge/Data/Item/Use.hs	80;"	f
+_recoil	src/Dodge/Data/Item/Use.hs	81;"	f
 _reloadAction	src/Dodge/Data/LoadAction.hs	26;"	f
 _remotePos	src/Dodge/Data/Item/Scope.hs	17;"	f
 _remoteZoom	src/Dodge/Data/Item/Scope.hs	18;"	f
@@ -3895,7 +3892,7 @@ _renderData	src/Data/Preload.hs	11;"	f
 _reverseAmount	src/Dodge/Data/World.hs	63;"	f
 _reverseAmount	src/Dodge/Data/World.hs	69;"	f
 _reverseAmount	src/Dodge/Data/World.hs	73;"	f
-_rifling	src/Dodge/Data/Item/Use.hs	79;"	f
+_rifling	src/Dodge/Data/Item/Use.hs	80;"	f
 _rlDir	src/Dodge/Data/Room.hs	26;"	f
 _rlPos	src/Dodge/Data/Room.hs	25;"	f
 _rlType	src/Dodge/Data/Room.hs	24;"	f
@@ -3983,8 +3980,8 @@ _scopeZoomChange	src/Dodge/Data/Item/Attachment.hs	33;"	f
 _scopeZoomChange	src/Dodge/Item/Attachment/Data.hs	33;"	f
 _screenTextureVAO	src/Data/Preload/Render.hs	50;"	f
 _scrollAmount	src/Dodge/Data/Input.hs	24;"	f
-_scrollAttachParams	src/Dodge/Data/Item/Use.hs	89;"	f
+_scrollAttachParams	src/Dodge/Data/Item/Use.hs	92;"	f
-_scrollChar	src/Dodge/Data/Item/Use.hs	113;"	f
+_scrollChar	src/Dodge/Data/Item/Use.hs	116;"	f
 _scrollItemLocation	src/Dodge/Data/World.hs	65;"	f
 _scrollItemLocation	src/Dodge/Data/World.hs	74;"	f
 _scrollItemLocation	src/Dodge/Data/World.hs	78;"	f
@@ -4040,7 +4037,7 @@ _siPictures	src/Dodge/Data/SelectionList.hs	77;"	f
 _siPictures	src/Dodge/Data/SelectionList.hs	85;"	f
 _sideEffect	src/Loop/Data.hs	13;"	f
 _sideImpulses	src/Dodge/Data/ActionPlan.hs	170;"	f
-_sidePush	src/Dodge/Data/Item/Use.hs	83;"	f
+_sidePush	src/Dodge/Data/Item/Use.hs	84;"	f
 _silhouetteEBO	src/Data/Preload/Render.hs	27;"	f
 _skColor	src/Dodge/Data/Spark.hs	17;"	f
 _skDamageType	src/Dodge/Data/Spark.hs	21;"	f
@@ -4180,7 +4177,7 @@ _toPlaySoundVolume	src/Sound/Data.hs	43;"	f
 _toPlaySoundVolumeFraction	src/Sound/Data.hs	44;"	f
 _toPlaySounds	src/Dodge/Data/World.hs	41;"	f
 _topBoxSize	src/Shape/Data.hs	17;"	f
-_torqueAfter	src/Dodge/Data/Item/Use.hs	81;"	f
+_torqueAfter	src/Dodge/Data/Item/Use.hs	82;"	f
 _tractorBeams	src/Dodge/Data/LWorld.hs	121;"	f
 _trieChildren	src/SimpleTrie.hs	7;"	f
 _trieMVal	src/SimpleTrie.hs	6;"	f
@@ -4270,6 +4267,8 @@ _warmMax	src/Dodge/Data/Item/UseDelay.hs	24;"	f
 _warmTime	src/Dodge/Data/Item/HeldDelay.hs	25;"	f
 _warmTime	src/Dodge/Data/Item/Use/Delay.hs	23;"	f
 _warmTime	src/Dodge/Data/Item/UseDelay.hs	23;"	f
+_weaponInvLock	src/Dodge/Data/Item/Use.hs	86;"	f
+_weaponRepeat	src/Dodge/Data/Item/Use.hs	87;"	f
 _windowPosX	src/Dodge/Config/Data.hs	23;"	f
 _windowPosX	src/Dodge/Data/Config.hs	53;"	f
 _windowPosY	src/Dodge/Config/Data.hs	24;"	f
@@ -4419,7 +4418,7 @@ alongSegBy	src/Geometry.hs	43;"	f
 ammoCheckI	src/Dodge/Item/Weapon/TriggerType.hs	145;"	f
 ammoComposedItem	src/Dodge/Item/Grammar.hs	44;"	f
 ammoTweakStrings	src/Dodge/Render/HUD.hs	284;"	f
-amr	src/Dodge/Item/Held/Rod.hs	53;"	f
+amr	src/Dodge/Item/Held/Rod.hs	45;"	f
 amr	src/Dodge/Item/Weapon/BulletGun/Rod.hs	56;"	f
 anItemFindPulse	src/Dodge/Item/Weapon/UseEffect.hs	25;"	f
 analyser	src/Dodge/Placement/Instance/Analyser.hs	12;"	f
@@ -4434,23 +4433,24 @@ anyTargeting	src/Dodge/Render/ShapePicture.hs	70;"	f
 anyUnusedSpot	src/Dodge/PlacementSpot.hs	66;"	f
 anythingHitCirc	src/Dodge/Base/Collide.hs	242;"	f
 appendEitherTree	src/Dodge/Layout/Tree/Either.hs	29;"	f
-applyCME	src/Dodge/HeldUse.hs	362;"	f
+applyCME	src/Dodge/HeldUse.hs	363;"	f
 applyCreatureDamage	src/Dodge/Creature/Damage.hs	14;"	f
 applyDamageEffect	src/Dodge/Creature/Damage.hs	31;"	f
 applyEventIO	src/Loop.hs	89;"	f
 applyIndividualDamage	src/Dodge/Creature/Damage.hs	49;"	f
 applyIndividualDamage'	src/Dodge/Creature/Damage.hs	52;"	f
+applyInvLock	src/Dodge/HeldUse.hs	373;"	f
 applyMagnetsToBul	src/Dodge/Bullet.hs	46;"	f
 applyModules	src/Dodge/Combine/Module.hs	52;"	f
 applyNoDamage	src/Dodge/Creature/Damage.hs	11;"	f
 applyPastDamages	src/Dodge/Creature/State.hs	169;"	f
 applyPiercingDamage	src/Dodge/Creature/Damage.hs	57;"	f
 applyPosition	src/Sound.hs	110;"	f
-applyRecoil	src/Dodge/HeldUse.hs	379;"	f
+applyRecoil	src/Dodge/HeldUse.hs	388;"	f
 applyResFactor	src/Dodge/Data/Config.hs	108;"	f
 applySetTerminalString	src/Dodge/Debug/Terminal.hs	78;"	f
-applySidePush	src/Dodge/HeldUse.hs	386;"	f
+applySidePush	src/Dodge/HeldUse.hs	395;"	f
-applySoundCME	src/Dodge/HeldUse.hs	372;"	f
+applySoundCME	src/Dodge/HeldUse.hs	381;"	f
 applyTerminalCommand	src/Dodge/Debug/Terminal.hs	27;"	f
 applyTerminalCommandArguments	src/Dodge/Debug/Terminal.hs	39;"	f
 applyTerminalString	src/Dodge/Debug/Terminal.hs	21;"	f
@@ -4465,7 +4465,7 @@ applyToSubforest	src/Dodge/Tree/Polymorphic.hs	66;"	f
 applyToSubforest	src/TreeHelp.hs	77;"	f
 applyToSubtree	src/Dodge/Tree/Polymorphic.hs	60;"	f
 applyToSubtree	src/TreeHelp.hs	70;"	f
-applyTorqueCME	src/Dodge/HeldUse.hs	396;"	f
+applyTorqueCME	src/Dodge/HeldUse.hs	405;"	f
 applyWorldConfig	src/Dodge/Config/Update.hs	38;"	f
 aquamarine	src/Color.hs	23;"	f
 arc	src/Picture/Base.hs	287;"	f
@@ -4501,7 +4501,7 @@ attachOnward'	src/Dodge/Tree/Compose.hs	98;"	f
 attachTree	src/Dodge/Tree/Compose.hs	38;"	f
 attentionViewPoint	src/Dodge/Creature/ReaderUpdate.hs	66;"	f
 attribSize	src/Shader/Compile.hs	352;"	f
-autoAmr	src/Dodge/Item/Held/Rod.hs	58;"	f
+autoAmr	src/Dodge/Item/Held/Rod.hs	50;"	f
 autoAmr	src/Dodge/Item/Weapon/BulletGun/Rod.hs	62;"	f
 autoBS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	350;"	f
 autoCrit	src/Dodge/Creature/AutoCrit.hs	13;"	f
@@ -4511,10 +4511,10 @@ autoGun	src/Dodge/Item/Weapon/AutoGun.hs	24;"	f
 autoGunPic	src/Dodge/Item/Weapon/AutoGun.hs	66;"	f
 autoGunS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	496;"	f
 autoGunSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
-autoPistol	src/Dodge/Item/Held/Stick.hs	60;"	f
+autoPistol	src/Dodge/Item/Held/Stick.hs	53;"	f
 autoPistol	src/Dodge/Item/Weapon/BulletGun/Stick.hs	79;"	f
 autoRadarEffect	src/Dodge/Item/Weapon/ExtraEffect.hs	39;"	f
-autoRifle	src/Dodge/Item/Held/Cane.hs	75;"	f
+autoRifle	src/Dodge/Item/Held/Cane.hs	67;"	f
 autoRifle	src/Dodge/Item/Weapon/BulletGun/Cane.hs	97;"	f
 autoSonarEffect	src/Dodge/Item/Weapon/ExtraEffect.hs	43;"	f
 autogunSpread	src/Dodge/Item/Weapon/AutoGun.hs	78;"	f
@@ -4536,7 +4536,7 @@ bangRod	src/Dodge/Item/Weapon/BulletGun/Rod.hs	18;"	f
 bangS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	478;"	f
 bangStick	src/Dodge/Item/Held/Stick.hs	17;"	f
 bangStick	src/Dodge/Item/Weapon/BulletGun/Stick.hs	17;"	f
-bangStickSoundChoice	src/Dodge/HeldUse.hs	966;"	f
+bangStickSoundChoice	src/Dodge/HeldUse.hs	986;"	f
 bangStickSoundChoice	src/Dodge/HeldUse/BulletWeapon.hs	226;"	f
 barPP	src/Dodge/Room/Foreground.hs	236;"	f
 barrel	src/Dodge/Creature/Inanimate.hs	17;"	f
@@ -4555,7 +4555,7 @@ baseSMGShape	src/Dodge/Item/Draw/SPic.hs	412;"	f
 baseShoulder	src/Dodge/Creature/Picture.hs	158;"	f
 baseStickShape	src/Dodge/Item/Draw/SPic.hs	227;"	f
 baseStickShapeX	src/Dodge/Item/Draw/SPic.hs	222;"	f
-baseStickSpread	src/Dodge/Item/Held/Stick.hs	39;"	f
+baseStickSpread	src/Dodge/Item/Held/Stick.hs	32;"	f
 baseStickSpread	src/Dodge/Item/Weapon/BulletGun/Stick.hs	46;"	f
 baseWindowPane	src/Dodge/Placements/Wall.hs	73;"	f
 baseWindowPane	src/Dodge/Room/Placement.hs	103;"	f
@@ -4573,13 +4573,14 @@ basicDrawBeam	src/Dodge/Beam/Draw.hs	11;"	f
 basicItemDisplay	src/Dodge/Item/Display.hs	50;"	f
 basicMachineApplyDamage	src/Dodge/Machine/Damage.hs	6;"	f
 basicMachineUpdate	src/Dodge/Machine.hs	13;"	f
+basicMuzFlare	src/Dodge/HeldUse.hs	445;"	f
 basicPerceptionUpdateR	src/Dodge/Creature/AlertLevel.hs	17;"	f
 basicTerminal	src/Dodge/Terminal.hs	32;"	f
-battery	src/Dodge/Item/Ammo.hs	62;"	f
+battery	src/Dodge/Item/Ammo.hs	67;"	f
 batteryModules	src/Dodge/Item/Held/BatteryGuns.hs	112;"	f
 batteryPack	src/Dodge/Item/Equipment.hs	58;"	f
 belowNumX	src/Dodge/Combine/Graph.hs	77;"	f
-beltMag	src/Dodge/Item/Ammo.hs	37;"	f
+beltMag	src/Dodge/Item/Ammo.hs	42;"	f
 bezierGun	src/Dodge/Item/Weapon/Bezier.hs	24;"	f
 bfsNodePoints	src/Dodge/Path.hs	58;"	f
 bfsThenReturn	src/Dodge/Creature/ReaderUpdate.hs	216;"	f
@@ -4614,7 +4615,7 @@ bloodPuddleAt	src/Dodge/Creature/State.hs	132;"	f
 blowTorch	src/Dodge/Item/Held/SprayGuns.hs	44;"	f
 blowTorch	src/Dodge/Item/Weapon/SprayGuns.hs	49;"	f
 blue	src/Color.hs	16;"	f
-blunderbuss	src/Dodge/Item/Held/Cone.hs	31;"	f
+blunderbuss	src/Dodge/Item/Held/Cone.hs	28;"	f
 boostPoint	src/Dodge/Item/Weapon/Booster.hs	17;"	f
 boostPoint	src/Dodge/Luse.hs	104;"	f
 boostSelfL	src/Dodge/Item/Weapon/Booster.hs	31;"	f
@@ -4624,7 +4625,7 @@ boosterGun	src/Dodge/Item/Weapon/Booster.hs	111;"	f
 bossKeyItems	src/Dodge/LockAndKey.hs	11;"	f
 bossRoom	src/Dodge/Room/Boss.hs	59;"	f
 bounceBall	src/Dodge/Base/Collide.hs	77;"	f
-bounceDir	src/Dodge/Bullet.hs	92;"	f
+bounceDir	src/Dodge/Bullet.hs	99;"	f
 bounceModule	src/Dodge/Item/Craftable.hs	29;"	f
 bouncePoint	src/Dodge/Base/Collide.hs	87;"	f
 boundPoints	src/Bound.hs	10;"	f
@@ -4649,20 +4650,20 @@ bufferPokedVBO	src/Shader/Bind.hs	18;"	f
 bufferShaderLayers	src/Shader/Bind.hs	35;"	f
 bulDamageCr	src/Dodge/Particle/Bullet/DestroyDamage.hs	21;"	f
 bulDamageWall	src/Dodge/Particle/Bullet/DestroyDamage.hs	30;"	f
-bulGunEffect	src/Dodge/HeldUse.hs	351;"	f
+bulGunEffect	src/Dodge/HeldUse.hs	352;"	f
-bulGunEffect'	src/Dodge/HeldUse.hs	354;"	f
+bulGunEffect'	src/Dodge/HeldUse.hs	355;"	f
 bulSelTweak	src/Dodge/TweakBullet.hs	15;"	f
 bulletBeltBracer	src/Dodge/Item/Equipment.hs	83;"	f
 bulletBeltPack	src/Dodge/Item/Equipment.hs	74;"	f
 bulletBodyCraft	src/Dodge/Item/Craftable.hs	24;"	f
 bulletCombinations	src/Dodge/Combine/Graph.hs	35;"	f
-bulletGunEffect	src/Dodge/HeldUse.hs	488;"	f
+bulletGunEffect	src/Dodge/HeldUse.hs	508;"	f
 bulletMagazines	src/Dodge/Combine/Combinations.hs	239;"	f
-bulletSpawn	src/Dodge/Bullet.hs	97;"	f
+bulletSpawn	src/Dodge/Bullet.hs	104;"	f
-bulletSynthesizer	src/Dodge/Item/Ammo.hs	76;"	f
+bulletSynthesizer	src/Dodge/Item/Ammo.hs	81;"	f
 bulletTypes	src/Dodge/TweakBullet.hs	26;"	f
 bulletWeapons	src/Dodge/Combine/Combinations.hs	247;"	f
-burstRifle	src/Dodge/Item/Held/Cane.hs	84;"	f
+burstRifle	src/Dodge/Item/Held/Cane.hs	76;"	f
 burstRifle	src/Dodge/Item/Weapon/BulletGun/Cane.hs	105;"	f
 buzzS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	502;"	f
 buzzSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
@@ -4672,7 +4673,7 @@ canAttachTargeting	src/Dodge/Item/Display.hs	19;"	f
 canHeldScrollAttach	src/Dodge/HeldScroll.hs	75;"	f
 canSee	src/Dodge/Base/Collide.hs	228;"	f
 canSeeIndirect	src/Dodge/Base/Collide.hs	235;"	f
-caneStickSoundChoice	src/Dodge/HeldUse.hs	961;"	f
+caneStickSoundChoice	src/Dodge/HeldUse.hs	981;"	f
 cardList	src/Dodge/Base/CardinalPoint.hs	6;"	f
 cardVec	src/Dodge/Base/CardinalPoint.hs	9;"	f
 cardinalVectors	src/Dodge/FloorItem.hs	39;"	f
@@ -4825,8 +4826,6 @@ composeTree	src/Dodge/Tree/Compose.hs	46;"	f
 computerBeepingS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	458;"	f
 conEffects	src/Dodge/Concurrent.hs	17;"	f
 concBall	src/Dodge/WorldEvent/SpawnParticle.hs	27;"	f
-coneRandItemParams	src/Dodge/HeldUse.hs	975;"	f
-coneRandItemUpdate	src/Dodge/HeldUse.hs	969;"	f
 connectRoom	src/Dodge/Layout/Tree/Either.hs	48;"	f
 connectTrunk	src/Dodge/Layout/Tree/Either.hs	54;"	f
 connectionBlurb	src/Dodge/Terminal.hs	100;"	f
@@ -4984,7 +4983,7 @@ damageSensor	src/Dodge/Machine/Sensor.hs	16;"	f
 damageSensor	src/Dodge/Placement/Instance/Sensor.hs	15;"	f
 damageSensor	src/Dodge/Placements/Sensor.hs	15;"	f
 damageStone	src/Dodge/Material/Damage.hs	20;"	f
-damageThingHit	src/Dodge/Bullet.hs	168;"	f
+damageThingHit	src/Dodge/Bullet.hs	175;"	f
 damageTypeThreshold	src/Dodge/Placement/Instance/Sensor.hs	45;"	f
 damageUsing	src/Dodge/Machine/Update.hs	151;"	f
 damageWall	src/Dodge/Wall/Damage.hs	15;"	f
@@ -5044,7 +5043,7 @@ defaultArcStep	src/Dodge/Tesla/Arc/Default.hs	15;"	f
 defaultAudition	src/Dodge/Default/Creature.hs	99;"	f
 defaultAutoBatteryGun	src/Dodge/Item/Held/BatteryGuns.hs	119;"	f
 defaultAutoWall	src/Dodge/Default/Door.hs	15;"	f
-defaultBangCane	src/Dodge/Item/Held/Cane.hs	19;"	f
+defaultBangCane	src/Dodge/Item/Held/Cane.hs	18;"	f
 defaultBangCane	src/Dodge/Item/Weapon/BulletGun/Cane.hs	16;"	f
 defaultBatteryGun	src/Dodge/Item/Held/BatteryGuns.hs	107;"	f
 defaultBlock	src/Dodge/Default/Block.hs	5;"	f
@@ -5144,7 +5143,7 @@ deleteWallFromZones	src/Dodge/Wall/Zone.hs	23;"	f
 deleteWallID	src/Dodge/Wall/Delete.hs	13;"	f
 deleteWallIDs	src/Dodge/Wall/Delete.hs	28;"	f
 denormalEdges	src/Polyhedra.hs	135;"	f
-destroyAt	src/Dodge/Bullet.hs	193;"	f
+destroyAt	src/Dodge/Bullet.hs	200;"	f
 destroyAt	src/Dodge/WorldEvent/HitEffect.hs	24;"	f
 destroyBlock	src/Dodge/Block.hs	51;"	f
 destroyDoor	src/Dodge/Block.hs	79;"	f
@@ -5404,7 +5403,7 @@ dropByState	src/Dodge/Creature/State.hs	154;"	f
 dropExcept	src/Dodge/Creature/Action.hs	178;"	f
 dropItem	src/Dodge/Creature/Action.hs	183;"	f
 dropItemKey	src/Dodge/Config/KeyConfig.hs	24;"	f
-drumMag	src/Dodge/Item/Ammo.hs	31;"	f
+drumMag	src/Dodge/Item/Ammo.hs	36;"	f
 dtIL	src/Dodge/DoubleTree.hs	15;"	f
 dtToAdjacency	src/Dodge/DoubleTree.hs	22;"	f
 dtToUpDownAdj	src/Dodge/DoubleTree.hs	28;"	f
@@ -5423,7 +5422,7 @@ edgeFormatting	src/Dodge/Combine/Graph.hs	119;"	f
 edgeToPic	src/Dodge/Debug/Picture.hs	392;"	f
 ejectS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	470;"	f
 elecCrackleS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	362;"	f
-elephantGun	src/Dodge/Item/Held/Rod.hs	44;"	f
+elephantGun	src/Dodge/Item/Held/Rod.hs	37;"	f
 elephantGun	src/Dodge/Item/Weapon/BulletGun/Rod.hs	46;"	f
 ellNum	src/Picture/Data.hs	53;"	f
 emptyCorridor	src/Dodge/Room/BlinkAcross.hs	22;"	f
@@ -5466,7 +5465,7 @@ expandPolyByFixed	src/Dodge/LevelGen/StaticWalls.hs	97;"	f
 expandPolyCorners	src/Dodge/LevelGen/StaticWalls.hs	103;"	f
 expandToSquare	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	83;"	f
 expandTreeBy	src/Dodge/Layout/Tree/Either.hs	16;"	f
-expireAndDamage	src/Dodge/Bullet.hs	175;"	f
+expireAndDamage	src/Dodge/Bullet.hs	182;"	f
 expireAndDamage	src/Dodge/Particle/HitEffect/ExpireAndDamage.hs	11;"	f
 expireAndDamageFL	src/Dodge/Flame.hs	48;"	f
 explodeRemoteRocket	src/Dodge/Item/Weapon/Launcher.hs	10;"	f
@@ -5504,7 +5503,7 @@ findWallFreeDropPoint	src/Dodge/FloorItem.hs	47;"	f
 findWallsInPolygon	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	78;"	f
 findWithIx	src/ListHelp.hs	123;"	f
 fireLoudS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	504;"	f
-fireRemoteShell	src/Dodge/HeldUse.hs	933;"	f
+fireRemoteShell	src/Dodge/HeldUse.hs	953;"	f
 fireS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	332;"	f
 fireShell	src/Dodge/Projectile/Create.hs	35;"	f
 fireSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
@@ -5607,7 +5606,7 @@ gameRoomViewpoints	src/Dodge/Viewpoints.hs	35;"	f
 gameRoomsFromRooms	src/Dodge/Layout.hs	158;"	f
 gameplayMenu	src/Dodge/Menu.hs	131;"	f
 gameplayMenuOptions	src/Dodge/Menu.hs	134;"	f
-gasEffect	src/Dodge/HeldUse.hs	339;"	f
+gasEffect	src/Dodge/HeldUse.hs	340;"	f
 generateGenParams	src/Dodge/LevelGen/LevelStructure.hs	22;"	f
 generateGraphs	src/Dodge/LevelGen.hs	39;"	f
 generateLayout	src/Dodge/Layout/Generate.hs	10;"	f
@@ -5618,7 +5617,7 @@ geometryQuickCheckTests	test/Spec.hs	55;"	f
 geometryTests	test/Spec.hs	17;"	f
 geometryUnitTests	test/Spec.hs	22;"	f
 geqConstr	src/SameConstr.hs	21;"	f
-getAmmoMagazine	src/Dodge/HeldUse.hs	907;"	f
+getAmmoMagazine	src/Dodge/HeldUse.hs	927;"	f
 getArguments	src/Dodge/Update/Scroll.hs	147;"	f
 getArguments'	src/Dodge/Update/Scroll.hs	135;"	f
 getAvailableListLines	src/Dodge/SelectionList.hs	11;"	f
@@ -5668,7 +5667,7 @@ goToTarget	src/Dodge/Creature/ReaderUpdate.hs	136;"	f
 gotoTerminal	src/Dodge/Update.hs	118;"	f
 grahamEliminate	src/Geometry/Polygon.hs	108;"	f
 grahamScan	src/Geometry/Polygon.hs	101;"	f
-grapeCannon	src/Dodge/Item/Held/Cone.hs	40;"	f
+grapeCannon	src/Dodge/Item/Held/Cone.hs	37;"	f
 graphToEdges	src/Dodge/Graph.hs	35;"	f
 graphToIncidence	src/Dodge/Graph.hs	40;"	f
 graphicsMenu	src/Dodge/Menu.hs	162;"	f
@@ -5735,7 +5734,7 @@ heightWallPS	src/Dodge/Placement/Instance/Wall.hs	13;"	f
 heldAimEffects	src/Dodge/Creature/State.hs	68;"	f
 heldBounds	src/Dodge/Item/Module.hs	27;"	f
 heldComposedItem	src/Dodge/Item/Grammar.hs	38;"	f
-heldEffect	src/Dodge/HeldUse.hs	41;"	f
+heldEffect	src/Dodge/HeldUse.hs	42;"	f
 heldInfo	src/Dodge/Item/Info.hs	61;"	f
 heldItemOffset	src/Dodge/Item/HeldOffset.hs	24;"	f
 heldItemSPic	src/Dodge/Item/Draw/SPic.hs	156;"	f
@@ -5748,7 +5747,7 @@ highBar	src/Dodge/Room/Foreground.hs	89;"	f
 highDiagonalMesh	src/Dodge/Room/Foreground.hs	35;"	f
 highMesh	src/Dodge/Room/Foreground.hs	25;"	f
 hit1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	412;"	f
-hitEffFromBul	src/Dodge/Bullet.hs	137;"	f
+hitEffFromBul	src/Dodge/Bullet.hs	144;"	f
 hitS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	382;"	f
 hitSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
 holdForm	src/Dodge/Creature/Boid.hs	136;"	f
@@ -5870,7 +5869,7 @@ invertIntMap	src/Multiset.hs	61;"	f
 invertInventoryToMap	src/Dodge/Combine.hs	25;"	f
 invisibleChaseCrit	src/Dodge/Creature/ChaseCrit.hs	25;"	f
 invisibleWall	src/Dodge/Placement/Instance/Wall.hs	16;"	f
-isAmmoIntLink	src/Dodge/HeldUse.hs	448;"	f
+isAmmoIntLink	src/Dodge/HeldUse.hs	462;"	f
 isAnimate	src/Dodge/Creature/Test.hs	138;"	f
 isCognizant	src/Dodge/Creature/Perception.hs	105;"	f
 isElectrical	src/Dodge/Data/Damage.hs	42;"	f
@@ -5990,7 +5989,7 @@ lasTunnelRunPast	src/Dodge/Room/LasTurret.hs	165;"	f
 lasTurret	src/Dodge/Placement/Instance/Turret.hs	23;"	f
 lasTurret	src/Dodge/Placements/Turret.hs	29;"	f
 lasWide	src/Dodge/Item/Held/BatteryGuns.hs	98;"	f
-lasWideRate	src/Dodge/HeldUse.hs	822;"	f
+lasWideRate	src/Dodge/HeldUse.hs	842;"	f
 lastMap	src/Dodge/DoubleTree.hs	65;"	f
 latchkey	src/Dodge/Item/Held/Utility.hs	23;"	f
 latchkey	src/Dodge/Item/PassKey.hs	14;"	f
@@ -6056,7 +6055,7 @@ loadEject	src/Dodge/Reloading/Action.hs	12;"	f
 loadInsert	src/Dodge/Reloading/Action.hs	6;"	f
 loadKeyConfig	src/Dodge/Config/KeyConfig.hs	60;"	f
 loadMusic	src/Dodge/SoundLogic/LoadSound.hs	21;"	f
-loadMuzzle	src/Dodge/HeldUse.hs	415;"	f
+loadMuzzle	src/Dodge/HeldUse.hs	424;"	f
 loadPartialInsert	src/Dodge/Reloading/Action.hs	9;"	f
 loadPrime	src/Dodge/Reloading/Action.hs	15;"	f
 loadSaveSlot	src/Dodge/Save.hs	74;"	f
@@ -6094,9 +6093,9 @@ lsPosRad	src/Dodge/LightSource.hs	23;"	f
 lsRadCol	src/Dodge/LightSource.hs	64;"	f
 ltAutoCrit	src/Dodge/Creature/LtAutoCrit.hs	13;"	f
 machineAddSound	src/Dodge/Machine.hs	49;"	f
-machineGun	src/Dodge/Item/Held/Rod.hs	71;"	f
+machineGun	src/Dodge/Item/Held/Rod.hs	62;"	f
 machineGun	src/Dodge/Item/Weapon/BulletGun/Rod.hs	79;"	f
-machinePistol	src/Dodge/Item/Held/Stick.hs	69;"	f
+machinePistol	src/Dodge/Item/Held/Stick.hs	62;"	f
 machinePistol	src/Dodge/Item/Weapon/BulletGun/Stick.hs	86;"	f
 machineUpdateDeathEff	src/Dodge/Machine.hs	34;"	f
 machineUpdateLiveDieEff	src/Dodge/Machine.hs	16;"	f
@@ -6114,7 +6113,7 @@ makeArc	src/Picture/Base.hs	157;"	f
 makeBlip	src/Dodge/RadarSweep.hs	50;"	f
 makeBlockDebris	src/Dodge/Block/Debris.hs	28;"	f
 makeBoolOption	src/Dodge/Menu/OptionType.hs	8;"	f
-makeBullet	src/Dodge/HeldUse.hs	468;"	f
+makeBullet	src/Dodge/HeldUse.hs	483;"	f
 makeButton	src/Dodge/LevelGen/Switch.hs	16;"	f
 makeByteStringShaderUsingVAO	src/Shader/Compile.hs	137;"	f
 makeCloudAt	src/Dodge/WorldEvent/Cloud.hs	18;"	f
@@ -6130,7 +6129,7 @@ makeDefaultCorpse	src/Dodge/Corpse/Make.hs	14;"	f
 makeDoorDebris	src/Dodge/Block/Debris.hs	18;"	f
 makeEnumOption	src/Dodge/Menu/OptionType.hs	13;"	f
 makeExplosionAt	src/Dodge/WorldEvent/Explosion.hs	79;"	f
-makeFlak	src/Dodge/Bullet.hs	123;"	f
+makeFlak	src/Dodge/Bullet.hs	130;"	f
 makeFlame	src/Dodge/Flame.hs	131;"	f
 makeFlame	src/Dodge/Particle/Flame.hs	9;"	f
 makeFlameExplosionAt	src/Dodge/WorldEvent/Explosion.hs	62;"	f
@@ -6138,14 +6137,14 @@ makeFlamelet	src/Dodge/EnergyBall.hs	16;"	f
 makeFlamerSmokeAt	src/Dodge/WorldEvent/Cloud.hs	68;"	f
 makeFlashBall	src/Dodge/EnergyBall.hs	74;"	f
 makeFootstepSound	src/Dodge/Creature/State/WalkCycle.hs	32;"	f
-makeFragBullets	src/Dodge/Bullet.hs	108;"	f
+makeFragBullets	src/Dodge/Bullet.hs	115;"	f
 makeGasCloud	src/Dodge/WorldEvent/SpawnParticle.hs	80;"	f
 makeGrid	src/Grid.hs	46;"	f
 makeIntInterval	src/Dodge/Zoning/Base.hs	33;"	f
 makeLaserAt	src/Dodge/Item/Weapon/Laser.hs	42;"	f
 makeLaserScope	src/Dodge/Item/Weapon/Decoration.hs	12;"	f
-makeMuzzleFlare	src/Dodge/HeldUse.hs	427;"	f
+makeMuzzleFlare	src/Dodge/HeldUse.hs	436;"	f
-makeMuzzleSmoke	src/Dodge/HeldUse.hs	438;"	f
+makeMuzzleSmoke	src/Dodge/HeldUse.hs	451;"	f
 makeOptionsSelectionList	src/Dodge/Menu/Option.hs	46;"	f
 makeParagraph	src/Justify.hs	6;"	f
 makePathBetween	src/Dodge/Path.hs	35;"	f
@@ -6209,12 +6208,13 @@ mcProximitySensorUpdate	src/Dodge/Machine/Update.hs	104;"	f
 mcSPic	src/Dodge/Render/ShapePicture.hs	169;"	f
 mcSensorTriggerUpdate	src/Dodge/Machine/Update.hs	69;"	f
 mcSensorUpdate	src/Dodge/Machine/Update.hs	99;"	f
-mcShootLaser	src/Dodge/HeldUse.hs	983;"	f
+mcShootLaser	src/Dodge/HeldUse.hs	1001;"	f
 mcTriggerVal	src/Dodge/Machine/Update.hs	75;"	f
 mcTypeUpdate	src/Dodge/Machine/Update.hs	24;"	f
-mcUseHeld	src/Dodge/HeldUse.hs	825;"	f
+mcUseHeld	src/Dodge/HeldUse.hs	845;"	f
 mcUseItem	src/Dodge/Machine/Update.hs	61;"	f
 medkit	src/Dodge/Item/Consumable.hs	8;"	f
+megaTinMag	src/Dodge/Item/Ammo.hs	8;"	f
 meleeHeadingMove	src/Dodge/Creature/Boid.hs	281;"	f
 meleeHeadingMove	src/Dodge/Creature/ImpulseRat.hs	10;"	f
 memoBoxEdgeIndices	src/Shader/Poke.hs	344;"	f
@@ -6254,9 +6254,9 @@ minOn	src/FoldableHelp.hs	35;"	f
 minStreamOn	src/StreamingHelp.hs	14;"	f
 mini1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	322;"	f
 miniGunCrit	src/Dodge/Creature.hs	62;"	f
-miniGunUse	src/Dodge/Item/Held/Cane.hs	92;"	f
+miniGunUse	src/Dodge/Item/Held/Cane.hs	86;"	f
 miniGunUse	src/Dodge/Item/Weapon/BulletGun/Cane.hs	113;"	f
-miniGunX	src/Dodge/Item/Held/Cane.hs	104;"	f
+miniGunX	src/Dodge/Item/Held/Cane.hs	98;"	f
 miniGunX	src/Dodge/Item/Weapon/BulletGun/Cane.hs	120;"	f
 miniGunXPict	src/Dodge/Item/Draw/SPic.hs	391;"	f
 miniGunXPictItem	src/Dodge/Item/Draw/SPic.hs	385;"	f
@@ -6311,7 +6311,7 @@ mouseCursorType	src/Dodge/Render/Picture.hs	70;"	f
 mouseOverSelectionList	src/Dodge/Update/Input/ScreenLayer.hs	73;"	f
 mousePlus	src/Dodge/Render/Picture.hs	82;"	f
 mouseWorldPos	src/Dodge/Base/Coordinate.hs	48;"	f
-moveBullet	src/Dodge/Bullet.hs	185;"	f
+moveBullet	src/Dodge/Bullet.hs	192;"	f
 moveCombineSel	src/Dodge/Update/Scroll.hs	55;"	f
 moveDoorToward	src/Dodge/LevelGen/MoveDoor.hs	22;"	f
 moveDownKey	src/Dodge/Config/KeyConfig.hs	19;"	f
@@ -6321,7 +6321,7 @@ moveLSThen	src/Dodge/Placement/Instance/LightSource.hs	31;"	f
 moveLaser	src/Dodge/Item/Weapon/Laser.hs	48;"	f
 moveLeftKey	src/Dodge/Config/KeyConfig.hs	20;"	f
 moveOldHotkey	src/Dodge/Hotkey.hs	32;"	f
-movePenBullet	src/Dodge/Bullet.hs	203;"	f
+movePenBullet	src/Dodge/Bullet.hs	210;"	f
 moveRightKey	src/Dodge/Config/KeyConfig.hs	21;"	f
 moveRoomBy	src/Dodge/Room/Link.hs	53;"	f
 moveSelectionMapSelection	src/SelectionIntMap.hs	47;"	f
@@ -6448,9 +6448,9 @@ overColObj	src/Shape.hs	269;"	f
 overColSH	src/Shape.hs	237;"	f
 overLnkPosDir	src/Dodge/RoomLink.hs	100;"	f
 overLnkType	src/Dodge/RoomLink.hs	87;"	f
-overNozzle	src/Dodge/HeldUse.hs	889;"	f
+overNozzle	src/Dodge/HeldUse.hs	909;"	f
-overNozzles	src/Dodge/HeldUse.hs	867;"	f
+overNozzles	src/Dodge/HeldUse.hs	887;"	f
-overNozzles'	src/Dodge/HeldUse.hs	875;"	f
+overNozzles'	src/Dodge/HeldUse.hs	895;"	f
 overPos	src/Picture/Base.hs	303;"	f
 overPosObj	src/Shape.hs	273;"	f
 overPosSH	src/Shape.hs	257;"	f
@@ -6486,7 +6486,7 @@ pauseSound	src/Dodge/SoundLogic.hs	41;"	f
 pauseTime	src/Dodge/Update.hs	171;"	f
 peZoneSize	src/Dodge/Zoning/Pathing.hs	46;"	f
 pedestalRoom	src/Dodge/Room/Containing.hs	49;"	f
-penThing	src/Dodge/Bullet.hs	216;"	f
+penThing	src/Dodge/Bullet.hs	223;"	f
 penWalls	src/Dodge/Particle/HitEffect.hs	15;"	f
 penWalls	src/Dodge/WorldEvent/HitEffect.hs	38;"	f
 penetrate	src/Dodge/Particle/HitEffect/Penetrate.hs	12;"	f
@@ -6520,7 +6520,7 @@ pincerP''	src/Dodge/Creature/Boid.hs	103;"	f
 pincerP'''	src/Dodge/Creature/Boid.hs	74;"	f
 pingPongBetween	src/Render.hs	220;"	f
 pipe	src/Dodge/Item/Craftable.hs	44;"	f
-pistol	src/Dodge/Item/Held/Stick.hs	42;"	f
+pistol	src/Dodge/Item/Held/Stick.hs	35;"	f
 pistol	src/Dodge/Item/Weapon/BulletGun/Stick.hs	59;"	f
 pistolCrit	src/Dodge/Creature/PistolCrit.hs	13;"	f
 pistolerRoom	src/Dodge/Room/Room.hs	323;"	f
@@ -6893,7 +6893,7 @@ retreatFireLauncher	src/Dodge/Humanoid.hs	269;"	f
 retreatPointForFrom	src/Dodge/Creature/Action/Flee.hs	7;"	f
 retreatPointForFrom	src/Dodge/Creature/Impulse/Flee.hs	7;"	f
 reversePair	src/Dodge/LevelGen.hs	82;"	f
-revolveMag	src/Dodge/Item/Ammo.hs	24;"	f
+revolveMag	src/Dodge/Item/Ammo.hs	29;"	f
 revolver	src/Dodge/Item/Weapon/BulletGun/Stick.hs	49;"	f
 revolverX	src/Dodge/Item/Weapon/BulletGun/Stick.hs	104;"	f
 rewindWatch	src/Dodge/Item/Weapon/Utility.hs	37;"	f
@@ -6908,7 +6908,7 @@ rezInvBox	src/Dodge/Room/RezBox.hs	131;"	f
 rezText	src/Dodge/Story.hs	4;"	f
 rezText'	src/Dodge/Story.hs	17;"	f
 rhombus	src/Polyhedra.hs	71;"	f
-rifle	src/Dodge/Item/Held/Cane.hs	58;"	f
+rifle	src/Dodge/Item/Held/Cane.hs	50;"	f
 rifle	src/Dodge/Item/Weapon/BulletGun/Cane.hs	77;"	f
 right	src/DoubleStack.hs	16;"	f
 rightIsParentCombine	src/Dodge/Item/Grammar.hs	66;"	f
@@ -7070,7 +7070,7 @@ setDepth	src/Picture/Base.hs	128;"	f
 setDirPS	src/Dodge/PlacementSpot.hs	49;"	f
 setFallback	src/Dodge/PlacementSpot.hs	127;"	f
 setFirstPosSelectionSections	src/Dodge/SelectionSections.hs	23;"	f
-setFromToDams	src/Dodge/Bullet.hs	163;"	f
+setFromToDams	src/Dodge/Bullet.hs	170;"	f
 setHotkey	src/Dodge/Hotkey.hs	38;"	f
 setInLinks	src/Dodge/RoomLink.hs	51;"	f
 setInLinksByType	src/Dodge/RoomLink.hs	54;"	f
@@ -7136,7 +7136,7 @@ shatterGun	src/Dodge/Item/Held/Weapons.hs	7;"	f
 shatterGunSPic	src/Dodge/Item/Draw/SPic.hs	239;"	f
 shatterWall	src/Dodge/Item/Weapon/Shatter.hs	26;"	f
 shellCollisionCheck	src/Dodge/Projectile/Update.hs	30;"	f
-shellMag	src/Dodge/Item/Ammo.hs	44;"	f
+shellMag	src/Dodge/Item/Ammo.hs	49;"	f
 shellShape	src/Dodge/Projectile/Draw.hs	24;"	f
 shellTrailCloud	src/Dodge/WorldEvent/Cloud.hs	65;"	f
 shieldWall	src/Dodge/Euse.hs	114;"	f
@@ -7186,7 +7186,7 @@ shootRevolverXRepeat	src/Dodge/HeldUse/BulletWeapon.hs	49;"	f
 shootRifle	src/Dodge/HeldUse/BulletWeapon.hs	140;"	f
 shootShatter	src/Dodge/Item/Weapon/Shatter.hs	12;"	f
 shootSmgMod	src/Dodge/HeldUse/BulletWeapon.hs	86;"	f
-shootTeslaArc	src/Dodge/HeldUse.hs	992;"	f
+shootTeslaArc	src/Dodge/HeldUse.hs	1010;"	f
 shootTillEmpty	src/Dodge/Creature/Volition.hs	18;"	f
 shootVolleyGun	src/Dodge/HeldUse/BulletWeapon.hs	128;"	f
 shootersRoom	src/Dodge/Room/Room.hs	317;"	f
@@ -7263,12 +7263,12 @@ smallGlass3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	372;"	f
 smallGlass4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	334;"	f
 smallPillar	src/Dodge/Room/Pillar.hs	32;"	f
 smallRoom	src/Dodge/Room/RunPast.hs	31;"	f
-smg	src/Dodge/Item/Held/Stick.hs	78;"	f
+smg	src/Dodge/Item/Held/Stick.hs	71;"	f
 smg	src/Dodge/Item/Weapon/BulletGun/Stick.hs	95;"	f
 smokeCloudAt	src/Dodge/WorldEvent/Cloud.hs	41;"	f
 smokeTrailSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
 sndV2	src/Geometry/Data.hs	52;"	f
-sniperRifle	src/Dodge/Item/Held/Rod.hs	64;"	f
+sniperRifle	src/Dodge/Item/Held/Rod.hs	55;"	f
 sniperRifle	src/Dodge/Item/Weapon/BulletGun/Rod.hs	68;"	f
 someCrits	src/Dodge/LockAndKey.hs	129;"	f
 sortStreamOn	src/StreamingHelp.hs	21;"	f
@@ -7500,7 +7500,7 @@ tilesToLine	src/Shader/AuxAddition.hs	66;"	f
 timeFlowUpdate	src/Dodge/Update.hs	158;"	f
 timeModule	src/Dodge/Item/Craftable.hs	35;"	f
 timerTLS	src/Dodge/LightSource/Update.hs	22;"	f
-tinMag	src/Dodge/Item/Ammo.hs	8;"	f
+tinMag	src/Dodge/Item/Ammo.hs	13;"	f
 tinitusS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	402;"	f
 titleOptionsMenu	src/Dodge/Menu.hs	99;"	f
 titleOptionsNoWrite	src/Dodge/Menu.hs	102;"	f
@@ -7817,9 +7817,9 @@ useAmmoParams	src/Dodge/Item/Weapon/AmmoParams.hs	17;"	f
 useC	src/Dodge/Cuse.hs	6;"	f
 useE	src/Dodge/Euse.hs	24;"	f
 useEquipment	src/Dodge/Creature/State.hs	218;"	f
-useForceFieldGun	src/Dodge/HeldUse.hs	1005;"	f
+useForceFieldGun	src/Dodge/HeldUse.hs	1023;"	f
-useGasParams	src/Dodge/HeldUse.hs	916;"	f
+useGasParams	src/Dodge/HeldUse.hs	936;"	f
-useHeld	src/Dodge/HeldUse.hs	830;"	f
+useHeld	src/Dodge/HeldUse.hs	850;"	f
 useHotKey	src/Dodge/Creature/YourControl.hs	49;"	f
 useItem	src/Dodge/Creature/Action/UseItem.hs	14;"	f
 useItemHotkey	src/Dodge/Creature/Impulse/UseItem.hs	124;"	f
@@ -7828,13 +7828,13 @@ useItemRightClick	src/Dodge/Creature/Impulse/UseItem.hs	25;"	f
 useL	src/Dodge/Luse.hs	13;"	f
 useLeftItem	src/Dodge/Creature/Action/UseItem.hs	38;"	f
 useLnkRoomPos	src/Dodge/PlacementSpot.hs	244;"	f
-useLoadedAmmo	src/Dodge/HeldUse.hs	452;"	f
+useLoadedAmmo	src/Dodge/HeldUse.hs	466;"	f
 useMagShield	src/Dodge/Euse.hs	69;"	f
-useMod	src/Dodge/HeldUse.hs	500;"	f
+useMod	src/Dodge/HeldUse.hs	520;"	f
 useNormalCamera	src/Dodge/Camera.hs	6;"	f
 usePayload	src/Dodge/Payload.hs	7;"	f
-usePjCreation	src/Dodge/HeldUse.hs	849;"	f
+usePjCreation	src/Dodge/HeldUse.hs	869;"	f
-usePjCreationX	src/Dodge/HeldUse.hs	858;"	f
+usePjCreationX	src/Dodge/HeldUse.hs	878;"	f
 useRewindGun	src/Dodge/Luse.hs	41;"	f
 useRoomPosCond	src/Dodge/PlacementSpot.hs	178;"	f
 useRoomPosRoomCond	src/Dodge/PlacementSpot.hs	181;"	f
@@ -7875,7 +7875,7 @@ violet	src/Color.hs	21;"	f
 visibleWalls	src/Dodge/Base/Collide.hs	123;"	f
 visionCheck	src/Dodge/Creature/Perception.hs	152;"	f
 vocalizationTest	src/Dodge/Creature/Vocalization.hs	8;"	f
-volleyGun	src/Dodge/Item/Held/Cane.hs	40;"	f
+volleyGun	src/Dodge/Item/Held/Cane.hs	32;"	f
 volleyGun	src/Dodge/Item/Weapon/BulletGun/Cane.hs	43;"	f
 volleyGunShape	src/Dodge/Item/Draw/SPic.hs	373;"	f
 waistSP	src/Dodge/Creature/HandPos.hs	199;"	f