Add more weapons to attachment chain effects

ghcidOutput

@@ -1,38 +1,31 @@
-/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:(44,25)-(322,30): warning: [-Wincomplete-patterns]
-    Pattern match(es) are non-exhaustive
-    In a case alternative: Patterns not matched: MachineGunMod
-   |
-44 | heldEffect effecttype = case effecttype of
-   |                         ^^^^^^^^^^^^^^^^^^...
-/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:(487,43)-(500,9): warning: [-Wincomplete-patterns]
+/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:(493,66)-(498,55): warning: [-Wincomplete-patterns]
     Pattern match(es) are non-exhaustive
     In a case alternative:
         Patterns not matched:
-            MuzzleLaser
-            MuzzleTesla
-            MuzzleTractor
-            MuzzleLauncher
-            ...
+            MuzzleFlame
+            MuzzleGas
     |
-487 | useLoadedAmmo itm cr (cme,w) (mz,x,mid) = case _mzEffect mz of
-    |                                           ^^^^^^^^^^^^^^^^^^^^...
-/home/justin/Haskell/loop/src/Dodge/Bullet.hs:6:1-30: warning: [-Wunused-imports]
-    The import of ‘Dodge.Data.ComposedItem’ is redundant
-  |
-6 | import Dodge.Data.ComposedItem
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-/home/justin/Haskell/loop/src/Dodge/Bullet.hs:7:1-28: warning: [-Wunused-imports]
-    The import of ‘Dodge.Data.DoubleTree’ is redundant
-  |
-7 | import Dodge.Data.DoubleTree
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-/home/justin/Haskell/loop/src/Dodge/Bullet.hs:13:1-28: warning: [-Wunused-imports]
-    The import of ‘Dodge.Base.Coordinate’ is redundant
-   |
-13 | import Dodge.Base.Coordinate
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-/home/justin/Haskell/loop/src/Dodge/Bullet.hs:14:1-29: warning: [-Wunused-imports]
-    The import of ‘Dodge.Creature.HandPos’ is redundant
-   |
-14 | import Dodge.Creature.HandPos
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+493 |         removeAmmoFromMag x mid cr . makeMuzzleFlare mz itm cr $ case _mzEffect mz of
+    |                                                                  ^^^^^^^^^^^^^^^^^^^^...
+/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:539:1-17: warning: [-Wmissing-signatures]
+    Top-level binding with no type signature:
+      removeAmmoFromMag :: Int -> Maybe Int -> Creature -> World -> World
+    |
+539 | removeAmmoFromMag x mid cr = fromMaybe id $ do
+    | ^^^^^^^^^^^^^^^^^
+/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:552:5-7: warning: [-Wunused-local-binds]
+    Defined but not used: ‘cid’
+    |
+552 |     cid = _crID cr
+    |     ^^^
+/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:(595,13)-(817,9): warning: [-Wincomplete-patterns]
+    Pattern match(es) are non-exhaustive
+    In a case alternative: Patterns not matched: TractorMod
+    |
+595 | useMod hm = case hm of
+    |             ^^^^^^^^^^...
+/home/justin/Haskell/loop/src/Dodge/HeldUse.hs:1083:21-22: warning: [-Wunused-matches]
+    Defined but not used: ‘mz’
+     |
+1083 | shootTeslaArc it cr mz w =
+     |                     ^^

src/Dodge/Bullet.hs

@@ -3,15 +3,15 @@ module Dodge.Bullet (
 --    shootBullet,
 ) where
 
-import Dodge.Data.ComposedItem
-import Dodge.Data.DoubleTree
+--import Dodge.Data.ComposedItem
+--import Dodge.Data.DoubleTree
 import Linear
 import Dodge.Item.Weapon.Bullet
 import System.Random
 import Data.Foldable
 import Data.Maybe
-import Dodge.Base.Coordinate
-import Dodge.Creature.HandPos
+--import Dodge.Base.Coordinate
+--import Dodge.Creature.HandPos
 import Dodge.Creature.Test
 import Dodge.Data.World
 import Dodge.EnergyBall

src/Dodge/Creature.hs

@@ -269,12 +269,10 @@ testInventory =
 stackedInventory :: [Item]
 stackedInventory =
     [ burstRifle
-    , bangCone
     , megaTinMag
-    , volleyGun 3
-    , tinMag
-    , tinMag
-    , tinMag
+    , teslaGun
+    , lasGun
+    , megaBattery
     , bulletSynthesizer
     , drumMag
     , launcher

src/Dodge/Data/Item/HeldUse.hs

@@ -21,7 +21,7 @@ data Huse
     | HeldFireRemoteShell
     | HeldExplodeRemoteShell Int Int
     | HeldDetectorEffect Detector
-    | HeldTeslaArc
+--    | HeldTeslaArc
     | HeldLaser
     | HeldCircleLaser
     | HeldDualLaser
@@ -71,7 +71,7 @@ data HeldMod
     | FlameSpitterRepeatMod
     | FlameThrowerMod
     | LauncherMod
-    | TeslaMod
+--    | TeslaMod
 --    | CircleLaserMod
     | LasWideMod Int
     | DualBeamMod
@@ -88,7 +88,7 @@ data HeldMod
 --    | BangRodMod
 --    | ElephantGunMod
 --    | AutoAmrMod
-    | MachineGunMod
+--    | MachineGunMod
 --    | ModWithDirectedTeleport HeldMod
 --    | BangStickMod
     | PistolMod

src/Dodge/Data/Item/Use.hs

@@ -139,6 +139,7 @@ data FlareType = DefaultFlareType
     | MiniGunFlare
     | HeavySmokeFlare
     | LasGunFlare
+    | TeslaGunFlare
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 data MuzzleEffect
     = MuzzleShootBullet

src/Dodge/HeldUse.hs

@@ -5,6 +5,7 @@ module Dodge.HeldUse
 --    ) 
     where
 
+import Dodge.Base.Collide
 import Dodge.Inventory.Lock
 import Dodge.WorldEvent.Cloud
 import Dodge.LightSource
@@ -79,12 +80,12 @@ heldEffect effecttype = case effecttype of
 --        , ammoCheckI
         , blCheck
         ]
-    TeslaMod -> foldl' (&) (shootTeslaArc . _ldtValue)
-        [ useAmmoAmount 1
-        , withSoundForI elecCrackleS 1
-        , withTempLight 1 100 (V3 0 0 1)
-        , ammoCheckI
-        ]
+--    TeslaMod -> foldl' (&) (shootTeslaArc . _ldtValue)
+--        [ useAmmoAmount 1
+--        , withSoundForI elecCrackleS 1
+--        , withTempLight 1 100 (V3 0 0 1)
+--        , ammoCheckI
+--        ]
     LasWideMod n -> foldl' (&) (shootLaser . _ldtValue)
         [ useAmmoAmount 1
         , withItem $ \it ->
@@ -454,6 +455,8 @@ makeMuzzleFlare mz itm cr = case mz ^. mzFlareType of
         . muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir
     HeavySmokeFlare -> basicMuzFlare pos dir
     LasGunFlare -> flareCircleAt (_lasColor $ _itParams itm) 0.8 (pos `v2z` 20)
+    TeslaGunFlare -> cWorld . lWorld . tempLightSources .:~ 
+            tlsTimeRadColPos 1 100 (V3 0 0 1) (pos `v2z` 10)
   where
     pos = _crPos cr + rotateV (_crDir cr) (_mzPos mz + aimingWeaponZeroPos cr itm)
     dir = _crDir cr + _mzRot mz
@@ -464,6 +467,7 @@ basicMuzFlare pos dir = makeTlsTimeRadColPos 2 100 (V3 1 1 0.5) (pos `v2z` 20)
         . muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir
         . muzFlareAt (V4 10 10 1 3) (pos `v2z` 20) dir 
 
+-- need to add these to muzzle flare
 makeMuzzleSmoke :: Muzzle -> Item -> Creature -> World -> World
 makeMuzzleSmoke mz itm cr w = case mz ^. mzFlareType of
     DefaultFlareType -> w
@@ -471,6 +475,7 @@ makeMuzzleSmoke mz itm cr w = case mz ^. mzFlareType of
     MiniGunFlare -> smokeCloudAt (greyN 0.5) 5 400 5 pos w
     HeavySmokeFlare -> foldl' (flip $ smokeCloudAt black 20 400 5 . (+.+.+ pos) . (* 8)) w ps'
     LasGunFlare -> w
+    TeslaGunFlare -> w
   where
     ps = replicateM 2 randOnUnitSphere & evalState $ _randGen w
     ps' = replicateM 4 randOnUnitSphere & evalState $ _randGen w
@@ -484,20 +489,65 @@ isAmmoIntLink _ _ = False
 useLoadedAmmo :: Item -> Creature -> (CumulativeMuzzleEffect,World) -> (Muzzle,Int,Maybe Int) 
     -> (CumulativeMuzzleEffect,World)
 useLoadedAmmo _ _ (cme,w) (_,0,_) = (cme, w)
-useLoadedAmmo itm cr (cme,w) (mz,x,mid) = case _mzEffect mz of
-    MuzzleShootBullet -> 
+useLoadedAmmo itm cr (cme,w) (mz,x,mid) = (,) (cme & cmeSound .~ True) $ 
+        removeAmmoFromMag x mid cr . makeMuzzleFlare mz itm cr $ case _mzEffect mz of
+    MuzzleShootBullet -> shootBullet itm cr w (mz,x,mid)
+    MuzzleLaser -> shootLaser' itm cr mz w
+    MuzzleTesla -> shootTeslaArc itm cr mz w
+    MuzzleTractor -> shootTractorBeam itm cr w
+    MuzzleLauncher -> createProjectile' mid mz itm cr w 
 
+shootTractorBeam :: Item -> Creature -> World -> World
+shootTractorBeam _ cr w = w & cWorld . lWorld . tractorBeams .:~ tractorBeamAt' spos outpos dir power
+  where
+    cpos = _crPos cr
+    spos = cpos +.+ (_crRad cr + 10) *.* unitVectorAtAngle dir
+    xpos = cpos +.+ 400 *.* unitVectorAtAngle dir
+    dir = _crDir cr
+    outpos = fst $ collidePointWallsFilter (const True) cpos xpos w
+    power = _attractionPower . _itParams $ _crInv cr IM.! itRef
+    itRef = cr ^?! crManipulation . manObject . inInventory . ispItem -- unsafe!! TODO change
 
-     fromMaybe (cme,w) $ do
+tractorBeamAt' :: Point2 -> Point2 -> Float -> Point2 -> TractorBeam
+tractorBeamAt' pos outpos dir power =
+    TractorBeam
+        { _tbPos = pos
+        , _tbStartPos = outpos
+        , _tbVel = d
+        , _tbTime = 10
+        }
+  where
+    d = unitVectorAtAngle dir * power
+
+shootLaser' :: Item -> Creature -> Muzzle -> World -> World
+shootLaser' itm cr mz w = w 
+    & randGen .~ g
+    &
+    cWorld . lWorld . lasers
+        .:~ lasRayAt
+            (_lasColor $ _itParams itm)
+            (_lasDamage $ _itParams itm)
+            (_phaseV $ _itParams itm)
+            pos
+            dir
+  where
+    pos = _crPos cr + rotateV (_crDir cr) (_mzPos mz + aimingWeaponZeroPos cr itm)
+    (a,g) = randomR (-inacc,inacc) $ _randGen w
+    inacc = _mzInaccuracy mz
+    dir = _crDir cr + _mzRot mz + a
+
+removeAmmoFromMag x mid cr = fromMaybe id $ do
+    magid <- mid
+    return $ cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix magid . itUse . amagLoadStatus . iaLoaded -~ x
+
+shootBullet :: Item -> Creature -> World -> (Muzzle,Int,Maybe Int) -> World
+shootBullet itm cr w (mz,x,mid) = fromMaybe w $ do
     magid <- mid
     -- should be able to pass the magazine in from elsewhere?
     thebullet <- cr ^? crInv . ix magid . itUse . amagParams . ampBullet
-    return $ (cme & cmeSound .~ True,
-        w & cWorld . lWorld . creatures . ix cid . crInv . ix magid . itUse . amagLoadStatus . iaLoaded -~ x
-            & flip (foldl' (&)) (replicate x (makeBullet thebullet itm cr mz))
+    return $ w & flip (foldl' (&)) (replicate x (makeBullet thebullet itm cr mz))
             & makeMuzzleFlare mz itm cr
             & makeMuzzleSmoke mz itm cr
-        )
   where
     cid = _crID cr
 
@@ -543,7 +593,7 @@ useMod :: HeldMod ->
     [(LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World) 
         -> LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World]
 useMod hm = case hm of
-    TractorMod -> undefined
+--    TractorMod -> undefined
     FireRemoteShellMod -> undefined
     ExplodeRemoteShellMod -> undefined
     DoNothingMod -> undefined
@@ -586,12 +636,12 @@ useMod hm = case hm of
 --        , ammoCheckI
         , blCheck
         ]
-    TeslaMod ->
-        [ useAmmoAmount 1
-        , withSoundForI elecCrackleS 1
-        , withTempLight 1 100 (V3 0 0 1)
-        , ammoCheckI
-        ]
+--    TeslaMod ->
+--        [ useAmmoAmount 1
+--        , withSoundForI elecCrackleS 1
+--        , withTempLight 1 100 (V3 0 0 1)
+--        , ammoCheckI
+--        ]
 --    CircleLaserMod ->
 --        [ duplicateItem fLasCircle
 --        , useAmmoAmount 1
@@ -733,13 +783,13 @@ useMod hm = case hm of
 --        , useTimeCheck
 --        , ammoCheckI -- cf ElephantGun
 --        ]
-    MachineGunMod ->
-        [ withFlare
-        , withThinSmokeI
-        , withSoundStart bangEchoS
-        , rateIncAB (torqueBeforeAtLeast 0.1 0.1) withTorqueAfter
-        , ammoCheckI
-        ]
+--    MachineGunMod ->
+--        [ withFlare
+--        , withThinSmokeI
+--        , withSoundStart bangEchoS
+--        , rateIncAB (torqueBeforeAtLeast 0.1 0.1) withTorqueAfter
+--        , ammoCheckI
+--        ]
 --    ModWithDirectedTeleport hm' ->
 --        reverse $ withPosDirWallCheck directedTelPos : useMod hm'
 --    BangStickMod ->
@@ -878,7 +928,7 @@ useHeld hu = case hu of
     HeldPJCreationX _ -> usePjCreationX
     HeldFireRemoteShell -> fireRemoteShell
     HeldDetectorEffect dt -> detectorEffect dt . _ldtValue
-    HeldTeslaArc -> shootTeslaArc . _ldtValue
+--    HeldTeslaArc -> shootTeslaArc . _ldtValue
     HeldLaser -> shootLaser . _ldtValue
     HeldCircleLaser -> circleLaser . _ldtValue
     HeldDualLaser -> shootDualLaser . _ldtValue
@@ -1029,8 +1079,8 @@ mcShootLaser it mc = cWorld . lWorld . lasers .:~ lasRayAt (_lasColor $ _itParam
     dam = _lasDamage $ _itParams it
 
 -- | assumes that the item is held
-shootTeslaArc :: Item -> Creature -> World -> World
-shootTeslaArc it cr w =
+shootTeslaArc :: Item -> Creature -> Muzzle -> World -> World
+shootTeslaArc it cr mz w =
     w'
         & cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix itRef . itParams .~ ip
   where

src/Dodge/Item/Ammo.hs

@@ -63,6 +63,10 @@ shellMag =
                         }
                 , _amagType = ProjectileAmmo
                 }
+megaBattery :: Item
+megaBattery = battery
+    & itUse . amagLoadStatus . iaMax .~ 1000000
+    & itUse . amagLoadStatus . iaLoaded .~ 1000000
 
 battery :: Item
 battery =

src/Dodge/Item/Held/BatteryGuns.hs

@@ -22,17 +22,20 @@ sparkGun =
 teslaGun :: Item
 teslaGun =
     defaultBatteryGun
+        & itUse . heldParams .~ BeamShooterParams (elecCrackleS,2)
         & itDimension . dimRad .~ 9
         & itDimension . dimCenter .~ V3 4 0 0
         & itParams .~ teslaParams
 --        & itUse . heldUse .~ HeldTeslaArc --shootTeslaArc
         & itUse . heldDelay .~ NoDelay
-        & itUse . heldMods .~ TeslaMod
+        & itUse . heldMods .~ PistolMod
         & itUse . heldAim . aimWeight .~ 6
         & itUse . heldAim . aimStance .~ TwoHandFlat
         -- & itUse . heldAim . aimMuzPos .~ 4
-        & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 4 0) 0 0 0 DefaultFlareType MuzzleTesla]
+        & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 4 0) 0 0 0 TeslaGunFlare MuzzleTesla]
         & itType . iyBase .~ HELD TESLAGUN
+        & itUse . heldAmmoTypes .~ singleAmmo ElectricalAmmo
+        & itUse . heldTriggerType .~ AutoTrigger
 
 lasGun :: Item
 lasGun =

src/Dodge/Projectile/Create.hs

@@ -32,6 +32,29 @@ createProjectile ammoitem muz itm cr = fromMaybe failsound $ do
         Just 0 -> soundStart (CrWeaponSound (_crID cr) 0) (_crPos cr) click1S Nothing w'
         _ -> soundContinue (CrWeaponSound (_crID cr) 0) (_crPos cr) click1S Nothing w'
 
+createProjectile' :: Maybe Int -> Muzzle -> Item -> Creature -> World -> World
+createProjectile' mmagid muz itm cr = fromMaybe failsound $ do
+    magid <- mmagid
+    ammoitem <- cr ^? crInv . ix magid
+    matype <- ammoitem ^? itUse . amagType
+    guard $ matype == ProjectileAmmo
+    j <- ammoitem ^? itLocation . ipInvID
+    pt <- ammoitem ^? itUse . amagParams . ampPjCreation
+    return $ case pt of
+        CreateShell -> fireShell ammoitem muz itm cr . extrafuncs j
+        CreateTrackingShell -> fireTrackingShell ammoitem muz itm cr . extrafuncs j
+  where
+    --extrafuncs j = cancelanyreloading . startthesound . useammo j
+    extrafuncs j = startthesound . useammo j
+    useammo j = cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix j . itUse . amagLoadStatus . iaLoaded -~ 1
+    
+    --cancelanyreloading = cWorld . lWorld . creatures . ix (_crID cr) %~ crCancelReloading
+    -- the sound should be moved to the projectile firing
+    startthesound = soundMultiFrom [CrWeaponSound (_crID cr) j | j <- [0..3]] (_crPos cr) tap4S Nothing 
+    failsound w' = case w' ^? input . mouseButtons . ix SDL.ButtonLeft of
+        Just 0 -> soundStart (CrWeaponSound (_crID cr) 0) (_crPos cr) click1S Nothing w'
+        _ -> soundContinue (CrWeaponSound (_crID cr) 0) (_crPos cr) click1S Nothing w'
+
 fireShell :: Item -> Muzzle -> Item -> Creature -> World -> World
 fireShell ammoitem muz it cr =
     makeShell

tags

@@ -58,7 +58,7 @@ AimParams	src/Dodge/Data/Item/Use.hs	125;"	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	162;"	t
+AimStance	src/Dodge/Data/Item/Use.hs	173;"	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
@@ -685,7 +685,7 @@ DestroyItem	src/Dodge/Data/Scenario.hs	7;"	C
 DestroyTLS	src/Dodge/Data/LightSource.hs	22;"	C
 Detector	src/Dodge/Combine/Data.hs	224;"	t
 Detector	src/Dodge/Data/Item/Combine.hs	221;"	t
-DetectorMod	src/Dodge/Data/Item/HeldUse.hs	108;"	C
+DetectorMod	src/Dodge/Data/Item/HeldUse.hs	107;"	C
 Dirt	src/Dodge/Data/Material.hs	11;"	C
 DisasterType	src/Dodge/Data/Scenario.hs	24;"	t
 Display	src/Dodge/Item/Display.hs	1;"	m
@@ -708,7 +708,7 @@ DoActions	src/Dodge/Data/ActionPlan.hs	130;"	C
 DoImpulses	src/Dodge/Data/ActionPlan.hs	100;"	C
 DoImpulsesAlongside	src/Dodge/Data/ActionPlan.hs	169;"	C
 DoNotMoveEquipment	src/Dodge/Data/RightButtonOptions.hs	19;"	C
-DoNothingMod	src/Dodge/Data/Item/HeldUse.hs	106;"	C
+DoNothingMod	src/Dodge/Data/Item/HeldUse.hs	105;"	C
 DoReplicate	src/Dodge/Data/ActionPlan.hs	140;"	C
 DoReplicatePartial	src/Dodge/Data/ActionPlan.hs	144;"	C
 DockingBaySS	src/Dodge/Data/Scenario.hs	92;"	C
@@ -876,7 +876,7 @@ Event	src/Dodge/Button/Event.hs	1;"	m
 Event	src/Dodge/Event.hs	14;"	m
 ExamineInventory	src/Dodge/Data/HUD.hs	25;"	C
 ExpireAndDamage	src/Dodge/Particle/HitEffect/ExpireAndDamage.hs	1;"	m
-ExplodeRemoteShellMod	src/Dodge/Data/Item/HeldUse.hs	105;"	C
+ExplodeRemoteShellMod	src/Dodge/Data/Item/HeldUse.hs	104;"	C
 Explore	src/Dodge/Data/Scenario.hs	4;"	C
 Explosion	src/Dodge/Data/SoundOrigin.hs	35;"	C
 Explosion	src/Dodge/WorldEvent/Explosion.hs	4;"	m
@@ -927,7 +927,7 @@ Factory	src/Dodge/Data/Scenario.hs	56;"	C
 FailedResource	src/Dodge/Data/Scenario.hs	37;"	t
 Family	src/Dodge/Item/Family.hs	1;"	m
 FetchItem	src/Dodge/Data/Scenario.hs	11;"	C
-FireRemoteShellMod	src/Dodge/Data/Item/HeldUse.hs	104;"	C
+FireRemoteShellMod	src/Dodge/Data/Item/HeldUse.hs	103;"	C
 FirstWeapon	src/Dodge/Layout/Tree/Annotate.hs	19;"	C
 Fitting	src/Dodge/LightSources/Fitting.hs	1;"	m
 Fixated	src/Dodge/Creature/AlertLevel/Data.hs	23;"	C
@@ -996,7 +996,7 @@ FootstepSound	src/Dodge/Data/SoundOrigin.hs	27;"	C
 ForceField	src/Dodge/ForceField.hs	1;"	m
 ForceField	src/Dodge/Wall/ForceField.hs	1;"	m
 ForceFieldAmmo	src/Dodge/Data/Ammo.hs	47;"	C
-ForceFieldMod	src/Dodge/Data/Item/HeldUse.hs	107;"	C
+ForceFieldMod	src/Dodge/Data/Item/HeldUse.hs	106;"	C
 ForceFieldType	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	46;"	t
 Foreground	src/Dodge/Default/Foreground.hs	1;"	m
 Foreground	src/Dodge/Room/Foreground.hs	1;"	m
@@ -1146,12 +1146,10 @@ HeldScrollCharMode	src/Dodge/Data/Item/HeldScroll.hs	16;"	C
 HeldScrollDoNothing	src/Dodge/Data/Item/HeldScroll.hs	14;"	C
 HeldScrollZoom	src/Dodge/Data/Item/HeldScroll.hs	15;"	C
 HeldShatter	src/Dodge/Data/Item/HeldUse.hs	30;"	C
-HeldTeslaArc	src/Dodge/Data/Item/HeldUse.hs	24;"	C
 HeldTractor	src/Dodge/Data/Item/HeldUse.hs	28;"	C
 HeldUse	src/Dodge/Data/Item/Use.hs	33;"	C
 HeldUse	src/Dodge/Data/Item/HeldUse.hs	6;"	m
 HeldUse	src/Dodge/HeldUse.hs	2;"	m
-HeldUseAmmoParams	src/Dodge/Data/Item/HeldUse.hs	17;"	C
 HelpNum	src/HelpNum.hs	1;"	m
 HelperParticle	src/Dodge/WorldEvent/HelperParticle.hs	2;"	m
 HiddenGoal	src/Dodge/Data/Scenario.hs	14;"	C
@@ -1295,7 +1293,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	171;"	t
+ItZoom	src/Dodge/Data/Item/Use.hs	182;"	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
@@ -1401,8 +1399,7 @@ Lampoid	src/Dodge/Lampoid.hs	1;"	m
 Large	src/Shape/Data.hs	29;"	C
 LasBeamCombine	src/Dodge/Data/Beam.hs	40;"	C
 LasGunFlare	src/Dodge/Data/Item/Use.hs	141;"	C
-LasGunMod	src/Dodge/Data/Item/HeldUse.hs	78;"	C
-LasMod	src/Dodge/Data/Item/HeldUse.hs	79;"	C
+LasMod	src/Dodge/Data/Item/HeldUse.hs	78;"	C
 LasSound	src/Dodge/Data/SoundOrigin.hs	26;"	C
 LasTurret	src/Dodge/Room/LasTurret.hs	1;"	m
 LasWideMod	src/Dodge/Data/Item/HeldUse.hs	76;"	C
@@ -1417,7 +1414,7 @@ Launcher	src/Dodge/Item/Weapon/Launcher.hs	1;"	m
 LauncherAI	src/Dodge/Data/Creature/Misc.hs	55;"	C
 LauncherCrit	src/Dodge/Creature/LauncherCrit.hs	1;"	m
 LauncherMod	src/Dodge/Data/Item/HeldUse.hs	73;"	C
-LauncherXMod	src/Dodge/Data/Item/HeldUse.hs	80;"	C
+LauncherXMod	src/Dodge/Data/Item/HeldUse.hs	79;"	C
 LaundrySS	src/Dodge/Data/Scenario.hs	115;"	C
 Layer	src/Picture/Data.hs	22;"	t
 Layer	src/Dodge/Picture/Layer.hs	3;"	m
@@ -1545,7 +1542,6 @@ Machine	src/Dodge/Data/Machine.hs	31;"	t
 Machine	src/Dodge/Data/Machine.hs	6;"	m
 Machine	src/Dodge/Machine.hs	1;"	m
 MachineAltSound	src/Dodge/Data/SoundOrigin.hs	20;"	C
-MachineGunMod	src/Dodge/Data/Item/HeldUse.hs	92;"	C
 MachinePart	src/Dodge/Data/Wall.hs	51;"	C
 MachineSound	src/Dodge/Data/SoundOrigin.hs	19;"	C
 MachineType	src/Dodge/Data/Machine.hs	49;"	t
@@ -1673,8 +1669,16 @@ 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	144;"	t
+Muzzle	src/Dodge/Data/Item/Use.hs	154;"	t
+MuzzleEffect	src/Dodge/Data/Item/Use.hs	144;"	t
 MuzzleEffect	src/Dodge/Data/MuzzleEffect.hs	5;"	m
+MuzzleFlame	src/Dodge/Data/Item/Use.hs	150;"	C
+MuzzleGas	src/Dodge/Data/Item/Use.hs	151;"	C
+MuzzleLaser	src/Dodge/Data/Item/Use.hs	146;"	C
+MuzzleLauncher	src/Dodge/Data/Item/Use.hs	149;"	C
+MuzzleShootBullet	src/Dodge/Data/Item/Use.hs	145;"	C
+MuzzleTesla	src/Dodge/Data/Item/Use.hs	147;"	C
+MuzzleTractor	src/Dodge/Data/Item/Use.hs	148;"	C
 MvForward	src/Dodge/Data/ActionPlan.hs	35;"	C
 MvPt	src/Dodge/MvPt.hs	1;"	m
 MvTurnToward	src/Dodge/Data/ActionPlan.hs	34;"	C
@@ -1838,7 +1842,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	166;"	C
+OneHand	src/Dodge/Data/Item/Use.hs	177;"	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
@@ -1960,7 +1964,7 @@ Pipe	src/Dodge/Placement/Instance/Pipe.hs	1;"	m
 PistolAI	src/Dodge/Data/Creature/Misc.hs	53;"	C
 PistolCrit	src/Dodge/Creature/PistolCrit.hs	1;"	m
 PistolFlare	src/Dodge/Data/Item/Use.hs	138;"	C
-PistolMod	src/Dodge/Data/Item/HeldUse.hs	95;"	C
+PistolMod	src/Dodge/Data/Item/HeldUse.hs	94;"	C
 PlaceSpot	src/Dodge/Placement/PlaceSpot.hs	4;"	m
 Placement	src/Dodge/Data/GenWorld.hs	77;"	t
 Placement	src/Dodge/Placement.hs	1;"	m
@@ -2352,7 +2356,7 @@ ShapePicture	src/ShapePicture.hs	2;"	m
 ShapeProp	src/Dodge/Data/Prop.hs	33;"	C
 ShapeType	src/Shape/Data.hs	16;"	t
 Shatter	src/Dodge/Item/Weapon/Shatter.hs	1;"	m
-ShatterMod	src/Dodge/Data/Item/HeldUse.hs	81;"	C
+ShatterMod	src/Dodge/Data/Item/HeldUse.hs	80;"	C
 Shell	src/Dodge/Data/Projectile.hs	15;"	C
 Shell	src/Dodge/Default/Shell.hs	1;"	m
 Shell	src/Dodge/Item/Weapon/Shell.hs	1;"	m
@@ -2635,7 +2639,7 @@ TeslaArc	src/Dodge/Data/TeslaArc.hs	6;"	m
 TeslaArc	src/Dodge/Particle/TeslaArc.hs	1;"	m
 TeslaBall	src/Dodge/Data/Bullet.hs	32;"	C
 TeslaBeamCombine	src/Dodge/Data/Beam.hs	41;"	C
-TeslaMod	src/Dodge/Data/Item/HeldUse.hs	74;"	C
+TeslaGunFlare	src/Dodge/Data/Item/Use.hs	142;"	C
 Test	src/Dodge/Creature/Test.hs	8;"	m
 Test	src/Dodge/Event/Test.hs	1;"	m
 Test	src/Picture/Test.hs	1;"	m
@@ -2683,7 +2687,7 @@ TorqueDamage	src/Dodge/Data/Damage.hs	27;"	C
 TorqueDamage	src/Dodge/Data/DamageType.hs	33;"	C
 TractorBeam	src/Dodge/Data/TractorBeam.hs	13;"	t
 TractorBeam	src/Dodge/Data/TractorBeam.hs	6;"	m
-TractorMod	src/Dodge/Data/Item/HeldUse.hs	103;"	C
+TractorMod	src/Dodge/Data/Item/HeldUse.hs	102;"	C
 TrainingCamp	src/Dodge/Data/Scenario.hs	63;"	C
 Translate	src/Dodge/Path/Translate.hs	1;"	m
 TransparencyEffects	src/Dodge/TransparencyEffects.hs	1;"	m
@@ -2726,9 +2730,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	165;"	C
-TwoHandOver	src/Dodge/Data/Item/Use.hs	164;"	C
-TwoHandUnder	src/Dodge/Data/Item/Use.hs	163;"	C
+TwoHandFlat	src/Dodge/Data/Item/Use.hs	176;"	C
+TwoHandOver	src/Dodge/Data/Item/Use.hs	175;"	C
+TwoHandUnder	src/Dodge/Data/Item/Use.hs	174;"	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
@@ -3550,9 +3554,9 @@ _iyBase	src/Dodge/Data/Item/Combine.hs	17;"	f
 _iyModules	src/Dodge/Combine/Data.hs	14;"	f
 _iyModules	src/Dodge/Data/Item/Combine.hs	18;"	f
 _iyStack	src/Dodge/Combine/Data.hs	15;"	f
-_izFac	src/Dodge/Data/Item/Use.hs	174;"	f
-_izMax	src/Dodge/Data/Item/Use.hs	172;"	f
-_izMin	src/Dodge/Data/Item/Use.hs	173;"	f
+_izFac	src/Dodge/Data/Item/Use.hs	185;"	f
+_izMax	src/Dodge/Data/Item/Use.hs	183;"	f
+_izMin	src/Dodge/Data/Item/Use.hs	184;"	f
 _killTarget	src/Dodge/Data/ActionPlan.hs	198;"	f
 _lClock	src/Dodge/Data/LWorld.hs	145;"	f
 _lTestInt	src/Dodge/Data/LWorld.hs	147;"	f
@@ -3682,11 +3686,12 @@ _mvSpeed	src/Dodge/Data/Creature/Misc.hs	39;"	f
 _mvToPoint	src/Dodge/Data/Creature.hs	98;"	f
 _mvTurnJit	src/Dodge/Data/Creature/Misc.hs	43;"	f
 _mvTurnRad	src/Dodge/Data/Creature/Misc.hs	42;"	f
-_mzAmmoSlot	src/Dodge/Data/Item/Use.hs	148;"	f
-_mzFlareType	src/Dodge/Data/Item/Use.hs	149;"	f
-_mzInaccuracy	src/Dodge/Data/Item/Use.hs	147;"	f
-_mzPos	src/Dodge/Data/Item/Use.hs	145;"	f
-_mzRot	src/Dodge/Data/Item/Use.hs	146;"	f
+_mzAmmoSlot	src/Dodge/Data/Item/Use.hs	158;"	f
+_mzEffect	src/Dodge/Data/Item/Use.hs	160;"	f
+_mzFlareType	src/Dodge/Data/Item/Use.hs	159;"	f
+_mzInaccuracy	src/Dodge/Data/Item/Use.hs	157;"	f
+_mzPos	src/Dodge/Data/Item/Use.hs	155;"	f
+_mzRot	src/Dodge/Data/Item/Use.hs	156;"	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
@@ -4437,24 +4442,24 @@ anyTargeting	src/Dodge/Render/ShapePicture.hs	70;"	f
 anyUnusedSpot	src/Dodge/PlacementSpot.hs	66;"	f
 anythingHitCirc	src/Dodge/Base/Collide.hs	242;"	f
 appendEitherTree	src/Dodge/Layout/Tree/Either.hs	29;"	f
-applyCME	src/Dodge/HeldUse.hs	378;"	f
+applyCME	src/Dodge/HeldUse.hs	375;"	f
 applyCreatureDamage	src/Dodge/Creature/Damage.hs	14;"	f
 applyDamageEffect	src/Dodge/Creature/Damage.hs	31;"	f
 applyEventIO	src/Loop.hs	89;"	f
 applyIndividualDamage	src/Dodge/Creature/Damage.hs	49;"	f
 applyIndividualDamage'	src/Dodge/Creature/Damage.hs	52;"	f
-applyInvLock	src/Dodge/HeldUse.hs	388;"	f
+applyInvLock	src/Dodge/HeldUse.hs	385;"	f
 applyMagnetsToBul	src/Dodge/Bullet.hs	46;"	f
 applyModules	src/Dodge/Combine/Module.hs	52;"	f
 applyNoDamage	src/Dodge/Creature/Damage.hs	11;"	f
 applyPastDamages	src/Dodge/Creature/State.hs	169;"	f
 applyPiercingDamage	src/Dodge/Creature/Damage.hs	57;"	f
 applyPosition	src/Sound.hs	110;"	f
-applyRecoil	src/Dodge/HeldUse.hs	405;"	f
+applyRecoil	src/Dodge/HeldUse.hs	402;"	f
 applyResFactor	src/Dodge/Data/Config.hs	108;"	f
 applySetTerminalString	src/Dodge/Debug/Terminal.hs	78;"	f
-applySidePush	src/Dodge/HeldUse.hs	412;"	f
-applySoundCME	src/Dodge/HeldUse.hs	396;"	f
+applySidePush	src/Dodge/HeldUse.hs	409;"	f
+applySoundCME	src/Dodge/HeldUse.hs	393;"	f
 applyTerminalCommand	src/Dodge/Debug/Terminal.hs	27;"	f
 applyTerminalCommandArguments	src/Dodge/Debug/Terminal.hs	39;"	f
 applyTerminalString	src/Dodge/Debug/Terminal.hs	21;"	f
@@ -4469,7 +4474,7 @@ applyToSubforest	src/Dodge/Tree/Polymorphic.hs	66;"	f
 applyToSubforest	src/TreeHelp.hs	77;"	f
 applyToSubtree	src/Dodge/Tree/Polymorphic.hs	60;"	f
 applyToSubtree	src/TreeHelp.hs	70;"	f
-applyTorqueCME	src/Dodge/HeldUse.hs	422;"	f
+applyTorqueCME	src/Dodge/HeldUse.hs	419;"	f
 applyWorldConfig	src/Dodge/Config/Update.hs	38;"	f
 aquamarine	src/Color.hs	23;"	f
 arc	src/Picture/Base.hs	287;"	f
@@ -4518,7 +4523,7 @@ autoGunSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
 autoPistol	src/Dodge/Item/Held/Stick.hs	53;"	f
 autoPistol	src/Dodge/Item/Weapon/BulletGun/Stick.hs	79;"	f
 autoRadarEffect	src/Dodge/Item/Weapon/ExtraEffect.hs	39;"	f
-autoRifle	src/Dodge/Item/Held/Cane.hs	68;"	f
+autoRifle	src/Dodge/Item/Held/Cane.hs	69;"	f
 autoRifle	src/Dodge/Item/Weapon/BulletGun/Cane.hs	97;"	f
 autoSonarEffect	src/Dodge/Item/Weapon/ExtraEffect.hs	43;"	f
 autogunSpread	src/Dodge/Item/Weapon/AutoGun.hs	78;"	f
@@ -4540,7 +4545,7 @@ bangRod	src/Dodge/Item/Weapon/BulletGun/Rod.hs	18;"	f
 bangS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	478;"	f
 bangStick	src/Dodge/Item/Held/Stick.hs	17;"	f
 bangStick	src/Dodge/Item/Weapon/BulletGun/Stick.hs	17;"	f
-bangStickSoundChoice	src/Dodge/HeldUse.hs	1009;"	f
+bangStickSoundChoice	src/Dodge/HeldUse.hs	1057;"	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
@@ -4563,7 +4568,7 @@ baseStickSpread	src/Dodge/Item/Held/Stick.hs	32;"	f
 baseStickSpread	src/Dodge/Item/Weapon/BulletGun/Stick.hs	46;"	f
 baseWindowPane	src/Dodge/Placements/Wall.hs	73;"	f
 baseWindowPane	src/Dodge/Room/Placement.hs	103;"	f
-basicAmPjMoves	src/Dodge/Item/Held/Launcher.hs	59;"	f
+basicAmPjMoves	src/Dodge/Item/Held/Launcher.hs	65;"	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
@@ -4577,11 +4582,11 @@ basicDrawBeam	src/Dodge/Beam/Draw.hs	11;"	f
 basicItemDisplay	src/Dodge/Item/Display.hs	50;"	f
 basicMachineApplyDamage	src/Dodge/Machine/Damage.hs	6;"	f
 basicMachineUpdate	src/Dodge/Machine.hs	13;"	f
-basicMuzFlare	src/Dodge/HeldUse.hs	465;"	f
+basicMuzFlare	src/Dodge/HeldUse.hs	464;"	f
 basicPerceptionUpdateR	src/Dodge/Creature/AlertLevel.hs	17;"	f
 basicTerminal	src/Dodge/Terminal.hs	32;"	f
-battery	src/Dodge/Item/Ammo.hs	67;"	f
-batteryModules	src/Dodge/Item/Held/BatteryGuns.hs	115;"	f
+battery	src/Dodge/Item/Ammo.hs	71;"	f
+batteryModules	src/Dodge/Item/Held/BatteryGuns.hs	120;"	f
 batteryPack	src/Dodge/Item/Equipment.hs	58;"	f
 belowNumX	src/Dodge/Combine/Graph.hs	77;"	f
 beltMag	src/Dodge/Item/Ammo.hs	42;"	f
@@ -4619,7 +4624,7 @@ bloodPuddleAt	src/Dodge/Creature/State.hs	132;"	f
 blowTorch	src/Dodge/Item/Held/SprayGuns.hs	44;"	f
 blowTorch	src/Dodge/Item/Weapon/SprayGuns.hs	49;"	f
 blue	src/Color.hs	16;"	f
-blunderbuss	src/Dodge/Item/Held/Cone.hs	28;"	f
+blunderbuss	src/Dodge/Item/Held/Cone.hs	29;"	f
 boostPoint	src/Dodge/Item/Weapon/Booster.hs	17;"	f
 boostPoint	src/Dodge/Luse.hs	104;"	f
 boostSelfL	src/Dodge/Item/Weapon/Booster.hs	31;"	f
@@ -4629,7 +4634,7 @@ boosterGun	src/Dodge/Item/Weapon/Booster.hs	111;"	f
 bossKeyItems	src/Dodge/LockAndKey.hs	11;"	f
 bossRoom	src/Dodge/Room/Boss.hs	59;"	f
 bounceBall	src/Dodge/Base/Collide.hs	77;"	f
-bounceDir	src/Dodge/Bullet.hs	99;"	f
+bounceDir	src/Dodge/Bullet.hs	100;"	f
 bounceModule	src/Dodge/Item/Craftable.hs	29;"	f
 bouncePoint	src/Dodge/Base/Collide.hs	87;"	f
 boundPoints	src/Bound.hs	10;"	f
@@ -4654,20 +4659,19 @@ bufferPokedVBO	src/Shader/Bind.hs	18;"	f
 bufferShaderLayers	src/Shader/Bind.hs	35;"	f
 bulDamageCr	src/Dodge/Particle/Bullet/DestroyDamage.hs	21;"	f
 bulDamageWall	src/Dodge/Particle/Bullet/DestroyDamage.hs	30;"	f
-bulGunEffect	src/Dodge/HeldUse.hs	357;"	f
-bulGunEffect'	src/Dodge/HeldUse.hs	360;"	f
+bulGunEffect	src/Dodge/HeldUse.hs	354;"	f
+bulGunEffect'	src/Dodge/HeldUse.hs	357;"	f
 bulSelTweak	src/Dodge/TweakBullet.hs	15;"	f
 bulletBeltBracer	src/Dodge/Item/Equipment.hs	83;"	f
 bulletBeltPack	src/Dodge/Item/Equipment.hs	74;"	f
 bulletBodyCraft	src/Dodge/Item/Craftable.hs	24;"	f
 bulletCombinations	src/Dodge/Combine/Graph.hs	35;"	f
-bulletGunEffect	src/Dodge/HeldUse.hs	530;"	f
 bulletMagazines	src/Dodge/Combine/Combinations.hs	239;"	f
-bulletSpawn	src/Dodge/Bullet.hs	104;"	f
-bulletSynthesizer	src/Dodge/Item/Ammo.hs	81;"	f
+bulletSpawn	src/Dodge/Bullet.hs	105;"	f
+bulletSynthesizer	src/Dodge/Item/Ammo.hs	85;"	f
 bulletTypes	src/Dodge/TweakBullet.hs	26;"	f
 bulletWeapons	src/Dodge/Combine/Combinations.hs	247;"	f
-burstRifle	src/Dodge/Item/Held/Cane.hs	77;"	f
+burstRifle	src/Dodge/Item/Held/Cane.hs	78;"	f
 burstRifle	src/Dodge/Item/Weapon/BulletGun/Cane.hs	105;"	f
 buzzS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	502;"	f
 buzzSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
@@ -4677,7 +4681,7 @@ canAttachTargeting	src/Dodge/Item/Display.hs	19;"	f
 canHeldScrollAttach	src/Dodge/HeldScroll.hs	75;"	f
 canSee	src/Dodge/Base/Collide.hs	228;"	f
 canSeeIndirect	src/Dodge/Base/Collide.hs	235;"	f
-caneStickSoundChoice	src/Dodge/HeldUse.hs	1004;"	f
+caneStickSoundChoice	src/Dodge/HeldUse.hs	1052;"	f
 cardList	src/Dodge/Base/CardinalPoint.hs	6;"	f
 cardVec	src/Dodge/Base/CardinalPoint.hs	9;"	f
 cardinalVectors	src/Dodge/FloorItem.hs	39;"	f
@@ -4987,7 +4991,7 @@ damageSensor	src/Dodge/Machine/Sensor.hs	16;"	f
 damageSensor	src/Dodge/Placement/Instance/Sensor.hs	15;"	f
 damageSensor	src/Dodge/Placements/Sensor.hs	15;"	f
 damageStone	src/Dodge/Material/Damage.hs	20;"	f
-damageThingHit	src/Dodge/Bullet.hs	175;"	f
+damageThingHit	src/Dodge/Bullet.hs	176;"	f
 damageTypeThreshold	src/Dodge/Placement/Instance/Sensor.hs	45;"	f
 damageUsing	src/Dodge/Machine/Update.hs	151;"	f
 damageWall	src/Dodge/Wall/Damage.hs	15;"	f
@@ -5048,7 +5052,7 @@ defaultAudition	src/Dodge/Default/Creature.hs	99;"	f
 defaultAutoWall	src/Dodge/Default/Door.hs	15;"	f
 defaultBangCane	src/Dodge/Item/Held/Cane.hs	19;"	f
 defaultBangCane	src/Dodge/Item/Weapon/BulletGun/Cane.hs	16;"	f
-defaultBatteryGun	src/Dodge/Item/Held/BatteryGuns.hs	110;"	f
+defaultBatteryGun	src/Dodge/Item/Held/BatteryGuns.hs	115;"	f
 defaultBlock	src/Dodge/Default/Block.hs	5;"	f
 defaultBounds	src/Dodge/Bounds.hs	13;"	f
 defaultBounds	src/Dodge/Data/Bounds.hs	20;"	f
@@ -5065,7 +5069,7 @@ defaultChaseMvType	src/Dodge/Default/Creature.hs	113;"	f
 defaultClusterStatus	src/Dodge/Default/Room.hs	38;"	f
 defaultConfig	src/Dodge/Config/Data.hs	83;"	f
 defaultConfig	src/Dodge/Data/Config.hs	125;"	f
-defaultConsumable	src/Dodge/Default/Item.hs	68;"	f
+defaultConsumable	src/Dodge/Default/Item.hs	69;"	f
 defaultCorpse	src/Dodge/Corpse/Make.hs	29;"	f
 defaultCraftItem	src/Dodge/Default/Item.hs	42;"	f
 defaultCreature	src/Dodge/Default/Creature.hs	12;"	f
@@ -5099,7 +5103,7 @@ defaultInvSection	src/Dodge/Default/World.hs	216;"	f
 defaultInvSections	src/Dodge/Default/World.hs	174;"	f
 defaultInvSize	src/Dodge/Default/Creature.hs	79;"	f
 defaultItEffect	src/Dodge/Default/Item/Effect.hs	5;"	f
-defaultItZoom	src/Dodge/Default/Item/Use/AimParams.hs	30;"	f
+defaultItZoom	src/Dodge/Default/Item/Use/AimParams.hs	31;"	f
 defaultItemDimension	src/Dodge/Default/Item.hs	15;"	f
 defaultKeyConfigSDL	src/Dodge/Config/KeyConfig.hs	38;"	f
 defaultLS	src/Dodge/Default/LightSource.hs	6;"	f
@@ -5132,7 +5136,7 @@ defaultTerminal	src/Dodge/Default/Terminal.hs	8;"	f
 defaultTerminalInput	src/Dodge/Default/Terminal.hs	30;"	f
 defaultVision	src/Dodge/Default/Creature.hs	92;"	f
 defaultWall	src/Dodge/Default/Wall.hs	10;"	f
-defaultWeapon	src/Dodge/Default/Item.hs	58;"	f
+defaultWeapon	src/Dodge/Default/Item.hs	59;"	f
 defaultWindow	src/Dodge/Default/Wall.hs	74;"	f
 defaultWorld	src/Dodge/Default/World.hs	31;"	f
 defaultWorldHammers	src/Dodge/Default/Input.hs	28;"	f
@@ -5146,7 +5150,7 @@ deleteWallFromZones	src/Dodge/Wall/Zone.hs	23;"	f
 deleteWallID	src/Dodge/Wall/Delete.hs	13;"	f
 deleteWallIDs	src/Dodge/Wall/Delete.hs	28;"	f
 denormalEdges	src/Polyhedra.hs	135;"	f
-destroyAt	src/Dodge/Bullet.hs	200;"	f
+destroyAt	src/Dodge/Bullet.hs	201;"	f
 destroyAt	src/Dodge/WorldEvent/HitEffect.hs	24;"	f
 destroyBlock	src/Dodge/Block.hs	51;"	f
 destroyDoor	src/Dodge/Block.hs	79;"	f
@@ -5270,7 +5274,7 @@ doWdCrBl	src/Dodge/CreatureEffect.hs	37;"	f
 doWdCrCr	src/Dodge/CreatureEffect.hs	12;"	f
 doWdP2f	src/Dodge/WdP2f.hs	8;"	f
 doWdWd	src/Dodge/WorldEffect.hs	26;"	f
-doWeaponRepetitions	src/Dodge/HeldUse.hs	370;"	f
+doWeaponRepetitions	src/Dodge/HeldUse.hs	367;"	f
 doWindowScale	src/Dodge/Base/WinScale.hs	11;"	f
 doWindowScale	src/Dodge/WinScale.hs	10;"	f
 doWorldEvents	src/Dodge/Update.hs	307;"	f
@@ -5411,7 +5415,7 @@ drumMag	src/Dodge/Item/Ammo.hs	36;"	f
 dtIL	src/Dodge/DoubleTree.hs	15;"	f
 dtToAdjacency	src/Dodge/DoubleTree.hs	22;"	f
 dtToUpDownAdj	src/Dodge/DoubleTree.hs	28;"	f
-dualBeam	src/Dodge/Item/Held/BatteryGuns.hs	134;"	f
+dualBeam	src/Dodge/Item/Held/BatteryGuns.hs	139;"	f
 dualBeamPic	src/Dodge/Item/Draw/SPic.hs	471;"	f
 dualRayAt	src/Dodge/Item/Weapon/BatteryGuns.hs	144;"	f
 dummyMenuOption	src/Dodge/Menu/Option.hs	81;"	f
@@ -5469,7 +5473,7 @@ expandPolyByFixed	src/Dodge/LevelGen/StaticWalls.hs	97;"	f
 expandPolyCorners	src/Dodge/LevelGen/StaticWalls.hs	103;"	f
 expandToSquare	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	83;"	f
 expandTreeBy	src/Dodge/Layout/Tree/Either.hs	16;"	f
-expireAndDamage	src/Dodge/Bullet.hs	182;"	f
+expireAndDamage	src/Dodge/Bullet.hs	183;"	f
 expireAndDamage	src/Dodge/Particle/HitEffect/ExpireAndDamage.hs	11;"	f
 expireAndDamageFL	src/Dodge/Flame.hs	48;"	f
 explodeRemoteRocket	src/Dodge/Item/Weapon/Launcher.hs	10;"	f
@@ -5507,7 +5511,7 @@ findWallFreeDropPoint	src/Dodge/FloorItem.hs	47;"	f
 findWallsInPolygon	src/Dodge/LevelGen/StaticWalls/Deprecated.hs	78;"	f
 findWithIx	src/ListHelp.hs	123;"	f
 fireLoudS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	504;"	f
-fireRemoteShell	src/Dodge/HeldUse.hs	976;"	f
+fireRemoteShell	src/Dodge/HeldUse.hs	1024;"	f
 fireS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	332;"	f
 fireShell	src/Dodge/Projectile/Create.hs	35;"	f
 fireSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
@@ -5621,7 +5625,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	950;"	f
+getAmmoMagazine	src/Dodge/HeldUse.hs	998;"	f
 getArguments	src/Dodge/Update/Scroll.hs	147;"	f
 getArguments'	src/Dodge/Update/Scroll.hs	135;"	f
 getAvailableListLines	src/Dodge/SelectionList.hs	11;"	f
@@ -5671,7 +5675,7 @@ goToTarget	src/Dodge/Creature/ReaderUpdate.hs	136;"	f
 gotoTerminal	src/Dodge/Update.hs	118;"	f
 grahamEliminate	src/Geometry/Polygon.hs	108;"	f
 grahamScan	src/Geometry/Polygon.hs	101;"	f
-grapeCannon	src/Dodge/Item/Held/Cone.hs	37;"	f
+grapeCannon	src/Dodge/Item/Held/Cone.hs	38;"	f
 graphToEdges	src/Dodge/Graph.hs	35;"	f
 graphToIncidence	src/Dodge/Graph.hs	40;"	f
 graphicsMenu	src/Dodge/Menu.hs	162;"	f
@@ -5738,7 +5742,7 @@ heightWallPS	src/Dodge/Placement/Instance/Wall.hs	13;"	f
 heldAimEffects	src/Dodge/Creature/State.hs	68;"	f
 heldBounds	src/Dodge/Item/Module.hs	27;"	f
 heldComposedItem	src/Dodge/Item/Grammar.hs	38;"	f
-heldEffect	src/Dodge/HeldUse.hs	43;"	f
+heldEffect	src/Dodge/HeldUse.hs	44;"	f
 heldInfo	src/Dodge/Item/Info.hs	61;"	f
 heldItemOffset	src/Dodge/Item/HeldOffset.hs	24;"	f
 heldItemSPic	src/Dodge/Item/Draw/SPic.hs	156;"	f
@@ -5751,7 +5755,7 @@ highBar	src/Dodge/Room/Foreground.hs	89;"	f
 highDiagonalMesh	src/Dodge/Room/Foreground.hs	35;"	f
 highMesh	src/Dodge/Room/Foreground.hs	25;"	f
 hit1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	412;"	f
-hitEffFromBul	src/Dodge/Bullet.hs	144;"	f
+hitEffFromBul	src/Dodge/Bullet.hs	145;"	f
 hitS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	382;"	f
 hitSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
 holdForm	src/Dodge/Creature/Boid.hs	136;"	f
@@ -5873,7 +5877,7 @@ invertIntMap	src/Multiset.hs	61;"	f
 invertInventoryToMap	src/Dodge/Combine.hs	25;"	f
 invisibleChaseCrit	src/Dodge/Creature/ChaseCrit.hs	25;"	f
 invisibleWall	src/Dodge/Placement/Instance/Wall.hs	16;"	f
-isAmmoIntLink	src/Dodge/HeldUse.hs	484;"	f
+isAmmoIntLink	src/Dodge/HeldUse.hs	485;"	f
 isAnimate	src/Dodge/Creature/Test.hs	138;"	f
 isCognizant	src/Dodge/Creature/Perception.hs	105;"	f
 isElectrical	src/Dodge/Data/Damage.hs	42;"	f
@@ -5983,26 +5987,25 @@ lampCrSPic	src/Dodge/Render/ShapePicture.hs	93;"	f
 lasBeamCombine	src/Dodge/Beam.hs	31;"	f
 lasCenSensEdge	src/Dodge/Room/LasTurret.hs	112;"	f
 lasDronesPic	src/Dodge/Item/Weapon/Drone.hs	22;"	f
-lasGun	src/Dodge/Item/Held/BatteryGuns.hs	37;"	f
-lasGunEffect	src/Dodge/HeldUse.hs	354;"	f
+lasGun	src/Dodge/Item/Held/BatteryGuns.hs	40;"	f
 lasGunPic	src/Dodge/Item/Draw/SPic.hs	457;"	f
-lasGunTweak	src/Dodge/Item/Held/BatteryGuns.hs	68;"	f
+lasGunTweak	src/Dodge/Item/Held/BatteryGuns.hs	72;"	f
 lasRayAt	src/Dodge/Beam.hs	62;"	f
 lasSensorTurretTest	src/Dodge/Room/LasTurret.hs	105;"	f
 lasTunnel	src/Dodge/Room/LasTurret.hs	124;"	f
 lasTunnelRunPast	src/Dodge/Room/LasTurret.hs	165;"	f
 lasTurret	src/Dodge/Placement/Instance/Turret.hs	23;"	f
 lasTurret	src/Dodge/Placements/Turret.hs	29;"	f
-lasWide	src/Dodge/Item/Held/BatteryGuns.hs	101;"	f
-lasWideRate	src/Dodge/HeldUse.hs	865;"	f
+lasWide	src/Dodge/Item/Held/BatteryGuns.hs	105;"	f
+lasWideRate	src/Dodge/HeldUse.hs	913;"	f
 lastMap	src/Dodge/DoubleTree.hs	65;"	f
 latchkey	src/Dodge/Item/Held/Utility.hs	23;"	f
 latchkey	src/Dodge/Item/PassKey.hs	14;"	f
-launcher	src/Dodge/Item/Held/Launcher.hs	10;"	f
+launcher	src/Dodge/Item/Held/Launcher.hs	11;"	f
 launcherCrit	src/Dodge/Creature/LauncherCrit.hs	12;"	f
 launcherPic	src/Dodge/Item/Draw/SPic.hs	431;"	f
 launcherSound	src/Dodge/SoundLogic/Synonyms.hs	4;"	f
-launcherX	src/Dodge/Item/Held/Launcher.hs	39;"	f
+launcherX	src/Dodge/Item/Held/Launcher.hs	40;"	f
 layerNum	src/Picture/Data.hs	31;"	f
 layoutLevelFromSeed	src/Dodge/LevelGen.hs	47;"	f
 ldpVerticalSelection	src/Dodge/Update/Input/ScreenLayer.hs	90;"	f
@@ -6060,7 +6063,7 @@ loadEject	src/Dodge/Reloading/Action.hs	12;"	f
 loadInsert	src/Dodge/Reloading/Action.hs	6;"	f
 loadKeyConfig	src/Dodge/Config/KeyConfig.hs	60;"	f
 loadMusic	src/Dodge/SoundLogic/LoadSound.hs	21;"	f
-loadMuzzle	src/Dodge/HeldUse.hs	441;"	f
+loadMuzzle	src/Dodge/HeldUse.hs	438;"	f
 loadPartialInsert	src/Dodge/Reloading/Action.hs	9;"	f
 loadPrime	src/Dodge/Reloading/Action.hs	15;"	f
 loadSaveSlot	src/Dodge/Save.hs	74;"	f
@@ -6118,7 +6121,7 @@ makeArc	src/Picture/Base.hs	157;"	f
 makeBlip	src/Dodge/RadarSweep.hs	50;"	f
 makeBlockDebris	src/Dodge/Block/Debris.hs	28;"	f
 makeBoolOption	src/Dodge/Menu/OptionType.hs	8;"	f
-makeBullet	src/Dodge/HeldUse.hs	505;"	f
+makeBullet	src/Dodge/HeldUse.hs	554;"	f
 makeButton	src/Dodge/LevelGen/Switch.hs	16;"	f
 makeByteStringShaderUsingVAO	src/Shader/Compile.hs	137;"	f
 makeCloudAt	src/Dodge/WorldEvent/Cloud.hs	18;"	f
@@ -6134,7 +6137,7 @@ makeDefaultCorpse	src/Dodge/Corpse/Make.hs	14;"	f
 makeDoorDebris	src/Dodge/Block/Debris.hs	18;"	f
 makeEnumOption	src/Dodge/Menu/OptionType.hs	13;"	f
 makeExplosionAt	src/Dodge/WorldEvent/Explosion.hs	79;"	f
-makeFlak	src/Dodge/Bullet.hs	130;"	f
+makeFlak	src/Dodge/Bullet.hs	131;"	f
 makeFlame	src/Dodge/Flame.hs	131;"	f
 makeFlame	src/Dodge/Particle/Flame.hs	9;"	f
 makeFlameExplosionAt	src/Dodge/WorldEvent/Explosion.hs	62;"	f
@@ -6142,13 +6145,13 @@ makeFlamelet	src/Dodge/EnergyBall.hs	16;"	f
 makeFlamerSmokeAt	src/Dodge/WorldEvent/Cloud.hs	68;"	f
 makeFlashBall	src/Dodge/EnergyBall.hs	74;"	f
 makeFootstepSound	src/Dodge/Creature/State/WalkCycle.hs	32;"	f
-makeFragBullets	src/Dodge/Bullet.hs	115;"	f
+makeFragBullets	src/Dodge/Bullet.hs	116;"	f
 makeGasCloud	src/Dodge/WorldEvent/SpawnParticle.hs	80;"	f
 makeGrid	src/Grid.hs	46;"	f
 makeIntInterval	src/Dodge/Zoning/Base.hs	33;"	f
 makeLaserAt	src/Dodge/Item/Weapon/Laser.hs	42;"	f
 makeLaserScope	src/Dodge/Item/Weapon/Decoration.hs	12;"	f
-makeMuzzleFlare	src/Dodge/HeldUse.hs	453;"	f
+makeMuzzleFlare	src/Dodge/HeldUse.hs	450;"	f
 makeMuzzleSmoke	src/Dodge/HeldUse.hs	471;"	f
 makeOptionsSelectionList	src/Dodge/Menu/Option.hs	46;"	f
 makeParagraph	src/Justify.hs	6;"	f
@@ -6213,12 +6216,13 @@ mcProximitySensorUpdate	src/Dodge/Machine/Update.hs	104;"	f
 mcSPic	src/Dodge/Render/ShapePicture.hs	169;"	f
 mcSensorTriggerUpdate	src/Dodge/Machine/Update.hs	69;"	f
 mcSensorUpdate	src/Dodge/Machine/Update.hs	99;"	f
-mcShootLaser	src/Dodge/HeldUse.hs	1024;"	f
+mcShootLaser	src/Dodge/HeldUse.hs	1072;"	f
 mcTriggerVal	src/Dodge/Machine/Update.hs	75;"	f
 mcTypeUpdate	src/Dodge/Machine/Update.hs	24;"	f
-mcUseHeld	src/Dodge/HeldUse.hs	868;"	f
+mcUseHeld	src/Dodge/HeldUse.hs	916;"	f
 mcUseItem	src/Dodge/Machine/Update.hs	61;"	f
 medkit	src/Dodge/Item/Consumable.hs	8;"	f
+megaBattery	src/Dodge/Item/Ammo.hs	66;"	f
 megaTinMag	src/Dodge/Item/Ammo.hs	8;"	f
 meleeHeadingMove	src/Dodge/Creature/Boid.hs	281;"	f
 meleeHeadingMove	src/Dodge/Creature/ImpulseRat.hs	10;"	f
@@ -6260,7 +6264,7 @@ minStreamOn	src/StreamingHelp.hs	14;"	f
 mini1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	322;"	f
 miniGunCrit	src/Dodge/Creature.hs	62;"	f
 miniGunUse	src/Dodge/Item/Weapon/BulletGun/Cane.hs	113;"	f
-miniGunX	src/Dodge/Item/Held/Cane.hs	88;"	f
+miniGunX	src/Dodge/Item/Held/Cane.hs	89;"	f
 miniGunX	src/Dodge/Item/Weapon/BulletGun/Cane.hs	120;"	f
 miniGunXPict	src/Dodge/Item/Draw/SPic.hs	391;"	f
 miniGunXPictItem	src/Dodge/Item/Draw/SPic.hs	385;"	f
@@ -6315,7 +6319,7 @@ mouseCursorType	src/Dodge/Render/Picture.hs	74;"	f
 mouseOverSelectionList	src/Dodge/Update/Input/ScreenLayer.hs	73;"	f
 mousePlus	src/Dodge/Render/Picture.hs	86;"	f
 mouseWorldPos	src/Dodge/Base/Coordinate.hs	48;"	f
-moveBullet	src/Dodge/Bullet.hs	192;"	f
+moveBullet	src/Dodge/Bullet.hs	193;"	f
 moveCombineSel	src/Dodge/Update/Scroll.hs	55;"	f
 moveDoorToward	src/Dodge/LevelGen/MoveDoor.hs	22;"	f
 moveDownKey	src/Dodge/Config/KeyConfig.hs	19;"	f
@@ -6325,7 +6329,7 @@ moveLSThen	src/Dodge/Placement/Instance/LightSource.hs	31;"	f
 moveLaser	src/Dodge/Item/Weapon/Laser.hs	48;"	f
 moveLeftKey	src/Dodge/Config/KeyConfig.hs	20;"	f
 moveOldHotkey	src/Dodge/Hotkey.hs	32;"	f
-movePenBullet	src/Dodge/Bullet.hs	210;"	f
+movePenBullet	src/Dodge/Bullet.hs	211;"	f
 moveRightKey	src/Dodge/Config/KeyConfig.hs	21;"	f
 moveRoomBy	src/Dodge/Room/Link.hs	53;"	f
 moveSelectionMapSelection	src/SelectionIntMap.hs	47;"	f
@@ -6452,9 +6456,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	932;"	f
-overNozzles	src/Dodge/HeldUse.hs	910;"	f
-overNozzles'	src/Dodge/HeldUse.hs	918;"	f
+overNozzle	src/Dodge/HeldUse.hs	980;"	f
+overNozzles	src/Dodge/HeldUse.hs	958;"	f
+overNozzles'	src/Dodge/HeldUse.hs	966;"	f
 overPos	src/Picture/Base.hs	303;"	f
 overPosObj	src/Shape.hs	273;"	f
 overPosSH	src/Shape.hs	257;"	f
@@ -6490,7 +6494,7 @@ pauseSound	src/Dodge/SoundLogic.hs	41;"	f
 pauseTime	src/Dodge/Update.hs	171;"	f
 peZoneSize	src/Dodge/Zoning/Pathing.hs	46;"	f
 pedestalRoom	src/Dodge/Room/Containing.hs	49;"	f
-penThing	src/Dodge/Bullet.hs	223;"	f
+penThing	src/Dodge/Bullet.hs	224;"	f
 penWalls	src/Dodge/Particle/HitEffect.hs	15;"	f
 penWalls	src/Dodge/WorldEvent/HitEffect.hs	38;"	f
 penetrate	src/Dodge/Particle/HitEffect/Penetrate.hs	12;"	f
@@ -6855,9 +6859,10 @@ 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	50;"	f
+remoteLauncher	src/Dodge/Item/Held/Launcher.hs	56;"	f
 remoteShellCollisionCheck	src/Dodge/Projectile/Update.hs	42;"	f
 remoteShellShape	src/Dodge/Projectile/Draw.hs	39;"	f
+removeAmmoFromMag	src/Dodge/HeldUse.hs	538;"	f
 removeEither	src/Dodge/Layout/Tree/Either.hs	41;"	f
 removeHotkey	src/Dodge/Hotkey.hs	41;"	f
 removeInverseWalls	src/Dodge/LevelGen/StaticWalls.hs	25;"	f
@@ -6912,7 +6917,7 @@ rezInvBox	src/Dodge/Room/RezBox.hs	131;"	f
 rezText	src/Dodge/Story.hs	4;"	f
 rezText'	src/Dodge/Story.hs	17;"	f
 rhombus	src/Polyhedra.hs	71;"	f
-rifle	src/Dodge/Item/Held/Cane.hs	51;"	f
+rifle	src/Dodge/Item/Held/Cane.hs	52;"	f
 rifle	src/Dodge/Item/Weapon/BulletGun/Cane.hs	77;"	f
 right	src/DoubleStack.hs	16;"	f
 rightIsParentCombine	src/Dodge/Item/Grammar.hs	66;"	f
@@ -7074,7 +7079,7 @@ setDepth	src/Picture/Base.hs	128;"	f
 setDirPS	src/Dodge/PlacementSpot.hs	49;"	f
 setFallback	src/Dodge/PlacementSpot.hs	127;"	f
 setFirstPosSelectionSections	src/Dodge/SelectionSections.hs	23;"	f
-setFromToDams	src/Dodge/Bullet.hs	170;"	f
+setFromToDams	src/Dodge/Bullet.hs	171;"	f
 setHotkey	src/Dodge/Hotkey.hs	38;"	f
 setInLinks	src/Dodge/RoomLink.hs	51;"	f
 setInLinksByType	src/Dodge/RoomLink.hs	54;"	f
@@ -7169,7 +7174,7 @@ shootBangCone	src/Dodge/HeldUse/BulletWeapon.hs	98;"	f
 shootBangRod	src/Dodge/HeldUse/BulletWeapon.hs	185;"	f
 shootBangstick	src/Dodge/HeldUse/BulletWeapon.hs	9;"	f
 shootBezier	src/Dodge/Item/Weapon/Bezier.hs	51;"	f
-shootBullet	src/Dodge/Bullet.hs	61;"	f
+shootBullet	src/Dodge/HeldUse.hs	542;"	f
 shootBurstRifle	src/Dodge/HeldUse/BulletWeapon.hs	164;"	f
 shootBurstRifleRepeat	src/Dodge/HeldUse/BulletWeapon.hs	176;"	f
 shootDualLaser	src/Dodge/Item/Weapon/BatteryGuns.hs	103;"	f
@@ -7180,6 +7185,7 @@ shootFlameSpitterRepeat	src/Dodge/HeldUse/SprayWeapon.hs	19;"	f
 shootFlameThrower	src/Dodge/HeldUse/SprayWeapon.hs	26;"	f
 shootL	src/Dodge/Item/Weapon/TriggerType.hs	427;"	f
 shootLaser	src/Dodge/Item/Weapon/BatteryGuns.hs	77;"	f
+shootLaser'	src/Dodge/HeldUse.hs	521;"	f
 shootMachineGun	src/Dodge/HeldUse/BulletWeapon.hs	218;"	f
 shootMachinePistol	src/Dodge/HeldUse/BulletWeapon.hs	62;"	f
 shootMiniGun	src/Dodge/HeldUse/BulletWeapon.hs	113;"	f
@@ -7190,8 +7196,9 @@ 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	1033;"	f
+shootTeslaArc	src/Dodge/HeldUse.hs	1081;"	f
 shootTillEmpty	src/Dodge/Creature/Volition.hs	18;"	f
+shootTractorBeam	src/Dodge/HeldUse.hs	499;"	f
 shootVolleyGun	src/Dodge/HeldUse/BulletWeapon.hs	128;"	f
 shootersRoom	src/Dodge/Room/Room.hs	317;"	f
 shootersRoom'	src/Dodge/Room/Room.hs	282;"	f
@@ -7310,8 +7317,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	131;"	f
-spinDrag	src/Dodge/Item/Held/Launcher.hs	67;"	f
-spinStart	src/Dodge/Item/Held/Launcher.hs	75;"	f
+spinDrag	src/Dodge/Item/Held/Launcher.hs	73;"	f
+spinStart	src/Dodge/Item/Held/Launcher.hs	81;"	f
 splashMenu	src/Dodge/Menu.hs	27;"	f
 splashMenuOptions	src/Dodge/Menu.hs	32;"	f
 splashScreen	src/Dodge/Initialisation.hs	11;"	f
@@ -7497,7 +7504,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	83;"	f
+thrustParam	src/Dodge/Item/Held/Launcher.hs	89;"	f
 tileTexCoords	src/Tile.hs	10;"	f
 tilesFromRooms	src/Dodge/Layout.hs	205;"	f
 tilesToLine	src/Shader/AuxAddition.hs	66;"	f
@@ -7550,9 +7557,10 @@ torso	src/Dodge/Creature/Picture.hs	132;"	f
 tractCr	src/Dodge/TractorBeam/Update.hs	27;"	f
 tractFlIt	src/Dodge/TractorBeam/Update.hs	22;"	f
 tractorBeamAt	src/Dodge/Item/Weapon/BatteryGuns.hs	160;"	f
-tractorGun	src/Dodge/Item/Held/BatteryGuns.hs	76;"	f
+tractorBeamAt'	src/Dodge/HeldUse.hs	510;"	f
+tractorGun	src/Dodge/Item/Held/BatteryGuns.hs	80;"	f
 tractorGunPic	src/Dodge/Item/Draw/SPic.hs	485;"	f
-tractorGunTweak	src/Dodge/Item/Held/BatteryGuns.hs	93;"	f
+tractorGunTweak	src/Dodge/Item/Held/BatteryGuns.hs	97;"	f
 tractorPullPos	src/Dodge/TractorBeam/Update.hs	32;"	f
 tractorSPic	src/Dodge/TractorBeam/Draw.hs	10;"	f
 tranRot	src/Picture/Base.hs	124;"	f
@@ -7821,9 +7829,9 @@ useAmmoParams	src/Dodge/Item/Weapon/AmmoParams.hs	17;"	f
 useC	src/Dodge/Cuse.hs	6;"	f
 useE	src/Dodge/Euse.hs	24;"	f
 useEquipment	src/Dodge/Creature/State.hs	218;"	f
-useForceFieldGun	src/Dodge/HeldUse.hs	1046;"	f
-useGasParams	src/Dodge/HeldUse.hs	959;"	f
-useHeld	src/Dodge/HeldUse.hs	873;"	f
+useForceFieldGun	src/Dodge/HeldUse.hs	1094;"	f
+useGasParams	src/Dodge/HeldUse.hs	1007;"	f
+useHeld	src/Dodge/HeldUse.hs	921;"	f
 useHotKey	src/Dodge/Creature/YourControl.hs	49;"	f
 useItem	src/Dodge/Creature/Action/UseItem.hs	14;"	f
 useItemHotkey	src/Dodge/Creature/Impulse/UseItem.hs	124;"	f
@@ -7832,13 +7840,13 @@ useItemRightClick	src/Dodge/Creature/Impulse/UseItem.hs	25;"	f
 useL	src/Dodge/Luse.hs	13;"	f
 useLeftItem	src/Dodge/Creature/Action/UseItem.hs	38;"	f
 useLnkRoomPos	src/Dodge/PlacementSpot.hs	244;"	f
-useLoadedAmmo	src/Dodge/HeldUse.hs	488;"	f
+useLoadedAmmo	src/Dodge/HeldUse.hs	489;"	f
 useMagShield	src/Dodge/Euse.hs	69;"	f
-useMod	src/Dodge/HeldUse.hs	542;"	f
+useMod	src/Dodge/HeldUse.hs	591;"	f
 useNormalCamera	src/Dodge/Camera.hs	6;"	f
 usePayload	src/Dodge/Payload.hs	7;"	f
-usePjCreation	src/Dodge/HeldUse.hs	892;"	f
-usePjCreationX	src/Dodge/HeldUse.hs	901;"	f
+usePjCreation	src/Dodge/HeldUse.hs	940;"	f
+usePjCreationX	src/Dodge/HeldUse.hs	949;"	f
 useRewindGun	src/Dodge/Luse.hs	41;"	f
 useRoomPosCond	src/Dodge/PlacementSpot.hs	178;"	f
 useRoomPosRoomCond	src/Dodge/PlacementSpot.hs	181;"	f