Move around ammo source checks

ghcidOutput

@@ -1 +1 @@
-All good (615 modules, at 15:36:43)
+All good (615 modules, at 16:17:36)

graph/itemCombinations.gv

@@ -103,6 +103,8 @@ digraph {
             ,label="EQUIP {_ibtEquip = AUTODETECTOR CREATUREDETECTOR}"];
         140 [shape=box
             ,label="HELD {_ibtHeld = TORCH}"];
+        141 [shape=box
+            ,label="AMMOMAG {_ibtAmmoMag = BATTERY}"];
         144 [shape=box
             ,label="EQUIP {_ibtEquip = HEADLAMP}"];
         152 [shape=box
@@ -383,6 +385,12 @@ digraph {
     140 -> 143 [xlabel=1
                ,arrowhead=onone
                ,headport=w];
+    141 -> 139 [xlabel=1
+               ,arrowhead=onone
+               ,headport=w];
+    141 -> 147 [xlabel=1
+               ,arrowhead=onone
+               ,headport=w];
     143 -> 144 [xlabel=""
                ,tailport=e];
     151 -> 152 [xlabel=""

src/Dodge/Combine/Combinations.hs

@@ -99,10 +99,10 @@ itemCombinations =
            , po [cr MICROCHIP, cr TRANSMITTER, cr LIGHTSENSOR] (autoDetector ITEMDETECTOR)
            , po [cr MICROCHIP, cr TRANSMITTER, cr SOUNDSENSOR] (autoDetector WALLDETECTOR)
            , po [cr MICROCHIP, cr TRANSMITTER, cr HEATSENSOR] (autoDetector CREATUREDETECTOR)
-           , po [cr BATTERY, cr LED] torch
+           , po [AMMOMAG BATTERY, cr LED] torch
            , po [hd TORCH, eq HAT] headLamp
            , po [cr LIGHTER, cr THERMOMETER, cr MICROCHIP] (energyBallCraft IncBall)
-           , po [cr TRANSFORMER, cr BATTERY, cr MICROCHIP] (energyBallCraft TeslaBall)
+           , po [cr TRANSFORMER, AMMOMAG BATTERY, cr MICROCHIP] (energyBallCraft TeslaBall)
            ]
         ++ map (\i -> po [HELD (LASWIDE i), cr TRANSFORMER] $ lasWide (i + 1)) [2 .. 9]
         ++ map (\i -> po [cr PIPE, HELD (BANGSTICK i)] $ bangStick (i + 1)) [1 .. 8]

src/Dodge/Data/Item/Combine.hs

@@ -64,7 +64,6 @@ data CraftType
     | THERMOMETER
     | CREATURESENSOR
     | WIRE
-    | BATTERY
     | FUELCELL
     | PORTABLEFUSION
     | FRAGMODULE
@@ -112,6 +111,7 @@ data AmmoMagType
     | DRUMMAG
     | BELTMAG
     | SHELLMAG
+    | BATTERY
     deriving (Eq, Ord, Show, Read)
 
 

src/Dodge/Data/Item/HeldUse.hs

@@ -5,7 +5,7 @@
 
 module Dodge.Data.Item.HeldUse where
 
-import Dodge.Data.Item.Use.Consumption.Ammo
+--import Dodge.Data.Item.Use.Consumption.Ammo
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.CamouflageStatus
@@ -49,7 +49,7 @@ data Euse
     | EAmmoSource 
         { _euseAmmoAmount :: Int
         , _euseAmmoMax :: Int
-        , _euseAmmoSourceType :: AmmoSourceType
+--        , _euseAmmoSourceType :: AmmoSourceType
         , _euseAmmoLink :: Maybe Int
         }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)

src/Dodge/Data/Item/Use.hs

@@ -32,7 +32,7 @@ data ItemUse
         , _heldMods :: HeldMod
         , _heldHammer :: HammerPosition
         , _heldAim :: AimParams
-        , _heldConsumption :: HeldConsumption
+        , _heldConsumption :: [AmmoType]
         , _heldParams :: HeldParams
 --        , _useTargeting :: Maybe TargetType
         }
@@ -64,6 +64,8 @@ data ItemUse
 
 data HeldParams
     = DefaultHeldParams
+    | GasSprayParams
+        {_gasCreation :: GasCreate}
     | BulletShooterParams
         { _muzVel :: Float
         , _rifling :: Float
@@ -82,6 +84,7 @@ data AmmoParams = BulletParams {_ampBullet :: Bullet}
         , _ampPjDraw :: ProjectileDraw
         , _ampPjCreation :: ProjectileCreate
         }
+    | GasParams {_ampCreateGas :: GasCreate}
 
 data ScrollAttachParams
     = ZoomScrollParams

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

@@ -17,14 +17,6 @@ import Data.Aeson.TH
 import Dodge.Data.Item.Use.Consumption.Ammo
 import Dodge.Data.Item.Use.Consumption.LoadAction
 
-data HeldConsumption
-    = LoadableAmmo
-        { _laAmmoType :: AmmoType
-        , _laSourceType :: AmmoSourceType
-        }
-    | NoConsumption
-    deriving (Eq, Show, Read) --Generic, Flat)
-
 data ReloadStatus = ReloadStatus
     { _iaMax :: Int
     , _iaLoaded :: Int
@@ -54,11 +46,9 @@ newtype ItAmount = ItAmount {_getItAmount :: Int}
 --    deriving stock (Generic)
 --    deriving anyclass (Flat)
 
-makeLenses ''HeldConsumption
 makeLenses ''LeftConsumption
 makeLenses ''ItAmount
 makeLenses ''ReloadStatus
 deriveJSON defaultOptions ''ReloadStatus
-deriveJSON defaultOptions ''HeldConsumption
 deriveJSON defaultOptions ''LeftConsumption
 deriveJSON defaultOptions ''ItAmount

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

@@ -34,25 +34,12 @@ data ProjectileUpdate
     | PJRemoteShellCollisionCheck
     deriving (Show, Eq, Ord, Read) --Generic, Flat)
 
-data AmmoSourceType
-    = BulletSource
-    | ChargeSource
-    | ChemfuelSource
-    | BombSource
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
 data AmmoType
     = ProjectileAmmo
-    | SmallBulletAmmo
+    | BulletAmmo
-    | LargeBulletAmmo
+    | ElectricalAmmo
     | DroneAmmo
     | GasAmmo
-        { _amCreateGas :: GasCreate
-        }
-    | ForceFieldAmmo
-        { _amForceFieldType :: ForceFieldType
-        }
-    | GenericAmmo
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ForceFieldType = DefaultForceField
@@ -69,4 +56,3 @@ deriveJSON defaultOptions ''ProjectileUpdate
 deriveJSON defaultOptions ''GasCreate
 deriveJSON defaultOptions ''ForceFieldType
 deriveJSON defaultOptions ''AmmoType
-deriveJSON defaultOptions ''AmmoSourceType

src/Dodge/Default/Item.hs

@@ -44,7 +44,7 @@ defaultCraftItem = defaultHeldItem & itUse .~ CraftUse 1
 defaultBulletWeapon :: Item
 defaultBulletWeapon =
     defaultWeapon
-        & itUse . heldConsumption .~ defaultBulletLoadable
+        & itUse . heldConsumption .~ [BulletAmmo]
         & itUse . heldUse .~ HeldUseAmmoParams -- useAmmoParams
         & itType . iyModules . at ModBulletCollision ?~ EMPTYMODULE
 --        & itType . iyModules . at ModBulletPayload ?~ EMPTYMODULE

src/Dodge/Default/Item/Use.hs

@@ -34,7 +34,7 @@ defaultHeldUse =
         , _heldMods = HeldModNothing
         , _heldHammer = HammerUp
         , _heldAim = defaultAimParams
-        , _heldConsumption = defaultLoadable
+        , _heldConsumption = []
         , _heldParams = BulletShooterParams
             { _muzVel = 0.8
             , _rifling = 0.8

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

@@ -1,19 +1,9 @@
 module Dodge.Default.Item.Use.Consumption where
 
-import Control.Lens
+--import Control.Lens
 import Dodge.Data.Item.Use.Consumption
-import Dodge.Item.Weapon.Bullet
+--import Dodge.Item.Weapon.Bullet
 --import Dodge.Reloading.Action
 
-defaultLoadable :: HeldConsumption
-defaultLoadable =
-    LoadableAmmo
-        { _laAmmoType = GenericAmmo
-        , _laSourceType = BulletSource
-        }
-
-defaultBulletLoadable :: HeldConsumption
-defaultBulletLoadable = defaultLoadable & laAmmoType .~ basicBulletAmmo
-
 defaultLeftLoadable :: LeftConsumption
 defaultLeftLoadable = AutoRecharging 10 10 100 100

src/Dodge/HeldUse.hs

@@ -459,15 +459,25 @@ overNozzle eff it cr w nz =
     maxa = _nzMaxWalkAngle nz
     wa = min maxa $ max (negate maxa) (_nzCurrentWalkAngle nz + walkamount)
 
+getAmmoMagazine :: Item -> Creature -> Maybe ItemUse
+getAmmoMagazine itm cr = do
+    invid <- itm ^? itLocation . ipInvID
+    amtype <- itm ^? itUse . heldConsumption . ix 0
+    mag <- cr ^? crInv . ix (invid + 1) . itUse
+    magtype <- mag ^? amagType
+    guard $ amtype == magtype
+    return mag
+
 useGasParams :: Nozzle -> Item -> Creature -> World -> World
 useGasParams nz it cr =
     createGas
-        (_amCreateGas (_laAmmoType (_heldConsumption (_itUse it))))
+        (_ampCreateGas (_amagParams amag))
         (_nzPressure nz)
         pos
         dir
         cr
   where
+    amag = fromMaybe (error "cannot find gas ammo") $ getAmmoMagazine it cr
     dir = _crDir cr
     pos = _crPos cr +.+ (_nzLength nz *.* unitVectorAtAngle (_crDir cr))
 

src/Dodge/Item.hs

@@ -33,6 +33,7 @@ itemFromAmmoMag at = case at of
     REVOLVEMAG -> revolveMag
     BELTMAG -> beltMag
     SHELLMAG -> shellMag
+    BATTERY -> battery
 
 itemFromAttachType :: AttachType -> Item
 itemFromAttachType at = case at of

src/Dodge/Item/Ammo.hs

@@ -14,7 +14,7 @@ tinMag =
         & itUse
             .~ AmmoMagUse
                 { _amagParams = BulletParams defaultBullet
-                , _amagType = SmallBulletAmmo
+                , _amagType = BulletAmmo
                 , _amagLoadStatus =
                     ReloadStatus
                         { _iaMax = 15
@@ -57,8 +57,8 @@ shellMag =
                     }
                 , _amagLoadStatus =
                     ReloadStatus
-                        { _iaMax = 15
+                        { _iaMax = 1
-                        , _iaLoaded = 15
+                        , _iaLoaded = 1
                         , _iaPrimed = True
                         , _iaCycle = [loadEject 10, loadInsert 10, loadPrime 10]
                         , _iaProgress = Nothing
@@ -66,19 +66,17 @@ shellMag =
                 , _amagType = ProjectileAmmo
                 }
 
-smallBattery :: Item
+battery :: Item
-smallBattery =
+battery =
-    defaultHeldItem & itType . iyBase .~ AMMOMAG TINMAG
+    defaultHeldItem & itType . iyBase .~ AMMOMAG BATTERY
-        & itType . iyModules . at ModBulletPayload ?~ EMPTYMODULE
-        & itType . iyModules . at ModBulletTrajectory ?~ EMPTYMODULE
         & itUse
             .~ AmmoMagUse
                 { _amagParams = BulletParams defaultBullet
-                , _amagType = SmallBulletAmmo
+                , _amagType = ElectricalAmmo
                 , _amagLoadStatus =
                     ReloadStatus
-                        { _iaMax = 15
+                        { _iaMax = 100
-                        , _iaLoaded = 15
+                        , _iaLoaded = 100
                         , _iaPrimed = True
                         , _iaCycle = [loadEject 10, loadInsert 10, loadPrime 10]
                         , _iaProgress = Nothing

src/Dodge/Item/Equipment.hs

@@ -77,7 +77,8 @@ bulletBeltPack =
         & itUse . equipEffect . eeSite .~ GoesOnBack
         & itType . iyBase .~ EQUIP BULLETBELTPACK
         & itUse . equipEffect . eeAttachPos .~ V3 (-9) 0 10
-        & itUse . equipEffect . eeUse .~ EAmmoSource 2000 2000 BulletSource Nothing
+        & itUse . equipEffect . eeUse .~ EAmmoSource 2000 2000 --BulletSource 
+            Nothing
 
 bulletBeltBracer :: Item
 bulletBeltBracer =
@@ -85,7 +86,8 @@ bulletBeltBracer =
         & itUse . equipEffect . eeSite .~ GoesOnWrist
         & itType . iyBase .~ EQUIP BULLETBELTBRACER
         & itUse . equipEffect . eeAttachPos .~ V3 (-9) 0 10
-        & itUse . equipEffect . eeUse .~ EAmmoSource 100 100 BulletSource Nothing
+        & itUse . equipEffect . eeUse .~ EAmmoSource 100 100 --BulletSource 
+            Nothing
 
 jetPack :: Item
 jetPack =

src/Dodge/Item/Held/BatteryGuns.hs

@@ -36,9 +36,7 @@ teslaGun =
 lasGun :: Item
 lasGun =
     defaultAutoBatteryGun
-        & itUse . heldConsumption
+        & itUse . heldConsumption .~ [ElectricalAmmo]
-            .~ ( defaultLoadable
-               )
         & itParams
             .~ Refracting
                 { _phaseV = 1
@@ -75,9 +73,6 @@ lasGunTweak =
 tractorGun :: Item
 tractorGun =
     lasGun
-        & itUse . heldConsumption
-            .~ ( defaultLoadable
-               )
         & itParams .~ Attracting{_attractionPower = 1}
         & itTweaks
             .~ Tweakable

src/Dodge/Item/Held/Launcher.hs

@@ -32,8 +32,7 @@ launcher =
         -- & itUse . heldAim . aimHandlePos .~ V2 3 0
         -- & itUse . heldAim . aimMuzPos .~ 20
         & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 20 0) 0 0]
-        & itUse . heldConsumption . laAmmoType
+        & itUse . heldConsumption .~ [BulletAmmo]
-            .~ ProjectileAmmo
         & itType . iyBase .~ HELD LAUNCHER
         & itType . iyModules . at ModLauncherHoming ?~ EMPTYMODULE
 

src/Dodge/Item/Held/SprayGuns.hs

@@ -17,10 +17,8 @@ poisonSprayer :: Item
 poisonSprayer =
     flameThrower
         & itType . iyBase .~ HELD POISONSPRAYER
-        & itUse . heldConsumption . laAmmoType
+        & itUse . heldConsumption .~ [GasAmmo]
-            .~ GasAmmo
+        & itUse . heldParams .~ GasSprayParams CreatePoisonGas --aGasCloud
-                { _amCreateGas = CreatePoisonGas --aGasCloud
-                }
         & itUse . heldMods .~ PoisonSprayerMod
 
 flameSpitter :: Item
@@ -91,11 +89,6 @@ flameThrower =
         & itUse . heldAim . aimStance .~ TwoHandUnder
         -- & itUse . heldAim . aimHandlePos .~ 0
         & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 18 0) 0 0]
-        & itUse . heldConsumption
+        & itUse . heldConsumption .~ [GasAmmo]
-            .~ ( defaultLoadable
-                    & laAmmoType
-                        .~ GasAmmo
-                            { _amCreateGas = CreateFlame --aFlame
-                            }
-               )
         & itType . iyBase .~ HELD FLAMETHROWER
+        & itUse . heldParams .~ GasSprayParams CreateFlame --aGasCloud

src/Dodge/Item/Held/Stick.hs

@@ -38,9 +38,7 @@ baseStickSpread = 0.2
 pistol :: Item
 pistol =
     bangStick 1
-        & itUse . heldConsumption
+        & itUse . heldConsumption .~ [BulletAmmo]
-            .~ ( defaultBulletLoadable
-               )
         & itUse . heldDelay . rateMax .~ 6
         & itUse . heldMods .~ PistolMod
         & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 10 0) 0 0.05]

src/Dodge/Item/Held/Utility.hs

@@ -43,7 +43,7 @@ forceFieldGun =
         -- than the list below
         --[ hammerCheckI , ammoCheckI , useAmmoAmount 1]
         & itType . iyBase .~ HELD FORCEFIELDGUN
-        & itUse . heldConsumption .~ (defaultLoadable & laAmmoType .~ ForceFieldAmmo DefaultForceField)
+        & itUse . heldConsumption .~ [ElectricalAmmo]
 
 {- |
 Sends out pulses that display walls.

src/Dodge/Item/Info.hs

@@ -191,7 +191,7 @@ craftInfo fit = case fit of
     MICROPHONE -> "A device that measures air vibration."
     CREATURESENSOR -> "A device for detecting living beings."
     WIRE -> "A small thin object that conducts electricity."
-    BATTERY -> "A store of electical potential energy."
+--    BATTERY -> "A store of electical potential energy."
     FUELCELL -> "A devices that converts chemical energy into electricity."
     PORTABLEFUSION -> "A miniature nuclear reactor."
     GASINJECTOR -> "A device that can inject small quantities of gas into objects."

src/Dodge/Item/Weapon/Bullet.hs

@@ -1,5 +1,4 @@
 module Dodge.Item.Weapon.Bullet (
-    basicBulletAmmo,
     hvBulletAmmo,
     defaultBullet,
 ) where
@@ -8,11 +7,6 @@ import Control.Lens
 import Dodge.Data.Item.Use.Consumption.Ammo
 import Geometry.Data
 
-basicBulletAmmo :: AmmoType
-basicBulletAmmo = SmallBulletAmmo
-
---        , _amBullet = defaultBullet
-
 defaultBullet :: Bullet
 defaultBullet =
     Bullet

src/Dodge/Item/Weapon/Drone.hs

@@ -16,7 +16,7 @@ droneLauncher =
         & itUse . heldAim . aimWeight .~ 8
         & itUse . heldAim . aimRange .~ 0.5
         & itUse . heldAim . aimStance .~ TwoHandOver
-        & itUse . heldConsumption . laAmmoType .~ DroneAmmo
+        & itUse . heldConsumption .~ [DroneAmmo]
         & itType . iyBase .~ HELD DRONELAUNCHER
 
 lasDronesPic :: Item -> SPic

tags

@@ -22,13 +22,13 @@
 <$>	src/Dodge/Data/Terminal.hs	129;"	o
 AIUNIT	src/Dodge/Combine/Data.hs	48;"	C
 AIUNIT	src/Dodge/Data/Item/Combine.hs	54;"	C
-AMMOMAG	src/Dodge/Data/Item/Combine.hs	93;"	C
+AMMOMAG	src/Dodge/Data/Item/Combine.hs	92;"	C
 AMR	src/Dodge/Combine/Data.hs	157;"	C
 AMR	src/Dodge/Data/Item/Combine.hs	177;"	C
 ANTIMATTER	src/Dodge/Combine/Data.hs	44;"	C
 ANTIMATTER	src/Dodge/Data/Item/Combine.hs	48;"	C
 AQUAMARINE	src/Color/Data.hs	24;"	C
-ATTACH	src/Dodge/Data/Item/Combine.hs	92;"	C
+ATTACH	src/Dodge/Data/Item/Combine.hs	91;"	C
 ATTACHTORCH	src/Dodge/Combine/Data.hs	219;"	C
 ATTACHTORCH	src/Dodge/Data/Item/Combine.hs	218;"	C
 AUTOAMR	src/Dodge/Combine/Data.hs	158;"	C
@@ -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	108;"	t
+AimParams	src/Dodge/Data/Item/Use.hs	111;"	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	126;"	t
+AimStance	src/Dodge/Data/Item/Use.hs	129;"	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
@@ -74,15 +74,14 @@ Ammo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	6;"	m
 Ammo	src/Dodge/Item/Ammo.hs	1;"	m
 AmmoCheckMod	src/Dodge/Data/Item/HeldUse.hs	82;"	C
 AmmoHammerTimeUseOneMod	src/Dodge/Data/Item/HeldUse.hs	84;"	C
-AmmoMagType	src/Dodge/Data/Item/Combine.hs	109;"	t
+AmmoMagType	src/Dodge/Data/Item/Combine.hs	108;"	t
 AmmoMagUse	src/Dodge/Data/Item/Use.hs	58;"	C
-AmmoParams	src/Dodge/Data/Item/Use.hs	79;"	t
+AmmoParams	src/Dodge/Data/Item/Use.hs	81;"	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
-AmmoSourceType	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	37;"	t
 AmmoType	src/Dodge/Data/Ammo.hs	30;"	t
-AmmoType	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	44;"	t
+AmmoType	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	37;"	t
 AmmoUseCheckMod	src/Dodge/Data/Item/HeldUse.hs	83;"	C
 Amount	src/Dodge/Item/Amount.hs	1;"	m
 AnRoom	src/Dodge/Annotation/Data.hs	17;"	C
@@ -126,10 +125,10 @@ 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	75;"	t
+AttachParams	src/Dodge/Data/Item/Use.hs	77;"	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	98;"	t
+AttachType	src/Dodge/Data/Item/Combine.hs	97;"	t
 AttachUse	src/Dodge/Data/Item/Use.hs	56;"	C
 Attachment	src/Dodge/Data/Item/Attachment.hs	4;"	m
 Attachment	src/Dodge/Item/Attachment.hs	1;"	m
@@ -150,7 +149,7 @@ AutoDoorObstacle	src/Dodge/Data/PathGraph.hs	51;"	C
 AutoGun	src/Dodge/Item/Weapon/AutoGun.hs	1;"	m
 AutoPistolMod	src/Dodge/Data/Item/HeldUse.hs	96;"	C
 AutoRecharging	src/Dodge/Data/Item/Consumption.hs	23;"	C
-AutoRecharging	src/Dodge/Data/Item/Use/Consumption.hs	38;"	C
+AutoRecharging	src/Dodge/Data/Item/Use/Consumption.hs	30;"	C
 AutoRifleMod	src/Dodge/Data/Item/HeldUse.hs	88;"	C
 AuxAddition	src/Shader/AuxAddition.hs	1;"	m
 AwakeLevel	src/Dodge/Creature/AlertLevel/Data.hs	14;"	t
@@ -166,10 +165,10 @@ BANGROD	src/Dodge/Data/Item/Combine.hs	175;"	C
 BANGSTICK	src/Dodge/Combine/Data.hs	134;"	C
 BANGSTICK	src/Dodge/Data/Item/Combine.hs	160;"	C
 BATTERY	src/Dodge/Combine/Data.hs	59;"	C
-BATTERY	src/Dodge/Data/Item/Combine.hs	67;"	C
+BATTERY	src/Dodge/Data/Item/Combine.hs	114;"	C
 BATTERYPACK	src/Dodge/Data/Item/Combine.hs	142;"	C
 BELTMAG	src/Dodge/Combine/Data.hs	200;"	C
-BELTMAG	src/Dodge/Data/Item/Combine.hs	113;"	C
+BELTMAG	src/Dodge/Data/Item/Combine.hs	112;"	C
 BEZIERTRAJ	src/Dodge/Combine/Data.hs	212;"	C
 BLACK	src/Color/Data.hs	28;"	C
 BLINKER	src/Dodge/Combine/Data.hs	125;"	C
@@ -191,7 +190,7 @@ BQuad	src/Geometry/Bezier.hs	9;"	t
 BRAINHAT	src/Dodge/Combine/Data.hs	109;"	C
 BRAINHAT	src/Dodge/Data/Item/Combine.hs	131;"	C
 BULBODY	src/Dodge/Data/Item/Combine.hs	210;"	C
-BULBODYCRAFT	src/Dodge/Data/Item/Combine.hs	76;"	C
+BULBODYCRAFT	src/Dodge/Data/Item/Combine.hs	75;"	C
 BULLETBELTBRACER	src/Dodge/Data/Item/Combine.hs	141;"	C
 BULLETBELTPACK	src/Dodge/Data/Item/Combine.hs	140;"	C
 BULPAY	src/Dodge/Data/Item/Combine.hs	209;"	C
@@ -265,7 +264,6 @@ BlockedLink	src/Dodge/Data/Room.hs	48;"	C
 BloomLayer	src/Picture/Data.hs	25;"	C
 BloomNoZWrite	src/Picture/Data.hs	26;"	C
 Boid	src/Dodge/Creature/Boid.hs	1;"	m
-BombSource	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	41;"	C
 BoostPropIX	src/Dodge/Data/Item/Params.hs	61;"	C
 Booster	src/Dodge/Item/Equipment/Booster.hs	1;"	m
 Booster	src/Dodge/Item/Weapon/Booster.hs	1;"	m
@@ -302,14 +300,14 @@ Bullet	src/Dodge/Bullet.hs	1;"	m
 Bullet	src/Dodge/Data/Bullet.hs	6;"	m
 Bullet	src/Dodge/Item/Weapon/Bullet.hs	1;"	m
 BulletAmmo	src/Dodge/Data/Ammo.hs	37;"	C
+BulletAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	39;"	C
 BulletBeltAttachment	src/Dodge/Data/Item.hs	52;"	C
 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	79;"	C
+BulletParams	src/Dodge/Data/Item/Use.hs	81;"	C
-BulletShooterParams	src/Dodge/Data/Item/Use.hs	67;"	C
+BulletShooterParams	src/Dodge/Data/Item/Use.hs	69;"	C
-BulletSource	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	38;"	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
@@ -340,9 +338,9 @@ CONCUSBUL	src/Dodge/Combine/Data.hs	206;"	C
 CONCUSSIVE	src/Dodge/Data/Damage/Type.hs	22;"	C
 CONCUSSIVE	src/Dodge/Data/DamageType.hs	21;"	C
 CONCUSSMODULE	src/Dodge/Combine/Data.hs	66;"	C
-CONSUMABLE	src/Dodge/Data/Item/Combine.hs	90;"	C
+CONSUMABLE	src/Dodge/Data/Item/Combine.hs	89;"	C
 CRAFT	src/Dodge/Combine/Data.hs	97;"	C
-CRAFT	src/Dodge/Data/Item/Combine.hs	91;"	C
+CRAFT	src/Dodge/Data/Item/Combine.hs	90;"	C
 CREATUREDETECTOR	src/Dodge/Combine/Data.hs	226;"	C
 CREATUREDETECTOR	src/Dodge/Data/Item/Combine.hs	223;"	C
 CREATURESENSOR	src/Dodge/Combine/Data.hs	57;"	C
@@ -383,12 +381,11 @@ 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	95;"	C
+CharScrollParams	src/Dodge/Data/Item/Use.hs	98;"	C
 ChargeIfEquipped	src/Dodge/Data/Item/Effect.hs	22;"	C
 ChargeIfInInventory	src/Dodge/Data/Item/Effect.hs	23;"	C
-ChargeSource	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	39;"	C
 ChargeableAmmo	src/Dodge/Data/Item/Consumption.hs	29;"	C
-ChargeableAmmo	src/Dodge/Data/Item/Use/Consumption.hs	44;"	C
+ChargeableAmmo	src/Dodge/Data/Item/Use/Consumption.hs	36;"	C
 ChaseAI	src/Dodge/Data/Creature/Misc.hs	50;"	C
 ChaseCrit	src/Dodge/Creature/ChaseCrit.hs	1;"	m
 ChaseCritters	src/Dodge/Creature/State/Data.hs	33;"	C
@@ -396,7 +393,6 @@ ChaseCritters	src/Dodge/Data/Creature/State.hs	38;"	C
 Check	src/Framebuffer/Check.hs	1;"	m
 CheckConsistency	src/Dodge/Room/CheckConsistency.hs	1;"	m
 CheckSlots	src/Dodge/Inventory/CheckSlots.hs	1;"	m
-ChemfuelSource	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	40;"	C
 ChooseMovementLtAuto	src/Dodge/Data/CreatureEffect.hs	63;"	C
 ChooseMovementSpreadGun	src/Dodge/Data/CreatureEffect.hs	62;"	C
 ChooseTarget	src/Dodge/Creature/ChooseTarget.hs	1;"	m
@@ -469,7 +465,7 @@ Consumable	src/Dodge/Item/Consumable.hs	1;"	m
 ConsumableFamily	src/Dodge/Item/Family.hs	7;"	C
 ConsumableItemType	src/Dodge/Data/Item/Combine.hs	118;"	t
 ConsumeUse	src/Dodge/Data/Item/Use.hs	46;"	C
-ConsumeUse'	src/Dodge/Data/Item/Use.hs	106;"	t
+ConsumeUse'	src/Dodge/Data/Item/Use.hs	109;"	t
 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
@@ -541,11 +537,11 @@ Create	src/Dodge/Projectile/Create.hs	1;"	m
 Create	src/Dodge/Prop/Create.hs	1;"	m
 Create	src/Dodge/Wall/Create.hs	1;"	m
 CreateFlame	src/Dodge/Data/Gas.hs	6;"	C
-CreateFlame	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	61;"	C
+CreateFlame	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	48;"	C
 CreateHeldLight	src/Dodge/Data/ItEffect.hs	41;"	C
 CreateHeldLight	src/Dodge/Data/Item/Effect.hs	26;"	C
 CreatePoisonGas	src/Dodge/Data/Gas.hs	6;"	C
-CreatePoisonGas	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	61;"	C
+CreatePoisonGas	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	48;"	C
 CreateShell	src/Dodge/Data/Ammo.hs	17;"	C
 CreateShell	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	21;"	C
 CreateShieldWall	src/Dodge/Data/ItEffect.hs	42;"	C
@@ -586,7 +582,7 @@ DRONELAUNCHER	src/Dodge/Combine/Data.hs	184;"	C
 DRONELAUNCHER	src/Dodge/Data/Item/Combine.hs	197;"	C
 DRUM	src/Dodge/Combine/Data.hs	34;"	C
 DRUMMAG	src/Dodge/Combine/Data.hs	199;"	C
-DRUMMAG	src/Dodge/Data/Item/Combine.hs	112;"	C
+DRUMMAG	src/Dodge/Data/Item/Combine.hs	111;"	C
 DS	src/DoubleStack.hs	3;"	t
 DUALBEAM	src/Dodge/Combine/Data.hs	171;"	C
 DUALBEAM	src/Dodge/Data/Item/Combine.hs	190;"	C
@@ -667,7 +663,7 @@ 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
-DefaultForceField	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	58;"	C
+DefaultForceField	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	45;"	C
 DefaultHeldParams	src/Dodge/Data/Item/Use.hs	66;"	C
 DefaultLightSourceDraw	src/Dodge/Data/LightSource.hs	13;"	C
 DefaultRoomType	src/Dodge/Data/Room.hs	31;"	C
@@ -771,7 +767,7 @@ DrawShell	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	18;"	C
 DrawnWall	src/Dodge/Data/Wall.hs	41;"	C
 Drone	src/Dodge/Item/Weapon/Drone.hs	1;"	m
 DroneAmmo	src/Dodge/Data/Ammo.hs	41;"	C
-DroneAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	48;"	C
+DroneAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	41;"	C
 DropAll	src/Dodge/Creature/State/Data.hs	15;"	C
 DropAll	src/Dodge/Data/Creature/State.hs	24;"	C
 DropAmount	src/Dodge/Creature/State/Data.hs	16;"	C
@@ -800,11 +796,11 @@ ELEPHANTGUN	src/Dodge/Data/Item/Combine.hs	176;"	C
 EMPTYMODULE	src/Dodge/Combine/Data.hs	198;"	C
 EMPTYMODULE	src/Dodge/Data/Item/Combine.hs	207;"	C
 EMagShield	src/Dodge/Data/Item/HeldUse.hs	41;"	C
-ENERGYBALLCRAFT	src/Dodge/Data/Item/Combine.hs	75;"	C
+ENERGYBALLCRAFT	src/Dodge/Data/Item/Combine.hs	74;"	C
 ENTERREMENT	src/Dodge/Data/Damage/Type.hs	24;"	C
 ENTERREMENT	src/Dodge/Data/DamageType.hs	25;"	C
 EQUIP	src/Dodge/Combine/Data.hs	88;"	C
-EQUIP	src/Dodge/Data/Item/Combine.hs	89;"	C
+EQUIP	src/Dodge/Data/Item/Combine.hs	88;"	C
 EWristShield	src/Dodge/Data/Item/HeldUse.hs	42;"	C
 EXPLOSIVE	src/Dodge/Data/Damage/Type.hs	21;"	C
 EXPLOSIVE	src/Dodge/Data/DamageType.hs	20;"	C
@@ -822,6 +818,7 @@ EffectWhileHeld	src/Dodge/Data/Item/Effect.hs	29;"	C
 EighthRes	src/Dodge/Data/Config.hs	95;"	C
 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	40;"	C
 Electronics	src/Dodge/Data/Material.hs	11;"	C
 ElephantGunMod	src/Dodge/Data/Item/HeldUse.hs	90;"	C
 EllShad	src/Picture/Data.hs	41;"	C
@@ -850,7 +847,7 @@ 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	50;"	C
-EquipUse'	src/Dodge/Data/Item/Use.hs	105;"	t
+EquipUse'	src/Dodge/Data/Item/Use.hs	108;"	t
 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
@@ -881,7 +878,7 @@ Eyes	src/Dodge/Data/Creature/Perception.hs	41;"	C
 FBO	src/Shader/Data.hs	57;"	t
 FBranch	src/TreeExtra.hs	8;"	C
 FBranches	src/TreeExtra.hs	9;"	C
-FLAKCRAFT	src/Dodge/Data/Item/Combine.hs	73;"	C
+FLAKCRAFT	src/Dodge/Data/Item/Combine.hs	72;"	C
 FLAMESHIELD	src/Dodge/Combine/Data.hs	105;"	C
 FLAMESHIELD	src/Dodge/Data/Item/Combine.hs	127;"	C
 FLAMESPITTER	src/Dodge/Combine/Data.hs	161;"	C
@@ -895,21 +892,21 @@ FLAMEWALL	src/Dodge/Data/Item/Combine.hs	184;"	C
 FLAMING	src/Dodge/Data/Damage/Type.hs	18;"	C
 FLAMING	src/Dodge/Data/DamageType.hs	17;"	C
 FLASHMODULE	src/Dodge/Combine/Data.hs	68;"	C
-FLASHMODULE	src/Dodge/Data/Item/Combine.hs	71;"	C
+FLASHMODULE	src/Dodge/Data/Item/Combine.hs	70;"	C
 FLATSHIELD	src/Dodge/Combine/Data.hs	192;"	C
 FLATSHIELD	src/Dodge/Data/Item/Combine.hs	202;"	C
 FLECHETRAJ	src/Dodge/Combine/Data.hs	211;"	C
 FLeaf	src/TreeExtra.hs	10;"	C
 FORCEFIELDGUN	src/Dodge/Combine/Data.hs	188;"	C
 FORCEFIELDGUN	src/Dodge/Data/Item/Combine.hs	199;"	C
-FRAGCRAFT	src/Dodge/Data/Item/Combine.hs	74;"	C
+FRAGCRAFT	src/Dodge/Data/Item/Combine.hs	73;"	C
 FRAGMODULE	src/Dodge/Combine/Data.hs	67;"	C
-FRAGMODULE	src/Dodge/Data/Item/Combine.hs	70;"	C
+FRAGMODULE	src/Dodge/Data/Item/Combine.hs	69;"	C
 FRONTARMOUR	src/Dodge/Combine/Data.hs	106;"	C
 FRONTARMOUR	src/Dodge/Data/Item/Combine.hs	128;"	C
 FTree	src/TreeExtra.hs	7;"	t
 FUELCELL	src/Dodge/Combine/Data.hs	60;"	C
-FUELCELL	src/Dodge/Data/Item/Combine.hs	68;"	C
+FUELCELL	src/Dodge/Data/Item/Combine.hs	67;"	C
 FUELPACK	src/Dodge/Data/Item/Combine.hs	139;"	C
 FacilityType	src/Dodge/Data/Scenario.hs	55;"	t
 Faction	src/Dodge/Creature/State/Data.hs	29;"	t
@@ -985,8 +982,7 @@ FootstepSound	src/Dodge/Data/SoundOrigin.hs	28;"	C
 ForceField	src/Dodge/ForceField.hs	1;"	m
 ForceField	src/Dodge/Wall/ForceField.hs	1;"	m
 ForceFieldAmmo	src/Dodge/Data/Ammo.hs	47;"	C
-ForceFieldAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	52;"	C
+ForceFieldType	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	45;"	t
-ForceFieldType	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	58;"	t
 Foreground	src/Dodge/Default/Foreground.hs	1;"	m
 Foreground	src/Dodge/Room/Foreground.hs	1;"	m
 ForegroundShape	src/Dodge/Data/ForegroundShape.hs	14;"	t
@@ -1000,14 +996,14 @@ FullShadowFidelity	src/Shape/Data.hs	24;"	C
 FullSize	src/Dodge/Data/Item/Params.hs	64;"	C
 FullyVisible	src/Dodge/Data/CamouflageStatus.hs	12;"	C
 Furniture	src/Dodge/Room/Furniture.hs	1;"	m
-GASINJECTOR	src/Dodge/Data/Item/Combine.hs	72;"	C
+GASINJECTOR	src/Dodge/Data/Item/Combine.hs	71;"	C
 GEqC	src/SameConstr.hs	20;"	c
 GLASSSHARD	src/Dodge/Data/Item/Combine.hs	40;"	C
 GLHelp	src/GLHelp.hs	1;"	m
 GRAPECANNON	src/Dodge/Combine/Data.hs	143;"	C
 GRAPECANNON	src/Dodge/Data/Item/Combine.hs	167;"	C
 GRAVITYMODULE	src/Dodge/Combine/Data.hs	75;"	C
-GRAVITYMODULE	src/Dodge/Data/Item/Combine.hs	80;"	C
+GRAVITYMODULE	src/Dodge/Data/Item/Combine.hs	79;"	C
 GREEN	src/Color/Data.hs	16;"	C
 GameOver	src/Dodge/World/Trigger/Data.hs	11;"	C
 GameOverOptions	src/Dodge/Data/Universe.hs	68;"	C
@@ -1016,10 +1012,12 @@ GameRoom	src/Dodge/GameRoom.hs	8;"	m
 Gas	src/Dodge/Data/Gas.hs	3;"	m
 Gas	src/Dodge/Gas.hs	1;"	m
 GasAmmo	src/Dodge/Data/Ammo.hs	43;"	C
-GasAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	49;"	C
+GasAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	42;"	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	61;"	t
+GasCreate	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	48;"	t
+GasParams	src/Dodge/Data/Item/Use.hs	87;"	C
+GasSprayParams	src/Dodge/Data/Item/Use.hs	67;"	C
 GenCr	src/Dodge/Creature/State/Data.hs	24;"	C
 GenCr	src/Dodge/Data/Creature/State.hs	31;"	C
 GenParams	src/Dodge/Data/GenParams.hs	15;"	t
@@ -1030,7 +1028,6 @@ Generate	src/Dodge/Layout/Generate.hs	4;"	m
 GenerateStructure	src/Dodge/Layout/Tree/GenerateStructure.hs	6;"	m
 GenerateStructure	src/Dodge/Tree/GenerateStructure.hs	6;"	m
 GenericAmmo	src/Dodge/Data/Ammo.hs	50;"	C
-GenericAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	55;"	C
 GenericFaction	src/Dodge/Creature/State/Data.hs	30;"	C
 GenericFaction	src/Dodge/Data/Creature/State.hs	35;"	C
 GeoObjShads	src/Dodge/Data/Config.hs	99;"	C
@@ -1079,7 +1076,7 @@ HEADLAMP1	src/Dodge/Combine/Data.hs	112;"	C
 HEATSENSOR	src/Dodge/Combine/Data.hs	56;"	C
 HEATSENSOR	src/Dodge/Data/Item/Combine.hs	62;"	C
 HELD	src/Dodge/Combine/Data.hs	86;"	C
-HELD	src/Dodge/Data/Item/Combine.hs	87;"	C
+HELD	src/Dodge/Data/Item/Combine.hs	86;"	C
 HELDDETECTOR	src/Dodge/Combine/Data.hs	190;"	C
 HELDDETECTOR	src/Dodge/Data/Item/Combine.hs	200;"	C
 HOSE	src/Dodge/Data/Item/Combine.hs	34;"	C
@@ -1105,7 +1102,6 @@ Held	src/Dodge/Default/Item/Held.hs	1;"	m
 Held	src/Dodge/Item/Held.hs	1;"	m
 HeldCircleLaser	src/Dodge/Data/Item/HeldUse.hs	26;"	C
 HeldConsumption	src/Dodge/Data/Item/Consumption.hs	14;"	t
-HeldConsumption	src/Dodge/Data/Item/Use/Consumption.hs	20;"	t
 HeldDelay	src/Dodge/Data/Item/HeldDelay.hs	6;"	m
 HeldDetectorEffect	src/Dodge/Data/Item/HeldUse.hs	23;"	C
 HeldDoNothing	src/Dodge/Data/Item/HeldUse.hs	16;"	C
@@ -1136,7 +1132,7 @@ HeldTractor	src/Dodge/Data/Item/HeldUse.hs	28;"	C
 HeldUse	src/Dodge/Data/Item/Use.hs	29;"	C
 HeldUse	src/Dodge/Data/Item/HeldUse.hs	6;"	m
 HeldUse	src/Dodge/HeldUse.hs	1;"	m
-HeldUse'	src/Dodge/Data/Item/Use.hs	104;"	t
+HeldUse'	src/Dodge/Data/Item/Use.hs	107;"	t
 HeldUseAmmoParams	src/Dodge/Data/Item/HeldUse.hs	17;"	C
 HelpNum	src/HelpNum.hs	1;"	m
 HelperParticle	src/Dodge/WorldEvent/HelperParticle.hs	2;"	m
@@ -1260,7 +1256,7 @@ IsClose	src/Dodge/Data/Machine/Sensor.hs	39;"	C
 IsClose	src/Dodge/Data/Sensor.hs	33;"	C
 IsolationUnitSS	src/Dodge/Data/Scenario.hs	101;"	C
 ItAmount	src/Dodge/Data/Item/Use/Amount.hs	9;"	t
-ItAmount	src/Dodge/Data/Item/Use/Consumption.hs	50;"	t
+ItAmount	src/Dodge/Data/Item/Use/Consumption.hs	42;"	t
 ItAttachment	src/Dodge/Data/Item/Attachment.hs	11;"	t
 ItAttachment	src/Dodge/Item/Attachment/Data.hs	11;"	t
 ItCrWdId	src/Dodge/Data/WorldEffect.hs	17;"	C
@@ -1281,7 +1277,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	135;"	t
+ItZoom	src/Dodge/Data/Item/Use.hs	138;"	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
@@ -1291,14 +1287,14 @@ ItemAmount	src/Dodge/Data/Item/Use/Amount.hs	4;"	m
 ItemAmount	src/Dodge/Data/ItemAmount.hs	4;"	m
 ItemAttachment	src/Dodge/Data/Item.hs	50;"	t
 ItemBaseType	src/Dodge/Combine/Data.hs	81;"	t
-ItemBaseType	src/Dodge/Data/Item/Combine.hs	86;"	t
+ItemBaseType	src/Dodge/Data/Item/Combine.hs	85;"	t
 ItemClust	src/Dodge/Combine/Graph.hs	18;"	C
-ItemConsume	src/Dodge/Data/Item/Use.hs	101;"	C
+ItemConsume	src/Dodge/Data/Item/Use.hs	104;"	C
-ItemCraft	src/Dodge/Data/Item/Use.hs	102;"	C
+ItemCraft	src/Dodge/Data/Item/Use.hs	105;"	C
 ItemDimension	src/Dodge/Data/Item/Misc.hs	13;"	t
-ItemEquip	src/Dodge/Data/Item/Use.hs	100;"	C
+ItemEquip	src/Dodge/Data/Item/Use.hs	103;"	C
 ItemFamily	src/Dodge/Item/Family.hs	3;"	t
-ItemHeld	src/Dodge/Data/Item/Use.hs	99;"	C
+ItemHeld	src/Dodge/Data/Item/Use.hs	102;"	C
 ItemLocation	src/Dodge/Data/Item/Location.hs	11;"	t
 ItemModuleType	src/Dodge/Combine/Data.hs	197;"	t
 ItemModuleType	src/Dodge/Data/Item/Combine.hs	206;"	t
@@ -1311,7 +1307,7 @@ 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	28;"	t
-ItemUse'	src/Dodge/Data/Item/Use.hs	98;"	t
+ItemUse'	src/Dodge/Data/Item/Use.hs	101;"	t
 JETPACK	src/Dodge/Combine/Data.hs	116;"	C
 JETPACK	src/Dodge/Data/Item/Combine.hs	138;"	C
 JGK	src/Control/Foldl/JGK.hs	1;"	m
@@ -1349,7 +1345,7 @@ LDoNothing	src/Dodge/Data/Item/HeldUse.hs	58;"	C
 LED	src/Dodge/Combine/Data.hs	51;"	C
 LED	src/Dodge/Data/Item/Combine.hs	57;"	C
 LEFT	src/Dodge/Combine/Data.hs	87;"	C
-LEFT	src/Dodge/Data/Item/Combine.hs	88;"	C
+LEFT	src/Dodge/Data/Item/Combine.hs	87;"	C
 LHS	src/Geometry/LHS.hs	1;"	m
 LIGHTER	src/Dodge/Combine/Data.hs	42;"	C
 LIGHTER	src/Dodge/Data/Item/Combine.hs	46;"	C
@@ -1380,7 +1376,6 @@ Lamp	src/Dodge/LightSources/Lamp.hs	1;"	m
 Lampoid	src/Dodge/Data/Creature/Misc.hs	72;"	C
 Lampoid	src/Dodge/Lampoid.hs	1;"	m
 Large	src/Shape/Data.hs	29;"	C
-LargeBulletAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	47;"	C
 LasBeamCombine	src/Dodge/Data/Beam.hs	40;"	C
 LasMod	src/Dodge/Data/Item/HeldUse.hs	79;"	C
 LasSound	src/Dodge/Data/SoundOrigin.hs	27;"	C
@@ -1408,7 +1403,7 @@ Left	src/Dodge/Default/Item/Left.hs	1;"	m
 Left	src/Dodge/Item/Left.hs	1;"	m
 LeftButton	src/Dodge/Terminal/LeftButton.hs	1;"	m
 LeftClickFamily	src/Dodge/Item/Family.hs	6;"	C
-LeftConsumption	src/Dodge/Data/Item/Use/Consumption.hs	37;"	t
+LeftConsumption	src/Dodge/Data/Item/Use/Consumption.hs	29;"	t
 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
@@ -1467,7 +1462,6 @@ LoadPrime	src/Dodge/Data/LoadAction.hs	14;"	C
 LoadSeed	src/Dodge/LoadSeed.hs	1;"	m
 LoadSound	src/Dodge/SoundLogic/LoadSound.hs	1;"	m
 LoadableAmmo	src/Dodge/Data/Item/Consumption.hs	15;"	C
-LoadableAmmo	src/Dodge/Data/Item/Use/Consumption.hs	21;"	C
 Loading	src/Dodge/Menu/Loading.hs	1;"	m
 LoadingBaySS	src/Dodge/Data/Scenario.hs	93;"	C
 LoadingScreen	src/Dodge/Data/Universe.hs	69;"	C
@@ -1663,7 +1657,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	119;"	t
+Muzzle	src/Dodge/Data/Item/Use.hs	122;"	t
 MvForward	src/Dodge/Data/ActionPlan.hs	35;"	C
 MvPt	src/Dodge/MvPt.hs	1;"	m
 MvTurnToward	src/Dodge/Data/ActionPlan.hs	34;"	C
@@ -1690,7 +1684,6 @@ NoArguments	src/Dodge/Data/Terminal.hs	93;"	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
-NoConsumption	src/Dodge/Data/Item/Use/Consumption.hs	25;"	C
 NoCrImp	src/Dodge/Data/CreatureEffect.hs	24;"	C
 NoCrWdImp	src/Dodge/Data/CreatureEffect.hs	14;"	C
 NoCreatureEffect	src/Dodge/Data/CreatureEffect.hs	11;"	C
@@ -1827,7 +1820,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	130;"	C
+OneHand	src/Dodge/Data/Item/Use.hs	133;"	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
@@ -1887,7 +1880,7 @@ POISONDAM	src/Dodge/Data/DamageType.hs	24;"	C
 POISONSPRAYER	src/Dodge/Combine/Data.hs	183;"	C
 POISONSPRAYER	src/Dodge/Data/Item/Combine.hs	196;"	C
 PORTABLEFUSION	src/Dodge/Combine/Data.hs	61;"	C
-PORTABLEFUSION	src/Dodge/Data/Item/Combine.hs	69;"	C
+PORTABLEFUSION	src/Dodge/Data/Item/Combine.hs	68;"	C
 POWERLEGS	src/Dodge/Combine/Data.hs	113;"	C
 POWERLEGS	src/Dodge/Data/Item/Combine.hs	135;"	C
 PPLevelReset	src/Dodge/Data/PressPlate.hs	16;"	C
@@ -2011,12 +2004,12 @@ Proj	src/Dodge/Data/Projectile.hs	14;"	t
 Projectile	src/Dodge/Data/Projectile.hs	6;"	m
 Projectile	src/Dodge/Projectile.hs	1;"	m
 ProjectileAmmo	src/Dodge/Data/Ammo.hs	31;"	C
-ProjectileAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	45;"	C
+ProjectileAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	38;"	C
 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	80;"	C
+ProjectileParams	src/Dodge/Data/Item/Use.hs	82;"	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
@@ -2096,7 +2089,7 @@ REMOTELAUNCHER	src/Dodge/Combine/Data.hs	182;"	C
 REMOTELAUNCHER	src/Dodge/Data/Item/Combine.hs	195;"	C
 REPEATER	src/Dodge/Combine/Data.hs	150;"	C
 REPEATER	src/Dodge/Data/Item/Combine.hs	172;"	C
-REVOLVEMAG	src/Dodge/Data/Item/Combine.hs	110;"	C
+REVOLVEMAG	src/Dodge/Data/Item/Combine.hs	109;"	C
 REVOLVER	src/Dodge/Combine/Data.hs	136;"	C
 REVOLVERX	src/Dodge/Combine/Data.hs	137;"	C
 REWINDER	src/Dodge/Combine/Data.hs	124;"	C
@@ -2144,7 +2137,7 @@ Religion	src/Dodge/Data/Scenario.hs	47;"	C
 Reload	src/Dodge/Data/ActionPlan.hs	190;"	C
 ReloadAction	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	45;"	C
 ReloadAction	src/Dodge/Data/LoadAction.hs	26;"	C
-ReloadStatus	src/Dodge/Data/Item/Use/Consumption.hs	28;"	t
+ReloadStatus	src/Dodge/Data/Item/Use/Consumption.hs	20;"	t
 Reloading	src/Dodge/Reloading.hs	1;"	m
 Remote	src/Dodge/Item/Weapon/Remote.hs	1;"	m
 RemoteScope	src/Dodge/Data/Item/Attachment.hs	23;"	C
@@ -2222,18 +2215,18 @@ RoundedFaces	src/Shape/Data.hs	18;"	C
 RunPast	src/Dodge/Room/RunPast.hs	1;"	m
 RunningSideEffect	src/Dodge/Data/Universe.hs	65;"	C
 SCRAPMETAL	src/Dodge/Data/Item/Combine.hs	41;"	C
-SCROLLATTACH	src/Dodge/Data/Item/Combine.hs	99;"	C
+SCROLLATTACH	src/Dodge/Data/Item/Combine.hs	98;"	C
 SCROLLWATCH	src/Dodge/Data/Item/Combine.hs	152;"	C
 SHARDGLASS	src/Dodge/Combine/Data.hs	36;"	C
 SHATTERGUN	src/Dodge/Combine/Data.hs	186;"	C
 SHATTERGUN	src/Dodge/Data/Item/Combine.hs	198;"	C
 SHATTERING	src/Dodge/Data/Damage/Type.hs	17;"	C
 SHATTERING	src/Dodge/Data/DamageType.hs	16;"	C
-SHELLMAG	src/Dodge/Data/Item/Combine.hs	114;"	C
+SHELLMAG	src/Dodge/Data/Item/Combine.hs	113;"	C
 SHRINKER	src/Dodge/Combine/Data.hs	127;"	C
 SHRINKER	src/Dodge/Data/Item/Combine.hs	155;"	C
 SIZEMODULE	src/Dodge/Combine/Data.hs	74;"	C
-SIZEMODULE	src/Dodge/Data/Item/Combine.hs	79;"	C
+SIZEMODULE	src/Dodge/Data/Item/Combine.hs	78;"	C
 SMG	src/Dodge/Combine/Data.hs	140;"	C
 SMG	src/Dodge/Data/Item/Combine.hs	164;"	C
 SNIPERRIFLE	src/Dodge/Combine/Data.hs	159;"	C
@@ -2283,9 +2276,9 @@ 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	86;"	t
+ScrollAttachParams	src/Dodge/Data/Item/Use.hs	89;"	t
-ScrollAttachParams	src/Dodge/Data/Item/Use.hs	76;"	C
+ScrollAttachParams	src/Dodge/Data/Item/Use.hs	78;"	C
-ScrollAttachType	src/Dodge/Data/Item/Combine.hs	105;"	t
+ScrollAttachType	src/Dodge/Data/Item/Combine.hs	104;"	t
 ScrollValue	src/Dodge/ScrollValue.hs	1;"	m
 SecretCabal	src/Dodge/Data/Scenario.hs	44;"	C
 SectionCursor	src/Dodge/Data/SelectionList.hs	49;"	t
@@ -2405,7 +2398,6 @@ SkiffBaySS	src/Dodge/Data/Scenario.hs	108;"	C
 SleepingQuatersSS	src/Dodge/Data/Scenario.hs	90;"	C
 SlotsTaken	src/Dodge/Item/SlotsTaken.hs	1;"	m
 Small	src/Shape/Data.hs	31;"	C
-SmallBulletAmmo	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	46;"	C
 SmgMod	src/Dodge/Data/Item/HeldUse.hs	101;"	C
 SmokeCloud	src/Dodge/Data/Cloud.hs	30;"	C
 SmoothScroll	src/Dodge/SmoothScroll.hs	1;"	m
@@ -2502,24 +2494,24 @@ Synonyms	src/Dodge/SoundLogic/Synonyms.hs	1;"	m
 TAPE	src/Dodge/Data/Item/Combine.hs	35;"	C
 TARGCR	src/Dodge/Combine/Data.hs	207;"	C
 TARGET	src/Dodge/Data/Item/Combine.hs	212;"	C
-TARGETATTACH	src/Dodge/Data/Item/Combine.hs	100;"	C
+TARGETATTACH	src/Dodge/Data/Item/Combine.hs	99;"	C
 TARGETINGHAT	src/Dodge/Data/Item/Combine.hs	133;"	C
 TARGETLASER	src/Dodge/Data/Item/Targeting.hs	12;"	C
-TARGETMODULE	src/Dodge/Data/Item/Combine.hs	81;"	C
+TARGETMODULE	src/Dodge/Data/Item/Combine.hs	80;"	C
 TARGLAS	src/Dodge/Combine/Data.hs	208;"	C
 TARGPOS	src/Dodge/Combine/Data.hs	209;"	C
 TELEPORTMODULE	src/Dodge/Combine/Data.hs	72;"	C
-TELEPORTMODULE	src/Dodge/Data/Item/Combine.hs	77;"	C
+TELEPORTMODULE	src/Dodge/Data/Item/Combine.hs	76;"	C
 TESLAGUN	src/Dodge/Combine/Data.hs	167;"	C
 TESLAGUN	src/Dodge/Data/Item/Combine.hs	187;"	C
 THERMOMETER	src/Dodge/Combine/Data.hs	41;"	C
 THERMOMETER	src/Dodge/Data/Item/Combine.hs	64;"	C
 THREELINES	src/Dodge/Data/GenParams.hs	20;"	C
 TIMEMODULE	src/Dodge/Combine/Data.hs	73;"	C
-TIMEMODULE	src/Dodge/Data/Item/Combine.hs	78;"	C
+TIMEMODULE	src/Dodge/Data/Item/Combine.hs	77;"	C
 TIN	src/Dodge/Combine/Data.hs	33;"	C
 TIN	src/Dodge/Data/Item/Combine.hs	37;"	C
-TINMAG	src/Dodge/Data/Item/Combine.hs	111;"	C
+TINMAG	src/Dodge/Data/Item/Combine.hs	110;"	C
 TLS	src/Dodge/Data/LightSource.hs	42;"	C
 TLSFade	src/Dodge/Data/LightSource.hs	18;"	C
 TLSIntensity	src/Dodge/Data/LightSource.hs	16;"	t
@@ -2557,7 +2549,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	37;"	C
-TargetAttachParams	src/Dodge/Data/Item/Use.hs	77;"	C
+TargetAttachParams	src/Dodge/Data/Item/Use.hs	79;"	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
@@ -2718,9 +2710,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	129;"	C
+TwoHandFlat	src/Dodge/Data/Item/Use.hs	132;"	C
-TwoHandOver	src/Dodge/Data/Item/Use.hs	128;"	C
+TwoHandOver	src/Dodge/Data/Item/Use.hs	131;"	C
-TwoHandUnder	src/Dodge/Data/Item/Use.hs	127;"	C
+TwoHandUnder	src/Dodge/Data/Item/Use.hs	130;"	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
@@ -2917,7 +2909,7 @@ YELLOW	src/Color/Data.hs	18;"	C
 You	src/Dodge/Base/You.hs	1;"	m
 YourAI	src/Dodge/Data/Creature/Misc.hs	49;"	C
 YourControl	src/Dodge/Creature/YourControl.hs	1;"	m
-ZOOMSCOPE	src/Dodge/Data/Item/Combine.hs	106;"	C
+ZOOMSCOPE	src/Dodge/Data/Item/Combine.hs	105;"	C
 ZombieFaction	src/Dodge/Creature/State/Data.hs	31;"	C
 ZombieFaction	src/Dodge/Data/Creature/State.hs	36;"	C
 Zone	src/Dodge/Zone/Data.hs	8;"	t
@@ -2932,7 +2924,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	87;"	C
+ZoomScrollParams	src/Dodge/Data/Item/Use.hs	90;"	C
 __Just'	src/MaybeHelp.hs	13;"	f
 _actAction	src/Dodge/Data/ActionPlan.hs	81;"	f
 _actLabel	src/Dodge/Data/ActionPlan.hs	80;"	f
@@ -2947,13 +2939,13 @@ _actionTime	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	14;"	f
 _actionTime	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	17;"	f
 _actionTime	src/Dodge/Data/LoadAction.hs	11;"	f
 _actionTime	src/Dodge/Data/LoadAction.hs	14;"	f
-_aimHandlePos	src/Dodge/Data/Item/Use.hs	114;"	f
+_aimHandlePos	src/Dodge/Data/Item/Use.hs	117;"	f
-_aimMuzzles	src/Dodge/Data/Item/Use.hs	115;"	f
+_aimMuzzles	src/Dodge/Data/Item/Use.hs	118;"	f
-_aimRange	src/Dodge/Data/Item/Use.hs	111;"	f
+_aimRange	src/Dodge/Data/Item/Use.hs	114;"	f
-_aimStance	src/Dodge/Data/Item/Use.hs	113;"	f
+_aimStance	src/Dodge/Data/Item/Use.hs	116;"	f
-_aimTurnSpeed	src/Dodge/Data/Item/Use.hs	110;"	f
+_aimTurnSpeed	src/Dodge/Data/Item/Use.hs	113;"	f
-_aimWeight	src/Dodge/Data/Item/Use.hs	109;"	f
+_aimWeight	src/Dodge/Data/Item/Use.hs	112;"	f
-_aimZoom	src/Dodge/Data/Item/Use.hs	112;"	f
+_aimZoom	src/Dodge/Data/Item/Use.hs	115;"	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
@@ -2966,9 +2958,7 @@ _allocSwapID	src/Dodge/Data/RightButtonOptions.hs	30;"	f
 _alphaDivideShader	src/Data/Preload/Render.hs	18;"	f
 _amBullet	src/Dodge/Data/Ammo.hs	39;"	f
 _amCreateGas	src/Dodge/Data/Ammo.hs	45;"	f
-_amCreateGas	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	50;"	f
 _amForceFieldType	src/Dodge/Data/Ammo.hs	48;"	f
-_amForceFieldType	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	53;"	f
 _amPayload	src/Dodge/Data/Ammo.hs	32;"	f
 _amPjCreation	src/Dodge/Data/Ammo.hs	35;"	f
 _amPjDraw	src/Dodge/Data/Ammo.hs	34;"	f
@@ -2980,10 +2970,11 @@ _amagLoadStatus	src/Dodge/Data/Item/Use.hs	59;"	f
 _amagParams	src/Dodge/Data/Item/Use.hs	60;"	f
 _amagType	src/Dodge/Data/Item/Use.hs	61;"	f
 _ambushTarget	src/Dodge/Data/ActionPlan.hs	178;"	f
-_ampBullet	src/Dodge/Data/Item/Use.hs	79;"	f
+_ampBullet	src/Dodge/Data/Item/Use.hs	81;"	f
-_ampPayload	src/Dodge/Data/Item/Use.hs	81;"	f
+_ampCreateGas	src/Dodge/Data/Item/Use.hs	87;"	f
-_ampPjCreation	src/Dodge/Data/Item/Use.hs	83;"	f
+_ampPayload	src/Dodge/Data/Item/Use.hs	83;"	f
-_ampPjDraw	src/Dodge/Data/Item/Use.hs	82;"	f
+_ampPjCreation	src/Dodge/Data/Item/Use.hs	85;"	f
+_ampPjDraw	src/Dodge/Data/Item/Use.hs	84;"	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
@@ -2991,13 +2982,13 @@ _apGoal	src/Dodge/Data/ActionPlan.hs	22;"	f
 _apImpulse	src/Dodge/Data/ActionPlan.hs	19;"	f
 _apStrategy	src/Dodge/Data/ActionPlan.hs	21;"	f
 _arLoaded	src/Dodge/Data/Item/Consumption.hs	24;"	f
-_arLoaded	src/Dodge/Data/Item/Use/Consumption.hs	39;"	f
+_arLoaded	src/Dodge/Data/Item/Use/Consumption.hs	31;"	f
 _arMax	src/Dodge/Data/Item/Consumption.hs	25;"	f
-_arMax	src/Dodge/Data/Item/Use/Consumption.hs	40;"	f
+_arMax	src/Dodge/Data/Item/Use/Consumption.hs	32;"	f
 _arProgress	src/Dodge/Data/Item/Consumption.hs	27;"	f
-_arProgress	src/Dodge/Data/Item/Use/Consumption.hs	42;"	f
+_arProgress	src/Dodge/Data/Item/Use/Consumption.hs	34;"	f
 _arTime	src/Dodge/Data/Item/Consumption.hs	26;"	f
-_arTime	src/Dodge/Data/Item/Use/Consumption.hs	41;"	f
+_arTime	src/Dodge/Data/Item/Use/Consumption.hs	33;"	f
 _arbitraryAction	src/Dodge/Data/ActionPlan.hs	167;"	f
 _arcNumber	src/Dodge/Data/Item/Params.hs	56;"	f
 _arcSize	src/Dodge/Data/Item/Params.hs	55;"	f
@@ -3351,7 +3342,6 @@ _equipTargeting	src/Dodge/Data/Item/Use.hs	52;"	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
-_euseAmmoSourceType	src/Dodge/Data/Item/HeldUse.hs	52;"	f
 _euseBatteryAmount	src/Dodge/Data/Item/HeldUse.hs	48;"	f
 _euseBatteryMax	src/Dodge/Data/Item/HeldUse.hs	48;"	f
 _euseCamouflageStatus	src/Dodge/Data/Item/HeldUse.hs	44;"	f
@@ -3404,6 +3394,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	68;"	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
@@ -3413,7 +3404,7 @@ _getCrZoning	src/Dodge/Data/Zoning.hs	19;"	f
 _getFixated	src/Dodge/Creature/AlertLevel/Data.hs	23;"	f
 _getFixated	src/Dodge/Creature/Perception/Data.hs	67;"	f
 _getFixated	src/Dodge/Data/Creature/Perception.hs	62;"	f
-_getItAmount	src/Dodge/Data/Item/Use/Consumption.hs	50;"	f
+_getItAmount	src/Dodge/Data/Item/Use/Consumption.hs	42;"	f
 _getSoundID	src/Sound/Data.hs	32;"	f
 _grBound	src/Dodge/GameRoom.hs	18;"	f
 _grDir	src/Dodge/GameRoom.hs	20;"	f
@@ -3456,21 +3447,21 @@ _hsCharMode	src/Dodge/Data/Item/HeldScroll.hs	17;"	f
 _hud	src/Dodge/Data/World.hs	46;"	f
 _hudElement	src/Dodge/Data/HUD.hs	36;"	f
 _humanoidAI	src/Dodge/Data/Creature/Misc.hs	69;"	f
-_iaCycle	src/Dodge/Data/Item/Use/Consumption.hs	32;"	f
+_iaCycle	src/Dodge/Data/Item/Use/Consumption.hs	24;"	f
-_iaLoaded	src/Dodge/Data/Item/Use/Consumption.hs	30;"	f
+_iaLoaded	src/Dodge/Data/Item/Use/Consumption.hs	22;"	f
-_iaMax	src/Dodge/Data/Item/Use/Consumption.hs	29;"	f
+_iaMax	src/Dodge/Data/Item/Use/Consumption.hs	21;"	f
-_iaPrimed	src/Dodge/Data/Item/Use/Consumption.hs	31;"	f
+_iaPrimed	src/Dodge/Data/Item/Use/Consumption.hs	23;"	f
-_iaProgress	src/Dodge/Data/Item/Use/Consumption.hs	33;"	f
+_iaProgress	src/Dodge/Data/Item/Use/Consumption.hs	25;"	f
-_ibtAmmoMag	src/Dodge/Data/Item/Combine.hs	93;"	f
+_ibtAmmoMag	src/Dodge/Data/Item/Combine.hs	92;"	f
-_ibtAttach	src/Dodge/Data/Item/Combine.hs	92;"	f
+_ibtAttach	src/Dodge/Data/Item/Combine.hs	91;"	f
-_ibtAttachTarget	src/Dodge/Data/Item/Combine.hs	100;"	f
+_ibtAttachTarget	src/Dodge/Data/Item/Combine.hs	99;"	f
-_ibtConsumable	src/Dodge/Data/Item/Combine.hs	90;"	f
+_ibtConsumable	src/Dodge/Data/Item/Combine.hs	89;"	f
 _ibtEquip	src/Dodge/Combine/Data.hs	88;"	f
-_ibtEquip	src/Dodge/Data/Item/Combine.hs	89;"	f
+_ibtEquip	src/Dodge/Data/Item/Combine.hs	88;"	f
 _ibtHeld	src/Dodge/Combine/Data.hs	86;"	f
-_ibtHeld	src/Dodge/Data/Item/Combine.hs	87;"	f
+_ibtHeld	src/Dodge/Data/Item/Combine.hs	86;"	f
 _ibtLeft	src/Dodge/Combine/Data.hs	87;"	f
-_ibtLeft	src/Dodge/Data/Item/Combine.hs	88;"	f
+_ibtLeft	src/Dodge/Data/Item/Combine.hs	87;"	f
 _ieCounter	src/Dodge/Data/ItEffect.hs	15;"	f
 _ieCounter	src/Dodge/Data/ItEffect.hs	23;"	f
 _ieDrop	src/Dodge/Data/ItEffect.hs	31;"	f
@@ -3539,20 +3530,18 @@ _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	138;"	f
+_izFac	src/Dodge/Data/Item/Use.hs	141;"	f
-_izMax	src/Dodge/Data/Item/Use.hs	136;"	f
+_izMax	src/Dodge/Data/Item/Use.hs	139;"	f
-_izMin	src/Dodge/Data/Item/Use.hs	137;"	f
+_izMin	src/Dodge/Data/Item/Use.hs	140;"	f
 _killTarget	src/Dodge/Data/ActionPlan.hs	198;"	f
 _lClock	src/Dodge/Data/LWorld.hs	145;"	f
 _lWorld	src/Dodge/Data/CWorld.hs	26;"	f
 _laAmmoType	src/Dodge/Data/Item/Consumption.hs	16;"	f
-_laAmmoType	src/Dodge/Data/Item/Use/Consumption.hs	22;"	f
 _laCycle	src/Dodge/Data/Item/Consumption.hs	20;"	f
 _laLoaded	src/Dodge/Data/Item/Consumption.hs	18;"	f
 _laMax	src/Dodge/Data/Item/Consumption.hs	17;"	f
 _laPrimed	src/Dodge/Data/Item/Consumption.hs	19;"	f
 _laProgress	src/Dodge/Data/Item/Consumption.hs	21;"	f
-_laSourceType	src/Dodge/Data/Item/Use/Consumption.hs	23;"	f
 _lampColor	src/Dodge/Data/Creature/Misc.hs	72;"	f
 _lampHeight	src/Dodge/Data/Creature/Misc.hs	72;"	f
 _lampLSID	src/Dodge/Data/Creature/Misc.hs	72;"	f
@@ -3662,15 +3651,15 @@ _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	68;"	f
+_muzVel	src/Dodge/Data/Item/Use.hs	70;"	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
-_mzInaccuracy	src/Dodge/Data/Item/Use.hs	122;"	f
+_mzInaccuracy	src/Dodge/Data/Item/Use.hs	125;"	f
-_mzPos	src/Dodge/Data/Item/Use.hs	120;"	f
+_mzPos	src/Dodge/Data/Item/Use.hs	123;"	f
-_mzRot	src/Dodge/Data/Item/Use.hs	121;"	f
+_mzRot	src/Dodge/Data/Item/Use.hs	124;"	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
@@ -3694,9 +3683,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	93;"	f
+_opticDefaultZoom	src/Dodge/Data/Item/Use.hs	96;"	f
-_opticPos	src/Dodge/Data/Item/Use.hs	89;"	f
+_opticPos	src/Dodge/Data/Item/Use.hs	92;"	f
-_opticZoom	src/Dodge/Data/Item/Use.hs	92;"	f
+_opticZoom	src/Dodge/Data/Item/Use.hs	95;"	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
@@ -3845,7 +3834,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	72;"	f
+_randomOffset	src/Dodge/Data/Item/Use.hs	74;"	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
@@ -3871,7 +3860,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	70;"	f
+_recoil	src/Dodge/Data/Item/Use.hs	72;"	f
 _reloadAction	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	45;"	f
 _reloadAction	src/Dodge/Data/LoadAction.hs	26;"	f
 _remotePos	src/Dodge/Data/Item/Scope.hs	17;"	f
@@ -3880,7 +3869,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	69;"	f
+_rifling	src/Dodge/Data/Item/Use.hs	71;"	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
@@ -3968,8 +3957,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	76;"	f
+_scrollAttachParams	src/Dodge/Data/Item/Use.hs	78;"	f
-_scrollChar	src/Dodge/Data/Item/Use.hs	96;"	f
+_scrollChar	src/Dodge/Data/Item/Use.hs	99;"	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
@@ -4166,7 +4155,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	71;"	f
+_torqueAfter	src/Dodge/Data/Item/Use.hs	73;"	f
 _tractorBeams	src/Dodge/Data/LWorld.hs	121;"	f
 _trieChildren	src/SimpleTrie.hs	7;"	f
 _trieMVal	src/SimpleTrie.hs	6;"	f
@@ -4288,9 +4277,9 @@ _wlZoning	src/Dodge/Data/World.hs	50;"	f
 _worldEventFlags	src/Dodge/Data/World.hs	47;"	f
 _worldEvents	src/Dodge/Data/LWorld.hs	133;"	f
 _wpCharge	src/Dodge/Data/Item/Consumption.hs	31;"	f
-_wpCharge	src/Dodge/Data/Item/Use/Consumption.hs	46;"	f
+_wpCharge	src/Dodge/Data/Item/Use/Consumption.hs	38;"	f
 _wpMaxCharge	src/Dodge/Data/Item/Consumption.hs	30;"	f
-_wpMaxCharge	src/Dodge/Data/Item/Use/Consumption.hs	45;"	f
+_wpMaxCharge	src/Dodge/Data/Item/Use/Consumption.hs	37;"	f
 _wsBlock	src/Dodge/Data/Wall.hs	52;"	f
 _wsDoor	src/Dodge/Data/Wall.hs	50;"	f
 _wsMachine	src/Dodge/Data/Wall.hs	51;"	f
@@ -4520,7 +4509,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	16;"	f
 bangStick	src/Dodge/Item/Weapon/BulletGun/Stick.hs	17;"	f
-bangStickSoundChoice	src/Dodge/HeldUse.hs	498;"	f
+bangStickSoundChoice	src/Dodge/HeldUse.hs	514;"	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
@@ -4541,14 +4530,13 @@ baseStickSpread	src/Dodge/Item/Held/Stick.hs	35;"	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
-basicAmPjMoves	src/Dodge/Item/Held/Launcher.hs	55;"	f
+basicAmPjMoves	src/Dodge/Item/Held/Launcher.hs	54;"	f
 basicAttentionUpdate	src/Dodge/Creature/AlertLevel.hs	50;"	f
 basicAttentionUpdate	src/Dodge/Creature/Perception.hs	127;"	f
 basicAwarenessUpdate	src/Dodge/Creature/AlertLevel.hs	25;"	f
 basicAwarenessUpdate	src/Dodge/Creature/Perception.hs	37;"	f
 basicBeamAt	src/Dodge/Item/Weapon/BatteryGuns.hs	176;"	f
-basicBulDams	src/Dodge/Item/Weapon/Bullet.hs	32;"	f
+basicBulDams	src/Dodge/Item/Weapon/Bullet.hs	26;"	f
-basicBulletAmmo	src/Dodge/Item/Weapon/Bullet.hs	11;"	f
 basicCrPict	src/Dodge/Creature/Picture.hs	25;"	f
 basicCrShape	src/Dodge/Creature/Picture.hs	32;"	f
 basicCrSilhouette	src/Dodge/Creature/Silhouette.hs	17;"	f
@@ -4558,6 +4546,7 @@ basicMachineApplyDamage	src/Dodge/Machine/Damage.hs	6;"	f
 basicMachineUpdate	src/Dodge/Machine.hs	13;"	f
 basicPerceptionUpdateR	src/Dodge/Creature/AlertLevel.hs	17;"	f
 basicTerminal	src/Dodge/Terminal.hs	32;"	f
+battery	src/Dodge/Item/Ammo.hs	69;"	f
 batteryGuns	src/Dodge/Combine/Combinations.hs	220;"	f
 batteryModules	src/Dodge/Item/Held/BatteryGuns.hs	116;"	f
 batteryPack	src/Dodge/Item/Equipment.hs	58;"	f
@@ -4651,7 +4640,7 @@ canAttachTargeting	src/Dodge/Item/Display.hs	33;"	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	493;"	f
+caneStickSoundChoice	src/Dodge/HeldUse.hs	509;"	f
 cardList	src/Dodge/Base/CardinalPoint.hs	6;"	f
 cardVec	src/Dodge/Base/CardinalPoint.hs	9;"	f
 cardinalVectors	src/Dodge/FloorItem.hs	38;"	f
@@ -4805,8 +4794,8 @@ 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	507;"	f
+coneRandItemParams	src/Dodge/HeldUse.hs	523;"	f
-coneRandItemUpdate	src/Dodge/HeldUse.hs	501;"	f
+coneRandItemUpdate	src/Dodge/HeldUse.hs	517;"	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
@@ -5031,9 +5020,8 @@ defaultBatteryGun	src/Dodge/Item/Held/BatteryGuns.hs	111;"	f
 defaultBlock	src/Dodge/Default/Block.hs	5;"	f
 defaultBounds	src/Dodge/Bounds.hs	13;"	f
 defaultBounds	src/Dodge/Data/Bounds.hs	20;"	f
-defaultBullet	src/Dodge/Item/Weapon/Bullet.hs	16;"	f
+defaultBullet	src/Dodge/Item/Weapon/Bullet.hs	10;"	f
 defaultBulletLoadable	src/Dodge/Default/Item/Held/Consumption.hs	18;"	f
-defaultBulletLoadable	src/Dodge/Default/Item/Use/Consumption.hs	15;"	f
 defaultBulletSelTweak	src/Dodge/TweakBullet.hs	7;"	f
 defaultBulletWeapon	src/Dodge/Default/Item.hs	44;"	f
 defaultButton	src/Dodge/Default.hs	51;"	f
@@ -5085,11 +5073,10 @@ defaultKeyConfigSDL	src/Dodge/Config/KeyConfig.hs	38;"	f
 defaultLS	src/Dodge/Default/LightSource.hs	6;"	f
 defaultLWorld	src/Dodge/Default/World.hs	91;"	f
 defaultLeftItem	src/Dodge/Default/Item.hs	38;"	f
-defaultLeftLoadable	src/Dodge/Default/Item/Use/Consumption.hs	18;"	f
+defaultLeftLoadable	src/Dodge/Default/Item/Use/Consumption.hs	8;"	f
 defaultLeftUse	src/Dodge/Default/Item/Use.hs	13;"	f
 defaultListDisplayParams	src/Dodge/ListDisplayParams.hs	18;"	f
 defaultLoadable	src/Dodge/Default/Item/Held/Consumption.hs	7;"	f
-defaultLoadable	src/Dodge/Default/Item/Use/Consumption.hs	8;"	f
 defaultMachine	src/Dodge/Default.hs	33;"	f
 defaultMachineWall	src/Dodge/Default/Wall.hs	48;"	f
 defaultPP	src/Dodge/Default.hs	66;"	f
@@ -5481,11 +5468,11 @@ findReverseEdgeList	src/Polyhedra.hs	56;"	f
 findWallFreeDropPoint	src/Dodge/FloorItem.hs	46;"	f
 findWallsInPolygon	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	78;"	f
 fireLoudS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	504;"	f
-fireRemoteShell	src/Dodge/HeldUse.hs	471;"	f
+fireRemoteShell	src/Dodge/HeldUse.hs	484;"	f
 fireS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	332;"	f
-fireShell	src/Dodge/Projectile/Create.hs	18;"	f
+fireShell	src/Dodge/Projectile/Create.hs	16;"	f
 fireSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
-fireTrackingShell	src/Dodge/Projectile/Create.hs	60;"	f
+fireTrackingShell	src/Dodge/Projectile/Create.hs	58;"	f
 firstBreather	src/Dodge/Room/Breather.hs	9;"	f
 firstWorldLoad	appDodge/Main.hs	77;"	f
 fixedCoordPictures	src/Dodge/Render/Picture.hs	17;"	f
@@ -5591,6 +5578,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	462;"	f
 getArguments	src/Dodge/Update/Scroll.hs	147;"	f
 getArguments'	src/Dodge/Update/Scroll.hs	135;"	f
 getAvailableListLines	src/Dodge/SelectionList.hs	11;"	f
@@ -5699,7 +5687,7 @@ healS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	354;"	f
 healSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
 healthAnalyserByDoor	src/Dodge/Room/LasTurret.hs	72;"	f
 healthTest	src/Dodge/Room/LasTurret.hs	93;"	f
-heavyBulDams	src/Dodge/Item/Weapon/Bullet.hs	44;"	f
+heavyBulDams	src/Dodge/Item/Weapon/Bullet.hs	38;"	f
 heightWallPS	src/Dodge/Placement/Instance/Wall.hs	13;"	f
 heldAimEffects	src/Dodge/Creature/State.hs	69;"	f
 heldBounds	src/Dodge/Item/Module.hs	27;"	f
@@ -5729,7 +5717,7 @@ humanoidAIList	src/Dodge/Humanoid.hs	184;"	f
 hvBulDams	src/Dodge/Particle/Damage.hs	13;"	f
 hvBulHitCr	src/Dodge/Particle/Bullet/HitEffect.hs	17;"	f
 hvBulHitWall	src/Dodge/Particle/Bullet/HitEffect.hs	54;"	f
-hvBulletAmmo	src/Dodge/Item/Weapon/Bullet.hs	37;"	f
+hvBulletAmmo	src/Dodge/Item/Weapon/Bullet.hs	31;"	f
 iShape	src/Dodge/Placement/Instance/LightSource.hs	74;"	f
 iShape	src/Dodge/Placements/LightSource.hs	32;"	f
 icosahedronPoints	src/Polyhedra/Geodesic.hs	11;"	f
@@ -5874,12 +5862,12 @@ itemEffect	src/Dodge/Creature/Action/UseItem.hs	28;"	f
 itemEffect	src/Dodge/Creature/Impulse/UseItem.hs	35;"	f
 itemEquipPict	src/Dodge/Item/Draw.hs	17;"	f
 itemFromAmmoMag	src/Dodge/Item.hs	29;"	f
-itemFromAttachType	src/Dodge/Item.hs	37;"	f
+itemFromAttachType	src/Dodge/Item.hs	38;"	f
 itemFromBase	src/Dodge/Item.hs	19;"	f
-itemFromConsumableType	src/Dodge/Item.hs	43;"	f
+itemFromConsumableType	src/Dodge/Item.hs	44;"	f
-itemFromEquipType	src/Dodge/Item.hs	48;"	f
+itemFromEquipType	src/Dodge/Item.hs	49;"	f
 itemFromHeldType	src/Dodge/Item/Held.hs	25;"	f
-itemFromLeftType	src/Dodge/Item.hs	70;"	f
+itemFromLeftType	src/Dodge/Item.hs	71;"	f
 itemInfo	src/Dodge/Item/Info.hs	10;"	f
 itemInvColor	src/Dodge/Item/InventoryColor.hs	7;"	f
 itemInvSideEffect	src/Dodge/Creature/State.hs	246;"	f
@@ -5956,7 +5944,7 @@ launcher	src/Dodge/Item/Held/Launcher.hs	10;"	f
 launcherCrit	src/Dodge/Creature/LauncherCrit.hs	12;"	f
 launcherPic	src/Dodge/Item/Draw/SPic.hs	423;"	f
 launcherSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
-launcherX	src/Dodge/Item/Held/Launcher.hs	40;"	f
+launcherX	src/Dodge/Item/Held/Launcher.hs	39;"	f
 layerNum	src/Picture/Data.hs	31;"	f
 layoutLevelFromSeed	src/Dodge/LevelGen.hs	47;"	f
 ldpVerticalSelection	src/Dodge/Update/Input/ScreenLayer.hs	90;"	f
@@ -6106,7 +6094,7 @@ makeShaderProgram	src/Shader/Compile.hs	287;"	f
 makeShaderUsingVAO	src/Shader/Compile.hs	155;"	f
 makeShaderUsingVBO	src/Shader/Compile.hs	78;"	f
 makeShaderVBO	src/Shader/Compile.hs	38;"	f
-makeShell	src/Dodge/Projectile/Create.hs	36;"	f
+makeShell	src/Dodge/Projectile/Create.hs	34;"	f
 makeShockwaveAt	src/Dodge/WorldEvent/Shockwave.hs	12;"	f
 makeSourcedShader	src/Shader/Compile.hs	203;"	f
 makeStartCloudAt	src/Dodge/WorldEvent/Cloud.hs	60;"	f
@@ -6157,7 +6145,7 @@ 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	515;"	f
+mcShootLaser	src/Dodge/HeldUse.hs	531;"	f
 mcTriggerVal	src/Dodge/Machine/Update.hs	75;"	f
 mcTypeUpdate	src/Dodge/Machine/Update.hs	24;"	f
 mcUseHeld	src/Dodge/HeldUse.hs	380;"	f
@@ -6396,9 +6384,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	441;"	f
+overNozzle	src/Dodge/HeldUse.hs	444;"	f
-overNozzles	src/Dodge/HeldUse.hs	421;"	f
+overNozzles	src/Dodge/HeldUse.hs	424;"	f
-overNozzles'	src/Dodge/HeldUse.hs	429;"	f
+overNozzles'	src/Dodge/HeldUse.hs	432;"	f
 overPos	src/Picture/Base.hs	302;"	f
 overPosObj	src/Shape.hs	273;"	f
 overPosSH	src/Shape.hs	257;"	f
@@ -6799,7 +6787,7 @@ reloadS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	426;"	f
 reloadSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
 rememberSounds	src/Dodge/Creature/Perception.hs	177;"	f
 remoteBombUnarmedPic	src/Dodge/Item/Weapon/Grenade.hs	268;"	f
-remoteLauncher	src/Dodge/Item/Held/Launcher.hs	47;"	f
+remoteLauncher	src/Dodge/Item/Held/Launcher.hs	46;"	f
 remoteShellCollisionCheck	src/Dodge/Projectile/Update.hs	44;"	f
 remoteShellShape	src/Dodge/Projectile/Draw.hs	39;"	f
 removeEither	src/Dodge/Layout/Tree/Either.hs	41;"	f
@@ -7134,7 +7122,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	524;"	f
+shootTeslaArc	src/Dodge/HeldUse.hs	540;"	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
@@ -7252,8 +7240,8 @@ spawnSmokeAtCursor	src/Dodge/WorldEvent/Cloud.hs	73;"	f
 spawnerCrit	src/Dodge/Creature.hs	55;"	f
 spawnerRoom	src/Dodge/Room/Room.hs	362;"	f
 speedLegs	src/Dodge/Item/Equipment.hs	129;"	f
-spinDrag	src/Dodge/Item/Held/Launcher.hs	63;"	f
+spinDrag	src/Dodge/Item/Held/Launcher.hs	62;"	f
-spinStart	src/Dodge/Item/Held/Launcher.hs	71;"	f
+spinStart	src/Dodge/Item/Held/Launcher.hs	70;"	f
 splashMenu	src/Dodge/Menu.hs	27;"	f
 splashMenuOptions	src/Dodge/Menu.hs	32;"	f
 splashScreen	src/Dodge/Initialisation.hs	11;"	f
@@ -7441,7 +7429,7 @@ thingsHit	src/Dodge/WorldEvent/ThingsHit.hs	29;"	f
 thingsHitExceptCr	src/Dodge/WorldEvent/ThingsHit.hs	73;"	f
 threeLineDecoration	src/Dodge/Placement/TopDecoration.hs	61;"	f
 throwRemoteBomb	src/Dodge/Item/Weapon/Grenade.hs	205;"	f
-thrustParam	src/Dodge/Item/Held/Launcher.hs	79;"	f
+thrustParam	src/Dodge/Item/Held/Launcher.hs	78;"	f
 tileTexCoords	src/Tile.hs	10;"	f
 tilesFromRooms	src/Dodge/Layout.hs	205;"	f
 tilesToLine	src/Shader/AuxAddition.hs	66;"	f
@@ -7767,8 +7755,8 @@ useAmmoUpTo	src/Dodge/Item/Weapon/TriggerType.hs	346;"	f
 useC	src/Dodge/Cuse.hs	6;"	f
 useE	src/Dodge/Euse.hs	24;"	f
 useEquipment	src/Dodge/Creature/State.hs	219;"	f
-useForceFieldGun	src/Dodge/HeldUse.hs	537;"	f
+useForceFieldGun	src/Dodge/HeldUse.hs	553;"	f
-useGasParams	src/Dodge/HeldUse.hs	459;"	f
+useGasParams	src/Dodge/HeldUse.hs	471;"	f
 useHeld	src/Dodge/HeldUse.hs	385;"	f
 useHotKey	src/Dodge/Creature/YourControl.hs	49;"	f
 useItem	src/Dodge/Creature/Action/UseItem.hs	14;"	f