Remove consumable records

src/Dodge/Creature/State.hs

@@ -3,6 +3,7 @@ module Dodge.Creature.State (
     doDamage,
 ) where
 
+import Dodge.Item.MaxAmmo
 import Control.Applicative
 import Dodge.HeldUse
 import Control.Monad
@@ -208,7 +209,7 @@ trySynthBullet loc w = fromMaybe w $ do
             then do
                 bat <- loc ^? locLDT . ldtLeft . ix 0 . _2 . ldtValue . _1
                 j <- bat ^? itLocation . ilInvID
-                y <- bat ^? itConsumables . magLoadStatus . iaLoaded
+                y <- bat ^. itConsumables
                 guard $ y > 0
                 return $
                     w
@@ -225,14 +226,13 @@ trySynthBullet loc w = fromMaybe w $ do
                             . crInv
                             . ix j
                             . itConsumables
-                            . magLoadStatus
+                            . _Just
-                            . iaLoaded
                             -~ 1
             else do
                 mag <- loc ^? locLdtContext . cldtParent . _1
                 j <- mag ^? itLocation . ilInvID
-                y <- mag ^? itConsumables . magLoadStatus . iaLoaded
+                y <- mag ^. itConsumables
-                ymax <- mag ^? itConsumables . magLoadStatus . iaMax
+                ymax <- maxAmmo mag-- ^? itConsumables . magLoadStatus . iaMax
                 guard $ y < ymax
                 return $
                     w
@@ -249,8 +249,7 @@ trySynthBullet loc w = fromMaybe w $ do
                             . crInv
                             . ix j
                             . itConsumables
-                            . magLoadStatus
+                            . _Just
-                            . iaLoaded
                             +~ 1
   where
     itm = loc ^. locLDT . ldtValue . _1
@@ -314,7 +313,7 @@ shineTargetLaser ::
 shineTargetLaser cr itmtree (p, q) w = fromMaybe (w & pointittarg . itTgPos .~ Nothing) $ do
     guard (crIsAiming cr)
     (_, mag) <- find (isammolink . _iatType . fst) (itmtree ^. ldtLeft)
-    i <- mag ^? ldtValue . _1 . itConsumables . magLoadStatus . iaLoaded
+    i <- mag ^. ldtValue . _1 . itConsumables
     guard $ i >= x
     maginvid <- mag ^? ldtValue . _1 . itLocation . ilInvID
     return $
@@ -324,8 +323,7 @@ shineTargetLaser cr itmtree (p, q) w = fromMaybe (w & pointittarg . itTgPos .~ N
                 . crInv
                 . ix maginvid
                 . itConsumables
-                . magLoadStatus
+                . _Just
-                . iaLoaded
                 -~ x
             & cWorld . lWorld . lasers
                 .:~ Laser
@@ -355,14 +353,14 @@ shineTorch ::
     World
 shineTorch cr itmtree (p, q) = fromMaybe id $ do
     (_, mag) <- find (isammolink . _iatType . fst) (itmtree ^. ldtLeft)
-    i <- mag ^? ldtValue . _1 . itConsumables . magLoadStatus . iaLoaded
+    i <- mag ^. ldtValue . _1 . itConsumables
     guard $ crIsAiming cr
     guard $ i >= x
     invid <- mag ^? ldtValue . _1 . itLocation . ilInvID
     return $
         --(cWorld . lWorld . tempLightSources .:~ tlsTimeRadColPos 1 250 0.7 pos'')
         (cWorld . lWorld . lights .:~ LSParam pos'' 250 0.7)
-            . (cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix invid . itConsumables . magLoadStatus . iaLoaded -~ x)
+            . (cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix invid . itConsumables . _Just -~ x)
   where
     x = 10
     isammolink AmmoInLink{} = True

src/Dodge/Data/Item.hs

@@ -33,21 +33,17 @@ data Consumables
     = NoConsumables
     | AmmoMag
         { _magLoadStatus :: ReloadStatus
-        , _magParams :: AmmoParams
---        , _magType :: AmmoType
         }
     deriving (Eq, Show, Read)
 
 data Item = Item
     { _itUse :: ItemUse
---    , _itUseCondition :: UseCondition
+    , _itConsumables :: Maybe Int
-    , _itConsumables :: Consumables
     , _itType :: ItemType
     , _itID :: NewInt ItmInt
     , _itLocation :: ItemLocation
     , _itEffect :: ItEffect
     , _itTargeting :: ItemTargeting
---    , _itAmmoSlots :: IM.IntMap AmmoType
     , _itParams :: ItemParams
     , _itScroll :: ItemScroll
     , _itTimeLastUsed :: Int

src/Dodge/Data/Item/Use.hs

@@ -39,11 +39,6 @@ data ItemUse
         }
     deriving (Eq, Show, Read)
 
-data UseFocus
-    = UseFromRoot
-    | UseFromLocation
-    deriving (Eq, Show, Read)
-
 data AttachParams
     = APProjectiles {_apProjectiles :: [Int]}
     | APInt {_apInt :: Int}
@@ -60,10 +55,7 @@ data AmmoParams
 makeLenses ''ItemUse
 makeLenses ''AttachParams
 makeLenses ''AmmoParams
---makeLenses ''UseCondition
+--makeLenses ''UseFocus
-makeLenses ''UseFocus
+--deriveJSON defaultOptions ''AmmoParams
---deriveJSON defaultOptions ''UseFocus
---deriveJSON defaultOptions ''UseCondition
-deriveJSON defaultOptions ''AmmoParams
 deriveJSON defaultOptions ''AttachParams
 deriveJSON defaultOptions ''ItemUse

src/Dodge/Data/Item/Use/Consumption.hs

@@ -18,8 +18,7 @@ import Dodge.Data.Item.Use.Consumption.Ammo
 import Dodge.Data.Item.Use.Consumption.LoadAction
 
 data ReloadStatus = ReloadStatus
-    { _iaMax :: Int
+    { _iaLoaded :: Int
-    , _iaLoaded :: Int
     }
     deriving (Eq, Show, Read) --Generic, Flat)
 

src/Dodge/Data/UseCondition.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE StrictData #-}
-module Dodge.Data.UseCondition
+module Dodge.Data.UseCondition where
-    where
 
 data UseCondition
     = UseableWhenAimed
@@ -9,4 +8,7 @@ data UseCondition
     | NeverUsable
     deriving (Eq, Show, Read)
 
-
+data UseFocus
+    = UseFromRoot
+    | UseFromLocation
+    deriving (Eq, Show, Read)

src/Dodge/Default/Item.hs

@@ -10,7 +10,7 @@ defaultHeldItem :: Item
 defaultHeldItem =
     Item
         { _itType = HELD PISTOL
-        , _itConsumables = NoConsumables
+        , _itConsumables = Nothing
         , _itEffect = defaultItEffect
         , _itID = 0 -- should this return an error ? const $ error "itID not correctly initialised" ?
         , _itTargeting = NoItTargeting

src/Dodge/HeldUse.hs

@@ -632,7 +632,7 @@ loadMuzzle t@(LDT _ l _) mz = fromMaybe (t, Nothing) $ do
     let as = _mzAmmoSlot mz
         amamount = _mzAmmoPerShot mz
     (i, (_, mag)) <- findWithIx (isAmmoIntLink as . fst) l
-    availableammo <- mag ^? ldtValue . itConsumables . magLoadStatus . iaLoaded
+    availableammo <- mag ^. ldtValue . itConsumables
     let usedammo = case amamount of
             UseUpTo x -> min x availableammo
             UseExactly x
@@ -640,8 +640,7 @@ loadMuzzle t@(LDT _ l _) mz = fromMaybe (t, Nothing) $ do
                 | otherwise -> 0
     guard $ usedammo > 0
     return
-        ( t & ldtLeft . ix i . _2 . ldtValue . itConsumables . magLoadStatus . iaLoaded
+        ( t & ldtLeft . ix i . _2 . ldtValue . itConsumables . _Just -~ usedammo
-            -~ usedammo
         , Just (mz, usedammo, mag)
         )
 
@@ -873,13 +872,13 @@ removeAmmoFromMag x mid cr = fromMaybe id $ do
             . crInv
             . ix magid
             . itConsumables
-            . magLoadStatus
+            . _Just
-            . iaLoaded
             -~ x
 
 getBulletType :: LabelDoubleTree ComposeLinkType Item -> Maybe Bullet
 getBulletType magtree =
-    magtree ^? ldtValue . itConsumables . magParams . ampBullet
+    --magtree ^? ldtValue . itConsumables . magParams . ampBullet
+    (magtree ^? ldtValue >>= magAmmoParams >>= (^? ampBullet))
         --        <&> buTrajectory .~ btraj
         <&> buPayload .~ bpayload
         <&> buEffect .~ beffect
@@ -897,6 +896,23 @@ getBulletType magtree =
         attree <- lookup AmmoEffectLink (magtree ^. ldtLeft)
         attree ^? ldtValue . itUse . ubMod . bmEffect
 
+magAmmoParams :: Item -> Maybe AmmoParams
+magAmmoParams itm = case itm ^. itType of
+    EQUIP BATTERYPACK -> Just NoAmmoParams
+    EQUIP FUELPACK -> Just $ GasParams ChemFuel
+    AMMOMAG CHEMFUELPOUCH -> Just $ GasParams ChemFuel
+    EQUIP BULLETBELTPACK -> Just $ BulletParams defaultBullet
+    EQUIP BULLETBELTBRACER -> Just $ BulletParams defaultBullet
+    AMMOMAG TINMAG -> Just $ BulletParams defaultBullet
+    AMMOMAG DRUMMAG -> Just $ BulletParams defaultBullet
+    AMMOMAG BELTMAG -> Just $ BulletParams defaultBullet
+    AMMOMAG SHELLMAG -> Just $ 
+                    ProjectileParams
+                        { _ampPayload = ExplosionPayload
+                        }
+    AMMOMAG BATTERY -> Just NoAmmoParams
+    _ -> Nothing
+
 --getBulletTrajectory ::
 --    Muzzle ->
 --    Item ->
@@ -1107,7 +1123,8 @@ useGasParams mmagid mz itm cr w =
     gastype = fromMaybe (error "cannot find gas ammo") $ do
         magid <- mmagid
         hit <- itm ^? itType . ibtHeld
-        fueltype <- cr ^? crInv . ix magid . itConsumables . magParams . ampCreateGas
+        --fueltype <- cr ^? crInv . ix magid . itConsumables . magParams . ampCreateGas
+        fueltype <- cr ^? crInv . ix magid >>= magAmmoParams >>= (^? ampCreateGas)
         gasType hit fueltype
     --pos = _crPos cr + rotateV (_crDir cr) (_mzPos mz + aimingWeaponZeroPos cr itm)
     (moff, mrot) = heldItemOrient2D itm cr (_mzPos mz) (_mzRot mz)
@@ -1274,7 +1291,8 @@ createProjectile pjtype magtree stab muz cr = fromMaybe failsound $ do
                 <$> lookup RemoteScreenLink (magtree ^. ldtLeft)
     aparams <-
         ((magtree ^? ldtLeft) >>= lookup AmmoPayloadLink >>= (^? ldtValue . itType . ibtAttach . shellPayload))
-            <|> ammoitem ^? itConsumables . magParams . ampPayload
+--            <|> ammoitem ^? itConsumables . magParams . ampPayload
+            <|> magAmmoParams ammoitem ^? _Just . ampPayload
     return $
         createShell rdetonate rscreen stab pjtype aparams muz cr
             . startthesound

src/Dodge/Item/Ammo.hs

@@ -16,103 +16,61 @@ import Control.Lens
 import Dodge.Data.World
 import Dodge.Default.Item
 import Dodge.Item.Attach
-import Dodge.Item.Weapon.Bullet
+
+--import Dodge.Item.Weapon.Bullet
 
 megaTinMag :: Int -> Item
 megaTinMag x =
     tinMag
-        & itConsumables . magLoadStatus . iaMax .~ x
+        & itConsumables ?~ x
-        & itConsumables . magLoadStatus . iaLoaded .~ x
 
 tinMag :: Item
 tinMag =
     defaultHeldItem & itType .~ AMMOMAG TINMAG
         & itUse .~ UseNothing
-        & itConsumables
+        & itConsumables ?~ 15
-            .~ AmmoMag
-                { _magParams = BulletParams defaultBullet
---                , _magType = BulletAmmo
-                , _magLoadStatus =
-                    ReloadStatus
-                        { _iaMax = 15
-                        , _iaLoaded = 15
-                        }
-                }
 
 drumMag :: Item
-drumMag = tinMag & itType . ibtAmmoMag .~ DRUMMAG
+drumMag =
-        & itConsumables . magLoadStatus . iaLoaded .~ 30
+    tinMag & itType . ibtAmmoMag .~ DRUMMAG
-        & itConsumables . magLoadStatus . iaMax .~ 30
+        & itConsumables ?~ 30
 
 beltMag :: Item
-beltMag = tinMag & itType . ibtAmmoMag .~ BELTMAG
+beltMag =
-        & itConsumables . magLoadStatus . iaLoaded .~ 10000
+    tinMag & itType . ibtAmmoMag .~ BELTMAG
-        & itConsumables . magLoadStatus . iaMax .~ 20000
+        & itConsumables ?~ 10000
---        & itConsumables . magType .~ BeltBulletAmmo
 
 megaShellMag :: Item
-megaShellMag = shellMag
+megaShellMag =
-        & itConsumables . magLoadStatus . iaMax .~ 1000000
+    shellMag
-        & itConsumables . magLoadStatus . iaLoaded .~ 1000000
+        & itConsumables ?~ 1000000
 
 shellMag :: Item
 shellMag =
     defaultHeldItem & itType .~ AMMOMAG SHELLMAG
         & itUse .~ UseNothing
-        & itConsumables
+        & itConsumables ?~ 1
-            .~ AmmoMag
-                { _magParams =
-                    ProjectileParams
-                        { _ampPayload = ExplosionPayload
-                        }
-                , _magLoadStatus =
-                    ReloadStatus
-                        { _iaMax = 1
-                        , _iaLoaded = 1
-                        }
---                , _magType = LauncherAmmo
-                }
 
 megaBattery :: Item
-megaBattery = battery
+megaBattery =
-        & itConsumables . magLoadStatus . iaMax .~ 1000000
+    battery
-        & itConsumables . magLoadStatus . iaLoaded .~ 1000000
+        & itConsumables ?~ 1000000
 
 smallBattery :: Item
-smallBattery =
+smallBattery = battery & itConsumables ?~ 999
-    battery
-        & itConsumables . magLoadStatus . iaMax .~ 999
-        & itConsumables . magLoadStatus . iaLoaded .~ 999
 
 battery :: Item
 battery =
     defaultHeldItem & itType .~ AMMOMAG BATTERY
         & itUse .~ UseNothing
-        & itConsumables
+        & itConsumables ?~ 10 ^ (9 :: Int)
-            .~ AmmoMag
-                { _magParams = NoAmmoParams
---                , _magType = ElectricalAmmo
-                , _magLoadStatus =
-                    ReloadStatus
-                        { _iaMax = 10 ^ (9 :: Int)
-                        , _iaLoaded = 10 ^ (9 :: Int)
-                        }
-                }
 
 chemFuelPouch :: Item
 chemFuelPouch =
     defaultHeldItem & itType .~ AMMOMAG CHEMFUELPOUCH
         & itUse .~ UseNothing
         & itConsumables
-            .~ AmmoMag
+            ?~  1000
-                { _magParams = GasParams ChemFuel
---                , _magType = GasAmmo
-                , _magLoadStatus =
-                    ReloadStatus
-                        { _iaMax = 1000
-                        , _iaLoaded = 1000
-                        }
-                }
 
 bulletSynthesizer :: Item
 bulletSynthesizer = makeAttach BULLETSYNTH & itUse .~ UseAttach (APInt 0)

src/Dodge/Item/Display.hs

@@ -35,7 +35,7 @@ itemInternalValue itm
     | Just x <- itm ^? itUse . uInt = Just (Left x)
     | Just x <- itm ^? itUse . useToggle = Just (Right $ show x)
     | isJust $ itm ^? itTargeting . itTgPos . _Just = Just $ Right "!TARGETING"
-    | Just x <- itm ^? itConsumables . magLoadStatus . iaLoaded = Just $ Left x
+    | Just x <- itm ^. itConsumables = Just $ Left x
     | UseAttach (APInt i) <- itm ^. itUse = Just $ Left i
     | UseAttach (APProjectiles x) <- itm ^. itUse = Just . Right $ show x
     | v <- itm ^? itUse . uValue = v

src/Dodge/Item/Draw/SPic.hs

@@ -5,6 +5,7 @@ module Dodge.Item.Draw.SPic (
     itemTreeSPic,
 ) where
 
+import Dodge.Item.MaxAmmo
 import Color
 import Data.Maybe
 import Data.Strict.Tuple
@@ -131,11 +132,15 @@ ammoMagSPic it = \case
     _ -> noPic $ upperPrismPolyTS 1 (rectNSWE 0 (- y) (-1) 1)
   where
     y = fromIntegral y' * 0.3
-    y' = fromMaybe 0 $ it ^? itConsumables . magLoadStatus . iaLoaded
+    y' = fromMaybe 0 $ it ^. itConsumables
-    am = fractionLoadedAmmo (it ^?! itConsumables . magLoadStatus)
+    am = fractionLoadedAmmo it -- (it ^?! itConsumables . magLoadStatus)
+
+fractionLoadedAmmo :: Item -> Float
+fractionLoadedAmmo itm = fromMaybe 0 $ do
+    m <- maxAmmo itm
+    return $ fromIntegral (itm ^?! itConsumables . _Just) 
+        / fromIntegral m
 
-fractionLoadedAmmo :: ReloadStatus -> Float
-fractionLoadedAmmo rs = fromIntegral (_iaLoaded rs) / fromIntegral (_iaMax rs)
 --
 --fractionLoadedAmmo2 :: ReloadStatus -> Float
 --fractionLoadedAmmo2 rs =

src/Dodge/Item/Equipment.hs

@@ -18,16 +18,16 @@ module Dodge.Item.Equipment (
 ) where
 
 import Dodge.Data.Equipment.Misc
-import Dodge.Data.Magnet
+--import Dodge.Item.Weapon.Bullet
-import Dodge.Item.Weapon.Bullet
 import Dodge.Data.Item
+import Dodge.Data.Magnet
 import Dodge.Default
 import LensHelp
 
 magShield :: MagnetBuBu -> Item
 magShield mt =
     defaultEquipment
---        & itUse . uequipEffect . eeUse .~ EMagShield MagnetRepulse
+        --        & itUse . uequipEffect . eeUse .~ EMagShield MagnetRepulse
         & itType .~ EQUIP (MAGSHIELD mt)
 
 flameShield :: Item
@@ -44,61 +44,30 @@ wristArmour :: Item
 wristArmour = defaultEquipment & itType .~ EQUIP WRISTARMOUR
 
 batteryPack :: Item
-batteryPack = defaultEquipment
+batteryPack =
+    defaultEquipment
         & itConsumables
-            .~ AmmoMag
+            ?~ 10000000
-                { _magParams = NoAmmoParams
-                , _magLoadStatus =
-                    ReloadStatus
-                        { _iaMax = 10000000
-                        , _iaLoaded = 10000000
-                        }
-                }
         & itType .~ EQUIP BATTERYPACK
 
 fuelPack :: Item
 fuelPack =
     defaultEquipment
---        & itUse . uequipEffect . eeUse .~ EFuelSource 10000 10000
+        --        & itUse . uequipEffect . eeUse .~ EFuelSource 10000 10000
         & itType .~ EQUIP FUELPACK
         & itConsumables
-            .~ AmmoMag
+            ?~ 100000
-                { _magParams = GasParams ChemFuel
-                , _magLoadStatus =
-                    ReloadStatus
-                        { _iaMax = 100000
-                        , _iaLoaded = 100000
-                        }
-                }
 
 bulletBeltPack :: Item
 bulletBeltPack =
     defaultEquipment
---        & itUse . uequipEffect . eeUse .~ EDoNothing
+        & itConsumables ?~ 10000000
-        & itConsumables
-            .~ AmmoMag
-                { _magParams = BulletParams defaultBullet
-                , _magLoadStatus =
-                    ReloadStatus
-                        { _iaMax = 10000000
-                        , _iaLoaded = 10000000
-                        }
-                }
         & itType .~ EQUIP BULLETBELTPACK
 
 bulletBeltBracer :: Item
 bulletBeltBracer =
     defaultEquipment
---        & itUse . uequipEffect . eeUse .~ EDoNothing
+        & itConsumables ?~ 100000
-        & itConsumables
-            .~ AmmoMag
-                { _magParams = BulletParams defaultBullet
-                , _magLoadStatus =
-                    ReloadStatus
-                        { _iaMax = 100000
-                        , _iaLoaded = 100000
-                        }
-                }
         & itType .~ EQUIP BULLETBELTBRACER
 
 brainHat :: Item
@@ -110,7 +79,7 @@ hat = defaultEquipment & itType .~ EQUIP HAT
 headLamp :: Item
 headLamp =
     defaultEquipment
---        & itUse . uequipEffect . eeUse .~ EHeadLamp
+        --        & itUse . uequipEffect . eeUse .~ EHeadLamp
         & itType .~ EQUIP HEADLAMP
 
 powerLegs :: Item
@@ -127,8 +96,8 @@ jumpLegs = powerLegs & itType .~ EQUIP JUMPLEGS
 wristInvisibility :: Item
 wristInvisibility =
     defaultEquipment
---        & itUse . uequipEffect . eeOnEquip .~ ECamouflage Invisible 
+        --        & itUse . uequipEffect . eeOnEquip .~ ECamouflage Invisible
---        & itUse . uequipEffect . eeOnRemove .~ ECamouflage FullyVisible 
+        --        & itUse . uequipEffect . eeOnRemove .~ ECamouflage FullyVisible
         & itType .~ EQUIP (INVISIBILITYEQUIPMENT GoesOnWrist)
 
 pulseChecker :: Item

src/Dodge/ItemUseCondition.hs

@@ -7,5 +7,5 @@ itUseCondition :: Item -> UseCondition
 itUseCondition itm = case _itType itm of
     DETECTOR _ -> UseableAnytime
     HELD BLINKER -> UseableAnytime
-    HELD UNSAFEBLINKER -> UseableAnytime
+    HELD BLINKERUNSAFE -> UseableAnytime
     _ -> UseableWhenAimed

tags

@@ -25,9 +25,9 @@ ALTERIFLE	src/Dodge/Data/Item/Combine.hs	153;"	C
 AMMOMAG	src/Dodge/Data/Item/Combine.hs	21;"	C
 AMR	src/Dodge/Data/Item/Combine.hs	158;"	C
 ANTIMATTER	src/Dodge/Data/Item/Combine.hs	68;"	C
-APInt	src/Dodge/Data/Item/Use.hs	49;"	C
+APInt	src/Dodge/Data/Item/Use.hs	44;"	C
-APNothing	src/Dodge/Data/Item/Use.hs	50;"	C
+APNothing	src/Dodge/Data/Item/Use.hs	45;"	C
-APProjectiles	src/Dodge/Data/Item/Use.hs	48;"	C
+APProjectiles	src/Dodge/Data/Item/Use.hs	43;"	C
 AQUAMARINE	src/Color/Data.hs	24;"	C
 ARHUD	src/Dodge/Data/Item/Combine.hs	35;"	C
 ARHUDSF	src/Dodge/Data/ComposedItem.hs	51;"	C
@@ -68,7 +68,7 @@ AmmoMagSF	src/Dodge/Data/ComposedItem.hs	52;"	C
 AmmoMagType	src/Dodge/Data/Item/Combine.hs	105;"	t
 AmmoModLink	src/Dodge/Data/ComposedItem.hs	20;"	C
 AmmoModifierSF	src/Dodge/Data/ComposedItem.hs	58;"	C
-AmmoParams	src/Dodge/Data/Item/Use.hs	53;"	t
+AmmoParams	src/Dodge/Data/Item/Use.hs	48;"	t
 AmmoPayloadLink	src/Dodge/Data/ComposedItem.hs	22;"	C
 AmmoPayloadSF	src/Dodge/Data/ComposedItem.hs	60;"	C
 AmmoPerShot	src/Dodge/Data/Muzzle.hs	52;"	t
@@ -103,7 +103,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	47;"	t
+AttachParams	src/Dodge/Data/Item/Use.hs	42;"	t
 AttachType	src/Dodge/Data/Item/Combine.hs	91;"	t
 Attention	src/Dodge/Data/Creature/Perception.hs	60;"	t
 AttentiveTo	src/Dodge/Data/Creature/Perception.hs	61;"	C
@@ -111,7 +111,7 @@ Audition	src/Dodge/Data/Creature/Perception.hs	47;"	t
 AutoAI	src/Dodge/Data/Creature/Misc.hs	56;"	C
 AutoCrit	src/Dodge/Creature/AutoCrit.hs	1;"	m
 AutoDoorObstacle	src/Dodge/Data/PathGraph.hs	51;"	C
-AutoRecharging	src/Dodge/Data/Item/Use/Consumption.hs	27;"	C
+AutoRecharging	src/Dodge/Data/Item/Use/Consumption.hs	26;"	C
 AutoTrigger	src/Dodge/Data/TriggerType.hs	10;"	C
 AuxAddition	src/Shader/AuxAddition.hs	1;"	m
 Avatar	src/Dodge/Data/Creature/Misc.hs	70;"	C
@@ -235,7 +235,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	54;"	C
+BulletParams	src/Dodge/Data/Item/Use.hs	49;"	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
@@ -297,7 +297,7 @@ ChainUpdates	src/Dodge/Creature/ChainUpdates.hs	1;"	m
 ChangePosture	src/Dodge/Data/ActionPlan.hs	42;"	C
 ChangeStrategy	src/Dodge/Data/ActionPlan.hs	44;"	C
 CharacterEnums	src/Dodge/CharacterEnums.hs	1;"	m
-ChargeableAmmo	src/Dodge/Data/Item/Use/Consumption.hs	33;"	C
+ChargeableAmmo	src/Dodge/Data/Item/Use/Consumption.hs	32;"	C
 ChaseAI	src/Dodge/Data/Creature/Misc.hs	49;"	C
 ChaseCrit	src/Dodge/Creature/ChaseCrit.hs	1;"	m
 ChaseCritters	src/Dodge/Data/Creature/State.hs	38;"	C
@@ -760,7 +760,7 @@ GasAmmo	src/Dodge/Data/AmmoType.hs	15;"	C
 GasCloud	src/Dodge/Data/Cloud.hs	31;"	C
 GasCreate	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	31;"	t
 GasFuel	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	28;"	t
-GasParams	src/Dodge/Data/Item/Use.hs	56;"	C
+GasParams	src/Dodge/Data/Item/Use.hs	51;"	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
@@ -937,7 +937,7 @@ Invisible	src/Dodge/Data/CamouflageStatus.hs	13;"	C
 InwardShockwave	src/Dodge/Data/Shockwave.hs	14;"	C
 IsClose	src/Dodge/Data/Machine/Sensor.hs	39;"	C
 IsolationUnitSS	src/Dodge/Data/Scenario.hs	101;"	C
-ItAmount	src/Dodge/Data/Item/Use/Consumption.hs	39;"	t
+ItAmount	src/Dodge/Data/Item/Use/Consumption.hs	38;"	t
 ItCrWdItemHeldEffect	src/Dodge/Data/WorldEffect.hs	17;"	C
 ItCrWdItemHeldEffectNoHammer	src/Dodge/Data/WorldEffect.hs	18;"	C
 ItCrWdWd	src/Dodge/Data/WorldEffect.hs	17;"	t
@@ -946,8 +946,8 @@ ItEffect	src/Dodge/Data/Item/Effect.hs	16;"	t
 ItEffect	src/Dodge/ItEffect.hs	3;"	m
 ItID	src/Dodge/Data/Item.hs	29;"	t
 ItInvEffect	src/Dodge/Data/Item/Effect.hs	23;"	t
-ItTargeting	src/Dodge/Data/Item.hs	62;"	C
+ItTargeting	src/Dodge/Data/Item.hs	58;"	C
-Item	src/Dodge/Data/Item.hs	41;"	t
+Item	src/Dodge/Data/Item.hs	39;"	t
 Item	src/Dodge/Data/Item.hs	4;"	m
 Item	src/Dodge/Default/Item.hs	1;"	m
 Item	src/Dodge/Item.hs	3;"	m
@@ -961,13 +961,13 @@ ItemParamID	src/Dodge/Data/Item/Params.hs	21;"	C
 ItemParams	src/Dodge/Data/Item/Params.hs	13;"	t
 ItemParams	src/Dodge/Tesla/ItemParams.hs	1;"	m
 ItemReduceWarmTime	src/Dodge/Data/Item/Effect.hs	33;"	C
-ItemScroll	src/Dodge/Data/Item.hs	56;"	t
+ItemScroll	src/Dodge/Data/Item.hs	52;"	t
-ItemScrollInt	src/Dodge/Data/Item.hs	58;"	C
+ItemScrollInt	src/Dodge/Data/Item.hs	54;"	C
-ItemScrollIntRange	src/Dodge/Data/Item.hs	59;"	C
+ItemScrollIntRange	src/Dodge/Data/Item.hs	55;"	C
 ItemScrollTimeFlow	src/Dodge/Data/World.hs	61;"	C
 ItemSetWarmTime	src/Dodge/Data/Item/Effect.hs	34;"	C
 ItemStructuralFunction	src/Dodge/Data/ComposedItem.hs	40;"	t
-ItemTargeting	src/Dodge/Data/Item.hs	61;"	t
+ItemTargeting	src/Dodge/Data/Item.hs	57;"	t
 ItemType	src/Dodge/Data/Item/Combine.hs	16;"	t
 ItemUse	src/Dodge/Data/Item/Use.hs	26;"	t
 ItemUseCondition	src/Dodge/ItemUseCondition.hs	1;"	m
@@ -991,7 +991,7 @@ LASER	src/Dodge/Data/Item/Combine.hs	168;"	C
 LASERING	src/Dodge/Data/Damage/Type.hs	19;"	C
 LDT	src/Dodge/Data/DoubleTree.hs	40;"	C
 LDTBottomNode	src/Dodge/Data/DoubleTree.hs	28;"	C
-LDTComb	src/Dodge/Item/Grammar.hs	238;"	t
+LDTComb	src/Dodge/Item/Grammar.hs	239;"	t
 LDTMidAboveNode	src/Dodge/Data/DoubleTree.hs	26;"	C
 LDTMidBelowNode	src/Dodge/Data/DoubleTree.hs	27;"	C
 LDTRootNode	src/Dodge/Data/DoubleTree.hs	24;"	C
@@ -1035,7 +1035,7 @@ Layer	src/Picture/Data.hs	22;"	t
 Layout	src/Dodge/Layout.hs	2;"	m
 LeadTarget	src/Dodge/Data/ActionPlan.hs	149;"	C
 Left	src/Dodge/Item/Left.hs	1;"	m
-LeftConsumption	src/Dodge/Data/Item/Use/Consumption.hs	26;"	t
+LeftConsumption	src/Dodge/Data/Item/Use/Consumption.hs	25;"	t
 LeftForward	src/Dodge/Data/Creature/Stance.hs	32;"	C
 LeftwardLDT	src/Dodge/Data/DoubleTree.hs	50;"	C
 LensHelp	src/LensHelp.hs	1;"	m
@@ -1157,6 +1157,7 @@ Material	src/Dodge/Data/Material.hs	6;"	m
 Material	src/Dodge/Material.hs	1;"	m
 MaterialSound	src/Dodge/Data/SoundOrigin.hs	34;"	C
 MatrixHelper	src/MatrixHelper.hs	1;"	m
+MaxAmmo	src/Dodge/Item/MaxAmmo.hs	1;"	m
 Maybe'	src/MaybeHelp.hs	13;"	t
 MaybeHelp	src/MaybeHelp.hs	7;"	m
 McSensor	src/Dodge/Data/Machine.hs	52;"	C
@@ -1258,7 +1259,7 @@ NearCosmicRays	src/Dodge/Data/Scenario.hs	84;"	C
 NearDustBelt	src/Dodge/Data/Scenario.hs	85;"	C
 NearGravityFlux	src/Dodge/Data/Scenario.hs	83;"	C
 NearSolar	src/Dodge/Data/Scenario.hs	82;"	C
-NeverUsable	src/Dodge/Data/UseCondition.hs	9;"	C
+NeverUsable	src/Dodge/Data/UseCondition.hs	8;"	C
 NewID	src/Dodge/Base/NewID.hs	1;"	m
 NewInt	src/NewInt.hs	15;"	t
 NewInt	src/NewInt.hs	7;"	m
@@ -1266,7 +1267,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	57;"	C
+NoAmmoParams	src/Dodge/Data/Item/Use.hs	52;"	C
 NoArguments	src/Dodge/Data/Terminal.hs	91;"	C
 NoBeamCombine	src/Dodge/Data/Beam.hs	43;"	C
 NoConcurrentEffect	src/Loop/Data.hs	7;"	C
@@ -1286,8 +1287,8 @@ NoHammer	src/Dodge/Data/Hammer.hs	13;"	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	61;"	C
+NoItTargeting	src/Dodge/Data/Item.hs	57;"	C
-NoItemScroll	src/Dodge/Data/Item.hs	57;"	C
+NoItemScroll	src/Dodge/Data/Item.hs	53;"	C
 NoLightFlare	src/Dodge/Data/Muzzle.hs	24;"	C
 NoLighting	src/Dodge/Data/Config.hs	104;"	C
 NoMouseContext	src/Dodge/Data/Input.hs	22;"	C
@@ -1507,7 +1508,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	55;"	C
+ProjectileParams	src/Dodge/Data/Item/Use.hs	50;"	C
 ProjectileStabiliserLink	src/Dodge/Data/ComposedItem.hs	33;"	C
 ProjectileStabiliserSF	src/Dodge/Data/ComposedItem.hs	64;"	C
 ProjectileType	src/Dodge/Data/Projectile.hs	36;"	t
@@ -2079,16 +2080,15 @@ Use	src/Dodge/Default/Item/Use.hs	1;"	m
 UseAheadPos	src/Dodge/Data/ActionPlan.hs	160;"	C
 UseAttach	src/Dodge/Data/Item/Use.hs	29;"	C
 UseBulletMod	src/Dodge/Data/Item/Use.hs	34;"	C
-UseCondition	src/Dodge/Data/UseCondition.hs	5;"	t
 UseCondition	src/Dodge/Data/UseCondition.hs	2;"	m
 UseDelay	src/Dodge/Data/Item/HeldDelay.hs	13;"	t
 UseDelay	src/Dodge/Data/UseDelay.hs	6;"	m
 UseDelay	src/Dodge/Item/UseDelay.hs	3;"	m
 UseEquip	src/Dodge/Data/Item/Use.hs	28;"	C
 UseExactly	src/Dodge/Data/Muzzle.hs	53;"	C
-UseFocus	src/Dodge/Data/Item/Use.hs	42;"	t
+UseFocus	src/Dodge/Data/UseCondition.hs	11;"	t
-UseFromLocation	src/Dodge/Data/Item/Use.hs	44;"	C
+UseFromLocation	src/Dodge/Data/UseCondition.hs	13;"	C
-UseFromRoot	src/Dodge/Data/Item/Use.hs	43;"	C
+UseFromRoot	src/Dodge/Data/UseCondition.hs	12;"	C
 UseHeld	src/Dodge/Data/Item/Use.hs	27;"	C
 UseInt	src/Dodge/Data/Item/Use.hs	30;"	C
 UseInvItem	src/Dodge/Data/WorldEffect.hs	34;"	C
@@ -2104,9 +2104,9 @@ UseTarget	src/Dodge/Data/ActionPlan.hs	154;"	C
 UseToggle	src/Dodge/Data/Item/Use.hs	35;"	C
 UseUpTo	src/Dodge/Data/Muzzle.hs	54;"	C
 UseValue	src/Dodge/Data/Item/Use.hs	32;"	C
-UseableAnytime	src/Dodge/Data/UseCondition.hs	8;"	C
+UseableAnytime	src/Dodge/Data/UseCondition.hs	7;"	C
-UseableWhenAimed	src/Dodge/Data/UseCondition.hs	6;"	C
+UseableWhenAimed	src/Dodge/Data/UseCondition.hs	5;"	C
-UseableWhenHeld	src/Dodge/Data/UseCondition.hs	7;"	C
+UseableWhenHeld	src/Dodge/Data/UseCondition.hs	6;"	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
@@ -2243,19 +2243,19 @@ _allocSwapID	src/Dodge/Data/RightButtonOptions.hs	30;"	f
 _alphaDivideShader	src/Data/Preload/Render.hs	18;"	f
 _alteRifleSwitch	src/Dodge/Data/Item/Params.hs	19;"	f
 _ambushTarget	src/Dodge/Data/ActionPlan.hs	178;"	f
-_ampBullet	src/Dodge/Data/Item/Use.hs	54;"	f
+_ampBullet	src/Dodge/Data/Item/Use.hs	49;"	f
-_ampCreateGas	src/Dodge/Data/Item/Use.hs	56;"	f
+_ampCreateGas	src/Dodge/Data/Item/Use.hs	51;"	f
-_ampPayload	src/Dodge/Data/Item/Use.hs	55;"	f
+_ampPayload	src/Dodge/Data/Item/Use.hs	50;"	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	49;"	f
+_apInt	src/Dodge/Data/Item/Use.hs	44;"	f
-_apProjectiles	src/Dodge/Data/Item/Use.hs	48;"	f
+_apProjectiles	src/Dodge/Data/Item/Use.hs	43;"	f
 _apStrategy	src/Dodge/Data/ActionPlan.hs	21;"	f
-_arLoaded	src/Dodge/Data/Item/Use/Consumption.hs	28;"	f
+_arLoaded	src/Dodge/Data/Item/Use/Consumption.hs	27;"	f
-_arMax	src/Dodge/Data/Item/Use/Consumption.hs	29;"	f
+_arMax	src/Dodge/Data/Item/Use/Consumption.hs	28;"	f
-_arProgress	src/Dodge/Data/Item/Use/Consumption.hs	31;"	f
+_arProgress	src/Dodge/Data/Item/Use/Consumption.hs	30;"	f
-_arTime	src/Dodge/Data/Item/Use/Consumption.hs	30;"	f
+_arTime	src/Dodge/Data/Item/Use/Consumption.hs	29;"	f
 _arbitraryAction	src/Dodge/Data/ActionPlan.hs	167;"	f
 _arcNode	src/Dodge/Data/LWorld.hs	117;"	f
 _argList	src/Dodge/Data/Terminal.hs	94;"	f
@@ -2581,7 +2581,7 @@ _genPlacements	src/Dodge/Data/GenWorld.hs	25;"	f
 _genRooms	src/Dodge/Data/GenWorld.hs	26;"	f
 _getAttentiveTo	src/Dodge/Data/Creature/Perception.hs	61;"	f
 _getFixated	src/Dodge/Data/Creature/Perception.hs	62;"	f
-_getItAmount	src/Dodge/Data/Item/Use/Consumption.hs	39;"	f
+_getItAmount	src/Dodge/Data/Item/Use/Consumption.hs	38;"	f
 _getSoundID	src/Sound/Data.hs	32;"	f
 _gfConstant	src/Dodge/Data/GenFloat.hs	11;"	f
 _gfMax	src/Dodge/Data/GenFloat.hs	12;"	f
@@ -2617,8 +2617,7 @@ _hotkeys	src/Dodge/Data/LWorld.hs	149;"	f
 _hud	src/Dodge/Data/World.hs	45;"	f
 _hudElement	src/Dodge/Data/HUD.hs	45;"	f
 _humanoidAI	src/Dodge/Data/Creature/Misc.hs	80;"	f
-_iaLoaded	src/Dodge/Data/Item/Use/Consumption.hs	22;"	f
+_iaLoaded	src/Dodge/Data/Item/Use/Consumption.hs	21;"	f
-_iaMax	src/Dodge/Data/Item/Use/Consumption.hs	21;"	f
 _iatOrient	src/Dodge/Data/ComposedItem.hs	74;"	f
 _iatType	src/Dodge/Data/ComposedItem.hs	73;"	f
 _ibtAmmoMag	src/Dodge/Data/Item/Combine.hs	21;"	f
@@ -2658,24 +2657,24 @@ _ipPlacement	src/Dodge/Data/GenWorld.hs	132;"	f
 _ipPlacementID	src/Dodge/Data/GenWorld.hs	133;"	f
 _ispCloseButton	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	31;"	f
 _ispCloseItem	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	29;"	f
-_itConsumables	src/Dodge/Data/Item.hs	44;"	f
+_itConsumables	src/Dodge/Data/Item.hs	41;"	f
-_itEffect	src/Dodge/Data/Item.hs	48;"	f
+_itEffect	src/Dodge/Data/Item.hs	45;"	f
-_itID	src/Dodge/Data/Item.hs	46;"	f
+_itID	src/Dodge/Data/Item.hs	43;"	f
-_itLocation	src/Dodge/Data/Item.hs	47;"	f
+_itLocation	src/Dodge/Data/Item.hs	44;"	f
 _itParamID	src/Dodge/Data/Item/Params.hs	21;"	f
-_itParams	src/Dodge/Data/Item.hs	51;"	f
+_itParams	src/Dodge/Data/Item.hs	47;"	f
-_itScroll	src/Dodge/Data/Item.hs	52;"	f
+_itScroll	src/Dodge/Data/Item.hs	48;"	f
-_itTargeting	src/Dodge/Data/Item.hs	49;"	f
+_itTargeting	src/Dodge/Data/Item.hs	46;"	f
-_itTgActive	src/Dodge/Data/Item.hs	65;"	f
+_itTgActive	src/Dodge/Data/Item.hs	61;"	f
-_itTgID	src/Dodge/Data/Item.hs	64;"	f
+_itTgID	src/Dodge/Data/Item.hs	60;"	f
-_itTgPos	src/Dodge/Data/Item.hs	63;"	f
+_itTgPos	src/Dodge/Data/Item.hs	59;"	f
-_itTimeLastUsed	src/Dodge/Data/Item.hs	53;"	f
+_itTimeLastUsed	src/Dodge/Data/Item.hs	49;"	f
-_itType	src/Dodge/Data/Item.hs	45;"	f
+_itType	src/Dodge/Data/Item.hs	42;"	f
-_itUse	src/Dodge/Data/Item.hs	42;"	f
+_itUse	src/Dodge/Data/Item.hs	40;"	f
 _itemLocations	src/Dodge/Data/LWorld.hs	102;"	f
-_itsInt	src/Dodge/Data/Item.hs	58;"	f
+_itsInt	src/Dodge/Data/Item.hs	54;"	f
-_itsMax	src/Dodge/Data/Item.hs	59;"	f
+_itsMax	src/Dodge/Data/Item.hs	55;"	f
-_itsRangeInt	src/Dodge/Data/Item.hs	59;"	f
+_itsRangeInt	src/Dodge/Data/Item.hs	55;"	f
 _killTarget	src/Dodge/Data/ActionPlan.hs	198;"	f
 _lAimPos	src/Dodge/Data/LWorld.hs	151;"	f
 _lClock	src/Dodge/Data/LWorld.hs	146;"	f
@@ -2727,7 +2726,6 @@ _lwPos	src/Dodge/Data/LinearShockwave.hs	14;"	f
 _lwTimer	src/Dodge/Data/LinearShockwave.hs	17;"	f
 _machines	src/Dodge/Data/LWorld.hs	126;"	f
 _magLoadStatus	src/Dodge/Data/Item.hs	35;"	f
-_magParams	src/Dodge/Data/Item.hs	36;"	f
 _magnets	src/Dodge/Data/LWorld.hs	129;"	f
 _mainAction	src/Dodge/Data/ActionPlan.hs	171;"	f
 _manObject	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	15;"	f
@@ -3305,8 +3303,8 @@ _wlWalkable	src/Dodge/Data/Wall.hs	28;"	f
 _wlZoning	src/Dodge/Data/World.hs	49;"	f
 _worldEventFlags	src/Dodge/Data/World.hs	46;"	f
 _worldEvents	src/Dodge/Data/LWorld.hs	135;"	f
-_wpCharge	src/Dodge/Data/Item/Use/Consumption.hs	35;"	f
+_wpCharge	src/Dodge/Data/Item/Use/Consumption.hs	34;"	f
-_wpMaxCharge	src/Dodge/Data/Item/Use/Consumption.hs	34;"	f
+_wpMaxCharge	src/Dodge/Data/Item/Use/Consumption.hs	33;"	f
 _wsBlock	src/Dodge/Data/Wall/Structure.hs	16;"	f
 _wsDoor	src/Dodge/Data/Wall/Structure.hs	14;"	f
 _wsMachine	src/Dodge/Data/Wall/Structure.hs	15;"	f
@@ -3380,7 +3378,7 @@ airlockDoor	src/Dodge/Room/Airlock.hs	51;"	f
 airlockDoubleDoor	src/Dodge/Room/Airlock.hs	54;"	f
 airlockSimple	src/Dodge/Room/Airlock.hs	66;"	f
 airlockZ	src/Dodge/Room/Airlock.hs	91;"	f
-allInvLocs	src/Dodge/Item/Grammar.hs	317;"	f
+allInvLocs	src/Dodge/Item/Grammar.hs	318;"	f
 allVisibleWalls	src/Dodge/Base/Collide.hs	131;"	f
 alongSegBy	src/Geometry.hs	40;"	f
 alteRifle	src/Dodge/Item/Held/Cane.hs	34;"	f
@@ -3471,28 +3469,28 @@ azure	src/Color.hs	22;"	f
 bQuadToF	src/Geometry/Bezier.hs	37;"	f
 bQuadToLine	src/Geometry/Bezier.hs	30;"	f
 backpackCombinations	src/Dodge/Combine/Combinations.hs	26;"	f
-backpackShape	src/Dodge/Item/Draw/SPic.hs	173;"	f
+backpackShape	src/Dodge/Item/Draw/SPic.hs	174;"	f
 backspaceInputted	src/Dodge/Update/Input/Text.hs	25;"	f
 bangCone	src/Dodge/Item/Held/Cone.hs	11;"	f
-bangConeShape	src/Dodge/Item/Draw/SPic.hs	288;"	f
+bangConeShape	src/Dodge/Item/Draw/SPic.hs	289;"	f
 bangEchoS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	394;"	f
 bangRod	src/Dodge/Item/Held/Rod.hs	18;"	f
 bangS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	512;"	f
 bangStick	src/Dodge/Item/Held/Stick.hs	15;"	f
 barPP	src/Dodge/Room/Foreground.hs	236;"	f
 barrel	src/Dodge/Creature/Inanimate.hs	17;"	f
-baseAMRShape	src/Dodge/Item/Draw/SPic.hs	402;"	f
+baseAMRShape	src/Dodge/Item/Draw/SPic.hs	403;"	f
 baseBlockPane	src/Dodge/Placement/Instance/Wall.hs	86;"	f
-baseCI	src/Dodge/Item/Grammar.hs	192;"	f
+baseCI	src/Dodge/Item/Grammar.hs	193;"	f
-baseCaneShape	src/Dodge/Item/Draw/SPic.hs	308;"	f
+baseCaneShape	src/Dodge/Item/Draw/SPic.hs	309;"	f
 baseDebris	src/Dodge/Block/Debris.hs	122;"	f
 baseFloorTileSize	src/Tile.hs	45;"	f
-baseRifleShape	src/Dodge/Item/Draw/SPic.hs	311;"	f
+baseRifleShape	src/Dodge/Item/Draw/SPic.hs	312;"	f
-baseRodShape	src/Dodge/Item/Draw/SPic.hs	399;"	f
+baseRodShape	src/Dodge/Item/Draw/SPic.hs	400;"	f
-baseSMGShape	src/Dodge/Item/Draw/SPic.hs	379;"	f
+baseSMGShape	src/Dodge/Item/Draw/SPic.hs	380;"	f
 baseShoulder	src/Dodge/Creature/Picture.hs	131;"	f
-baseStickShape	src/Dodge/Item/Draw/SPic.hs	285;"	f
+baseStickShape	src/Dodge/Item/Draw/SPic.hs	286;"	f
-baseStickShapeX	src/Dodge/Item/Draw/SPic.hs	278;"	f
+baseStickShapeX	src/Dodge/Item/Draw/SPic.hs	279;"	f
 baseStickSpread	src/Dodge/HeldUse.hs	282;"	f
 baseTriggerType	src/Dodge/BaseTriggerType.hs	12;"	f
 baseTriggerType	src/Dodge/Item/TriggerType.hs	5;"	f
@@ -3507,10 +3505,10 @@ basicMachineApplyDamage	src/Dodge/Machine/Damage.hs	6;"	f
 basicMachineUpdate	src/Dodge/Machine.hs	13;"	f
 basicMuzFlare	src/Dodge/HeldUse.hs	709;"	f
 basicTerminal	src/Dodge/Terminal.hs	35;"	f
-battery	src/Dodge/Item/Ammo.hs	87;"	f
+battery	src/Dodge/Item/Ammo.hs	75;"	f
 batteryPack	src/Dodge/Item/Equipment.hs	46;"	f
 belowNumX	src/Dodge/Combine/Graph.hs	85;"	f
-beltMag	src/Dodge/Item/Ammo.hs	47;"	f
+beltMag	src/Dodge/Item/Ammo.hs	44;"	f
 bfsNodePoints	src/Dodge/Path.hs	58;"	f
 bfsThenReturn	src/Dodge/Creature/ReaderUpdate.hs	216;"	f
 bgateCalc	src/Dodge/Inventory/SelectionList.hs	113;"	f
@@ -3524,7 +3522,7 @@ blinkActionFail	src/Dodge/Creature/Action/Blink.hs	88;"	f
 blinkActionMousePos	src/Dodge/Creature/Action/Blink.hs	22;"	f
 blinkDistortions	src/Dodge/Creature/Action/Blink.hs	43;"	f
 blinkShockwave	src/Dodge/Creature/Action/Blink.hs	79;"	f
-blinker	src/Dodge/Item/Held/Utility.hs	45;"	f
+blinker	src/Dodge/Item/Held/Utility.hs	38;"	f
 blinker	src/Dodge/Item/Weapon/Utility.hs	14;"	f
 blipAt	src/Dodge/RadarSweep.hs	77;"	f
 blockLine	src/Dodge/Placement/Instance/Wall.hs	41;"	f
@@ -3556,7 +3554,7 @@ boxSurfaces	src/Shader/Poke.hs	277;"	f
 boxSurfacesIndices	src/Shader/Poke.hs	290;"	f
 boxXYZ	src/Polyhedra.hs	94;"	f
 boxXYZnobase	src/Polyhedra.hs	80;"	f
-brainHat	src/Dodge/Item/Equipment.hs	104;"	f
+brainHat	src/Dodge/Item/Equipment.hs	100;"	f
 branchRectWith	src/Dodge/Room/Branch.hs	15;"	f
 branchWith	src/Dodge/Room/Room.hs	67;"	f
 bright	src/Color.hs	120;"	f
@@ -3565,11 +3563,11 @@ btSPic	src/Dodge/Render/ShapePicture.hs	115;"	f
 bufferEBO	src/Shader/Bind.hs	28;"	f
 bufferPokedVBO	src/Shader/Bind.hs	19;"	f
 bufferShaderLayers	src/Shader/Bind.hs	36;"	f
-bulletBeltBracer	src/Dodge/Item/Equipment.hs	89;"	f
+bulletBeltBracer	src/Dodge/Item/Equipment.hs	86;"	f
-bulletBeltPack	src/Dodge/Item/Equipment.hs	74;"	f
+bulletBeltPack	src/Dodge/Item/Equipment.hs	72;"	f
 bulletModule	src/Dodge/Item/Scope.hs	118;"	f
 bulletPayloadModule	src/Dodge/Item/Scope.hs	132;"	f
-bulletSynthesizer	src/Dodge/Item/Ammo.hs	117;"	f
+bulletSynthesizer	src/Dodge/Item/Ammo.hs	103;"	f
 bulletWeapons	src/Dodge/Combine/Combinations.hs	247;"	f
 burstRifle	src/Dodge/Item/Held/Cane.hs	45;"	f
 buzzS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	538;"	f
@@ -3618,7 +3616,7 @@ checkTermDist	src/Dodge/Update.hs	313;"	f
 checkWallLeft	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	29;"	f
 checkWallRight	src/Dodge/LevelGen/StaticWalls.hs	54;"	f
 checkWallRight	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	59;"	f
-chemFuelPouch	src/Dodge/Item/Ammo.hs	102;"	f
+chemFuelPouch	src/Dodge/Item/Ammo.hs	89;"	f
 chooseCursorBorders	src/Dodge/Render/List.hs	156;"	f
 chooseEquipPosition	src/Dodge/Inventory/RBList.hs	36;"	f
 chooseFootSound	src/Dodge/Creature/State/WalkCycle.hs	39;"	f
@@ -3776,8 +3774,8 @@ 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	1258;"	f
+createProjectile	src/Dodge/HeldUse.hs	1277;"	f
-createProjectileR	src/Dodge/HeldUse.hs	1223;"	f
+createProjectileR	src/Dodge/HeldUse.hs	1242;"	f
 createShell	src/Dodge/Projectile/Create.hs	23;"	f
 createShieldWall	src/Dodge/Euse.hs	77;"	f
 createUnusedLinkPos	src/Dodge/Tree/Shift.hs	117;"	f
@@ -3886,7 +3884,7 @@ dededumS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	476;"	f
 dedumS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	340;"	f
 defDamageMaterial	src/Dodge/Material/Damage.hs	17;"	f
 defLSPic	src/Dodge/LightSource/Draw.hs	10;"	f
-defSPic	src/Dodge/Item/Draw/SPic.hs	294;"	f
+defSPic	src/Dodge/Item/Draw/SPic.hs	295;"	f
 defaultAimMvType	src/Dodge/Default/Creature.hs	117;"	f
 defaultAimingCrit	src/Dodge/Default/Creature.hs	126;"	f
 defaultApplyDamage	src/Dodge/Creature/Damage.hs	20;"	f
@@ -3970,10 +3968,10 @@ destroyMounts	src/Dodge/Block.hs	99;"	f
 destroyProjectile	src/Dodge/Projectile/Update.hs	139;"	f
 detV	src/Geometry/Vector.hs	93;"	f
 detector	src/Dodge/Item/Held/Utility.hs	35;"	f
-detectorColor	src/Dodge/Item/Draw/SPic.hs	448;"	f
+detectorColor	src/Dodge/Item/Draw/SPic.hs	449;"	f
 detectorEffect	src/Dodge/Item/Weapon/Radar.hs	20;"	f
 detectorInfo	src/Dodge/Item/Info.hs	224;"	f
-determineProjectileTracking	src/Dodge/HeldUse.hs	1206;"	f
+determineProjectileTracking	src/Dodge/HeldUse.hs	1225;"	f
 diagonalLinesRect	src/Dodge/Room/Foreground.hs	52;"	f
 did	src/Dodge/Item/InvSize.hs	54;"	f
 diffAngles	src/Geometry.hs	204;"	f
@@ -4038,7 +4036,7 @@ 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	1164;"	f
+doGenFloat	src/Dodge/HeldUse.hs	1183;"	f
 doGravityPU	src/Dodge/Projectile/Update.hs	50;"	f
 doHeldUseEffect	src/Dodge/HeldUse.hs	310;"	f
 doInPlacements	src/Dodge/Layout.hs	92;"	f
@@ -4231,10 +4229,10 @@ 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	1336;"	f
+dropInventoryPath	src/Dodge/HeldUse.hs	1356;"	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
+drumMag	src/Dodge/Item/Ammo.hs	40;"	f
 dtIL	src/Dodge/DoubleTree.hs	75;"	f
 dtToAdjRootParent	src/Dodge/DoubleTree.hs	126;"	f
 dtToAdjRootParentEither	src/Dodge/DoubleTree.hs	132;"	f
@@ -4272,7 +4270,7 @@ eqSiteToPositions	src/Dodge/Inventory/RBList.hs	77;"	f
 equipAllocString	src/Dodge/Render/HUD.hs	308;"	f
 equipAttachPos	src/Dodge/Item/Draw.hs	30;"	f
 equipInfo	src/Dodge/Item/Info.hs	140;"	f
-equipItemSPic	src/Dodge/Item/Draw/SPic.hs	144;"	f
+equipItemSPic	src/Dodge/Item/Draw/SPic.hs	145;"	f
 equipPosition	src/Dodge/Item/Draw.hs	38;"	f
 equipSiteInfo	src/Dodge/Item/Info.hs	253;"	f
 equipType	src/Dodge/Data/EquipType.hs	10;"	f
@@ -4301,8 +4299,8 @@ extTrigLitPos	src/Dodge/Placement/Instance/Button.hs	84;"	f
 extendAway	src/Dodge/Placement/Instance/LightSource.hs	200;"	f
 extendConeToScreenEdge	src/Dodge/Debug/Picture.hs	82;"	f
 extraPics	src/Dodge/Render/ShapePicture.hs	82;"	f
-extraWeaponLinks	src/Dodge/Item/Grammar.hs	125;"	f
+extraWeaponLinks	src/Dodge/Item/Grammar.hs	126;"	f
-extraWeaponLinksBelow	src/Dodge/Item/Grammar.hs	134;"	f
+extraWeaponLinksBelow	src/Dodge/Item/Grammar.hs	135;"	f
 extractRoomPos	src/Dodge/RoomPos.hs	6;"	f
 faceEdges	src/Polyhedra.hs	65;"	f
 facesToVF	src/Polyhedra/Geodesic.hs	69;"	f
@@ -4340,12 +4338,12 @@ flameSpitter	src/Dodge/Item/Held/SprayGuns.hs	23;"	f
 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	382;"	f
+flamerPic	src/Dodge/Item/Draw/SPic.hs	383;"	f
 flareCircleAt	src/Dodge/HeldUse.hs	690;"	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
-flatShieldEquipSPic	src/Dodge/Item/Draw/SPic.hs	435;"	f
+flatShieldEquipSPic	src/Dodge/Item/Draw/SPic.hs	436;"	f
 fleeFrom	src/Dodge/CreatureEffect.hs	120;"	f
 fleeFromTarget	src/Dodge/CreatureEffect.hs	66;"	f
 flickerMod	src/Dodge/Placement/Instance/LightSource/Flicker.hs	10;"	f
@@ -4393,7 +4391,7 @@ fromTopLeft	src/Dodge/ScreenPos.hs	9;"	f
 fromV3	src/Geometry/Data.hs	43;"	f
 frontArmour	src/Dodge/Item/Equipment.hs	38;"	f
 fstV2	src/Geometry/Data.hs	50;"	f
-fuelPack	src/Dodge/Item/Equipment.hs	59;"	f
+fuelPack	src/Dodge/Item/Equipment.hs	58;"	f
 functionalUpdate	src/Dodge/Update.hs	250;"	f
 fuseFunc	src/Dodge/Path.hs	150;"	f
 fusePairs	src/Dodge/Path.hs	153;"	f
@@ -4410,7 +4408,7 @@ gameRoomViewpoints	src/Dodge/Viewpoints.hs	35;"	f
 gameRoomsFromRooms	src/Dodge/Layout.hs	158;"	f
 gameplayMenu	src/Dodge/Menu.hs	134;"	f
 gameplayMenuOptions	src/Dodge/Menu.hs	137;"	f
-gasType	src/Dodge/HeldUse.hs	1120;"	f
+gasType	src/Dodge/HeldUse.hs	1139;"	f
 generateGenParams	src/Dodge/LevelGen/LevelStructure.hs	22;"	f
 generateGraphs	src/Dodge/LevelGen.hs	39;"	f
 generateLayout	src/Dodge/Layout/Generate.hs	10;"	f
@@ -4422,11 +4420,11 @@ geometryTests	test/Spec.hs	17;"	f
 geometryUnitTests	test/Spec.hs	22;"	f
 geqConstr	src/SameConstr.hs	21;"	f
 getAimZoom	src/Dodge/Update/Camera.hs	134;"	f
-getAmmoLinks	src/Dodge/Item/Grammar.hs	141;"	f
+getAmmoLinks	src/Dodge/Item/Grammar.hs	142;"	f
 getArguments	src/Dodge/Update/Scroll.hs	178;"	f
 getArguments'	src/Dodge/Update/Scroll.hs	166;"	f
 getAttachedSFLink	src/Dodge/HeldUse.hs	760;"	f
-getAutoSpringLinks	src/Dodge/Item/Grammar.hs	120;"	f
+getAutoSpringLinks	src/Dodge/Item/Grammar.hs	121;"	f
 getAvailableListLines	src/Dodge/SelectionList.hs	10;"	f
 getBulletType	src/Dodge/HeldUse.hs	880;"	f
 getCloseObj	src/Dodge/Update/Input/InGame.hs	515;"	f
@@ -4437,7 +4435,7 @@ 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	47;"	f
-getGrenadeHitEffect	src/Dodge/HeldUse.hs	1251;"	f
+getGrenadeHitEffect	src/Dodge/HeldUse.hs	1270;"	f
 getInventoryPath	src/Dodge/Inventory/Path.hs	8;"	f
 getItemValue	src/Dodge/Inventory/SelectionList.hs	142;"	f
 getLaserColor	src/Dodge/HeldUse.hs	706;"	f
@@ -4447,7 +4445,7 @@ 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	1243;"	f
+getPJStabiliser	src/Dodge/HeldUse.hs	1262;"	f
 getPretty	src/AesonHelp.hs	8;"	f
 getPromptTM	src/Dodge/Terminal/Type.hs	8;"	f
 getRootItemBounds	src/Dodge/Render/HUD.hs	95;"	f
@@ -4475,7 +4473,7 @@ glassShat4S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	464;"	f
 glassSwitchBack	src/Dodge/Room/Room.hs	70;"	f
 glassSwitchBackCrits	src/Dodge/Room/Room.hs	99;"	f
 glassWallDamage	src/Dodge/Wall/DamageEffect.hs	48;"	f
-glauncherPic	src/Dodge/Item/Draw/SPic.hs	388;"	f
+glauncherPic	src/Dodge/Item/Draw/SPic.hs	389;"	f
 glushortSize	src/Shader/Parameters.hs	25;"	f
 goToPostStrat	src/Dodge/Creature/Strategy.hs	10;"	f
 goToTarget	src/Dodge/Creature/ReaderUpdate.hs	136;"	f
@@ -4523,10 +4521,10 @@ hasCaneGunDim	src/Dodge/Item/InvSize.hs	48;"	f
 hasFrontArmour	src/Dodge/Creature/Test.hs	115;"	f
 hasLOS	src/Dodge/Base/Collide.hs	203;"	f
 hasLOSIndirect	src/Dodge/Base/Collide.hs	218;"	f
-hat	src/Dodge/Item/Equipment.hs	107;"	f
+hat	src/Dodge/Item/Equipment.hs	103;"	f
 head	src/DoubleStack.hs	14;"	f
-headLamp	src/Dodge/Item/Equipment.hs	110;"	f
+headLamp	src/Dodge/Item/Equipment.hs	106;"	f
-headLampShape	src/Dodge/Item/Draw/SPic.hs	438;"	f
+headLampShape	src/Dodge/Item/Draw/SPic.hs	439;"	f
 headMap	src/Dodge/DoubleTree.hs	170;"	f
 heal	src/Dodge/Item/Consumable.hs	17;"	f
 heal25	src/Dodge/Item/Consumable.hs	14;"	f
@@ -4544,13 +4542,13 @@ heldInfo	src/Dodge/Item/Info.hs	90;"	f
 heldItemAmmoSlots	src/Dodge/Item/AmmoSlots.hs	18;"	f
 heldItemBulkiness	src/Dodge/Creature/YourControl.hs	176;"	f
 heldItemInvLock	src/Dodge/HeldUse.hs	438;"	f
-heldItemMuzVel	src/Dodge/HeldUse.hs	1007;"	f
+heldItemMuzVel	src/Dodge/HeldUse.hs	1025;"	f
 heldItemMuzzles	src/Dodge/HeldUse.hs	168;"	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	1051;"	f
+heldItemRifling	src/Dodge/HeldUse.hs	1069;"	f
-heldItemSPic	src/Dodge/Item/Draw/SPic.hs	220;"	f
+heldItemSPic	src/Dodge/Item/Draw/SPic.hs	221;"	f
 heldItemWeight	src/Dodge/Creature/Statistics.hs	41;"	f
 heldPositionInfo	src/Dodge/Item/Info.hs	240;"	f
 heldTorqueAmount	src/Dodge/HeldUse.hs	581;"	f
@@ -4644,16 +4642,16 @@ interweave	src/Justify.hs	17;"	f
 introScan	src/Dodge/Item/Scope.hs	57;"	f
 introScanValue	src/Dodge/Inventory/SelectionList.hs	78;"	f
 intsToPos	src/Dodge/Room/Modify/Girder.hs	160;"	f
-invAdj	src/Dodge/Item/Grammar.hs	298;"	f
+invAdj	src/Dodge/Item/Grammar.hs	299;"	f
 invCursorParams	src/Dodge/ListDisplayParams.hs	36;"	f
 invDP	src/Dodge/ListDisplayParams.hs	30;"	f
 invDimColor	src/Dodge/DisplayInventory.hs	192;"	f
 invHead	src/Dodge/Render/HUD.hs	405;"	f
 invItemLocUpdate	src/Dodge/Creature/State.hs	178;"	f
-invLDT	src/Dodge/Item/Grammar.hs	278;"	f
+invLDT	src/Dodge/Item/Grammar.hs	279;"	f
 invRootItemEffs	src/Dodge/Creature/State.hs	171;"	f
-invRootMap	src/Dodge/Item/Grammar.hs	287;"	f
+invRootMap	src/Dodge/Item/Grammar.hs	288;"	f
-invRootTrees	src/Dodge/Item/Grammar.hs	308;"	f
+invRootTrees	src/Dodge/Item/Grammar.hs	309;"	f
 invSelectionItem	src/Dodge/Inventory/SelectionList.hs	31;"	f
 invSetSelection	src/Dodge/Inventory.hs	185;"	f
 invSetSelectionPos	src/Dodge/Inventory.hs	193;"	f
@@ -4699,9 +4697,9 @@ isoMatrix	src/MatrixHelper.hs	30;"	f
 isotriBWH	src/Geometry/Polygon.hs	20;"	f
 itDim	src/Dodge/Item/InvSize.hs	21;"	f
 itInvHeight	src/Dodge/Item/InvSize.hs	11;"	f
-itUseCondition	src/Dodge/ItemUseCondition.hs	7;"	f
+itUseCondition	src/Dodge/ItemUseCondition.hs	6;"	f
 itemAmmoSlots	src/Dodge/Item/AmmoSlots.hs	12;"	f
-itemBaseConnections	src/Dodge/Item/Grammar.hs	195;"	f
+itemBaseConnections	src/Dodge/Item/Grammar.hs	196;"	f
 itemBaseName	src/Dodge/Item/Display.hs	59;"	f
 itemBlips	src/Dodge/RadarSweep.hs	93;"	f
 itemBulkiness	src/Dodge/Creature/YourControl.hs	171;"	f
@@ -4721,7 +4719,7 @@ itemInternalValue	src/Dodge/Item/Display.hs	33;"	f
 itemInvColor	src/Dodge/Item/InventoryColor.hs	9;"	f
 itemInvLock	src/Dodge/HeldUse.hs	433;"	f
 itemMuzzles	src/Dodge/HeldUse.hs	159;"	f
-itemRandomOffset	src/Dodge/HeldUse.hs	944;"	f
+itemRandomOffset	src/Dodge/HeldUse.hs	962;"	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
@@ -4731,8 +4729,8 @@ itemScrollDisplay	src/Dodge/Inventory/SelectionList.hs	119;"	f
 itemScrollValue	src/Dodge/Inventory/SelectionList.hs	146;"	f
 itemSidePush	src/Dodge/HeldUse.hs	379;"	f
 itemString	src/Dodge/Item/Display.hs	55;"	f
-itemToBreakLists	src/Dodge/Item/Grammar.hs	67;"	f
+itemToBreakLists	src/Dodge/Item/Grammar.hs	68;"	f
-itemToFunction	src/Dodge/Item/Grammar.hs	147;"	f
+itemToFunction	src/Dodge/Item/Grammar.hs	148;"	f
 itemTreeSPic	src/Dodge/Item/Draw/SPic.hs	22;"	f
 itemWeight	src/Dodge/Creature/Statistics.hs	36;"	f
 iterateUntil	src/MonadHelp.hs	23;"	f
@@ -4743,7 +4741,7 @@ itmSpaceInfo	src/Dodge/Item/Info.hs	25;"	f
 itmUsageInfo	src/Dodge/Item/Info.hs	230;"	f
 jShape	src/Dodge/Placement/Instance/LightSource.hs	85;"	f
 jaggedShape	src/Dodge/Block/Debris.hs	191;"	f
-joinItemsInList	src/Dodge/Item/Grammar.hs	268;"	f
+joinItemsInList	src/Dodge/Item/Grammar.hs	269;"	f
 joystick	src/Dodge/Item/Scope.hs	150;"	f
 jps0'	src/Dodge/LevelGen/PlacementHelper.hs	60;"	f
 jps0PushPS	src/Dodge/LevelGen/PlacementHelper.hs	63;"	f
@@ -4751,7 +4749,7 @@ jsps	src/Dodge/LevelGen/PlacementHelper.hs	36;"	f
 jsps0	src/Dodge/LevelGen/PlacementHelper.hs	39;"	f
 jsps0J	src/Dodge/LevelGen/PlacementHelper.hs	48;"	f
 jspsJ	src/Dodge/LevelGen/PlacementHelper.hs	45;"	f
-jumpLegs	src/Dodge/Item/Equipment.hs	124;"	f
+jumpLegs	src/Dodge/Item/Equipment.hs	120;"	f
 justify	src/Justify.hs	9;"	f
 k	src/ShortShow.hs	33;"	f
 k'	src/ShortShow.hs	33;"	f
@@ -4759,7 +4757,7 @@ keyCard	src/Dodge/Item/Held/Utility.hs	24;"	f
 keyCardAnalyserByDoor	src/Dodge/Room/LasTurret.hs	71;"	f
 keyCardRoomRunPast	src/Dodge/Room/LasTurret.hs	59;"	f
 keyCardRunPastRand	src/Dodge/LockAndKey.hs	36;"	f
-keyPic	src/Dodge/Item/Draw/SPic.hs	454;"	f
+keyPic	src/Dodge/Item/Draw/SPic.hs	455;"	f
 keyholeCorridor	src/Dodge/Room/Corridor.hs	39;"	f
 knifeS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	484;"	f
 lConnect	src/Dodge/Render/Connectors.hs	42;"	f
@@ -4771,13 +4769,13 @@ lampCoverWhen	src/Dodge/Placement/Instance/LightSource/Cover.hs	19;"	f
 lampCrSPic	src/Dodge/Render/ShapePicture.hs	56;"	f
 lasCenSensEdge	src/Dodge/Room/LasTurret.hs	114;"	f
 lasDronesPic	src/Dodge/Item/Weapon/Drone.hs	22;"	f
-lasGunPic	src/Dodge/Item/Draw/SPic.hs	408;"	f
+lasGunPic	src/Dodge/Item/Draw/SPic.hs	409;"	f
 lasSensorTurretTest	src/Dodge/Room/LasTurret.hs	107;"	f
 lasTunnel	src/Dodge/Room/LasTurret.hs	126;"	f
 lasTunnelRunPast	src/Dodge/Room/LasTurret.hs	167;"	f
 lasTurret	src/Dodge/Placement/Instance/Turret.hs	38;"	f
 laser	src/Dodge/Item/Held/BatteryGuns.hs	41;"	f
-laserLinkTest	src/Dodge/Item/Grammar.hs	201;"	f
+laserLinkTest	src/Dodge/Item/Grammar.hs	202;"	f
 lastMap	src/Dodge/DoubleTree.hs	174;"	f
 launcherCrit	src/Dodge/Creature/LauncherCrit.hs	12;"	f
 layoutLevelFromSeed	src/Dodge/LevelGen.hs	47;"	f
@@ -4792,10 +4790,10 @@ ldtToIM	src/Dodge/DoubleTree.hs	143;"	f
 ldtToIndentList	src/Dodge/DoubleTree.hs	146;"	f
 ldtToLoc	src/Dodge/DoubleTree.hs	187;"	f
 left	src/DoubleStack.hs	16;"	f
-leftIsParentCombine	src/Dodge/Item/Grammar.hs	240;"	f
+leftIsParentCombine	src/Dodge/Item/Grammar.hs	241;"	f
 leftPad	src/Padding.hs	15;"	f
-leftRightCombine	src/Dodge/Item/Grammar.hs	254;"	f
+leftRightCombine	src/Dodge/Item/Grammar.hs	255;"	f
-legsSPic	src/Dodge/Item/Draw/SPic.hs	472;"	f
+legsSPic	src/Dodge/Item/Draw/SPic.hs	473;"	f
 liShape	src/Dodge/Placement/Instance/LightSource.hs	98;"	f
 light	src/Color.hs	104;"	f
 lightSensByDoor	src/Dodge/Room/LasTurret.hs	46;"	f
@@ -4822,8 +4820,8 @@ listCursorChooseBorderScale	src/Dodge/Render/List.hs	135;"	f
 listGuard	src/Dodge/Creature/ReaderUpdate.hs	188;"	f
 listSelectionColorPicture	src/Dodge/DisplayInventory.hs	308;"	f
 litCorridor90	src/Dodge/Room/RoadBlock.hs	26;"	f
-llleft	src/Dodge/Item/Grammar.hs	204;"	f
+llleft	src/Dodge/Item/Grammar.hs	205;"	f
-llright	src/Dodge/Item/Grammar.hs	210;"	f
+llright	src/Dodge/Item/Grammar.hs	211;"	f
 lmt	src/MatrixHelper.hs	43;"	f
 lnkBothAnd	src/Dodge/Room/Procedural.hs	121;"	f
 lnkMidPosInvSelsCol	src/Dodge/Render/HUD.hs	394;"	f
@@ -4873,6 +4871,7 @@ machineAddSound	src/Dodge/Machine.hs	49;"	f
 machinePistol	src/Dodge/Item/Held/Stick.hs	52;"	f
 machineUpdateDeathEff	src/Dodge/Machine.hs	34;"	f
 machineUpdateLiveDieEff	src/Dodge/Machine.hs	16;"	f
+magAmmoParams	src/Dodge/HeldUse.hs	901;"	f
 magAmmoType	src/Dodge/Item/MagAmmoType.hs	11;"	f
 magShield	src/Dodge/Item/Equipment.hs	27;"	f
 magV	src/Geometry/Vector.hs	171;"	f
@@ -4887,8 +4886,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	988;"	f
+makeBullet	src/Dodge/HeldUse.hs	1006;"	f
-makeBullet'	src/Dodge/HeldUse.hs	930;"	f
+makeBullet'	src/Dodge/HeldUse.hs	948;"	f
 makeButton	src/Dodge/LevelGen/Switch.hs	16;"	f
 makeByteStringShaderUsingVAO	src/Shader/Compile.hs	128;"	f
 makeCloudAt	src/Dodge/WorldEvent/Cloud.hs	18;"	f
@@ -4946,6 +4945,7 @@ makeTileFromPoly	src/Tile.hs	34;"	f
 makeTypeCraft	src/Dodge/Item/Craftable.hs	18;"	f
 makeTypeCraftNum	src/Dodge/Item/Craftable.hs	12;"	f
 mapper	src/Dodge/Item/Scope.hs	70;"	f
+maxAmmo	src/Dodge/Item/MaxAmmo.hs	5;"	f
 maxDamageType	src/Dodge/Damage.hs	37;"	f
 maxShowX	src/Dodge/Combine/Graph.hs	49;"	f
 maxViewDistance	src/Dodge/Viewpoints.hs	26;"	f
@@ -4970,15 +4970,15 @@ 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	1175;"	f
+mcShootAuto	src/Dodge/HeldUse.hs	1194;"	f
-mcShootLaser	src/Dodge/HeldUse.hs	1168;"	f
+mcShootLaser	src/Dodge/HeldUse.hs	1187;"	f
 mcTriggerVal	src/Dodge/Machine/Update.hs	93;"	f
 mcTypeUpdate	src/Dodge/Machine/Update.hs	27;"	f
-mcUseHeld	src/Dodge/HeldUse.hs	1095;"	f
+mcUseHeld	src/Dodge/HeldUse.hs	1113;"	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
+megaBattery	src/Dodge/Item/Ammo.hs	68;"	f
-megaShellMag	src/Dodge/Item/Ammo.hs	53;"	f
+megaShellMag	src/Dodge/Item/Ammo.hs	48;"	f
 megaTinMag	src/Dodge/Item/Ammo.hs	21;"	f
 meleeHeadingMove	src/Dodge/Creature/Boid.hs	281;"	f
 memoBoxEdgeIndices	src/Shader/Poke.hs	352;"	f
@@ -5016,8 +5016,8 @@ minOn	src/FoldableHelp.hs	35;"	f
 mini1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	346;"	f
 miniGunCrit	src/Dodge/Creature.hs	63;"	f
 miniGunX	src/Dodge/Item/Held/Cane.hs	52;"	f
-miniGunXPict	src/Dodge/Item/Draw/SPic.hs	360;"	f
+miniGunXPict	src/Dodge/Item/Draw/SPic.hs	361;"	f
-miniGunXPictItem	src/Dodge/Item/Draw/SPic.hs	354;"	f
+miniGunXPictItem	src/Dodge/Item/Draw/SPic.hs	355;"	f
 miniS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	548;"	f
 miniTree2	src/Dodge/Room/Room.hs	106;"	f
 minimumOn	src/FoldlHelp.hs	12;"	f
@@ -5329,7 +5329,7 @@ postUniverseLoadSideEffect	src/Dodge/WorldLoad.hs	11;"	f
 postWorldLoad	src/Dodge/WorldLoad.hs	14;"	f
 powerFakeout	src/Dodge/Room/Start.hs	27;"	f
 powerFakeout'	src/Dodge/Room/Start.hs	24;"	f
-powerLegs	src/Dodge/Item/Equipment.hs	116;"	f
+powerLegs	src/Dodge/Item/Equipment.hs	112;"	f
 powlist	src/Multiset.hs	61;"	f
 powlistUpToN	src/Multiset.hs	23;"	f
 powlistUpToN'	src/Multiset.hs	12;"	f
@@ -5376,7 +5376,7 @@ psj	src/Dodge/LevelGen/PlacementHelper.hs	70;"	f
 psposAddLabel	src/Dodge/PlacementSpot.hs	69;"	f
 pt0	src/Dodge/LevelGen/PlacementHelper.hs	54;"	f
 ptCont	src/Dodge/LevelGen/PlacementHelper.hs	21;"	f
-pulseChecker	src/Dodge/Item/Equipment.hs	134;"	f
+pulseChecker	src/Dodge/Item/Equipment.hs	130;"	f
 pushCreatureOutFromWalls	src/Dodge/WallCreatureCollisions.hs	54;"	f
 pushL	src/DoubleStack.hs	20;"	f
 pushOrCrush	src/Dodge/WallCreatureCollisions.hs	73;"	f
@@ -5512,7 +5512,7 @@ retreatActionsPistol	src/Dodge/Humanoid.hs	248;"	f
 retreatFireLauncher	src/Dodge/Humanoid.hs	269;"	f
 retreatPointForFrom	src/Dodge/Creature/Impulse/Flee.hs	7;"	f
 reversePair	src/Dodge/LevelGen.hs	82;"	f
-rewinder	src/Dodge/Item/Held/Utility.hs	61;"	f
+rewinder	src/Dodge/Item/Held/Utility.hs	44;"	f
 rewinder	src/Dodge/Item/Weapon/Utility.hs	34;"	f
 rezBox	src/Dodge/Room/RezBox.hs	23;"	f
 rezBox'	src/Dodge/Room/RezBox.hs	31;"	f
@@ -5527,11 +5527,11 @@ rezText'	src/Dodge/Story.hs	17;"	f
 rhombus	src/Polyhedra.hs	72;"	f
 rifle	src/Dodge/Item/Held/Cane.hs	30;"	f
 right	src/DoubleStack.hs	16;"	f
-rightIsParentCombine	src/Dodge/Item/Grammar.hs	247;"	f
+rightIsParentCombine	src/Dodge/Item/Grammar.hs	248;"	f
 rightPad	src/Padding.hs	19;"	f
 rightPadNoSquash	src/Padding.hs	23;"	f
 rlPosDir	src/Dodge/RoomLink.hs	94;"	f
-rlauncherPic	src/Dodge/Item/Draw/SPic.hs	385;"	f
+rlauncherPic	src/Dodge/Item/Draw/SPic.hs	386;"	f
 rmInLinks	src/Dodge/RoomLink.hs	138;"	f
 rmInvItem	src/Dodge/Inventory.hs	64;"	f
 rmLinksOfType	src/Dodge/RoomLink.hs	135;"	f
@@ -5733,10 +5733,10 @@ shapeVerxAttributes	src/Shape/Parameters.hs	13;"	f
 shapeVerxSize	src/Shape/Parameters.hs	10;"	f
 shardShape	src/Dodge/Block/Debris.hs	181;"	f
 shatterGun	src/Dodge/Item/Held/Weapons.hs	8;"	f
-shatterGunSPic	src/Dodge/Item/Draw/SPic.hs	297;"	f
+shatterGunSPic	src/Dodge/Item/Draw/SPic.hs	298;"	f
 shatterWall	src/Dodge/Item/Weapon/Shatter.hs	26;"	f
 shellCollisionCheck	src/Dodge/Projectile/Update.hs	85;"	f
-shellMag	src/Dodge/Item/Ammo.hs	58;"	f
+shellMag	src/Dodge/Item/Ammo.hs	52;"	f
 shellModule	src/Dodge/Item/Scope.hs	124;"	f
 shellShape	src/Dodge/Projectile/Draw.hs	34;"	f
 shellTrailCloud	src/Dodge/WorldEvent/Cloud.hs	65;"	f
@@ -5763,12 +5763,12 @@ 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	920;"	f
+shootBullet	src/Dodge/HeldUse.hs	938;"	f
 shootFirstMiss	src/Dodge/Creature/Volition.hs	33;"	f
 shootLaser	src/Dodge/HeldUse.hs	846;"	f
 shootOutPassage	src/Dodge/Room/RezBox.hs	74;"	f
 shootShatter	src/Dodge/Item/Weapon/Shatter.hs	11;"	f
-shootTeslaArc	src/Dodge/HeldUse.hs	1194;"	f
+shootTeslaArc	src/Dodge/HeldUse.hs	1213;"	f
 shootTillEmpty	src/Dodge/Creature/Volition.hs	18;"	f
 shootTractorBeam	src/Dodge/HeldUse.hs	799;"	f
 shootersRoom	src/Dodge/Room/Room.hs	315;"	f
@@ -5816,7 +5816,7 @@ slideDoorS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	528;"	f
 slideWindow	src/ListHelp.hs	80;"	f
 slowDoorRoom	src/Dodge/Room/LongDoor.hs	152;"	f
 slowDoorRoomRunPast	src/Dodge/Room/LongDoor.hs	169;"	f
-smallBattery	src/Dodge/Item/Ammo.hs	81;"	f
+smallBattery	src/Dodge/Item/Ammo.hs	72;"	f
 smallBranch	src/Dodge/Tree/GenerateStructure.hs	32;"	f
 smallChaseCrit	src/Dodge/Creature/ChaseCrit.hs	15;"	f
 smallDrawTree	src/Dodge/LevelGen.hs	88;"	f
@@ -5863,7 +5863,7 @@ spawnGun	src/Dodge/Item/Weapon/Spawn.hs	12;"	f
 spawnSmokeAtCursor	src/Dodge/WorldEvent/Cloud.hs	73;"	f
 spawnerCrit	src/Dodge/Creature.hs	56;"	f
 spawnerRoom	src/Dodge/Room/Room.hs	360;"	f
-speedLegs	src/Dodge/Item/Equipment.hs	121;"	f
+speedLegs	src/Dodge/Item/Equipment.hs	117;"	f
 splashMenu	src/Dodge/Menu.hs	30;"	f
 splashMenuOptions	src/Dodge/Menu.hs	35;"	f
 splashScreen	src/Dodge/Initialisation.hs	11;"	f
@@ -5877,7 +5877,7 @@ spreadCenter	src/Dodge/Base.hs	187;"	f
 spreadFromCenter	src/Dodge/Base.hs	176;"	f
 spreadGunCrit	src/Dodge/Creature/SpreadGunCrit.hs	12;"	f
 spreadOut	src/Dodge/Creature/Boid.hs	157;"	f
-springLinkTest	src/Dodge/Item/Grammar.hs	222;"	f
+springLinkTest	src/Dodge/Item/Grammar.hs	223;"	f
 sps	src/Dodge/LevelGen/PlacementHelper.hs	30;"	f
 sps0	src/Dodge/LevelGen/PlacementHelper.hs	42;"	f
 square	src/Geometry/Polygon.hs	46;"	f
@@ -5934,7 +5934,7 @@ strideRot	src/Dodge/Item/HeldOffset.hs	77;"	f
 stringToList	src/Picture/Base.hs	313;"	f
 stringToListGrad	src/Picture/Text.hs	12;"	f
 stripZ	src/Geometry/Vector3D.hs	97;"	f
-structureToPotentialFunction	src/Dodge/Item/Grammar.hs	182;"	f
+structureToPotentialFunction	src/Dodge/Item/Grammar.hs	183;"	f
 structureUseAtLoc	src/Dodge/Creature/Impulse/UseItem.hs	78;"	f
 subInvX	src/Dodge/ListDisplayParams.hs	48;"	f
 subMap	src/TreeHelp.hs	118;"	f
@@ -5989,7 +5989,7 @@ terminalScreenGlow	src/Dodge/Machine/Update.hs	34;"	f
 terminalShape	src/Dodge/Machine/Draw.hs	32;"	f
 terminalWheelEvent	src/Dodge/Update/Scroll.hs	124;"	f
 teslaGun	src/Dodge/Item/Held/BatteryGuns.hs	19;"	f
-teslaGunPic	src/Dodge/Item/Draw/SPic.hs	405;"	f
+teslaGunPic	src/Dodge/Item/Draw/SPic.hs	406;"	f
 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
@@ -6025,12 +6025,12 @@ tileTexCoords	src/Tile.hs	11;"	f
 tilesFromRooms	src/Dodge/Layout.hs	205;"	f
 tilesToLine	src/Shader/AuxAddition.hs	66;"	f
 timeFlowUpdate	src/Dodge/Update.hs	170;"	f
-timeScroller	src/Dodge/Item/Held/Utility.hs	74;"	f
+timeScroller	src/Dodge/Item/Held/Utility.hs	57;"	f
 timeScroller	src/Dodge/Item/Weapon/Utility.hs	47;"	f
-timeStopper	src/Dodge/Item/Held/Utility.hs	68;"	f
+timeStopper	src/Dodge/Item/Held/Utility.hs	51;"	f
 timeStopper	src/Dodge/Item/Weapon/Utility.hs	41;"	f
 timerTLS	src/Dodge/LightSource/Update.hs	22;"	f
-tinMag	src/Dodge/Item/Ammo.hs	27;"	f
+tinMag	src/Dodge/Item/Ammo.hs	26;"	f
 tinitusS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	428;"	f
 titleOptionsMenu	src/Dodge/Menu.hs	102;"	f
 titleOptionsNoWrite	src/Dodge/Menu.hs	105;"	f
@@ -6041,7 +6041,7 @@ toClosestMultiple	src/HelpNum.hs	3;"	f
 toColor8	src/Color.hs	148;"	f
 toFloatVAs	src/Shader/Compile.hs	211;"	f
 toLabel	src/Dodge/Cleat.hs	16;"	f
-toLasgunUpdate	src/Dodge/Item/Grammar.hs	215;"	f
+toLasgunUpdate	src/Dodge/Item/Grammar.hs	216;"	f
 toMultiset	src/Multiset.hs	64;"	f
 toOnward	src/Dodge/Tree/Compose.hs	101;"	f
 toTopLeft	src/Dodge/Render/List.hs	219;"	f
@@ -6065,7 +6065,7 @@ topPrismEdgeIndices	src/Shader/Poke.hs	335;"	f
 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
+torchShape	src/Dodge/Item/Draw/SPic.hs	265;"	f
 torqueAmount	src/Dodge/HeldUse.hs	576;"	f
 torqueCr	src/Dodge/WorldEffect.hs	74;"	f
 torso	src/Dodge/Creature/Picture.hs	105;"	f
@@ -6073,7 +6073,7 @@ tractCr	src/Dodge/TractorBeam/Update.hs	28;"	f
 tractFlIt	src/Dodge/TractorBeam/Update.hs	23;"	f
 tractorBeamAt	src/Dodge/HeldUse.hs	811;"	f
 tractorGun	src/Dodge/Item/Held/BatteryGuns.hs	60;"	f
-tractorGunPic	src/Dodge/Item/Draw/SPic.hs	432;"	f
+tractorGunPic	src/Dodge/Item/Draw/SPic.hs	433;"	f
 tractorPullPos	src/Dodge/TractorBeam/Update.hs	33;"	f
 tractorSPic	src/Dodge/TractorBeam/Draw.hs	10;"	f
 tranRot	src/Picture/Base.hs	124;"	f
@@ -6124,7 +6124,7 @@ triggerSwitchSPicLight	src/Dodge/Placement/Instance/Button.hs	31;"	f
 truncFaces	src/Polyhedra/Geodesic.hs	53;"	f
 truncate	src/Polyhedra/Geodesic.hs	38;"	f
 trunkDepth	src/TreeHelp.hs	161;"	f
-tryAttachItems	src/Dodge/Item/Grammar.hs	30;"	f
+tryAttachItems	src/Dodge/Item/Grammar.hs	31;"	f
 tryClickUse	src/Dodge/Creature/YourControl.hs	220;"	f
 tryCombine	src/Dodge/Update/Input/InGame.hs	526;"	f
 tryDropSelected	src/Dodge/Update/Input/InGame.hs	125;"	f
@@ -6166,7 +6166,7 @@ unitVectorAtAngle	src/Geometry/Vector.hs	100;"	f
 unlockInv	src/Dodge/Inventory/Lock.hs	12;"	f
 unpause	src/Dodge/Menu.hs	195;"	f
 unsafeBlinkAction	src/Dodge/Creature/Action/Blink.hs	55;"	f
-unsafeBlinker	src/Dodge/Item/Held/Utility.hs	55;"	f
+unsafeBlinker	src/Dodge/Item/Held/Utility.hs	41;"	f
 unsafeBlinker	src/Dodge/Item/Weapon/Utility.hs	27;"	f
 unsafeSwapKeys	src/IntMapHelp.hs	74;"	f
 unshadowBlock	src/Dodge/Block.hs	43;"	f
@@ -6306,16 +6306,16 @@ upperPrismPolyST	src/Shape.hs	107;"	f
 upperPrismPolySU	src/Shape.hs	113;"	f
 upperPrismPolyTS	src/Shape.hs	119;"	f
 upperRounded	src/Shape.hs	184;"	f
-useBreakL	src/Dodge/Item/Grammar.hs	36;"	f
+useBreakL	src/Dodge/Item/Grammar.hs	37;"	f
-useBreakListsLinkTest	src/Dodge/Item/Grammar.hs	44;"	f
+useBreakListsLinkTest	src/Dodge/Item/Grammar.hs	45;"	f
 useBulletPayload	src/Dodge/Bullet.hs	111;"	f
 useC	src/Dodge/Cuse.hs	8;"	f
 useC'	src/Dodge/Cuse.hs	13;"	f
 useDelay	src/Dodge/Item/UseDelay.hs	13;"	f
 useE	src/Dodge/Euse.hs	23;"	f
-useGasParams	src/Dodge/HeldUse.hs	1100;"	f
+useGasParams	src/Dodge/HeldUse.hs	1118;"	f
 useHotkey	src/Dodge/Creature/YourControl.hs	69;"	f
-useInventoryPath	src/Dodge/HeldUse.hs	1361;"	f
+useInventoryPath	src/Dodge/HeldUse.hs	1381;"	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
@@ -6324,15 +6324,15 @@ useLocation	src/Dodge/Creature/Impulse/UseItem.hs	66;"	f
 useMagShield	src/Dodge/Euse.hs	34;"	f
 useNormalCamera	src/Dodge/Camera.hs	6;"	f
 usePayload	src/Dodge/Payload.hs	18;"	f
-useRewindGun	src/Dodge/HeldUse.hs	1327;"	f
+useRewindGun	src/Dodge/HeldUse.hs	1347;"	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	1308;"	f
+useStopWatch	src/Dodge/HeldUse.hs	1328;"	f
 useStopWatch	src/Dodge/Luse.hs	21;"	f
 useTimeCheck	src/Dodge/HeldUse.hs	115;"	f
 useTimeCheck	src/Dodge/Item/Weapon/TriggerType.hs	127;"	f
-useTimeScrollGun	src/Dodge/HeldUse.hs	1316;"	f
+useTimeScrollGun	src/Dodge/HeldUse.hs	1336;"	f
 useTimeScrollGun	src/Dodge/Luse.hs	29;"	f
 useUnusedLnk	src/Dodge/PlacementSpot.hs	169;"	f
 usedRoomInLinkPoss	src/Dodge/PlacementSpot.hs	196;"	f
@@ -6366,7 +6366,7 @@ 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	15;"	f
-volleyGunShape	src/Dodge/Item/Draw/SPic.hs	342;"	f
+volleyGunShape	src/Dodge/Item/Draw/SPic.hs	343;"	f
 waistSP	src/Dodge/Creature/HandPos.hs	173;"	f
 walkNozzle	src/Dodge/HeldUse.hs	781;"	f
 walkableNodeNear	src/Dodge/Path.hs	48;"	f
@@ -6428,7 +6428,7 @@ worldToGenWorld	src/Dodge/LevelGen/LevelStructure.hs	14;"	f
 wpAdd	src/Dodge/Room/RezBox.hs	137;"	f
 wrench1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	414;"	f
 wristArmour	src/Dodge/Item/Equipment.hs	43;"	f
-wristInvisibility	src/Dodge/Item/Equipment.hs	127;"	f
+wristInvisibility	src/Dodge/Item/Equipment.hs	123;"	f
 writeConfig	src/Dodge/Menu.hs	162;"	f
 writeSaveSlot	src/Dodge/Save.hs	34;"	f
 xCylinder	src/Shape.hs	136;"	f