From 636a13b678f6f58604ec93d2d52a9045f73415fd Mon Sep 17 00:00:00 2001 From: justin Date: Wed, 4 Jun 2025 11:21:15 +0100 Subject: [PATCH] Move weapon torque out of records --- src/Dodge/Data/Item/Use.hs | 7 +- src/Dodge/Default/Item/Use.hs | 3 +- src/Dodge/HeldUse.hs | 100 ++++++++- src/Dodge/Item/Held/Cane.hs | 3 - src/Dodge/Item/Held/Cone.hs | 2 - src/Dodge/Item/Held/Launcher.hs | 1 - src/Dodge/Item/Held/Rod.hs | 5 - src/Dodge/Item/Held/SprayGuns.hs | 8 +- src/Dodge/Item/Held/Stick.hs | 5 +- tags | 361 +++++++++++++++---------------- 10 files changed, 279 insertions(+), 216 deletions(-) diff --git a/src/Dodge/Data/Item/Use.hs b/src/Dodge/Data/Item/Use.hs index 3421223fd..b2c0da73c 100644 --- a/src/Dodge/Data/Item/Use.hs +++ b/src/Dodge/Data/Item/Use.hs @@ -75,17 +75,14 @@ data AttachParams data HeldParams = DefaultHeldParams | GasSprayParams - { _gasCreation :: GasCreate - , _torqueAfter :: Float - , _randomOffset :: Float + { _randomOffset :: Float , _sidePush :: Float , _weaponInvLock :: Int , _weaponRepeat :: [Int] } | BeamShooterParams | BulletShooterParams - { _torqueAfter :: Float - , _randomOffset :: Float + { _randomOffset :: Float , _sidePush :: Float , _weaponInvLock :: Int , _weaponRepeat :: [Int] diff --git a/src/Dodge/Default/Item/Use.hs b/src/Dodge/Default/Item/Use.hs index 9d6422e67..c52e889a1 100644 --- a/src/Dodge/Default/Item/Use.hs +++ b/src/Dodge/Default/Item/Use.hs @@ -29,8 +29,7 @@ defaultHeldUse = UseHeld -- , _heldHammer = HammerUp , _heldMuzzles = defaultMuzzles , _heldParams = BulletShooterParams - { _torqueAfter = 0.2 - , _randomOffset = 0 + { _randomOffset = 0 , _sidePush = 0 -- , _bulGunSound = Just (tap3S, 0) , _weaponInvLock = 0 diff --git a/src/Dodge/HeldUse.hs b/src/Dodge/HeldUse.hs index bfe056740..27ea3684d 100644 --- a/src/Dodge/HeldUse.hs +++ b/src/Dodge/HeldUse.hs @@ -322,7 +322,56 @@ applyTorqueCME itm cr w where cid = _crID cr (rot, g) = randomR (- torque, torque) $ _randGen w - torque = fromMaybe 0 $ itm ^? itUse . heldParams . torqueAfter + torque = torqueAmount itm + +torqueAmount :: Item -> Float +torqueAmount itm = case itm ^. itType of + HELD hit -> heldTorqueAmount hit + _ -> 0 + +heldTorqueAmount :: HeldItemType -> Float +heldTorqueAmount = \case + BANGSTICK i -> 0.18 + 0.02 * fromIntegral i + REWINDER -> 0 + TIMESTOPPER -> 0 + TIMESCROLLER -> 0 + PISTOL -> 0.2 + MACHINEPISTOL -> 0.2 + AUTOPISTOL -> 0.2 + SMG -> 0.05 + BANGCONE -> 0.1 + BLUNDERBUSS -> 0.1 + GRAPECANNON i -> 0.1 + 0.2 * fromIntegral i + MINIGUNX i -> 0.04 + 0.02 * fromIntegral i + VOLLEYGUN{} -> 0.1 + RIFLE -> 0.1 + ALTERIFLE -> 0.1 + AUTORIFLE -> 0.1 + BURSTRIFLE -> 0.1 + BANGROD -> 0.3 + ELEPHANTGUN -> 0.3 + AMR -> 0.3 + AUTOAMR -> 0.3 + SNIPERRIFLE -> 0.3 + FLAMESPITTER -> 0 + FLAMETHROWER -> 0 + FLAMETORRENT -> 0 + FLAMEWALL -> 0 + BLOWTORCH -> 0 + SPARKGUN -> 0 + TESLAGUN -> 0 + LASER -> 0 + TRACTORGUN -> 0 + RLAUNCHER -> 0 + RLAUNCHERX{} -> 0 + GLAUNCHER -> 0 + POISONSPRAYER -> 0 + SHATTERGUN -> 0 + TORCH -> 0 + FLATSHIELD -> 0 + KEYCARD{} -> 0 + BLINKER -> 0 + BLINKERUNSAFE -> 0 -- (Muzzle,Int,Int) = (muzzle, amountloaded, id of mag taken from) loadMuzzle :: @@ -787,9 +836,9 @@ useGasParams mmagid mz itm cr w = (pressure, g) = doGenFloat (_nzPressure $ _mzEffect mz) (_randGen w) gastype = fromMaybe (error "cannot find gas ammo") $ do magid <- mmagid + hit <- itm ^? itType . ibtHeld fueltype <- cr ^? crInv . ix magid . itConsumables . magParams . ampCreateGas - gc <- itm ^? itUse . heldParams . gasCreation - return $ gasCreate fueltype gc + gasType hit fueltype --pos = _crPos cr + rotateV (_crDir cr) (_mzPos mz + aimingWeaponZeroPos cr itm) (moff, mrot) = heldItemOrient2D itm cr (_mzPos mz) (_mzRot mz) pos = _crPos cr + rotateV (_crDir cr) moff @@ -797,8 +846,49 @@ useGasParams mmagid mz itm cr w = inacc = _mzInaccuracy mz dir = _crDir cr + mrot + a + _nzCurrentWalkAngle (_mzEffect mz) -gasCreate :: GasFuel -> GasCreate -> GasCreate -gasCreate = const id +gasType :: HeldItemType -> GasFuel -> Maybe GasCreate +gasType hit _ = case hit of + BANGSTICK{} -> Nothing + REWINDER -> Nothing + TIMESTOPPER -> Nothing + TIMESCROLLER -> Nothing + PISTOL -> Nothing + MACHINEPISTOL -> Nothing + AUTOPISTOL -> Nothing + SMG -> Nothing + BANGCONE -> Nothing + BLUNDERBUSS -> Nothing + GRAPECANNON{} -> Nothing + MINIGUNX{} -> Nothing + VOLLEYGUN{} -> Nothing + RIFLE -> Nothing + ALTERIFLE -> Nothing + AUTORIFLE -> Nothing + BURSTRIFLE -> Nothing + BANGROD -> Nothing + ELEPHANTGUN -> Nothing + AMR -> Nothing + AUTOAMR -> Nothing + SNIPERRIFLE -> Nothing + FLAMESPITTER -> Nothing + FLAMETHROWER -> Just CreateFlame + FLAMETORRENT -> Just CreateFlame + FLAMEWALL -> Just CreateFlame + BLOWTORCH -> Nothing + SPARKGUN -> Nothing + TESLAGUN -> Nothing + LASER -> Nothing + TRACTORGUN -> Nothing + RLAUNCHER -> Nothing + RLAUNCHERX{} -> Nothing + GLAUNCHER -> Nothing + POISONSPRAYER -> Just CreatePoisonGas + SHATTERGUN -> Nothing + TORCH -> Nothing + FLATSHIELD -> Nothing + KEYCARD{} -> Nothing + BLINKER -> Nothing + BLINKERUNSAFE -> Nothing doGenFloat :: RandomGen g => GenFloat -> g -> (Float, g) doGenFloat (ConstFloat x) g = (x, g) diff --git a/src/Dodge/Item/Held/Cane.hs b/src/Dodge/Item/Held/Cane.hs index 74d13a54e..bd45e8368 100644 --- a/src/Dodge/Item/Held/Cane.hs +++ b/src/Dodge/Item/Held/Cane.hs @@ -21,7 +21,6 @@ defaultBangCane :: Item defaultBangCane = defaultBulletWeapon -- & itUse . heldParams . recoil .~ 50 - & itUse . heldParams . torqueAfter .~ 0.1 & itUse . heldDelay . rateMax .~ 6 -- & itUse . heldMods .~ BangCaneMod -- & itUse . heldAim . aimHandlePos .~ 5 @@ -39,7 +38,6 @@ volleyGun i = <*> ZipList [0..i-1] ) & itUse . heldParams . weaponInvLock .~ i + 1 - & itUse . heldParams . torqueAfter .~ 0.1 -- & itUse . heldParams . recoil .~ 30 & itType .~ HELD (VOLLEYGUN i) & itAmmoSlots .~ IM.fromList (zip [0..i-1] $ repeat BulletAmmo) @@ -94,7 +92,6 @@ miniGunX i = .~ replicate i (Muzzle (V2 30 0) 0 0.05 0 MiniGunFlare MuzzleShootBullet (UseExactly 1) 0) -- & itUse . heldParams . recoil .~ 10 * fromIntegral i - & itUse . heldParams . torqueAfter .~ 0.04 + 0.02 * fromIntegral i & itUse . heldParams . sidePush .~ 10 * fromIntegral i & itUse . heldParams . randomOffset .~ 10 & itType .~ HELD (MINIGUNX i) diff --git a/src/Dodge/Item/Held/Cone.hs b/src/Dodge/Item/Held/Cone.hs index c3c44bae1..641ec4ffa 100644 --- a/src/Dodge/Item/Held/Cone.hs +++ b/src/Dodge/Item/Held/Cone.hs @@ -19,7 +19,6 @@ bangCone = 15 (Muzzle (V2 15 0) 0 0.5 0 NoFlare MuzzleShootBullet (UseExactly 1) 0) & itUse . heldMuzzles . ix 0 . mzFlareType .~ BasicFlare - & itUse . heldParams . torqueAfter .~ 0.1 & itUse . heldParams . randomOffset .~ 12 & itType .~ HELD BANGCONE @@ -33,5 +32,4 @@ grapeCannon :: Int -> Item grapeCannon i = blunderbuss & itType .~ HELD (GRAPECANNON i) - & itUse . heldParams . torqueAfter .~ (0.1 + 0.2 * fromIntegral i) & itUse . heldParams . randomOffset .~ (12 + 4 * fromIntegral i) diff --git a/src/Dodge/Item/Held/Launcher.hs b/src/Dodge/Item/Held/Launcher.hs index d52352d8b..806504fd8 100644 --- a/src/Dodge/Item/Held/Launcher.hs +++ b/src/Dodge/Item/Held/Launcher.hs @@ -20,7 +20,6 @@ rLauncher = & itUse . heldMuzzles . ix 0 . mzPos .~ V2 20 0 & itAmmoSlots .~ singleAmmo LauncherAmmo & itType .~ HELD RLAUNCHER - & itUse . heldParams . torqueAfter .~ 0 -- & itUse . heldParams . bulGunSound ?~ (tap4S, 0) diff --git a/src/Dodge/Item/Held/Rod.hs b/src/Dodge/Item/Held/Rod.hs index fce6c3091..3e22ec896 100644 --- a/src/Dodge/Item/Held/Rod.hs +++ b/src/Dodge/Item/Held/Rod.hs @@ -18,13 +18,8 @@ import LensHelp bangRod :: Item bangRod = defaultBulletWeapon --- & itUse . heldParams . recoil .~ 50 - & itUse . heldParams . torqueAfter .~ 0.3 --- & itUse . heldParams . bulGunSound ?~ (bangEchoS,0) & itUse . heldDelay . rateMax .~ 12 & itType .~ HELD BANGROD --- & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5} - -- & itUse . heldAim . aimHandlePos .~ 5 & itUse . heldMuzzles . ix 0 . mzPos .~ V2 30 0 & itUse . heldMuzzles . ix 0 . mzFlareType .~ HeavySmokeFlare -- & itUse . heldConsumption . laAmmoType .~ hvBulletAmmo diff --git a/src/Dodge/Item/Held/SprayGuns.hs b/src/Dodge/Item/Held/SprayGuns.hs index e0add1769..d72e0df3c 100644 --- a/src/Dodge/Item/Held/SprayGuns.hs +++ b/src/Dodge/Item/Held/SprayGuns.hs @@ -19,9 +19,6 @@ poisonSprayer = flameThrower & itType .~ HELD POISONSPRAYER & itAmmoSlots .~ singleAmmo GasAmmo - & itUse . heldParams . gasCreation .~ CreatePoisonGas --aGasCloud --- & itUse . heldParams . recoil .~ 0 - & itUse . heldParams . torqueAfter .~ 0 & itUse . heldParams . randomOffset .~ 0 & itUse . heldParams . sidePush .~ 0 -- & itUse . heldParams . bulGunSound ?~ (foamSprayLoopS,5) @@ -86,10 +83,7 @@ flameThrower = & itAmmoSlots .~ singleAmmo GasAmmo & itType .~ HELD FLAMETHROWER & itUse . heldParams .~ GasSprayParams - {_gasCreation = CreateFlame --- , _recoil = 0 - , _torqueAfter = 0 - , _randomOffset = 0 + { _randomOffset = 0 , _sidePush = 25 -- , _bulGunSound = Nothing , _weaponInvLock = 0 diff --git a/src/Dodge/Item/Held/Stick.hs b/src/Dodge/Item/Held/Stick.hs index fb7dc47b9..43acf8c2f 100644 --- a/src/Dodge/Item/Held/Stick.hs +++ b/src/Dodge/Item/Held/Stick.hs @@ -17,7 +17,6 @@ bangStick :: Int -> Item bangStick i = defaultBulletWeapon -- & itUse . heldParams . recoil .~ 25 - & itUse . heldParams . torqueAfter .~ 0.18 + 0.02 * fromIntegral i & itType .~ HELD (BANGSTICK i) & itUse . heldDelay . rateMax .~ 8 & itUse . heldMuzzles @@ -47,8 +46,7 @@ pistol = & itUse . heldMuzzles . ix 0 . mzInaccuracy %~ const 0.05 & itUse . heldMuzzles . ix 0 . mzFlareType %~ const BasicFlare & itUse . heldParams - %~ ( (torqueAfter .~ 0.2) - . (sidePush .~ 50) + %~ ( (sidePush .~ 50) ) & itType .~ HELD PISTOL @@ -68,5 +66,4 @@ smg = & itType .~ HELD SMG & itUse . heldMuzzles . ix 0 . mzPos .~ V2 20 0 & itUse . heldMuzzles . ix 0 . mzInaccuracy .~ 0 - & itUse . heldParams . torqueAfter .~ 0.05 & itUse . heldParams . sidePush .~ 30 diff --git a/tags b/tags index 454749cae..2c00cb240 100644 --- a/tags +++ b/tags @@ -25,9 +25,9 @@ ALTERIFLE src/Dodge/Data/Item/Combine.hs 152;" C AMMOMAG src/Dodge/Data/Item/Combine.hs 20;" C AMR src/Dodge/Data/Item/Combine.hs 157;" C ANTIMATTER src/Dodge/Data/Item/Combine.hs 67;" C -APInt src/Dodge/Data/Item/Use.hs 72;" C -APNothing src/Dodge/Data/Item/Use.hs 73;" C -APProjectiles src/Dodge/Data/Item/Use.hs 71;" C +APInt src/Dodge/Data/Item/Use.hs 71;" C +APNothing src/Dodge/Data/Item/Use.hs 72;" C +APProjectiles src/Dodge/Data/Item/Use.hs 70;" C AQUAMARINE src/Color/Data.hs 24;" C ARHUD src/Dodge/Data/Item/Combine.hs 34;" C ARHUDSF src/Dodge/Data/ComposedItem.hs 50;" C @@ -46,7 +46,6 @@ Add src/Dodge/Inventory/Add.hs 1;" m AddGoal src/Dodge/Data/ActionPlan.hs 45;" C AesonHelp src/AesonHelp.hs 1;" m AimAt src/Dodge/Data/ActionPlan.hs 84;" C -AimParams src/Dodge/Data/Item/Use.hs 109;" t AimParams src/Dodge/Default/Item/Use/AimParams.hs 1;" m AimStance src/Dodge/Data/AimStance.hs 9;" t AimStance src/Dodge/Data/AimStance.hs 4;" m @@ -68,10 +67,10 @@ AmmoMagSF src/Dodge/Data/ComposedItem.hs 51;" C AmmoMagType src/Dodge/Data/Item/Combine.hs 104;" t AmmoModLink src/Dodge/Data/ComposedItem.hs 19;" C AmmoModifierSF src/Dodge/Data/ComposedItem.hs 57;" C -AmmoParams src/Dodge/Data/Item/Use.hs 102;" t +AmmoParams src/Dodge/Data/Item/Use.hs 96;" t AmmoPayloadLink src/Dodge/Data/ComposedItem.hs 21;" C AmmoPayloadSF src/Dodge/Data/ComposedItem.hs 59;" C -AmmoPerShot src/Dodge/Data/Item/Use.hs 144;" t +AmmoPerShot src/Dodge/Data/Item/Use.hs 135;" t AmmoTargetingLink src/Dodge/Data/ComposedItem.hs 20;" C AmmoTargetingSF src/Dodge/Data/ComposedItem.hs 58;" C AmmoType src/Dodge/Data/Item/Use/Consumption/Ammo.hs 24;" t @@ -100,7 +99,7 @@ AsteroidStrike src/Dodge/Data/Scenario.hs 33;" C AtEase src/Dodge/Data/Creature/Stance.hs 40;" C AtomicWaste src/Dodge/Data/Scenario.hs 26;" C Attach src/Dodge/Item/Attach.hs 1;" m -AttachParams src/Dodge/Data/Item/Use.hs 70;" t +AttachParams src/Dodge/Data/Item/Use.hs 69;" t AttachType src/Dodge/Data/Item/Combine.hs 90;" t Attention src/Dodge/Data/Creature/Perception.hs 60;" t AttentiveTo src/Dodge/Data/Creature/Perception.hs 61;" C @@ -151,7 +150,7 @@ BaseTriggerType src/Dodge/BaseTriggerType.hs 3;" m BasicBeamDraw src/Dodge/Data/Beam.hs 34;" C BasicBulletTrajectory src/Dodge/Data/Bullet.hs 50;" C BasicBulletTrajectoryType src/Dodge/Data/Bullet.hs 57;" C -BasicFlare src/Dodge/Data/Item/Use.hs 114;" C +BasicFlare src/Dodge/Data/Item/Use.hs 105;" C BatteryGuns src/Dodge/Item/Held/BatteryGuns.hs 1;" m BatteryGuns src/Dodge/Item/Weapon/BatteryGuns.hs 1;" m Beam src/Dodge/Data/Beam.hs 18;" t @@ -233,7 +232,7 @@ BulletMod src/Dodge/Data/Item/BulletMod.hs 10;" t BulletMod src/Dodge/Data/Item/BulletMod.hs 3;" m BulletModEffect src/Dodge/Data/Item/BulletMod.hs 12;" C BulletModPayload src/Dodge/Data/Item/BulletMod.hs 11;" C -BulletParams src/Dodge/Data/Item/Use.hs 103;" C +BulletParams src/Dodge/Data/Item/Use.hs 97;" C BulletPayload src/Dodge/Data/Bullet.hs 41;" t BulletShooterParams src/Dodge/Data/Item/Use.hs 87;" C BulletTrajectory src/Dodge/Data/Bullet.hs 49;" t @@ -289,7 +288,7 @@ CardinalPoint src/Dodge/Base/CardinalPoint.hs 1;" m CardinalPoint src/Dodge/Data/CardinalPoint.hs 1;" m Carriage src/Dodge/Data/Creature/Stance.hs 20;" t Carte src/Dodge/Render/HUD/Carte.hs 1;" m -ChainEffect src/Dodge/HeldUse.hs 74;" t +ChainEffect src/Dodge/HeldUse.hs 75;" t ChainEffect src/Dodge/Item/Weapon/TriggerType.hs 43;" t ChainUpdates src/Dodge/Creature/ChainUpdates.hs 1;" m ChangePosture src/Dodge/Data/ActionPlan.hs 42;" C @@ -501,7 +500,7 @@ 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 35;" C -DefaultHeldParams src/Dodge/Data/Item/Use.hs 77;" C +DefaultHeldParams src/Dodge/Data/Item/Use.hs 76;" C DefaultLightSourceDraw src/Dodge/Data/LightSource.hs 13;" C DefaultRoomType src/Dodge/Data/Room.hs 31;" C DefaultTerminal src/Dodge/Data/Terminal.hs 55;" C @@ -690,7 +689,7 @@ FlameBeamCombine src/Dodge/Data/Beam.hs 39;" C FlameSound src/Dodge/Data/SoundOrigin.hs 27;" C Flamer src/Dodge/Data/SoundOrigin.hs 25;" C Flank src/Dodge/Data/ActionPlan.hs 177;" C -FlareType src/Dodge/Data/Item/Use.hs 112;" t +FlareType src/Dodge/Data/Item/Use.hs 103;" t FlashBall src/Dodge/Data/Bullet.hs 32;" C FlatFaces src/Shape/Data.hs 17;" C FlatShieldParams src/Dodge/Data/Item/Params.hs 15;" C @@ -760,8 +759,8 @@ GasAmmo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 30;" C GasCloud src/Dodge/Data/Cloud.hs 31;" C GasCreate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 41;" t GasFuel src/Dodge/Data/Item/Use/Consumption/Ammo.hs 38;" t -GasParams src/Dodge/Data/Item/Use.hs 105;" C -GasSprayParams src/Dodge/Data/Item/Use.hs 78;" C +GasParams src/Dodge/Data/Item/Use.hs 99;" C +GasSprayParams src/Dodge/Data/Item/Use.hs 77;" C GenCr src/Dodge/Data/Creature/State.hs 31;" C GenFloat src/Dodge/Data/GenFloat.hs 11;" t GenFloat src/Dodge/Data/GenFloat.hs 5;" m @@ -829,17 +828,17 @@ HammerUp src/Dodge/Data/Hammer.hs 20;" C HandPos src/Dodge/Creature/HandPos.hs 1;" m HardQuit src/Dodge/Data/Universe.hs 70;" C HasHammer src/Dodge/Data/Hammer.hs 14;" C -HeavySmokeFlare src/Dodge/Data/Item/Use.hs 117;" C +HeavySmokeFlare src/Dodge/Data/Item/Use.hs 108;" C Held src/Dodge/Item/Held.hs 1;" m HeldDelay src/Dodge/Data/Item/HeldDelay.hs 6;" m HeldItemType src/Dodge/Data/Item/Combine.hs 137;" t HeldOffset src/Dodge/Item/HeldOffset.hs 2;" m -HeldParams src/Dodge/Data/Item/Use.hs 76;" t +HeldParams src/Dodge/Data/Item/Use.hs 75;" t HeldPlatformSF src/Dodge/Data/ComposedItem.hs 41;" C HeldScroll src/Dodge/HeldScroll.hs 1;" m HeldUse src/Dodge/Data/Item/HeldUse.hs 6;" m -HeldUse src/Dodge/HeldUse.hs 4;" m -HeldUseEffect src/Dodge/Data/Item/Use.hs 54;" t +HeldUse src/Dodge/HeldUse.hs 5;" m +HeldUseEffect src/Dodge/Data/Item/Use.hs 53;" t HelpNum src/HelpNum.hs 1;" m HiddenGoal src/Dodge/Data/Scenario.hs 14;" C HomeUsingRemoteScreen src/Dodge/Data/Projectile.hs 49;" C @@ -970,7 +969,7 @@ ItemSetWarmTime src/Dodge/Data/Item/Effect.hs 34;" C ItemStructuralFunction src/Dodge/Data/ComposedItem.hs 39;" t ItemTargeting src/Dodge/Data/Item.hs 60;" t ItemType src/Dodge/Data/Item/Combine.hs 15;" t -ItemUse src/Dodge/Data/Item/Use.hs 32;" t +ItemUse src/Dodge/Data/Item/Use.hs 31;" t ItemUseToggle src/Dodge/Data/Item/Effect.hs 30;" C ItmCrWdWd src/Dodge/Data/Item/Use/Equipment.hs 28;" t ItmCrWdWdDoNothing src/Dodge/Data/Item/Use/Equipment.hs 29;" C @@ -1018,7 +1017,7 @@ Lampoid src/Dodge/Data/Creature/Misc.hs 83;" C Lampoid src/Dodge/Lampoid.hs 1;" m Large src/Shape/Data.hs 29;" C LasBeamCombine src/Dodge/Data/Beam.hs 40;" C -LasGunFlare src/Dodge/Data/Item/Use.hs 118;" C +LasGunFlare src/Dodge/Data/Item/Use.hs 109;" C LasSound src/Dodge/Data/SoundOrigin.hs 28;" C LasTurret src/Dodge/Room/LasTurret.hs 1;" m Laser src/Dodge/Data/Laser.hs 21;" t @@ -1189,7 +1188,7 @@ Metapysics src/Dodge/Data/Scenario.hs 17;" t Military src/Dodge/Data/Scenario.hs 45;" C Mine src/Dodge/Data/Scenario.hs 64;" C MiniGunAI src/Dodge/Data/Creature/Misc.hs 58;" C -MiniGunFlare src/Dodge/Data/Item/Use.hs 116;" C +MiniGunFlare src/Dodge/Data/Item/Use.hs 107;" C Misc src/Dodge/Data/Creature/Misc.hs 6;" m Misc src/Dodge/Data/Equipment/Misc.hs 6;" m Misc src/Dodge/Data/Item/Misc.hs 6;" m @@ -1223,23 +1222,23 @@ Multiset src/Multiset.hs 4;" m Music src/Music.hs 1;" m MusicData src/Music.hs 7;" t Mute src/Dodge/Data/Creature/Misc.hs 28;" C -Muzzle src/Dodge/Data/Item/Use.hs 149;" t -MuzzleBlink src/Dodge/Data/Item/Use.hs 137;" C -MuzzleDetector src/Dodge/Data/Item/Use.hs 136;" C -MuzzleEffect src/Dodge/Data/Item/Use.hs 122;" t +Muzzle src/Dodge/Data/Item/Use.hs 140;" t +MuzzleBlink src/Dodge/Data/Item/Use.hs 128;" C +MuzzleDetector src/Dodge/Data/Item/Use.hs 127;" C +MuzzleEffect src/Dodge/Data/Item/Use.hs 113;" t MuzzleEffect src/Dodge/Data/MuzzleEffect.hs 5;" m -MuzzleGLauncher src/Dodge/Data/Item/Use.hs 128;" C -MuzzleLaser src/Dodge/Data/Item/Use.hs 124;" C -MuzzleNozzle src/Dodge/Data/Item/Use.hs 129;" C -MuzzleRLauncher src/Dodge/Data/Item/Use.hs 127;" C -MuzzleRewind src/Dodge/Data/Item/Use.hs 139;" C -MuzzleScroller src/Dodge/Data/Item/Use.hs 141;" C -MuzzleShatter src/Dodge/Data/Item/Use.hs 135;" C -MuzzleShootBullet src/Dodge/Data/Item/Use.hs 123;" C -MuzzleStopper src/Dodge/Data/Item/Use.hs 140;" C -MuzzleTesla src/Dodge/Data/Item/Use.hs 125;" C -MuzzleTractor src/Dodge/Data/Item/Use.hs 126;" C -MuzzleUnsafeBlink src/Dodge/Data/Item/Use.hs 138;" C +MuzzleGLauncher src/Dodge/Data/Item/Use.hs 119;" C +MuzzleLaser src/Dodge/Data/Item/Use.hs 115;" C +MuzzleNozzle src/Dodge/Data/Item/Use.hs 120;" C +MuzzleRLauncher src/Dodge/Data/Item/Use.hs 118;" C +MuzzleRewind src/Dodge/Data/Item/Use.hs 130;" C +MuzzleScroller src/Dodge/Data/Item/Use.hs 132;" C +MuzzleShatter src/Dodge/Data/Item/Use.hs 126;" C +MuzzleShootBullet src/Dodge/Data/Item/Use.hs 114;" C +MuzzleStopper src/Dodge/Data/Item/Use.hs 131;" C +MuzzleTesla src/Dodge/Data/Item/Use.hs 116;" C +MuzzleTractor src/Dodge/Data/Item/Use.hs 117;" C +MuzzleUnsafeBlink src/Dodge/Data/Item/Use.hs 129;" C MvForward src/Dodge/Data/ActionPlan.hs 35;" C MvTurnToward src/Dodge/Data/ActionPlan.hs 34;" C MvWalking src/Dodge/Data/Creature/Misc.hs 39;" C @@ -1262,7 +1261,7 @@ NewIntMap src/NewInt.hs 18;" t NewSideEffect src/Dodge/Data/Universe.hs 65;" C Ngon src/Dodge/Room/Ngon.hs 1;" m NoAction src/Dodge/Data/ActionPlan.hs 152;" C -NoAmmoParams src/Dodge/Data/Item/Use.hs 106;" C +NoAmmoParams src/Dodge/Data/Item/Use.hs 100;" C NoArguments src/Dodge/Data/Terminal.hs 91;" C NoBeamCombine src/Dodge/Data/Beam.hs 43;" C NoConcurrentEffect src/Loop/Data.hs 7;" C @@ -1277,15 +1276,15 @@ NoDropEffect src/Dodge/Data/Item/Effect.hs 37;" C NoEquipParams src/Dodge/Data/Item/Use/Equipment.hs 36;" C NoEscapeMenuOption src/Dodge/Data/Universe.hs 79;" C NoFaction src/Dodge/Data/Creature/State.hs 40;" C -NoFlare src/Dodge/Data/Item/Use.hs 113;" C +NoFlare src/Dodge/Data/Item/Use.hs 104;" C NoHammer src/Dodge/Data/Hammer.hs 13;" C -NoHeldUseEffect src/Dodge/Data/Item/Use.hs 55;" C +NoHeldUseEffect src/Dodge/Data/Item/Use.hs 54;" C NoHoming src/Dodge/Data/Projectile.hs 48;" C NoIntImp src/Dodge/Data/CreatureEffect.hs 20;" C NoInvEffect src/Dodge/Data/Item/Effect.hs 24;" C NoItTargeting src/Dodge/Data/Item.hs 60;" C NoItemScroll src/Dodge/Data/Item.hs 56;" C -NoLightFlare src/Dodge/Data/Item/Use.hs 115;" C +NoLightFlare src/Dodge/Data/Item/Use.hs 106;" C NoLighting src/Dodge/Data/Config.hs 104;" C NoMouseContext src/Dodge/Data/Input.hs 22;" C NoMvType src/Dodge/Data/Creature/Misc.hs 38;" C @@ -1503,7 +1502,7 @@ Procedural src/Dodge/Room/Procedural.hs 2;" m Projectile src/Dodge/Data/Projectile.hs 17;" t Projectile src/Dodge/Data/Projectile.hs 6;" m Projectile src/Dodge/Projectile.hs 1;" m -ProjectileParams src/Dodge/Data/Item/Use.hs 104;" C +ProjectileParams src/Dodge/Data/Item/Use.hs 98;" C ProjectileStabiliserLink src/Dodge/Data/ComposedItem.hs 32;" C ProjectileStabiliserSF src/Dodge/Data/ComposedItem.hs 63;" C ProjectileType src/Dodge/Data/Projectile.hs 36;" t @@ -1605,7 +1604,7 @@ RandomHelp src/RandomHelp.hs 3;" m RandomImpulse src/Dodge/Data/ActionPlan.hs 32;" C RandomPlacement src/Dodge/Data/GenWorld.hs 84;" C RandomTurn src/Dodge/Data/ActionPlan.hs 31;" C -RandomiseMuzzleFrames src/Dodge/Data/Item/Use.hs 56;" C +RandomiseMuzzleFrames src/Dodge/Data/Item/Use.hs 55;" C ReactorSS src/Dodge/Data/Scenario.hs 111;" C ReaderUpdate src/Dodge/Creature/ReaderUpdate.hs 1;" m RecRoomSS src/Dodge/Data/Scenario.hs 103;" C @@ -1881,7 +1880,7 @@ SwarmAI src/Dodge/Data/Creature/Misc.hs 55;" C SwarmCrit src/Dodge/Creature/SwarmCrit.hs 1;" m SwarmPlacement src/Dodge/LevelGen/SwarmPlacement.hs 1;" m Switch src/Dodge/LevelGen/Switch.hs 1;" m -SwitchAlteRifle src/Dodge/Data/Item/Use.hs 57;" C +SwitchAlteRifle src/Dodge/Data/Item/Use.hs 56;" C SwitchToItem src/Dodge/Data/ActionPlan.hs 38;" C TAPE src/Dodge/Data/Item/Combine.hs 54;" C TARGETING src/Dodge/Data/Item/Combine.hs 21;" C @@ -1961,7 +1960,7 @@ TeslaArc src/Dodge/Data/TeslaArc.hs 17;" t TeslaArc src/Dodge/Data/TeslaArc.hs 6;" m TeslaBall src/Dodge/Data/Bullet.hs 31;" C TeslaBeamCombine src/Dodge/Data/Beam.hs 41;" C -TeslaGunFlare src/Dodge/Data/Item/Use.hs 119;" C +TeslaGunFlare src/Dodge/Data/Item/Use.hs 110;" C Test src/Dodge/Creature/Test.hs 8;" m Test src/Dodge/Event/Test.hs 1;" m Test src/Picture/Test.hs 1;" m @@ -2075,32 +2074,32 @@ Update src/Preload/Update.hs 3;" m Use src/Dodge/Data/Item/Use.hs 5;" m Use src/Dodge/Default/Item/Use.hs 1;" m UseAheadPos src/Dodge/Data/ActionPlan.hs 160;" C -UseAttach src/Dodge/Data/Item/Use.hs 41;" C -UseBulletMod src/Dodge/Data/Item/Use.hs 46;" C -UseCondition src/Dodge/Data/Item/Use.hs 65;" t +UseAttach src/Dodge/Data/Item/Use.hs 40;" C +UseBulletMod src/Dodge/Data/Item/Use.hs 45;" C +UseCondition src/Dodge/Data/Item/Use.hs 64;" t UseDelay src/Dodge/Data/Item/HeldDelay.hs 13;" t -UseEquip src/Dodge/Data/Item/Use.hs 40;" C -UseExactly src/Dodge/Data/Item/Use.hs 145;" C -UseFocus src/Dodge/Data/Item/Use.hs 60;" t -UseFromLocation src/Dodge/Data/Item/Use.hs 62;" C -UseFromRoot src/Dodge/Data/Item/Use.hs 61;" C -UseHeld src/Dodge/Data/Item/Use.hs 33;" C -UseInt src/Dodge/Data/Item/Use.hs 42;" C +UseEquip src/Dodge/Data/Item/Use.hs 39;" C +UseExactly src/Dodge/Data/Item/Use.hs 136;" C +UseFocus src/Dodge/Data/Item/Use.hs 59;" t +UseFromLocation src/Dodge/Data/Item/Use.hs 61;" C +UseFromRoot src/Dodge/Data/Item/Use.hs 60;" C +UseHeld src/Dodge/Data/Item/Use.hs 32;" C +UseInt src/Dodge/Data/Item/Use.hs 41;" C UseInvItem src/Dodge/Data/WorldEffect.hs 36;" C UseItem src/Dodge/Data/ActionPlan.hs 37;" C UseItem src/Dodge/Creature/Impulse/UseItem.hs 3;" m UseItemWidth src/Dodge/Data/SelectionList.hs 41;" C -UseMapper src/Dodge/Data/Item/Use.hs 48;" C +UseMapper src/Dodge/Data/Item/Use.hs 47;" C UseMvTargetPos src/Dodge/Data/ActionPlan.hs 163;" C -UseNothing src/Dodge/Data/Item/Use.hs 43;" C -UseScope src/Dodge/Data/Item/Use.hs 45;" C +UseNothing src/Dodge/Data/Item/Use.hs 42;" C +UseScope src/Dodge/Data/Item/Use.hs 44;" C UseSelf src/Dodge/Data/ActionPlan.hs 157;" C UseTarget src/Dodge/Data/ActionPlan.hs 154;" C -UseToggle src/Dodge/Data/Item/Use.hs 47;" C -UseUpTo src/Dodge/Data/Item/Use.hs 146;" C -UseValue src/Dodge/Data/Item/Use.hs 44;" C -UseableAnytime src/Dodge/Data/Item/Use.hs 67;" C -UseableWhenAimed src/Dodge/Data/Item/Use.hs 66;" C +UseToggle src/Dodge/Data/Item/Use.hs 46;" C +UseUpTo src/Dodge/Data/Item/Use.hs 137;" C +UseValue src/Dodge/Data/Item/Use.hs 43;" C +UseableAnytime src/Dodge/Data/Item/Use.hs 66;" C +UseableWhenAimed src/Dodge/Data/Item/Use.hs 65;" C UsedInLink src/Dodge/Data/Room.hs 61;" C UsedOutLink src/Dodge/Data/Room.hs 56;" C Utility src/Dodge/Item/Held/Utility.hs 1;" m @@ -2213,7 +2212,7 @@ WorldLoad src/Dodge/WorldLoad.hs 1;" m WorldPos src/Dodge/WorldPos.hs 1;" m YELLOW src/Color/Data.hs 18;" C You src/Dodge/Base/You.hs 1;" m -YourControl src/Dodge/Creature/YourControl.hs 2;" m +YourControl src/Dodge/Creature/YourControl.hs 3;" m ZOOMSCOPE src/Dodge/Data/Item/Combine.hs 91;" C ZombieFaction src/Dodge/Data/Creature/State.hs 36;" C Zone src/Dodge/Wall/Zone.hs 1;" m @@ -2222,7 +2221,6 @@ Zoning src/Dodge/Zoning.hs 1;" m __Just' src/MaybeHelp.hs 13;" f _actAction src/Dodge/Data/ActionPlan.hs 81;" f _actLabel src/Dodge/Data/ActionPlan.hs 80;" f -_aimMuzzles src/Dodge/Data/Item/Use.hs 109;" 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 @@ -2234,14 +2232,14 @@ _allocRemoveID src/Dodge/Data/RightButtonOptions.hs 34;" f _allocSwapID src/Dodge/Data/RightButtonOptions.hs 30;" f _alphaDivideShader src/Data/Preload/Render.hs 18;" f _ambushTarget src/Dodge/Data/ActionPlan.hs 178;" f -_ampBullet src/Dodge/Data/Item/Use.hs 103;" f -_ampCreateGas src/Dodge/Data/Item/Use.hs 105;" f -_ampPayload src/Dodge/Data/Item/Use.hs 104;" f +_ampBullet src/Dodge/Data/Item/Use.hs 97;" f +_ampCreateGas src/Dodge/Data/Item/Use.hs 99;" f +_ampPayload src/Dodge/Data/Item/Use.hs 98;" f _apAction src/Dodge/Data/ActionPlan.hs 20;" f _apGoal src/Dodge/Data/ActionPlan.hs 22;" f _apImpulse src/Dodge/Data/ActionPlan.hs 19;" f -_apInt src/Dodge/Data/Item/Use.hs 72;" f -_apProjectiles src/Dodge/Data/Item/Use.hs 71;" f +_apInt src/Dodge/Data/Item/Use.hs 71;" f +_apProjectiles src/Dodge/Data/Item/Use.hs 70;" f _apStrategy src/Dodge/Data/ActionPlan.hs 21;" f _arLoaded src/Dodge/Data/Item/Use/Consumption.hs 28;" f _arMax src/Dodge/Data/Item/Use/Consumption.hs 29;" f @@ -2576,7 +2574,6 @@ _fullscreenShader src/Data/Preload/Render.hs 20;" f _futureWorlds src/Dodge/Data/World.hs 64;" f _futureWorlds src/Dodge/Data/World.hs 70;" f _gameplay_rotate_to_wall src/Dodge/Data/Config.hs 55;" f -_gasCreation src/Dodge/Data/Item/Use.hs 79;" f _genPlacements src/Dodge/Data/GenWorld.hs 25;" f _genRooms src/Dodge/Data/GenWorld.hs 26;" f _getAttentiveTo src/Dodge/Data/Creature/Perception.hs 61;" f @@ -2611,12 +2608,12 @@ _guVel src/Dodge/Data/Gust.hs 16;" f _gusts src/Dodge/Data/LWorld.hs 103;" f _gwWorld src/Dodge/Data/GenWorld.hs 24;" f _hammerPosition src/Dodge/Data/Hammer.hs 14;" f -_heldAim src/Dodge/Data/Item/Use.hs 35;" f -_heldDelay src/Dodge/Data/Item/Use.hs 34;" f -_heldFrame src/Dodge/Data/Item/Use.hs 37;" f -_heldParams src/Dodge/Data/Item/Use.hs 36;" f +_heldDelay src/Dodge/Data/Item/Use.hs 33;" f +_heldFrame src/Dodge/Data/Item/Use.hs 36;" f +_heldMuzzles src/Dodge/Data/Item/Use.hs 34;" f +_heldParams src/Dodge/Data/Item/Use.hs 35;" f _heldPos src/Dodge/Data/Input.hs 54;" f -_heldUseEffect src/Dodge/Data/Item/Use.hs 38;" f +_heldUseEffect src/Dodge/Data/Item/Use.hs 37;" f _heldWorldPos src/Dodge/Data/Input.hs 56;" f _hotkeys src/Dodge/Data/LWorld.hs 148;" f _hud src/Dodge/Data/World.hs 45;" f @@ -2804,20 +2801,19 @@ _mtLabel src/Dodge/Tree/Compose/Data.hs 8;" f _mtTree src/Dodge/Data/MetaTree.hs 10;" f _mtTree src/Dodge/Tree/Compose/Data.hs 8;" f _musicData src/Data/Preload.hs 13;" f -_muzVel src/Dodge/Data/Item/Use.hs 88;" 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 78;" f _mvTurnJit src/Dodge/Data/Creature/Misc.hs 43;" f _mvTurnRad src/Dodge/Data/Creature/Misc.hs 42;" f -_mzAmmoPerShot src/Dodge/Data/Item/Use.hs 156;" f -_mzAmmoSlot src/Dodge/Data/Item/Use.hs 153;" f -_mzEffect src/Dodge/Data/Item/Use.hs 155;" f -_mzFlareType src/Dodge/Data/Item/Use.hs 154;" f -_mzFrame src/Dodge/Data/Item/Use.hs 157;" f -_mzInaccuracy src/Dodge/Data/Item/Use.hs 152;" f -_mzPos src/Dodge/Data/Item/Use.hs 150;" f -_mzRot src/Dodge/Data/Item/Use.hs 151;" f +_mzAmmoPerShot src/Dodge/Data/Item/Use.hs 147;" f +_mzAmmoSlot src/Dodge/Data/Item/Use.hs 144;" f +_mzEffect src/Dodge/Data/Item/Use.hs 146;" f +_mzFlareType src/Dodge/Data/Item/Use.hs 145;" f +_mzFrame src/Dodge/Data/Item/Use.hs 148;" f +_mzInaccuracy src/Dodge/Data/Item/Use.hs 143;" f +_mzPos src/Dodge/Data/Item/Use.hs 141;" f +_mzRot src/Dodge/Data/Item/Use.hs 142;" f _nodeMetaTree src/Dodge/Data/MetaTree.hs 14;" f _nodeMetaTree src/Dodge/Tree/Compose/Data.hs 9;" f _nodeTree src/Dodge/Data/MetaTree.hs 13;" f @@ -2826,10 +2822,10 @@ _nodesSearched src/Dodge/Data/Creature/Memory.hs 15;" f _numLinkEW src/Dodge/Data/Room.hs 33;" f _numLinkNS src/Dodge/Data/Room.hs 34;" f _numberFloorVerxs src/Dodge/Data/CWorld.hs 29;" f -_nzCurrentWalkAngle src/Dodge/Data/Item/Use.hs 132;" f -_nzMaxWalkAngle src/Dodge/Data/Item/Use.hs 131;" f -_nzPressure src/Dodge/Data/Item/Use.hs 130;" f -_nzWalkSpeed src/Dodge/Data/Item/Use.hs 133;" f +_nzCurrentWalkAngle src/Dodge/Data/Item/Use.hs 123;" f +_nzMaxWalkAngle src/Dodge/Data/Item/Use.hs 122;" f +_nzPressure src/Dodge/Data/Item/Use.hs 121;" f +_nzWalkSpeed src/Dodge/Data/Item/Use.hs 124;" f _offPathFromEdges src/Dodge/Data/Room.hs 74;" f _oldMagnets src/Dodge/Data/LWorld.hs 127;" f _onPathFromEdges src/Dodge/Data/Room.hs 73;" f @@ -2956,7 +2952,7 @@ _radarBlips src/Dodge/Data/LWorld.hs 113;" f _radarSweeps src/Dodge/Data/LWorld.hs 108;" f _randGen src/Dodge/Data/World.hs 39;" f _randomOffset src/Dodge/Data/Item/Use.hs 81;" f -_randomOffset src/Dodge/Data/Item/Use.hs 92;" f +_randomOffset src/Dodge/Data/Item/Use.hs 89;" f _rateMax src/Dodge/Data/Item/HeldDelay.hs 16;" f _rateTimeLastUsed src/Dodge/Data/Item/HeldDelay.hs 17;" f _rbColor src/Dodge/Data/RadarBlip.hs 15;" f @@ -2970,7 +2966,6 @@ _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 89;" f _rkHoming src/Dodge/Data/Projectile.hs 41;" f _rkSmoke src/Dodge/Data/Projectile.hs 42;" f _rlDir src/Dodge/Data/Room.hs 26;" f @@ -3081,7 +3076,7 @@ _siWidth src/Dodge/Data/SelectionList.hs 56;" f _sideEffect src/Loop/Data.hs 13;" f _sideImpulses src/Dodge/Data/ActionPlan.hs 170;" f _sidePush src/Dodge/Data/Item/Use.hs 82;" f -_sidePush src/Dodge/Data/Item/Use.hs 93;" f +_sidePush src/Dodge/Data/Item/Use.hs 90;" f _silhouetteEBO src/Data/Preload/Render.hs 27;" f _skColor src/Dodge/Data/Spark.hs 17;" f _skDamageType src/Dodge/Data/Spark.hs 21;" f @@ -3196,7 +3191,7 @@ _toPlaySoundVolumeFraction src/Sound/Data.hs 40;" f _toPlaySounds src/Dodge/Data/World.hs 40;" f _topBoxSize src/Shape/Data.hs 17;" f _torqueAfter src/Dodge/Data/Item/Use.hs 80;" f -_torqueAfter src/Dodge/Data/Item/Use.hs 91;" f +_torqueAfter src/Dodge/Data/Item/Use.hs 88;" f _tractorBeams src/Dodge/Data/LWorld.hs 121;" f _trieChildren src/SimpleTrie.hs 11;" f _trieMVal src/SimpleTrie.hs 10;" f @@ -3210,12 +3205,12 @@ _tuFireTime src/Dodge/Data/Machine.hs 60;" f _tuTurnSpeed src/Dodge/Data/Machine.hs 59;" f _tuWeapon src/Dodge/Data/Machine.hs 58;" f _turnToPoint src/Dodge/Data/ActionPlan.hs 92;" f -_uInt src/Dodge/Data/Item/Use.hs 42;" f -_uScope src/Dodge/Data/Item/Use.hs 45;" f -_uValue src/Dodge/Data/Item/Use.hs 44;" f -_uaParams src/Dodge/Data/Item/Use.hs 41;" f -_ubMod src/Dodge/Data/Item/Use.hs 46;" f -_uequipEffect src/Dodge/Data/Item/Use.hs 40;" f +_uInt src/Dodge/Data/Item/Use.hs 41;" f +_uScope src/Dodge/Data/Item/Use.hs 44;" f +_uValue src/Dodge/Data/Item/Use.hs 43;" f +_uaParams src/Dodge/Data/Item/Use.hs 40;" f +_ubMod src/Dodge/Data/Item/Use.hs 45;" f +_uequipEffect src/Dodge/Data/Item/Use.hs 39;" f _unCombEdge src/Dodge/Combine/Graph.hs 31;" f _unCombNode src/Dodge/Combine/Graph.hs 24;" f _unFBO src/Shader/Data.hs 57;" f @@ -3230,14 +3225,14 @@ _unTO src/Shader/Data.hs 59;" f _unpauseClock src/Dodge/Data/World.hs 54;" f _unputTerminal src/Dodge/Data/GenWorld.hs 36;" f _useAheadPos src/Dodge/Data/ActionPlan.hs 161;" f -_useExactly src/Dodge/Data/Item/Use.hs 145;" f -_useMapperLines src/Dodge/Data/Item/Use.hs 49;" f -_useMapperPoints src/Dodge/Data/Item/Use.hs 50;" f +_useExactly src/Dodge/Data/Item/Use.hs 136;" f +_useMapperLines src/Dodge/Data/Item/Use.hs 48;" f +_useMapperPoints src/Dodge/Data/Item/Use.hs 49;" f _useMvTargetPos src/Dodge/Data/ActionPlan.hs 164;" f _useSelf src/Dodge/Data/ActionPlan.hs 158;" f _useTarget src/Dodge/Data/ActionPlan.hs 155;" f -_useToggle src/Dodge/Data/Item/Use.hs 47;" f -_useUpTo src/Dodge/Data/Item/Use.hs 146;" f +_useToggle src/Dodge/Data/Item/Use.hs 46;" f +_useUpTo src/Dodge/Data/Item/Use.hs 137;" f _uvCanContinue src/Dodge/Data/Universe.hs 39;" f _uvConfig src/Dodge/Data/Universe.hs 37;" f _uvDebug src/Dodge/Data/Universe.hs 44;" f @@ -3293,9 +3288,9 @@ _warmMax src/Dodge/Data/Item/HeldDelay.hs 27;" f _warmSound src/Dodge/Data/Item/HeldDelay.hs 28;" f _warmTime src/Dodge/Data/Item/HeldDelay.hs 26;" f _weaponInvLock src/Dodge/Data/Item/Use.hs 83;" f -_weaponInvLock src/Dodge/Data/Item/Use.hs 97;" f +_weaponInvLock src/Dodge/Data/Item/Use.hs 91;" f _weaponRepeat src/Dodge/Data/Item/Use.hs 84;" f -_weaponRepeat src/Dodge/Data/Item/Use.hs 98;" f +_weaponRepeat src/Dodge/Data/Item/Use.hs 92;" f _windowPosX src/Dodge/Data/Config.hs 53;" f _windowPosY src/Dodge/Data/Config.hs 54;" f _windowShader src/Data/Preload/Render.hs 19;" f @@ -3386,7 +3381,7 @@ advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 44;" f aimDelaySweep src/Dodge/Render/Picture.hs 264;" f aimStanceHandlePos src/Dodge/Item/HeldOffset.hs 64;" f aimStanceInfo src/Dodge/Item/Info.hs 240;" f -aimTurn src/Dodge/Creature/YourControl.hs 162;" f +aimTurn src/Dodge/Creature/YourControl.hs 163;" f aimingWeaponZeroPos src/Dodge/Item/HeldOffset.hs 60;" f airlock src/Dodge/Room/Airlock.hs 19;" f airlock0 src/Dodge/Room/Airlock.hs 25;" f @@ -3399,10 +3394,10 @@ airlockZ src/Dodge/Room/Airlock.hs 91;" f allInvLocs src/Dodge/Item/Grammar.hs 313;" f allVisibleWalls src/Dodge/Base/Collide.hs 131;" f alongSegBy src/Geometry.hs 40;" f -alteRifle src/Dodge/Item/Held/Cane.hs 57;" f +alteRifle src/Dodge/Item/Held/Cane.hs 56;" f ammoMagInfo src/Dodge/Item/Info.hs 46;" f ammoMagSPic src/Dodge/Item/Draw/SPic.hs 124;" f -amr src/Dodge/Item/Held/Rod.hs 40;" f +amr src/Dodge/Item/Held/Rod.hs 39;" f analyser src/Dodge/Placement/Instance/Analyser.hs 12;" f analyserByDoor src/Dodge/Room/LasTurret.hs 77;" f andOrRegex src/Dodge/DisplayInventory.hs 78;" f @@ -3472,14 +3467,14 @@ attachOnward' src/Dodge/Tree/Compose.hs 98;" f attachTree src/Dodge/Tree/Compose.hs 38;" f attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 66;" f attribSize src/Shader/Compile.hs 306;" f -autoAmr src/Dodge/Item/Held/Rod.hs 45;" f +autoAmr src/Dodge/Item/Held/Rod.hs 44;" f autoBS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 374;" f autoCrit src/Dodge/Creature/AutoCrit.hs 12;" f autoDetector src/Dodge/Item/Weapon/Radar.hs 11;" f autoEffect src/Dodge/Item/Weapon/ExtraEffect.hs 18;" f autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 532;" f -autoPistol src/Dodge/Item/Held/Stick.hs 58;" f -autoRifle src/Dodge/Item/Held/Cane.hs 69;" f +autoPistol src/Dodge/Item/Held/Stick.hs 55;" f +autoRifle src/Dodge/Item/Held/Cane.hs 68;" f awakeLevelPerception src/Dodge/Creature/Perception.hs 162;" f axisInt src/Geometry/Intersect.hs 227;" f azure src/Color.hs 22;" f @@ -3539,7 +3534,7 @@ blinkActionFail src/Dodge/Creature/Action/Blink.hs 88;" f blinkActionMousePos src/Dodge/Creature/Action/Blink.hs 22;" f blinkDistortions src/Dodge/Creature/Action/Blink.hs 43;" f blinkShockwave src/Dodge/Creature/Action/Blink.hs 79;" f -blinker src/Dodge/Item/Held/Utility.hs 50;" f +blinker src/Dodge/Item/Held/Utility.hs 49;" f blinker src/Dodge/Item/Weapon/Utility.hs 14;" f blipAt src/Dodge/RadarSweep.hs 77;" f blockLine src/Dodge/Placement/Instance/Wall.hs 41;" f @@ -3557,7 +3552,7 @@ blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 366;" f blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 354;" f blowTorch src/Dodge/Item/Held/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 26;" f boosterGun src/Dodge/Item/Equipment/Booster.hs 9;" f bossKeyItems src/Dodge/LockAndKey.hs 12;" f bossRoom src/Dodge/Room/Boss.hs 60;" f @@ -3586,7 +3581,7 @@ bulletModule src/Dodge/Item/Scope.hs 118;" f bulletPayloadModule src/Dodge/Item/Scope.hs 132;" f bulletSynthesizer src/Dodge/Item/Ammo.hs 117;" f bulletWeapons src/Dodge/Combine/Combinations.hs 247;" f -burstRifle src/Dodge/Item/Held/Cane.hs 74;" f +burstRifle src/Dodge/Item/Held/Cane.hs 73;" f buzzS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 538;" f cFilledRect src/Dodge/CharacterEnums.hs 6;" f cWireRect src/Dodge/CharacterEnums.hs 10;" f @@ -3791,14 +3786,14 @@ createItemYou src/Dodge/Inventory/Add.hs 95;" f createLightMap src/Render.hs 26;" f createNewArc src/Dodge/Tesla/Arc.hs 90;" f createPathGrid src/Dodge/Room/Path.hs 21;" f -createProjectile src/Dodge/HeldUse.hs 828;" f -createProjectileR src/Dodge/HeldUse.hs 793;" f +createProjectile src/Dodge/HeldUse.hs 916;" f +createProjectileR src/Dodge/HeldUse.hs 881;" f createShell src/Dodge/Projectile/Create.hs 22;" f createShieldWall src/Dodge/Euse.hs 107;" f createUnusedLinkPos src/Dodge/Tree/Shift.hs 117;" f createWall src/Dodge/Wall/Create.hs 8;" f creatureDisplayText src/Dodge/Creature/Picture/Awareness.hs 10;" f -creatureShootLaser src/Dodge/HeldUse.hs 528;" f +creatureShootLaser src/Dodge/HeldUse.hs 527;" f creatureTurnTo src/Dodge/Creature/Impulse/Movement.hs 52;" f creatureTurnToward src/Dodge/Creature/Impulse/Movement.hs 73;" f creatureTurnTowardDir src/Dodge/Creature/Impulse/Movement.hs 62;" f @@ -3902,7 +3897,6 @@ defDamageMaterial src/Dodge/Material/Damage.hs 17;" f defLSPic src/Dodge/LightSource/Draw.hs 10;" f defSPic src/Dodge/Item/Draw/SPic.hs 292;" f defaultAimMvType src/Dodge/Default/Creature.hs 117;" f -defaultAimParams src/Dodge/Default/Item/Use/AimParams.hs 9;" f defaultAimingCrit src/Dodge/Default/Creature.hs 126;" f defaultApplyDamage src/Dodge/Creature/Damage.hs 20;" f defaultArcStep src/Dodge/Tesla/Arc.hs 140;" f @@ -3953,6 +3947,7 @@ defaultLeftLoadable src/Dodge/Default/Item/Use/Consumption.hs 8;" f defaultListDisplayParams src/Dodge/ListDisplayParams.hs 18;" f defaultMachine src/Dodge/Default.hs 32;" f defaultMachineWall src/Dodge/Default/Wall.hs 48;" f +defaultMuzzles src/Dodge/Default/Item/Use/AimParams.hs 8;" f defaultPP src/Dodge/Default.hs 65;" f defaultPerceptionState src/Dodge/Default/Creature.hs 77;" f defaultProp src/Dodge/Default/Prop.hs 6;" f @@ -3986,11 +3981,11 @@ destroyMount src/Dodge/Block.hs 102;" f destroyMounts src/Dodge/Block.hs 99;" f destroyProjectile src/Dodge/Projectile/Update.hs 139;" f detV src/Geometry/Vector.hs 93;" f -detector src/Dodge/Item/Held/Utility.hs 38;" f +detector src/Dodge/Item/Held/Utility.hs 37;" f detectorColor src/Dodge/Item/Draw/SPic.hs 445;" f detectorEffect src/Dodge/Item/Weapon/Radar.hs 20;" f detectorInfo src/Dodge/Item/Info.hs 221;" f -determineProjectileTracking src/Dodge/HeldUse.hs 776;" f +determineProjectileTracking src/Dodge/HeldUse.hs 864;" f diagonalLinesRect src/Dodge/Room/Foreground.hs 52;" f did src/Dodge/Item/InvSize.hs 54;" f diffAngles src/Geometry.hs 204;" f @@ -4021,7 +4016,7 @@ divideLineExact src/Geometry.hs 275;" f divideLineOddNumPoints src/Geometry.hs 260;" f doAfterPlacement src/Dodge/Layout.hs 86;" f doAfterPlacements src/Dodge/Layout.hs 83;" f -doAimTwist src/Dodge/Creature/YourControl.hs 137;" f +doAimTwist src/Dodge/Creature/YourControl.hs 138;" f doAnyEquipmentEffect src/Dodge/Creature/State.hs 189;" f doArcStep src/Dodge/Tesla/Arc.hs 135;" f doBackspace src/Dodge/Update/Input/Text.hs 31;" f @@ -4055,9 +4050,9 @@ doDrag src/Dodge/Update/Input/InGame.hs 107;" f doDrawing src/Dodge/Render.hs 35;" f doDrawing' src/Dodge/Render.hs 46;" f doFloatFloat src/Dodge/FloatFunction.hs 5;" f -doGenFloat src/Dodge/HeldUse.hs 715;" f +doGenFloat src/Dodge/HeldUse.hs 803;" f doGravityPU src/Dodge/Projectile/Update.hs 50;" f -doHeldUseEffect src/Dodge/HeldUse.hs 131;" f +doHeldUseEffect src/Dodge/HeldUse.hs 132;" f doInPlacements src/Dodge/Layout.hs 92;" f doIndividualPlacements src/Dodge/Layout.hs 117;" f doInputScreenInput src/Dodge/Update/Input/ScreenLayer.hs 28;" f @@ -4251,7 +4246,7 @@ drawZoneNearPointCursor src/Dodge/Debug/Picture.hs 279;" f droneLauncher src/Dodge/Item/Weapon/Drone.hs 11;" f dropByState src/Dodge/Creature/State.hs 130;" f dropExcept src/Dodge/Creature/Action.hs 167;" f -dropInventoryPath src/Dodge/HeldUse.hs 906;" f +dropInventoryPath src/Dodge/HeldUse.hs 994;" f dropItem src/Dodge/Creature/Action.hs 173;" f dropper src/Dodge/Item/Scope.hs 76;" f drumMag src/Dodge/Item/Ammo.hs 42;" f @@ -4271,7 +4266,7 @@ edgeToPic src/Dodge/Debug/Picture.hs 431;" f effectWhileAttached src/Dodge/ItEffect.hs 56;" f ejectS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 502;" f elecCrackleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 386;" f -elephantGun src/Dodge/Item/Held/Rod.hs 33;" f +elephantGun src/Dodge/Item/Held/Rod.hs 32;" f emptyCorridor src/Dodge/Room/BlinkAcross.hs 22;" f emptyTrie src/SimpleTrie.hs 16;" f encircle src/Dodge/Creature/Boid.hs 115;" f @@ -4415,16 +4410,16 @@ fusePoint src/Dodge/LevelGen/StaticWalls.hs 158;" f fuseWall src/Dodge/LevelGen/StaticWalls.hs 165;" f fuseWallsWith src/Dodge/LevelGen/StaticWalls.hs 172;" f g src/ShortShow.hs 33;" f -gLauncher src/Dodge/Item/Held/Launcher.hs 30;" f +gLauncher src/Dodge/Item/Held/Launcher.hs 27;" f gRandify src/Dodge/Randify.hs 11;" f -gadgetEffect src/Dodge/HeldUse.hs 42;" f +gadgetEffect src/Dodge/HeldUse.hs 43;" f gameOverMenu src/Dodge/Menu.hs 187;" f gameRoomFromRoom src/Dodge/Layout.hs 161;" f gameRoomViewpoints src/Dodge/Viewpoints.hs 35;" f gameRoomsFromRooms src/Dodge/Layout.hs 158;" f gameplayMenu src/Dodge/Menu.hs 134;" f gameplayMenuOptions src/Dodge/Menu.hs 137;" f -gasCreate src/Dodge/HeldUse.hs 712;" f +gasCreate src/Dodge/HeldUse.hs 800;" f generateGenParams src/Dodge/LevelGen/LevelStructure.hs 22;" f generateGraphs src/Dodge/LevelGen.hs 39;" f generateLayout src/Dodge/Layout/Generate.hs 10;" f @@ -4442,7 +4437,7 @@ getArguments' src/Dodge/Update/Scroll.hs 164;" f getAttachedSFLink src/Dodge/HeldUse.hs 462;" f getAutoSpringLinks src/Dodge/Item/Grammar.hs 116;" f getAvailableListLines src/Dodge/SelectionList.hs 10;" f -getBulletType src/Dodge/HeldUse.hs 597;" f +getBulletType src/Dodge/HeldUse.hs 596;" f getCloseObj src/Dodge/Update/Input/InGame.hs 515;" f getCommands src/Dodge/Terminal.hs 117;" f getCommandsHelp src/Dodge/Terminal.hs 75;" f @@ -4452,7 +4447,7 @@ getCrMoveSpeed src/Dodge/Creature/Statistics.hs 15;" f getDamageCoding src/Dodge/Terminal.hs 177;" f getDistortions src/Dodge/Render.hs 383;" f getEquipmentAllocation src/Dodge/Inventory/RBList.hs 45;" f -getGrenadeHitEffect src/Dodge/HeldUse.hs 821;" f +getGrenadeHitEffect src/Dodge/HeldUse.hs 909;" f getInventoryPath src/Dodge/Inventory/Path.hs 8;" f getItemValue src/Dodge/Inventory/SelectionList.hs 141;" f getLaserColor src/Dodge/HeldUse.hs 408;" f @@ -4462,7 +4457,7 @@ getLinksOfType src/Dodge/RoomLink.hs 39;" f getMaxLinesTM src/Dodge/Terminal/Type.hs 11;" f getMenuMouseContext src/Dodge/Update.hs 385;" f getNodePos src/Dodge/Path.hs 31;" f -getPJStabiliser src/Dodge/HeldUse.hs 813;" f +getPJStabiliser src/Dodge/HeldUse.hs 901;" f getPretty src/AesonHelp.hs 8;" f getPromptTM src/Dodge/Terminal/Type.hs 8;" f getRootItemBounds src/Dodge/Render/HUD.hs 94;" f @@ -4496,7 +4491,7 @@ goToPostStrat src/Dodge/Creature/Strategy.hs 10;" f goToTarget src/Dodge/Creature/ReaderUpdate.hs 136;" f grahamEliminate src/Geometry/Polygon.hs 125;" f grahamScan src/Geometry/Polygon.hs 116;" f -grapeCannon src/Dodge/Item/Held/Cone.hs 34;" f +grapeCannon src/Dodge/Item/Held/Cone.hs 32;" f graphToEdges src/Dodge/Graph.hs 35;" f graphToIncidence src/Dodge/Graph.hs 40;" f graphicsMenu src/Dodge/Menu.hs 165;" f @@ -4521,9 +4516,9 @@ hackOutline src/Dodge/Render/Outline.hs 5;" f halfHeight src/Dodge/Base/Window.hs 48;" f halfWidth src/Dodge/Base/Window.hs 48;" f haltSound src/Dodge/SoundLogic.hs 38;" f -hammerCheck src/Dodge/HeldUse.hs 81;" f +hammerCheck src/Dodge/HeldUse.hs 82;" f handleEvent src/Dodge/Event.hs 27;" f -handleHotkeys src/Dodge/Creature/YourControl.hs 42;" f +handleHotkeys src/Dodge/Creature/YourControl.hs 43;" f handleKeyboardEvent src/Dodge/Event/Input.hs 22;" f handleMouseButtonEvent src/Dodge/Event/Input.hs 63;" f handleMouseMotionEvent src/Dodge/Event/Input.hs 47;" f @@ -4551,15 +4546,17 @@ healthTest src/Dodge/Room/LasTurret.hs 95;" f heightWallPS src/Dodge/Placement/Instance/Wall.hs 13;" f heldAimStance src/Dodge/Item/AimStance.hs 17;" f heldAimZoom src/Dodge/Update/Camera.hs 139;" f -heldEffect src/Dodge/HeldUse.hs 62;" f -heldEffectMuzzles src/Dodge/HeldUse.hs 121;" f -heldEffectNoHammerCheck src/Dodge/HeldUse.hs 70;" f +heldEffect src/Dodge/HeldUse.hs 63;" f +heldEffectMuzzles src/Dodge/HeldUse.hs 122;" f +heldEffectNoHammerCheck src/Dodge/HeldUse.hs 71;" f heldHandlePos src/Dodge/Item/HeldOffset.hs 94;" f heldInfo src/Dodge/Item/Info.hs 88;" f -heldItemBulkiness src/Dodge/Creature/YourControl.hs 174;" f +heldItemBulkiness src/Dodge/Creature/YourControl.hs 175;" f +heldItemMuzVel src/Dodge/HeldUse.hs 681;" f heldItemOffset src/Dodge/Item/HeldOffset.hs 71;" f heldItemOrient2D src/Dodge/Item/HeldOffset.hs 28;" f heldItemRelativeOrient src/Dodge/Item/HeldOffset.hs 33;" f +heldItemRifling src/Dodge/HeldUse.hs 725;" f heldItemSPic src/Dodge/Item/Draw/SPic.hs 220;" f heldItemWeight src/Dodge/Creature/Statistics.hs 41;" f heldPositionInfo src/Dodge/Item/Info.hs 237;" f @@ -4579,7 +4576,7 @@ holsterWeapon src/Dodge/Creature/Volition.hs 14;" f homingModule src/Dodge/Item/Scope.hs 48;" f horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f hotkeyToChar src/Dodge/Inventory/SelectionList.hs 182;" f -hotkeyToScancode src/Dodge/Creature/YourControl.hs 72;" f +hotkeyToScancode src/Dodge/Creature/YourControl.hs 73;" f hotkeyToString src/Dodge/Inventory/SelectionList.hs 179;" f humanoidAIList src/Dodge/Humanoid.hs 181;" f iShape src/Dodge/Placement/Instance/LightSource.hs 73;" f @@ -4710,7 +4707,7 @@ itInvHeight src/Dodge/Item/InvSize.hs 11;" f itemBaseConnections src/Dodge/Item/Grammar.hs 191;" f itemBaseName src/Dodge/Item/Display.hs 57;" f itemBlips src/Dodge/RadarSweep.hs 93;" f -itemBulkiness src/Dodge/Creature/YourControl.hs 169;" f +itemBulkiness src/Dodge/Creature/YourControl.hs 170;" f itemCombinations src/Dodge/Combine/Combinations.hs 55;" f itemCombinationsEdges src/Dodge/Combine/Graph.hs 60;" f itemDetectorEffect src/Dodge/HeldUse.hs 468;" f @@ -4757,7 +4754,7 @@ jumpLegs src/Dodge/Item/Equipment.hs 155;" f justify src/Justify.hs 9;" f k src/ShortShow.hs 33;" f k' src/ShortShow.hs 33;" f -keyCard src/Dodge/Item/Held/Utility.hs 27;" f +keyCard src/Dodge/Item/Held/Utility.hs 26;" f keyCardAnalyserByDoor src/Dodge/Room/LasTurret.hs 71;" f keyCardRoomRunPast src/Dodge/Room/LasTurret.hs 59;" f keyCardRunPastRand src/Dodge/LockAndKey.hs 36;" f @@ -4871,7 +4868,7 @@ lsPosRad src/Dodge/LightSource.hs 17;" f ltAutoCrit src/Dodge/Creature/LtAutoCrit.hs 12;" f m src/ShortShow.hs 33;" f machineAddSound src/Dodge/Machine.hs 49;" f -machinePistol src/Dodge/Item/Held/Stick.hs 61;" f +machinePistol src/Dodge/Item/Held/Stick.hs 58;" f machineUpdateDeathEff src/Dodge/Machine.hs 34;" f machineUpdateLiveDieEff src/Dodge/Machine.hs 16;" f magShield src/Dodge/Item/Equipment.hs 27;" f @@ -4887,8 +4884,8 @@ makeAttach src/Dodge/Item/Attach.hs 10;" f makeBlip src/Dodge/RadarSweep.hs 69;" f makeBlockDebris src/Dodge/Block/Debris.hs 28;" f makeBoolOption src/Dodge/Menu/OptionType.hs 8;" f -makeBullet src/Dodge/HeldUse.hs 663;" f -makeBullet' src/Dodge/HeldUse.hs 649;" f +makeBullet src/Dodge/HeldUse.hs 662;" f +makeBullet' src/Dodge/HeldUse.hs 648;" f makeButton src/Dodge/LevelGen/Switch.hs 16;" f makeByteStringShaderUsingVAO src/Shader/Compile.hs 128;" f makeCloudAt src/Dodge/WorldEvent/Cloud.hs 18;" f @@ -4970,11 +4967,11 @@ mcProximitySensorUpdate src/Dodge/Machine/Update.hs 124;" f mcSPic src/Dodge/Render/ShapePicture.hs 120;" f mcSensorTriggerUpdate src/Dodge/Machine/Update.hs 87;" f mcSensorUpdate src/Dodge/Machine/Update.hs 119;" f -mcShootAuto src/Dodge/HeldUse.hs 747;" f -mcShootLaser src/Dodge/HeldUse.hs 739;" f +mcShootAuto src/Dodge/HeldUse.hs 835;" f +mcShootLaser src/Dodge/HeldUse.hs 827;" f mcTriggerVal src/Dodge/Machine/Update.hs 93;" f mcTypeUpdate src/Dodge/Machine/Update.hs 27;" f -mcUseHeld src/Dodge/HeldUse.hs 682;" f +mcUseHeld src/Dodge/HeldUse.hs 770;" f mcUseItem src/Dodge/Machine/Update.hs 79;" f medkit src/Dodge/Item/Consumable.hs 8;" f megaBattery src/Dodge/Item/Ammo.hs 76;" f @@ -5015,7 +5012,7 @@ minCrIXOn src/Dodge/Zoning/Creature.hs 46;" f minOn src/FoldableHelp.hs 35;" f mini1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 346;" f miniGunCrit src/Dodge/Creature.hs 62;" f -miniGunX src/Dodge/Item/Held/Cane.hs 87;" f +miniGunX src/Dodge/Item/Held/Cane.hs 86;" f miniGunXPict src/Dodge/Item/Draw/SPic.hs 357;" f miniGunXPictItem src/Dodge/Item/Draw/SPic.hs 352;" f miniS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 548;" f @@ -5413,7 +5410,7 @@ quarterRoomSquare src/Dodge/Room/Procedural.hs 213;" f quarterRoomTri src/Dodge/Room/Procedural.hs 177;" f quitCommand src/Dodge/Terminal.hs 57;" f rLauncher src/Dodge/Item/Held/Launcher.hs 14;" f -rLauncherX src/Dodge/Item/Held/Launcher.hs 36;" f +rLauncherX src/Dodge/Item/Held/Launcher.hs 33;" f rToOnward src/Dodge/Cleat.hs 21;" f radBounds src/Dodge/Room/Foreground.hs 154;" f radToDeg src/Geometry/Vector.hs 122;" f @@ -5482,8 +5479,8 @@ reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 452;" f rememberSounds src/Dodge/Creature/Perception.hs 177;" f remoteDetonator src/Dodge/Item/Scope.hs 145;" f remoteScreen src/Dodge/Item/Scope.hs 140;" f -removeAimPosture src/Dodge/Creature/YourControl.hs 144;" f -removeAmmoFromMag src/Dodge/HeldUse.hs 584;" f +removeAimPosture src/Dodge/Creature/YourControl.hs 145;" f +removeAmmoFromMag src/Dodge/HeldUse.hs 583;" f removeDot src/ShortShow.hs 29;" f removeInverseWalls src/Dodge/LevelGen/StaticWalls.hs 25;" f removeShieldWall src/Dodge/Euse.hs 125;" f @@ -5512,7 +5509,7 @@ retreatActionsPistol src/Dodge/Humanoid.hs 248;" f retreatFireLauncher src/Dodge/Humanoid.hs 269;" f retreatPointForFrom src/Dodge/Creature/Impulse/Flee.hs 7;" f reversePair src/Dodge/LevelGen.hs 82;" f -rewinder src/Dodge/Item/Held/Utility.hs 70;" f +rewinder src/Dodge/Item/Held/Utility.hs 69;" f rewinder src/Dodge/Item/Weapon/Utility.hs 34;" f rezBox src/Dodge/Room/RezBox.hs 23;" f rezBox' src/Dodge/Room/RezBox.hs 31;" f @@ -5525,7 +5522,7 @@ rezInvBox src/Dodge/Room/RezBox.hs 134;" f rezText src/Dodge/Story.hs 4;" f rezText' src/Dodge/Story.hs 17;" f rhombus src/Polyhedra.hs 72;" f -rifle src/Dodge/Item/Held/Cane.hs 50;" f +rifle src/Dodge/Item/Held/Cane.hs 49;" f right src/DoubleStack.hs 16;" f rightIsParentCombine src/Dodge/Item/Grammar.hs 243;" f rightPad src/Padding.hs 19;" f @@ -5617,7 +5614,7 @@ scaleMat src/MatrixHelper.hs 59;" f scaleMatrix src/MatrixHelper.hs 56;" f scaleSH src/Shape.hs 268;" f scalp src/Dodge/Creature/Picture.hs 96;" f -scancodeToHotkey src/Dodge/Creature/YourControl.hs 92;" f +scancodeToHotkey src/Dodge/Creature/YourControl.hs 93;" f scodeToChar src/Dodge/ScodeToChar.hs 6;" f scorchSPic src/Dodge/Creature/State.hs 118;" f screenBox src/Dodge/Base/Window.hs 53;" f @@ -5671,7 +5668,7 @@ sensorSPic src/Dodge/Machine/Draw.hs 70;" f sentinelAI src/Dodge/Creature/SentinelAI.hs 20;" f sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 83;" f sentinelFireType src/Dodge/Creature/SentinelAI.hs 50;" f -setAimPosture src/Dodge/Creature/YourControl.hs 134;" f +setAimPosture src/Dodge/Creature/YourControl.hs 135;" f setChannelPos src/Sound.hs 150;" f setClickWorldPos src/Dodge/Update.hs 99;" f setClusterID src/Dodge/Combine/Graph.hs 115;" f @@ -5762,14 +5759,14 @@ shiftRoomShiftToLink src/Dodge/Room/Link.hs 70;" f shiftedGrid src/Grid.hs 25;" f shineTargetLaser src/Dodge/Creature/State.hs 308;" f shineTorch src/Dodge/Creature/State.hs 350;" f -shootBullet src/Dodge/HeldUse.hs 639;" f +shootBullet src/Dodge/HeldUse.hs 638;" f shootFirstMiss src/Dodge/Creature/Volition.hs 33;" f -shootLaser src/Dodge/HeldUse.hs 553;" f +shootLaser src/Dodge/HeldUse.hs 552;" f shootOutPassage src/Dodge/Room/RezBox.hs 74;" f shootShatter src/Dodge/Item/Weapon/Shatter.hs 11;" f -shootTeslaArc src/Dodge/HeldUse.hs 764;" f +shootTeslaArc src/Dodge/HeldUse.hs 852;" f shootTillEmpty src/Dodge/Creature/Volition.hs 18;" f -shootTractorBeam src/Dodge/HeldUse.hs 505;" f +shootTractorBeam src/Dodge/HeldUse.hs 504;" f shootersRoom src/Dodge/Room/Room.hs 315;" f shootersRoom' src/Dodge/Room/Room.hs 280;" f shootersRoom1 src/Dodge/Room/Room.hs 305;" f @@ -5825,11 +5822,11 @@ smallGlass3S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 396;" f smallGlass4S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 358;" f smallPillar src/Dodge/Room/Pillar.hs 37;" f smallRoom src/Dodge/Room/RunPast.hs 31;" f -smg src/Dodge/Item/Held/Stick.hs 68;" f +smg src/Dodge/Item/Held/Stick.hs 65;" f smokeCloudAt src/Dodge/WorldEvent/Cloud.hs 41;" f smokeReducer src/Dodge/Item/Scope.hs 163;" f sndV2 src/Geometry/Data.hs 52;" f -sniperRifle src/Dodge/Item/Held/Rod.hs 50;" f +sniperRifle src/Dodge/Item/Held/Rod.hs 49;" f someCrits src/Dodge/LockAndKey.hs 120;" f soundAngle src/Dodge/SoundLogic.hs 163;" f soundContinue src/Dodge/SoundLogic.hs 131;" f @@ -6024,9 +6021,9 @@ tileTexCoords src/Tile.hs 11;" f tilesFromRooms src/Dodge/Layout.hs 205;" f tilesToLine src/Shader/AuxAddition.hs 66;" f timeFlowUpdate src/Dodge/Update.hs 170;" f -timeScroller src/Dodge/Item/Held/Utility.hs 83;" f +timeScroller src/Dodge/Item/Held/Utility.hs 82;" f timeScroller src/Dodge/Item/Weapon/Utility.hs 47;" f -timeStopper src/Dodge/Item/Held/Utility.hs 77;" f +timeStopper src/Dodge/Item/Held/Utility.hs 76;" f timeStopper src/Dodge/Item/Weapon/Utility.hs 41;" f timerTLS src/Dodge/LightSource/Update.hs 22;" f tinMag src/Dodge/Item/Ammo.hs 27;" f @@ -6063,14 +6060,14 @@ topInvW src/Dodge/ListDisplayParams.hs 51;" f topPrismEdgeIndices src/Shader/Poke.hs 335;" f topPrismIndices src/Shader/Poke.hs 410;" f topTestPart src/Dodge/TestString.hs 62;" f -torch src/Dodge/Item/Held/Utility.hs 30;" f +torch src/Dodge/Item/Held/Utility.hs 29;" f torchShape src/Dodge/Item/Draw/SPic.hs 264;" f torqueCr src/Dodge/WorldEffect.hs 67;" f torso src/Dodge/Creature/Picture.hs 105;" f tractCr src/Dodge/TractorBeam/Update.hs 28;" f tractFlIt src/Dodge/TractorBeam/Update.hs 23;" f -tractorBeamAt src/Dodge/HeldUse.hs 517;" f -tractorGun src/Dodge/Item/Held/BatteryGuns.hs 61;" f +tractorBeamAt src/Dodge/HeldUse.hs 516;" f +tractorGun src/Dodge/Item/Held/BatteryGuns.hs 60;" f tractorGunPic src/Dodge/Item/Draw/SPic.hs 429;" f tractorPullPos src/Dodge/TractorBeam/Update.hs 33;" f tractorSPic src/Dodge/TractorBeam/Draw.hs 10;" f @@ -6123,7 +6120,7 @@ truncFaces src/Polyhedra/Geodesic.hs 53;" f truncate src/Polyhedra/Geodesic.hs 38;" f trunkDepth src/TreeHelp.hs 161;" f tryAttachItems src/Dodge/Item/Grammar.hs 26;" f -tryClickUse src/Dodge/Creature/YourControl.hs 217;" f +tryClickUse src/Dodge/Creature/YourControl.hs 219;" f tryCombine src/Dodge/Update/Input/InGame.hs 526;" f tryDropSelected src/Dodge/Update/Input/InGame.hs 125;" f tryGetChannel src/Sound.hs 97;" f @@ -6149,7 +6146,7 @@ twinSlowDoorRoom src/Dodge/Room/LongDoor.hs 28;" f twists src/Dodge/Creature/Test.hs 105;" f twoFlat src/Dodge/Creature/Test.hs 102;" f twoFlatHRot src/Dodge/Item/HeldOffset.hs 86;" f -twoHandTwistAmount src/Dodge/Creature/YourControl.hs 147;" f +twoHandTwistAmount src/Dodge/Creature/YourControl.hs 148;" f twoRoomPoss src/Dodge/PlacementSpot.hs 147;" f twoStep1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 412;" f twoStepS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 450;" f @@ -6164,7 +6161,7 @@ unitVectorAtAngle src/Geometry/Vector.hs 100;" f unlockInv src/Dodge/Inventory/Lock.hs 12;" f unpause src/Dodge/Menu.hs 195;" f unsafeBlinkAction src/Dodge/Creature/Action/Blink.hs 55;" f -unsafeBlinker src/Dodge/Item/Held/Utility.hs 62;" f +unsafeBlinker src/Dodge/Item/Held/Utility.hs 61;" f unsafeBlinker src/Dodge/Item/Weapon/Utility.hs 27;" f unsafeSwapKeys src/IntMapHelp.hs 74;" f unshadowBlock src/Dodge/Block.hs 43;" f @@ -6310,9 +6307,9 @@ useBulletPayload src/Dodge/Bullet.hs 111;" f useC src/Dodge/Cuse.hs 8;" f useC' src/Dodge/Cuse.hs 13;" f useE src/Dodge/Euse.hs 34;" f -useGasParams src/Dodge/HeldUse.hs 687;" f -useHotkey src/Dodge/Creature/YourControl.hs 67;" f -useInventoryPath src/Dodge/HeldUse.hs 931;" f +useGasParams src/Dodge/HeldUse.hs 775;" f +useHotkey src/Dodge/Creature/YourControl.hs 68;" f +useInventoryPath src/Dodge/HeldUse.hs 1019;" f useItem src/Dodge/Creature/Impulse/UseItem.hs 20;" f useItemLoc src/Dodge/Creature/Impulse/UseItem.hs 27;" f useLnkRoomPos src/Dodge/PlacementSpot.hs 244;" f @@ -6321,15 +6318,15 @@ useLocation src/Dodge/Creature/Impulse/UseItem.hs 66;" f useMagShield src/Dodge/Euse.hs 46;" f useNormalCamera src/Dodge/Camera.hs 6;" f usePayload src/Dodge/Payload.hs 18;" f -useRewindGun src/Dodge/HeldUse.hs 897;" f +useRewindGun src/Dodge/HeldUse.hs 985;" f useRewindGun src/Dodge/Luse.hs 40;" f useRoomPosCond src/Dodge/PlacementSpot.hs 178;" f useRoomPosRoomCond src/Dodge/PlacementSpot.hs 181;" f -useStopWatch src/Dodge/HeldUse.hs 878;" f +useStopWatch src/Dodge/HeldUse.hs 966;" f useStopWatch src/Dodge/Luse.hs 21;" f -useTimeCheck src/Dodge/HeldUse.hs 97;" f +useTimeCheck src/Dodge/HeldUse.hs 98;" f useTimeCheck src/Dodge/Item/Weapon/TriggerType.hs 127;" f -useTimeScrollGun src/Dodge/HeldUse.hs 886;" f +useTimeScrollGun src/Dodge/HeldUse.hs 974;" f useTimeScrollGun src/Dodge/Luse.hs 29;" f useUnusedLnk src/Dodge/PlacementSpot.hs 169;" f usedRoomInLinkPoss src/Dodge/PlacementSpot.hs 196;" f @@ -6361,7 +6358,7 @@ violet src/Color.hs 21;" f visibleWalls src/Dodge/Base/Collide.hs 123;" f visionCheck src/Dodge/Creature/Perception.hs 152;" f vocalizationTest src/Dodge/Creature/Vocalization.hs 8;" f -volleyGun src/Dodge/Item/Held/Cane.hs 30;" f +volleyGun src/Dodge/Item/Held/Cane.hs 29;" f volleyGunShape src/Dodge/Item/Draw/SPic.hs 340;" f waistSP src/Dodge/Creature/HandPos.hs 173;" f walkNozzle src/Dodge/HeldUse.hs 483;" f @@ -6373,11 +6370,11 @@ wallLine src/Dodge/Placement/Instance/Wall.hs 71;" f wallsFromRooms src/Dodge/Layout.hs 146;" f wallsToDraw src/Dodge/Render/Walls.hs 17;" f warningRooms src/Dodge/Room/Warning.hs 27;" f -wasdAim src/Dodge/Creature/YourControl.hs 123;" f +wasdAim src/Dodge/Creature/YourControl.hs 124;" f wasdDir src/Dodge/WASD.hs 17;" f wasdM src/Dodge/WASD.hs 9;" f -wasdMovement src/Dodge/Creature/YourControl.hs 150;" f -wasdWithAiming src/Dodge/Creature/YourControl.hs 116;" f +wasdMovement src/Dodge/Creature/YourControl.hs 151;" f +wasdWithAiming src/Dodge/Creature/YourControl.hs 117;" f watchCombinations src/Dodge/Combine/Combinations.hs 15;" f watchUpdateStrat src/Dodge/Creature/ReaderUpdate.hs 177;" f weakenMatS src/Dodge/Material/Sound.hs 18;" f @@ -6439,7 +6436,7 @@ yellow src/Color.hs 17;" f you src/Dodge/Base/You.hs 12;" f youDropItem src/Dodge/Creature/Action.hs 190;" f yourAugmentedItem src/Dodge/Render/HUD.hs 235;" f -yourControl src/Dodge/Creature/YourControl.hs 25;" f +yourControl src/Dodge/Creature/YourControl.hs 26;" f yourDefaultSpeed src/Dodge/Default/Creature.hs 129;" f yourDefaultStrideLength src/Dodge/Default/Creature.hs 132;" f yourInfo src/Dodge/Creature/Info.hs 8;" f