From 86d8e3a98a5e54a73a77d6ea807db67becaceba7 Mon Sep 17 00:00:00 2001 From: justin Date: Sat, 21 Sep 2024 19:42:28 +0100 Subject: [PATCH] (Re)Implement nozzle walking --- ghcidOutput | 2 +- src/Dodge/Creature.hs | 2 + src/Dodge/Data/Item/Params.hs | 9 - src/Dodge/Data/Item/Use.hs | 88 +++--- src/Dodge/HeldUse.hs | 54 ++-- src/Dodge/Projectile/Create.hs | 22 -- tags | 514 ++++++++++++++++----------------- 7 files changed, 329 insertions(+), 362 deletions(-) diff --git a/ghcidOutput b/ghcidOutput index 7ffd7adaa..aa45b8d44 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1 +1 @@ -All good (617 modules, at 19:05:46) +All good (617 modules, at 19:41:21) diff --git a/src/Dodge/Creature.hs b/src/Dodge/Creature.hs index 99bc01bcb..2e0be9000 100644 --- a/src/Dodge/Creature.hs +++ b/src/Dodge/Creature.hs @@ -274,6 +274,8 @@ stackedInventory = , megaTinMag , teslaGun , megaBattery + , flameThrower + , chemFuelPouch , bulletSynthesizer , drumMag , launcher diff --git a/src/Dodge/Data/Item/Params.hs b/src/Dodge/Data/Item/Params.hs index f4ef7dd5b..fe296d017 100644 --- a/src/Dodge/Data/Item/Params.hs +++ b/src/Dodge/Data/Item/Params.hs @@ -44,11 +44,6 @@ data ItemParams , _dbGap :: Float } | Attracting {_attractionPower :: Point2} - | AngleWalk - { _maxWalkAngle :: Float - , _currentWalkAngle :: Float - , _walkSpeed :: Float - } | Arcing { _currentArc :: Maybe [ArcStep] , _arcSize :: Float @@ -77,12 +72,8 @@ data PreviousArcEffect = NoPreviousArcEffect | PerturbTillBreakPreviousArc -- } --deriving (Eq, Ord, Show, Read) --Generic, Flat) -data Nozzle = Nozzle - --deriving (Eq, Ord, Show, Read) --Generic, Flat) makeLenses ''ItemParams -makeLenses ''Nozzle deriveJSON defaultOptions ''ShrinkGunStatus deriveJSON defaultOptions ''PreviousArcEffect -deriveJSON defaultOptions ''Nozzle deriveJSON defaultOptions ''ItemParams diff --git a/src/Dodge/Data/Item/Use.hs b/src/Dodge/Data/Item/Use.hs index 36f255dda..bd5fb9a79 100644 --- a/src/Dodge/Data/Item/Use.hs +++ b/src/Dodge/Data/Item/Use.hs @@ -1,5 +1,5 @@ -{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE DeriveAnyClass #-} +{-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE StrictData #-} {-# LANGUAGE TemplateHaskell #-} @@ -11,28 +11,28 @@ module Dodge.Data.Item.Use ( module Dodge.Data.Item.Use.Consumption, module Dodge.Data.Hammer, module Dodge.Data.Item.Targeting, - module Dodge.Data.GenFloat + module Dodge.Data.GenFloat, ) where -import Dodge.Data.GenFloat -import Sound.Data -import qualified Data.IntMap.Strict as IM -import Geometry.Data import Control.Lens import Data.Aeson import Data.Aeson.TH +import qualified Data.IntMap.Strict as IM +import Dodge.Data.GenFloat --import qualified Data.Sequence as Seq import Dodge.Data.Hammer +import Dodge.Data.Item.HeldDelay import Dodge.Data.Item.HeldUse +import Dodge.Data.Item.Targeting import Dodge.Data.Item.Use.Consumption import Dodge.Data.Item.Use.Equipment -import Dodge.Data.Item.HeldDelay -import Dodge.Data.Item.Targeting +import Geometry.Data +import Sound.Data data ItemUse = HeldUse { -- _heldUse :: Huse - _heldDelay :: UseDelay + _heldDelay :: UseDelay , _heldMods :: HeldMod , _heldHammer :: HammerPosition , _heldAim :: AimParams @@ -40,7 +40,7 @@ data ItemUse , _heldParams :: HeldParams , _heldTriggerType :: TriggerType , _heldUsageTime :: Int -- this is not yet implemented --- , _useTargeting :: Maybe TargetType + -- , _useTargeting :: Maybe TargetType } | LeftUse { _leftUse :: Luse @@ -51,44 +51,45 @@ data ItemUse } | ConsumeUse { _cUse :: Cuse --- , _useAmount :: ItAmount + -- , _useAmount :: ItAmount } | EquipUse { _equipEffect :: EquipEffect , _equipTargeting :: Maybe TargetType } | CraftUse --- {_useAmount :: ItAmount} - | AttachUse --- {_attachParams :: AttachParams} - | AmmoMagUse + | -- {_useAmount :: ItAmount} + AttachUse + | -- {_attachParams :: AttachParams} + AmmoMagUse { _amagLoadStatus :: ReloadStatus - , _amagParams :: AmmoParams + , _amagParams :: AmmoParams , _amagType :: AmmoType } deriving (Eq, Show, Read) --Generic, Flat) -data TriggerType = AutoTrigger +data TriggerType + = AutoTrigger | HammerTrigger deriving (Eq, Show, Read) --Generic, Flat) data HeldParams = DefaultHeldParams | GasSprayParams - {_gasCreation :: GasCreate + { _gasCreation :: GasCreate , _recoil :: Float , _torqueAfter :: Float , _randomOffset :: Float , _sidePush :: Float , _bulGunSound :: Maybe (SoundID, Int) -- if the int is 0, play sound on new channel - -- if >0, continue playing sound for - -- given time + -- if >0, continue playing sound for + -- given time , _weaponInvLock :: Int , _weaponRepeat :: [Int] } | BeamShooterParams { _bulGunSound :: Maybe (SoundID, Int) -- if the int is 0, play sound on new channel - -- TODO remove duplicate + -- TODO remove duplicate } | BulletShooterParams { _muzVel :: GenFloat @@ -98,20 +99,15 @@ data HeldParams , _randomOffset :: Float , _sidePush :: Float , _bulGunSound :: Maybe (SoundID, Int) -- if the int is 0, play sound on new channel - -- if >0, continue playing sound for - -- given time + -- if >0, continue playing sound for + -- given time , _weaponInvLock :: Int , _weaponRepeat :: [Int] } deriving (Eq, Show, Read) --Generic, Flat) ---data AttachParams --- = ScrollAttachParams {_scrollAttachParams :: ScrollAttachParams} --- | TargetAttachParams --- | NoAttachParams --- deriving (Eq, Show, Read) --Generic, Flat) - -data AmmoParams = BulletParams {_ampBullet :: Bullet} +data AmmoParams + = BulletParams {_ampBullet :: Bullet} | ProjectileParams { _ampPayload :: Payload , _ampPjDraw :: ProjectileDraw @@ -136,14 +132,15 @@ data AimParams = AimParams } deriving (Eq, Ord, Show, Read) --Generic, Flat) - -data FlareType = DefaultFlareType +data FlareType + = DefaultFlareType | PistolFlare | MiniGunFlare | HeavySmokeFlare | LasGunFlare | TeslaGunFlare deriving (Eq, Ord, Show, Read) --Generic, Flat) + data MuzzleEffect = MuzzleShootBullet | MuzzleLaser @@ -156,9 +153,9 @@ data MuzzleEffect , _nzCurrentWalkAngle :: Float , _nzWalkSpeed :: Float } - | MuzzleShatter - | MuzzleForceField - | MuzzleDetector + | MuzzleShatter + | MuzzleForceField + | MuzzleDetector deriving (Eq, Ord, Show, Read) --Generic, Flat) data Muzzle = Muzzle @@ -169,24 +166,23 @@ data Muzzle = Muzzle , _mzFlareType :: FlareType , _mzEffect :: MuzzleEffect , _mzChargeRequirement :: Maybe Int --- , _mzRecoil :: Float --- , _mzTorque :: Float --- , _mzSidePush :: Float --- , _mzRandomOffset :: Float --- , _mzVel :: Float --- , _mzRifling :: Float --- , _mzAmmoSlot :: Either Int --- , _mzAmmoPerShot :: Int + -- , _mzRecoil :: Float + -- , _mzTorque :: Float + -- , _mzSidePush :: Float + -- , _mzRandomOffset :: Float + -- , _mzVel :: Float + -- , _mzRifling :: Float + -- , _mzAmmoSlot :: Either Int + -- , _mzAmmoPerShot :: Int } deriving (Eq, Ord, Show, Read) --Generic, Flat) - data AimStance = TwoHandUnder | TwoHandOver | TwoHandFlat | OneHand --- | LeaveHolstered + -- | LeaveHolstered deriving (Eq, Ord, Show, Read) --Generic, Flat) --deriving (Eq, Show, Ord, Enum, Read) --Generic, Flat) @@ -202,6 +198,7 @@ makeLenses ''AimParams makeLenses ''ItZoom makeLenses ''Muzzle makeLenses ''HeldParams + --makeLenses ''AttachParams --makeLenses ''ScrollAttachParams makeLenses ''AmmoParams @@ -213,6 +210,7 @@ deriveJSON defaultOptions ''AmmoParams deriveJSON defaultOptions ''HeldParams deriveJSON defaultOptions ''Muzzle deriveJSON defaultOptions ''AimStance + --deriveJSON defaultOptions ''ScrollAttachParams --deriveJSON defaultOptions ''AttachParams deriveJSON defaultOptions ''ItZoom diff --git a/src/Dodge/HeldUse.hs b/src/Dodge/HeldUse.hs index 09c1a14f2..4b12660e5 100644 --- a/src/Dodge/HeldUse.hs +++ b/src/Dodge/HeldUse.hs @@ -56,7 +56,7 @@ bulGunEffect' :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> Wo bulGunEffect' t cr w = fromMaybe (error "error in bulGunEffect") $ do muzzles <- t ^? ldtValue . itUse . heldAim . aimMuzzles let (upitm,loadedmuzzles) = mapAccumR loadMuzzle t muzzles - cmew = foldl' (useLoadedAmmo (_ldtValue t) cr) (CME 0 0 False,w) $ loadedmuzzles + cmew = foldl' (useLoadedAmmo (_ldtValue t) cr) (CME 0 0 False,w) $ zip [0..] loadedmuzzles return $ uncurry (applyCME (_ldtValue t) cr) cmew & cWorld . lWorld . lTestString .~ map (show . _mzAmmoSlot) muzzles & doWeaponRepetitions upitm cr @@ -177,17 +177,17 @@ isAmmoIntLink :: Int -> ComposeLinkType -> Bool isAmmoIntLink i (AmmoInLink j _) = i == j isAmmoIntLink _ _ = False -useLoadedAmmo :: Item -> Creature -> (CumulativeMuzzleEffect,World) -> (Muzzle,Int,Maybe Int) +useLoadedAmmo :: Item -> Creature -> (CumulativeMuzzleEffect,World) -> (Int,(Muzzle,Int,Maybe Int)) -> (CumulativeMuzzleEffect,World) -useLoadedAmmo _ _ (cme,w) (_,0,_) = (cme, w) -useLoadedAmmo itm cr (cme,w) (mz,x,mid) = (,) (cme & cmeSound .~ True) $ +useLoadedAmmo _ _ (cme,w) (_,(_,0,_)) = (cme, w) +useLoadedAmmo itm cr (cme,w) (mzid,(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 - MuzzleNozzle {} -> useGasParams mid mz itm cr $ walkNozzle mz itm cr w + MuzzleNozzle {} -> useGasParams mid mz itm cr $ walkNozzle mzid mz itm cr w MuzzleShatter -> shootShatter itm cr w MuzzleForceField -> useForceFieldGun itm cr w MuzzleDetector -> itemDetectorEffect itm cr w @@ -197,15 +197,19 @@ itemDetectorEffect itm cr w = fromMaybe w $ do HELDDETECTOR dt <- itm ^? itType . iyBase . ibtHeld return $ detectorEffect dt itm cr w -walkNozzle :: Muzzle -> Item -> Creature -> World -> World -walkNozzle _ _ _ w = w --- & randGen .~ g --- where --- nz = _mzEffect mz --- (walkamount, g) = randomR (- aspeed, aspeed) (_randGen w) --- aspeed = _nzWalkSpeed nz --- maxa = _nzMaxWalkAngle nz --- wa = min maxa $ max (negate maxa) (_nzCurrentWalkAngle nz + walkamount) +walkNozzle :: Int -> Muzzle -> Item -> Creature -> World -> World +walkNozzle mzid mz itm cr w = fromMaybe w $ do + invid <- itm ^? itLocation . ipInvID + return $ w + & cWorld . lWorld . creatures . ix (_crID cr) . crInv + . ix invid . itUse . heldAim . aimMuzzles . ix mzid . mzEffect . nzCurrentWalkAngle .~ wa + & randGen .~ g + where + nz = _mzEffect mz + (walkamount, g) = randomR (- aspeed, aspeed) (_randGen w) + aspeed = _nzWalkSpeed nz + maxa = _nzMaxWalkAngle nz + wa = min maxa $ max (negate maxa) (_nzCurrentWalkAngle nz + walkamount) shootTractorBeam :: Item -> Creature -> World -> World @@ -313,17 +317,17 @@ useHeld hu = case hu of HeldShatter -> shootShatter . _ldtValue HeldExplodeRemoteShell itid pjid -> const $ const $ explodeRemoteRocket itid pjid -usePjCreation :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World -usePjCreation itm cr = fromMaybe id $ do - atype <- itm ^? ldtValue . itUse . heldAmmoTypes . ix 0 - leftitms <- itm ^? ldtLeft - mag <- lookup (AmmoInLink 0 atype) leftitms - apm <- mag ^? ldtValue - muz <- itm ^? ldtValue . itUse . heldAim . aimMuzzles . ix 0 - return $ createProjectile apm muz (_ldtValue itm) cr +--usePjCreation :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World +--usePjCreation itm cr = fromMaybe id $ do +-- atype <- itm ^? ldtValue . itUse . heldAmmoTypes . ix 0 +-- leftitms <- itm ^? ldtLeft +-- mag <- lookup (AmmoInLink 0 atype) leftitms +-- apm <- mag ^? ldtValue +-- muz <- itm ^? ldtValue . itUse . heldAim . aimMuzzles . ix 0 +-- return $ createProjectile apm muz (_ldtValue itm) cr -usePjCreationX :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World -usePjCreationX = undefined +--usePjCreationX :: LabelDoubleTree ComposeLinkType Item -> Creature -> World -> World +--usePjCreationX = undefined --usePjCreationX ams itm cr = fromMaybe id $ do -- muzs <- itm ^? itUse . heldAim . aimMuzzles -- return $ foldr @@ -399,7 +403,7 @@ useGasParams mmagid mz itm cr w = pos = _crPos cr + rotateV (_crDir cr) (_mzPos mz + aimingWeaponZeroPos cr itm) (a,g') = randomR (-inacc,inacc) g inacc = _mzInaccuracy mz - dir = _crDir cr + _mzRot mz + a + dir = _crDir cr + _mzRot mz + a + (_nzCurrentWalkAngle $ _mzEffect mz) gasCreate :: GasFuel -> GasCreate -> GasCreate gasCreate = flip const diff --git a/src/Dodge/Projectile/Create.hs b/src/Dodge/Projectile/Create.hs index b724783b8..195f3a9c5 100644 --- a/src/Dodge/Projectile/Create.hs +++ b/src/Dodge/Projectile/Create.hs @@ -9,28 +9,6 @@ import qualified IntMapHelp as IM import LensHelp import qualified SDL -createProjectile :: Item -> Muzzle -> Item -> Creature -> World -> World -createProjectile ammoitem muz itm cr = fromMaybe failsound $ do - x <- ammoitem ^? itUse . amagLoadStatus . iaLoaded - guard $ x > 0 - 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' createProjectile' :: Maybe Int -> Muzzle -> Item -> Creature -> World -> World createProjectile' mmagid muz itm cr = fromMaybe failsound $ do diff --git a/tags b/tags index cd0995378..343a65022 100644 --- a/tags +++ b/tags @@ -24,22 +24,22 @@ AIUNIT src/Dodge/Combine/Data.hs 48;" C AIUNIT src/Dodge/Data/Item/Combine.hs 54;" C AMMOMAG src/Dodge/Data/Item/Combine.hs 92;" C AMR src/Dodge/Combine/Data.hs 157;" C -AMR src/Dodge/Data/Item/Combine.hs 180;" C +AMR src/Dodge/Data/Item/Combine.hs 176;" C ANTIMATTER src/Dodge/Combine/Data.hs 44;" C ANTIMATTER src/Dodge/Data/Item/Combine.hs 48;" C AQUAMARINE src/Color/Data.hs 24;" C ATTACH src/Dodge/Data/Item/Combine.hs 91;" C ATTACHTORCH src/Dodge/Combine/Data.hs 219;" C -ATTACHTORCH src/Dodge/Data/Item/Combine.hs 221;" C +ATTACHTORCH src/Dodge/Data/Item/Combine.hs 217;" C AUTOAMR src/Dodge/Combine/Data.hs 158;" C -AUTOAMR src/Dodge/Data/Item/Combine.hs 181;" C +AUTOAMR src/Dodge/Data/Item/Combine.hs 177;" C AUTODETECTOR src/Dodge/Combine/Data.hs 117;" C -AUTODETECTOR src/Dodge/Data/Item/Combine.hs 147;" C +AUTODETECTOR src/Dodge/Data/Item/Combine.hs 143;" C AUTOEFFGUN src/Dodge/Combine/Data.hs 84;" C AUTOPISTOL src/Dodge/Combine/Data.hs 139;" C -AUTOPISTOL src/Dodge/Data/Item/Combine.hs 167;" C +AUTOPISTOL src/Dodge/Data/Item/Combine.hs 163;" C AUTORIFLE src/Dodge/Combine/Data.hs 151;" C -AUTORIFLE src/Dodge/Data/Item/Combine.hs 176;" C +AUTORIFLE src/Dodge/Data/Item/Combine.hs 172;" C AZURE src/Color/Data.hs 23;" C AccessTerminal src/Dodge/Data/WorldEffect.hs 28;" C Action src/Dodge/Data/ActionPlan.hs 78;" t @@ -54,11 +54,11 @@ AddGoal src/Dodge/Data/ActionPlan.hs 45;" C AddTile src/Dodge/Room/AddTile.hs 1;" m AesonHelp src/AesonHelp.hs 1;" m AimAt src/Dodge/Data/ActionPlan.hs 84;" C -AimParams src/Dodge/Data/Item/Use.hs 128;" t +AimParams src/Dodge/Data/Item/Use.hs 124;" 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 184;" t +AimStance src/Dodge/Data/Item/Use.hs 180;" t Aiming src/Dodge/Creature/Stance/Data.hs 42;" C Aiming src/Dodge/Data/Creature/Stance.hs 39;" C AirFiltrationSS src/Dodge/Data/Scenario.hs 95;" C @@ -74,11 +74,11 @@ Ammo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 6;" m Ammo src/Dodge/Item/Ammo.hs 1;" m AmmoCI src/Dodge/Data/ComposedItem.hs 25;" C AmmoInLink src/Dodge/Data/ComposedItem.hs 14;" C -AmmoMagType src/Dodge/Data/Item/Combine.hs 111;" t +AmmoMagType src/Dodge/Data/Item/Combine.hs 107;" t AmmoMagUse src/Dodge/Data/Item/Use.hs 64;" C AmmoModLink src/Dodge/Data/ComposedItem.hs 15;" C AmmoModifierCI src/Dodge/Data/ComposedItem.hs 24;" C -AmmoParams src/Dodge/Data/Item/Use.hs 114;" t +AmmoParams src/Dodge/Data/Item/Use.hs 109;" t AmmoParams src/Dodge/Item/Weapon/AmmoParams.hs 1;" m AmmoPosition src/Dodge/Item/AmmoPosition.hs 8;" t AmmoPosition src/Dodge/Item/AmmoPosition.hs 2;" m @@ -88,7 +88,6 @@ Amount src/Dodge/Item/Amount.hs 1;" m AnRoom src/Dodge/Annotation/Data.hs 17;" C AnTree src/Dodge/Annotation/Data.hs 18;" C Analyser src/Dodge/Placement/Instance/Analyser.hs 1;" m -AngleWalk src/Dodge/Data/Item/Params.hs 47;" C Annotate src/Dodge/Layout/Tree/Annotate.hs 2;" m Annotation src/Dodge/Annotation/Data.hs 13;" t Annotation src/Dodge/Layout/Tree/Annotate.hs 14;" t @@ -103,7 +102,7 @@ ArcShad src/Picture/Data.hs 40;" C ArcStep src/Dodge/Data/ArcStep.hs 14;" t ArcStep src/Dodge/ArcStep.hs 1;" m ArcStep src/Dodge/Data/ArcStep.hs 6;" m -Arcing src/Dodge/Data/Item/Params.hs 52;" C +Arcing src/Dodge/Data/Item/Params.hs 47;" C Arithmetic src/Dodge/Base/Arithmetic.hs 1;" m ArmourChase src/Dodge/Creature/ArmourChase.hs 1;" m ArmourySS src/Dodge/Data/Scenario.hs 112;" C @@ -148,7 +147,7 @@ AutoDoorObstacle src/Dodge/Data/PathGraph.hs 51;" C AutoGun src/Dodge/Item/Weapon/AutoGun.hs 1;" m AutoRecharging src/Dodge/Data/Item/Consumption.hs 23;" C AutoRecharging src/Dodge/Data/Item/Use/Consumption.hs 28;" C -AutoTrigger src/Dodge/Data/Item/Use.hs 71;" C +AutoTrigger src/Dodge/Data/Item/Use.hs 72;" C AuxAddition src/Shader/AuxAddition.hs 1;" m AwakeLevel src/Dodge/Creature/AlertLevel/Data.hs 14;" t Awareness src/Dodge/Creature/Perception/Data.hs 72;" t @@ -157,45 +156,45 @@ Awareness src/Dodge/Creature/Picture/Awareness.hs 1;" m AwarenessInt src/Dodge/Creature/AlertLevel/Data.hs 26;" C AwarenessLevel src/Dodge/Creature/AlertLevel/Data.hs 25;" t BANGCONE src/Dodge/Combine/Data.hs 141;" C -BANGCONE src/Dodge/Data/Item/Combine.hs 169;" C +BANGCONE src/Dodge/Data/Item/Combine.hs 165;" C BANGROD src/Dodge/Combine/Data.hs 155;" C -BANGROD src/Dodge/Data/Item/Combine.hs 178;" C +BANGROD src/Dodge/Data/Item/Combine.hs 174;" C BANGSTICK src/Dodge/Combine/Data.hs 134;" C -BANGSTICK src/Dodge/Data/Item/Combine.hs 164;" C +BANGSTICK src/Dodge/Data/Item/Combine.hs 160;" C BATTERY src/Dodge/Combine/Data.hs 59;" C -BATTERY src/Dodge/Data/Item/Combine.hs 117;" C -BATTERYPACK src/Dodge/Data/Item/Combine.hs 146;" C +BATTERY src/Dodge/Data/Item/Combine.hs 113;" C +BATTERYPACK src/Dodge/Data/Item/Combine.hs 142;" C BELTMAG src/Dodge/Combine/Data.hs 200;" C -BELTMAG src/Dodge/Data/Item/Combine.hs 115;" C +BELTMAG src/Dodge/Data/Item/Combine.hs 111;" C BEZIERTRAJ src/Dodge/Combine/Data.hs 212;" C BLACK src/Color/Data.hs 28;" C BLINKER src/Dodge/Combine/Data.hs 125;" C -BLINKER src/Dodge/Data/Item/Combine.hs 157;" C +BLINKER src/Dodge/Data/Item/Combine.hs 153;" C BLINKERUNSAFE src/Dodge/Combine/Data.hs 126;" C -BLINKERUNSAFE src/Dodge/Data/Item/Combine.hs 158;" C +BLINKERUNSAFE src/Dodge/Data/Item/Combine.hs 154;" C BLOWTORCH src/Dodge/Combine/Data.hs 165;" C -BLOWTORCH src/Dodge/Data/Item/Combine.hs 188;" C +BLOWTORCH src/Dodge/Data/Item/Combine.hs 184;" C BLUE src/Color/Data.hs 17;" C BLUNDERBUSS src/Dodge/Combine/Data.hs 142;" C -BLUNDERBUSS src/Dodge/Data/Item/Combine.hs 170;" C +BLUNDERBUSS src/Dodge/Data/Item/Combine.hs 166;" C BLUNT src/Dodge/Data/Damage/Type.hs 13;" C BLUNT src/Dodge/Data/DamageType.hs 12;" C BOOSTER src/Dodge/Combine/Data.hs 123;" C -BOOSTER src/Dodge/Data/Item/Combine.hs 153;" C +BOOSTER src/Dodge/Data/Item/Combine.hs 149;" C BOUNCEBUL src/Dodge/Combine/Data.hs 203;" C BOUNCEMODULE src/Dodge/Combine/Data.hs 69;" C BQuad src/Geometry/Bezier.hs 9;" t BRAINHAT src/Dodge/Combine/Data.hs 109;" C -BRAINHAT src/Dodge/Data/Item/Combine.hs 135;" C -BULBODY src/Dodge/Data/Item/Combine.hs 213;" C +BRAINHAT src/Dodge/Data/Item/Combine.hs 131;" C +BULBODY src/Dodge/Data/Item/Combine.hs 209;" C BULBODYCRAFT src/Dodge/Data/Item/Combine.hs 75;" C -BULLETBELTBRACER src/Dodge/Data/Item/Combine.hs 145;" C -BULLETBELTPACK src/Dodge/Data/Item/Combine.hs 144;" C +BULLETBELTBRACER src/Dodge/Data/Item/Combine.hs 141;" C +BULLETBELTPACK src/Dodge/Data/Item/Combine.hs 140;" C BULLETSYNTHESIZER src/Dodge/Data/Item/Combine.hs 100;" C -BULPAY src/Dodge/Data/Item/Combine.hs 212;" C -BULTRAJ src/Dodge/Data/Item/Combine.hs 214;" C +BULPAY src/Dodge/Data/Item/Combine.hs 208;" C +BULTRAJ src/Dodge/Data/Item/Combine.hs 210;" C BURSTRIFLE src/Dodge/Combine/Data.hs 152;" C -BURSTRIFLE src/Dodge/Data/Item/Combine.hs 177;" C +BURSTRIFLE src/Dodge/Data/Item/Combine.hs 173;" C BackgroundSound src/Dodge/Data/SoundOrigin.hs 14;" C Ball src/Dodge/Tesla/Ball.hs 1;" m Bark src/Dodge/Data/ActionPlan.hs 40;" C @@ -221,7 +220,7 @@ BeamCombine src/Dodge/Data/Beam.hs 47;" C BeamCombineType src/Dodge/Data/Beam.hs 38;" t BeamDraw src/Dodge/Data/Beam.hs 33;" t BeamDrawColor src/Dodge/Data/Beam.hs 35;" C -BeamShooterParams src/Dodge/Data/Item/Use.hs 89;" C +BeamShooterParams src/Dodge/Data/Item/Use.hs 90;" C BeamSimple src/Dodge/Data/Beam.hs 50;" C BeamType src/Dodge/Data/Beam.hs 46;" t BecomePowerful src/Dodge/Data/Scenario.hs 9;" C @@ -261,7 +260,7 @@ BlockedLink src/Dodge/Data/Room.hs 48;" C BloomLayer src/Picture/Data.hs 25;" C BloomNoZWrite src/Picture/Data.hs 26;" C Boid src/Dodge/Creature/Boid.hs 1;" m -BoostPropIX src/Dodge/Data/Item/Params.hs 60;" C +BoostPropIX src/Dodge/Data/Item/Params.hs 55;" C Booster src/Dodge/Item/Equipment/Booster.hs 1;" m Booster src/Dodge/Item/Weapon/Booster.hs 1;" m Boosting src/Dodge/Creature/Stance/Data.hs 28;" C @@ -303,8 +302,8 @@ BulletClipAttachment src/Dodge/Data/Item.hs 51;" C BulletEffect src/Dodge/Data/Bullet.hs 36;" t BulletGun src/Dodge/Item/Held/BulletGun.hs 1;" m BulletGuns src/Dodge/Item/Weapon/BulletGuns.hs 1;" m -BulletParams src/Dodge/Data/Item/Use.hs 114;" C -BulletShooterParams src/Dodge/Data/Item/Use.hs 93;" C +BulletParams src/Dodge/Data/Item/Use.hs 110;" C +BulletShooterParams src/Dodge/Data/Item/Use.hs 94;" C BulletSpawn src/Dodge/Data/Bullet.hs 42;" t BulletTrajectory src/Dodge/Data/Bullet.hs 50;" t BulletTrajectoryType src/Dodge/Data/Bullet.hs 57;" t @@ -327,7 +326,7 @@ CAN src/Dodge/Combine/Data.hs 32;" C CAN src/Dodge/Data/Item/Combine.hs 36;" C CDoNothing src/Dodge/Data/Item/HeldUse.hs 34;" C CHARTREUSE src/Color/Data.hs 25;" C -CHEMFUELPOUCH src/Dodge/Data/Item/Combine.hs 118;" C +CHEMFUELPOUCH src/Dodge/Data/Item/Combine.hs 114;" C CHeal src/Dodge/Data/Item/HeldUse.hs 35;" C CIL src/Dodge/Item/Grammar.hs 20;" t CIRCLE src/Dodge/Data/GenParams.hs 20;" C @@ -340,7 +339,7 @@ CONSUMABLE src/Dodge/Data/Item/Combine.hs 89;" C CRAFT src/Dodge/Combine/Data.hs 97;" C CRAFT src/Dodge/Data/Item/Combine.hs 90;" C CREATUREDETECTOR src/Dodge/Combine/Data.hs 226;" C -CREATUREDETECTOR src/Dodge/Data/Item/Combine.hs 226;" C +CREATUREDETECTOR src/Dodge/Data/Item/Combine.hs 222;" C CREATURESENSOR src/Dodge/Combine/Data.hs 57;" C CREATURESENSOR src/Dodge/Data/Item/Combine.hs 65;" C CRUSHING src/Dodge/Data/Damage/Type.hs 16;" C @@ -465,7 +464,7 @@ ConstFloat src/Dodge/Data/GenFloat.hs 11;" C ConstantIntensity src/Dodge/Data/LightSource.hs 17;" C Consumable src/Dodge/Item/Consumable.hs 1;" m ConsumableFamily src/Dodge/Item/Family.hs 7;" C -ConsumableItemType src/Dodge/Data/Item/Combine.hs 122;" t +ConsumableItemType src/Dodge/Data/Item/Combine.hs 118;" t ConsumeUse src/Dodge/Data/Item/Use.hs 52;" C Consumption src/Dodge/Data/Item/Consumption.hs 5;" m Consumption src/Dodge/Data/Item/Use/Consumption.hs 8;" m @@ -579,10 +578,10 @@ Cuse src/Dodge/Cuse.hs 1;" m Cylinder src/Shape/Data.hs 19;" C DPoint2 src/Geometry/Data.hs 34;" t DRONELAUNCHER src/Dodge/Combine/Data.hs 184;" C -DRONELAUNCHER src/Dodge/Data/Item/Combine.hs 200;" C +DRONELAUNCHER src/Dodge/Data/Item/Combine.hs 196;" C DRUM src/Dodge/Combine/Data.hs 34;" C DRUMMAG src/Dodge/Combine/Data.hs 199;" C -DRUMMAG src/Dodge/Data/Item/Combine.hs 114;" C +DRUMMAG src/Dodge/Data/Item/Combine.hs 110;" C DS src/DoubleStack.hs 3;" t DT src/Dodge/Data/DoubleTree.hs 29;" C DTBottomNode src/Dodge/Data/DoubleTree.hs 19;" C @@ -668,9 +667,9 @@ DefaultArcStep src/Dodge/Data/ArcStep.hs 23;" C DefaultCrGroupUpdate src/Dodge/Data/CrGroupParams.hs 22;" C DefaultDrawButton src/Dodge/Data/Button.hs 17;" C DefaultDrawSwitch src/Dodge/Data/Button.hs 18;" C -DefaultFlareType src/Dodge/Data/Item/Use.hs 140;" C +DefaultFlareType src/Dodge/Data/Item/Use.hs 136;" C DefaultForceField src/Dodge/Data/Item/Use/Consumption/Ammo.hs 46;" C -DefaultHeldParams src/Dodge/Data/Item/Use.hs 76;" C +DefaultHeldParams src/Dodge/Data/Item/Use.hs 77;" C DefaultLightSourceDraw src/Dodge/Data/LightSource.hs 13;" C DefaultRoomType src/Dodge/Data/Room.hs 31;" C Delete src/Dodge/Wall/Delete.hs 1;" m @@ -683,7 +682,7 @@ DestroyDamage src/Dodge/Particle/Bullet/DestroyDamage.hs 1;" m 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 224;" t +Detector src/Dodge/Data/Item/Combine.hs 220;" t Dirt src/Dodge/Data/Material.hs 11;" C DisasterType src/Dodge/Data/Scenario.hs 24;" t Display src/Dodge/Item/Display.hs 1;" m @@ -802,9 +801,9 @@ EHeadLamp src/Dodge/Data/Item/HeldUse.hs 43;" C ELECTRICAL src/Dodge/Data/Damage/Type.hs 20;" C ELECTRICAL src/Dodge/Data/DamageType.hs 19;" C ELEPHANTGUN src/Dodge/Combine/Data.hs 156;" C -ELEPHANTGUN src/Dodge/Data/Item/Combine.hs 179;" C +ELEPHANTGUN src/Dodge/Data/Item/Combine.hs 175;" C EMPTYMODULE src/Dodge/Combine/Data.hs 198;" C -EMPTYMODULE src/Dodge/Data/Item/Combine.hs 210;" C +EMPTYMODULE src/Dodge/Data/Item/Combine.hs 206;" C EMagShield src/Dodge/Data/Item/HeldUse.hs 41;" C ENERGYBALLCRAFT src/Dodge/Data/Item/Combine.hs 74;" C ENTERREMENT src/Dodge/Data/Damage/Type.hs 24;" C @@ -814,7 +813,7 @@ EQUIP src/Dodge/Data/Item/Combine.hs 88;" C EWristShield src/Dodge/Data/Item/HeldUse.hs 42;" C EXPLOSIVE src/Dodge/Data/Damage/Type.hs 21;" C EXPLOSIVE src/Dodge/Data/DamageType.hs 20;" C -EXPLOSIVES src/Dodge/Data/Item/Combine.hs 124;" C +EXPLOSIVES src/Dodge/Data/Item/Combine.hs 120;" C EXTRABATTERY src/Dodge/Combine/Data.hs 218;" C Ears src/Dodge/Creature/Perception/Data.hs 48;" C Ears src/Dodge/Data/Creature/Perception.hs 47;" C @@ -848,7 +847,7 @@ EquipCounter src/Dodge/Data/Item/Use/Equipment.hs 31;" C EquipEffect src/Dodge/Data/Item/Use/Equipment.hs 17;" t EquipID src/Dodge/Data/Item/Use/Equipment.hs 30;" C EquipItemType src/Dodge/Combine/Data.hs 103;" t -EquipItemType src/Dodge/Data/Item/Combine.hs 129;" t +EquipItemType src/Dodge/Data/Item/Combine.hs 125;" t EquipOptions src/Dodge/Data/RightButtonOptions.hs 15;" C EquipParams src/Dodge/Data/Item/Use/Equipment.hs 28;" t EquipPosition src/Dodge/Data/Equipment/Misc.hs 20;" t @@ -889,34 +888,34 @@ FBranch src/TreeExtra.hs 8;" C FBranches src/TreeExtra.hs 9;" C FLAKCRAFT src/Dodge/Data/Item/Combine.hs 72;" C FLAMESHIELD src/Dodge/Combine/Data.hs 105;" C -FLAMESHIELD src/Dodge/Data/Item/Combine.hs 131;" C +FLAMESHIELD src/Dodge/Data/Item/Combine.hs 127;" C FLAMESPITTER src/Dodge/Combine/Data.hs 161;" C -FLAMESPITTER src/Dodge/Data/Item/Combine.hs 184;" C +FLAMESPITTER src/Dodge/Data/Item/Combine.hs 180;" C FLAMETHROWER src/Dodge/Combine/Data.hs 162;" C -FLAMETHROWER src/Dodge/Data/Item/Combine.hs 185;" C +FLAMETHROWER src/Dodge/Data/Item/Combine.hs 181;" C FLAMETORRENT src/Dodge/Combine/Data.hs 163;" C -FLAMETORRENT src/Dodge/Data/Item/Combine.hs 186;" C +FLAMETORRENT src/Dodge/Data/Item/Combine.hs 182;" C FLAMEWALL src/Dodge/Combine/Data.hs 164;" C -FLAMEWALL src/Dodge/Data/Item/Combine.hs 187;" C +FLAMEWALL src/Dodge/Data/Item/Combine.hs 183;" C FLAMING src/Dodge/Data/Damage/Type.hs 18;" C FLAMING src/Dodge/Data/DamageType.hs 17;" C FLASHMODULE src/Dodge/Combine/Data.hs 68;" C FLASHMODULE src/Dodge/Data/Item/Combine.hs 70;" C FLATSHIELD src/Dodge/Combine/Data.hs 192;" C -FLATSHIELD src/Dodge/Data/Item/Combine.hs 205;" C +FLATSHIELD src/Dodge/Data/Item/Combine.hs 201;" C FLECHETRAJ src/Dodge/Combine/Data.hs 211;" C FLeaf src/TreeExtra.hs 10;" C FORCEFIELDGUN src/Dodge/Combine/Data.hs 188;" C -FORCEFIELDGUN src/Dodge/Data/Item/Combine.hs 202;" C +FORCEFIELDGUN src/Dodge/Data/Item/Combine.hs 198;" C FRAGCRAFT src/Dodge/Data/Item/Combine.hs 73;" C FRAGMODULE src/Dodge/Combine/Data.hs 67;" C FRAGMODULE src/Dodge/Data/Item/Combine.hs 69;" C FRONTARMOUR src/Dodge/Combine/Data.hs 106;" C -FRONTARMOUR src/Dodge/Data/Item/Combine.hs 132;" C +FRONTARMOUR src/Dodge/Data/Item/Combine.hs 128;" C FTree src/TreeExtra.hs 7;" t FUELCELL src/Dodge/Combine/Data.hs 60;" C FUELCELL src/Dodge/Data/Item/Combine.hs 67;" C -FUELPACK src/Dodge/Data/Item/Combine.hs 143;" C +FUELPACK src/Dodge/Data/Item/Combine.hs 139;" C FacilityType src/Dodge/Data/Scenario.hs 55;" t Faction src/Dodge/Creature/State/Data.hs 29;" t Faction src/Dodge/Data/Creature/State.hs 34;" t @@ -949,7 +948,7 @@ Flank src/Dodge/Data/ActionPlan.hs 177;" C Flare src/Dodge/Data/Flare.hs 14;" t Flare src/Dodge/Data/Flare.hs 6;" m Flare src/Dodge/Flare.hs 1;" m -FlareType src/Dodge/Data/Item/Use.hs 140;" t +FlareType src/Dodge/Data/Item/Use.hs 135;" t Flash src/Dodge/WorldEvent/Flash.hs 11;" m FlashBall src/Dodge/Data/Bullet.hs 33;" C FlatFaces src/Shape/Data.hs 17;" C @@ -1001,7 +1000,7 @@ FromEdge src/Dodge/Data/Room.hs 47;" C FullRes src/Dodge/Config/Data.hs 54;" C FullRes src/Dodge/Data/Config.hs 95;" C FullShadowFidelity src/Shape/Data.hs 24;" C -FullSize src/Dodge/Data/Item/Params.hs 63;" C +FullSize src/Dodge/Data/Item/Params.hs 58;" C FullyVisible src/Dodge/Data/CamouflageStatus.hs 12;" C Furniture src/Dodge/Room/Furniture.hs 1;" m GASINJECTOR src/Dodge/Data/Item/Combine.hs 71;" C @@ -1009,7 +1008,7 @@ GEqC src/SameConstr.hs 20;" c GLASSSHARD src/Dodge/Data/Item/Combine.hs 40;" C GLHelp src/GLHelp.hs 1;" m GRAPECANNON src/Dodge/Combine/Data.hs 143;" C -GRAPECANNON src/Dodge/Data/Item/Combine.hs 171;" C +GRAPECANNON src/Dodge/Data/Item/Combine.hs 167;" C GRAVITYMODULE src/Dodge/Combine/Data.hs 75;" C GRAVITYMODULE src/Dodge/Data/Item/Combine.hs 79;" C GREEN src/Color/Data.hs 16;" C @@ -1025,8 +1024,8 @@ GasCloud src/Dodge/Data/Cloud.hs 31;" C GasCreate src/Dodge/Data/Gas.hs 6;" t GasCreate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 52;" t GasFuel src/Dodge/Data/Item/Use/Consumption/Ammo.hs 49;" t -GasParams src/Dodge/Data/Item/Use.hs 120;" C -GasSprayParams src/Dodge/Data/Item/Use.hs 77;" C +GasParams src/Dodge/Data/Item/Use.hs 116;" C +GasSprayParams src/Dodge/Data/Item/Use.hs 78;" C GenCr src/Dodge/Creature/State/Data.hs 24;" C GenCr src/Dodge/Data/Creature/State.hs 31;" C GenFloat src/Dodge/Data/GenFloat.hs 11;" t @@ -1081,16 +1080,16 @@ HARDDRIVE src/Dodge/Data/Item/Combine.hs 52;" C HARDWARE src/Dodge/Combine/Data.hs 29;" C HARDWARE src/Dodge/Data/Item/Combine.hs 32;" C HAT src/Dodge/Combine/Data.hs 110;" C -HAT src/Dodge/Data/Item/Combine.hs 136;" C +HAT src/Dodge/Data/Item/Combine.hs 132;" C HEADLAMP src/Dodge/Combine/Data.hs 111;" C -HEADLAMP src/Dodge/Data/Item/Combine.hs 138;" C +HEADLAMP src/Dodge/Data/Item/Combine.hs 134;" C HEADLAMP1 src/Dodge/Combine/Data.hs 112;" C HEATSENSOR src/Dodge/Combine/Data.hs 56;" C HEATSENSOR src/Dodge/Data/Item/Combine.hs 62;" C HELD src/Dodge/Combine/Data.hs 86;" C HELD src/Dodge/Data/Item/Combine.hs 86;" C HELDDETECTOR src/Dodge/Combine/Data.hs 190;" C -HELDDETECTOR src/Dodge/Data/Item/Combine.hs 203;" C +HELDDETECTOR src/Dodge/Data/Item/Combine.hs 199;" C HOSE src/Dodge/Data/Item/Combine.hs 34;" C HPtLayer src/Dodge/Picture/Layer/Data.hs 17;" C HUD src/Dodge/Data/HUD.hs 35;" t @@ -1104,13 +1103,13 @@ Hammer src/Dodge/Hammer.hs 1;" m HammerDown src/Dodge/Data/Hammer.hs 18;" C HammerPosition src/Dodge/Data/Hammer.hs 17;" t HammerReleased src/Dodge/Data/Hammer.hs 19;" C -HammerTrigger src/Dodge/Data/Item/Use.hs 72;" C +HammerTrigger src/Dodge/Data/Item/Use.hs 73;" C HammerType src/Dodge/Data/Hammer.hs 12;" t HammerUp src/Dodge/Data/Hammer.hs 20;" C HandPos src/Dodge/Creature/HandPos.hs 1;" m HardQuit src/Dodge/Data/Universe.hs 66;" C HasHammer src/Dodge/Data/Hammer.hs 14;" C -HeavySmokeFlare src/Dodge/Data/Item/Use.hs 143;" C +HeavySmokeFlare src/Dodge/Data/Item/Use.hs 139;" C Held src/Dodge/Default/Held.hs 1;" m Held src/Dodge/Default/Item/Held.hs 1;" m Held src/Dodge/Item/Held.hs 1;" m @@ -1125,10 +1124,10 @@ HeldFamily src/Dodge/Item/Family.hs 3;" C HeldFireRemoteShell src/Dodge/Data/Item/HeldUse.hs 21;" C HeldForceField src/Dodge/Data/Item/HeldUse.hs 29;" C HeldItemType src/Dodge/Combine/Data.hs 133;" t -HeldItemType src/Dodge/Data/Item/Combine.hs 163;" t +HeldItemType src/Dodge/Data/Item/Combine.hs 159;" t HeldMod src/Dodge/Data/Item/HeldUse.hs 68;" t HeldOffset src/Dodge/Item/HeldOffset.hs 1;" m -HeldParams src/Dodge/Data/Item/Use.hs 75;" t +HeldParams src/Dodge/Data/Item/Use.hs 76;" t HeldScroll src/Dodge/Data/Item/HeldScroll.hs 13;" t HeldScroll src/Dodge/Data/Item/HeldScroll.hs 6;" m HeldScroll src/Dodge/HeldScroll.hs 1;" m @@ -1173,13 +1172,13 @@ Huse src/Dodge/Data/Item/HeldUse.hs 15;" t INCENDBUL src/Dodge/Combine/Data.hs 202;" C INCENDIARYMODULE src/Dodge/Combine/Data.hs 64;" C INCENDLAS src/Dodge/Combine/Data.hs 213;" C -INCENDLAS src/Dodge/Data/Item/Combine.hs 216;" C +INCENDLAS src/Dodge/Data/Item/Combine.hs 212;" C INVISIBILITYEQUIPMENT src/Dodge/Combine/Data.hs 108;" C -INVISIBILITYEQUIPMENT src/Dodge/Data/Item/Combine.hs 134;" C +INVISIBILITYEQUIPMENT src/Dodge/Data/Item/Combine.hs 130;" C IRONBAR src/Dodge/Combine/Data.hs 53;" C IRONBAR src/Dodge/Data/Item/Combine.hs 59;" C ITEMDETECTOR src/Dodge/Combine/Data.hs 225;" C -ITEMDETECTOR src/Dodge/Data/Item/Combine.hs 225;" C +ITEMDETECTOR src/Dodge/Data/Item/Combine.hs 221;" C IcAmount src/Dodge/Data/ItemAmount.hs 9;" t ImmediateEffect src/Loop/Data.hs 8;" C Importance src/Shape/Data.hs 34;" t @@ -1283,7 +1282,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 193;" t +ItZoom src/Dodge/Data/Item/Use.hs 189;" 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 @@ -1299,7 +1298,7 @@ ItemDimension src/Dodge/Data/Item/Misc.hs 13;" t ItemFamily src/Dodge/Item/Family.hs 3;" t ItemLocation src/Dodge/Data/Item/Location.hs 11;" t ItemModuleType src/Dodge/Combine/Data.hs 197;" t -ItemModuleType src/Dodge/Data/Item/Combine.hs 209;" t +ItemModuleType src/Dodge/Data/Item/Combine.hs 205;" t ItemParams src/Dodge/Data/Item/Params.hs 16;" t ItemParams src/Dodge/Tesla/ItemParams.hs 1;" m ItemScrollTimeFlow src/Dodge/Data/World.hs 61;" C @@ -1310,16 +1309,16 @@ ItemType src/Dodge/Data/Item/Combine.hs 16;" t ItemUnlocker src/Dodge/Lock/Data.hs 13;" C ItemUse src/Dodge/Data/Item/Use.hs 32;" t JETPACK src/Dodge/Combine/Data.hs 116;" C -JETPACK src/Dodge/Data/Item/Combine.hs 142;" C +JETPACK src/Dodge/Data/Item/Combine.hs 138;" C JGK src/Control/Foldl/JGK.hs 1;" m JUMPLEGS src/Dodge/Combine/Data.hs 115;" C -JUMPLEGS src/Dodge/Data/Item/Combine.hs 141;" C +JUMPLEGS src/Dodge/Data/Item/Combine.hs 137;" C JoinClust src/Dodge/Combine/Graph.hs 19;" C Just' src/MaybeHelp.hs 13;" C JustStartedPlaying src/Sound/Data.hs 25;" C Justify src/Justify.hs 1;" m KEYCARD src/Dodge/Combine/Data.hs 94;" C -KEYCARD src/Dodge/Data/Item/Combine.hs 206;" C +KEYCARD src/Dodge/Data/Item/Combine.hs 202;" C Key src/Dodge/Layout/Tree/Annotate.hs 16;" C KeyConfig src/Dodge/Config/KeyConfig.hs 3;" m KeyConfigSDL src/Dodge/Config/KeyConfig.hs 17;" t @@ -1329,14 +1328,14 @@ LASCIRCLE src/Dodge/Combine/Data.hs 169;" C LASERING src/Dodge/Data/Damage/Type.hs 19;" C LASERING src/Dodge/Data/DamageType.hs 18;" C LASGUN src/Dodge/Combine/Data.hs 168;" C -LASGUN src/Dodge/Data/Item/Combine.hs 191;" C +LASGUN src/Dodge/Data/Item/Combine.hs 187;" C LASWIDE src/Dodge/Combine/Data.hs 175;" C LAUNCHER src/Dodge/Combine/Data.hs 179;" C -LAUNCHER src/Dodge/Data/Item/Combine.hs 196;" C +LAUNCHER src/Dodge/Data/Item/Combine.hs 192;" C LAUNCHERX src/Dodge/Combine/Data.hs 180;" C -LAUNCHERX src/Dodge/Data/Item/Combine.hs 197;" C +LAUNCHERX src/Dodge/Data/Item/Combine.hs 193;" C LAUNCHHOME src/Dodge/Combine/Data.hs 217;" C -LAUNCHHOME src/Dodge/Data/Item/Combine.hs 220;" C +LAUNCHHOME src/Dodge/Data/Item/Combine.hs 216;" C LBlink src/Dodge/Data/Item/HeldUse.hs 63;" C LBoost src/Dodge/Data/Item/HeldUse.hs 65;" C LBranches src/TreeExtra.hs 24;" C @@ -1387,7 +1386,7 @@ Lampoid src/Dodge/Data/Creature/Misc.hs 72;" 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 144;" C +LasGunFlare src/Dodge/Data/Item/Use.hs 140;" C LasSound src/Dodge/Data/SoundOrigin.hs 26;" C LasTurret src/Dodge/Room/LasTurret.hs 1;" m Laser src/Dodge/Data/Laser.hs 28;" t @@ -1414,7 +1413,7 @@ LeftConsumption src/Dodge/Data/Item/Use/Consumption.hs 27;" t LeftForward src/Dodge/Creature/Stance/Data.hs 34;" C LeftForward src/Dodge/Data/Creature/Stance.hs 32;" C LeftItemType src/Dodge/Combine/Data.hs 122;" t -LeftItemType src/Dodge/Data/Item/Combine.hs 152;" t +LeftItemType src/Dodge/Data/Item/Combine.hs 148;" t LeftUse src/Dodge/Data/Item/Use.hs 45;" C LensHelp src/LensHelp.hs 1;" m Lethargic src/Dodge/Creature/AlertLevel/Data.hs 17;" C @@ -1492,27 +1491,27 @@ Luse src/Dodge/Data/Item/HeldUse.hs 57;" t Luse src/Dodge/Luse.hs 1;" m MACHINEGUN src/Dodge/Combine/Data.hs 160;" C MACHINEPISTOL src/Dodge/Combine/Data.hs 138;" C -MACHINEPISTOL src/Dodge/Data/Item/Combine.hs 166;" C +MACHINEPISTOL src/Dodge/Data/Item/Combine.hs 162;" C MAGENTA src/Color/Data.hs 20;" C MAGNET src/Dodge/Combine/Data.hs 43;" C MAGNET src/Dodge/Data/Item/Combine.hs 47;" C MAGNETMAG src/Dodge/Combine/Data.hs 201;" C -MAGNETMAG src/Dodge/Data/Item/Combine.hs 211;" C +MAGNETMAG src/Dodge/Data/Item/Combine.hs 207;" C MAGNETTRAJ src/Dodge/Combine/Data.hs 210;" C MAGSHIELD src/Dodge/Combine/Data.hs 104;" C -MAGSHIELD src/Dodge/Data/Item/Combine.hs 130;" C +MAGSHIELD src/Dodge/Data/Item/Combine.hs 126;" C MBranch src/Dodge/Tree/Compose/Data.hs 10;" C MCrAc src/Dodge/Data/CreatureEffect.hs 45;" t MCrNoAction src/Dodge/Data/CreatureEffect.hs 45;" C MEDKIT src/Dodge/Combine/Data.hs 96;" C -MEDKIT src/Dodge/Data/Item/Combine.hs 123;" C +MEDKIT src/Dodge/Data/Item/Combine.hs 119;" C MICROCHIP src/Dodge/Combine/Data.hs 47;" C MICROCHIP src/Dodge/Data/Item/Combine.hs 51;" C MICROPHONE src/Dodge/Data/Item/Combine.hs 63;" C MINIDISPLAY src/Dodge/Combine/Data.hs 50;" C MINIDISPLAY src/Dodge/Data/Item/Combine.hs 56;" C MINIGUNX src/Dodge/Combine/Data.hs 147;" C -MINIGUNX src/Dodge/Data/Item/Combine.hs 172;" C +MINIGUNX src/Dodge/Data/Item/Combine.hs 168;" C MODBlockedString src/Dodge/Data/Universe.hs 96;" C MODString src/Dodge/Data/Universe.hs 95;" C MODStringOption src/Dodge/Data/Universe.hs 97;" C @@ -1593,34 +1592,34 @@ MidLayer src/Picture/Data.hs 24;" C Military src/Dodge/Data/Scenario.hs 45;" C Mine src/Dodge/Data/Scenario.hs 64;" C MiniGunAI src/Dodge/Data/Creature/Misc.hs 59;" C -MiniGunFlare src/Dodge/Data/Item/Use.hs 142;" C +MiniGunFlare src/Dodge/Data/Item/Use.hs 138;" 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 ModAutoMag src/Dodge/Combine/Data.hs 236;" C -ModAutoMag src/Dodge/Data/Item/Combine.hs 234;" C +ModAutoMag src/Dodge/Data/Item/Combine.hs 230;" C ModBattery src/Dodge/Combine/Data.hs 240;" C -ModBattery src/Dodge/Data/Item/Combine.hs 238;" C +ModBattery src/Dodge/Data/Item/Combine.hs 234;" C ModBullet src/Dodge/Combine/Data.hs 233;" C -ModBulletCollision src/Dodge/Data/Item/Combine.hs 231;" C -ModBulletPayload src/Dodge/Data/Item/Combine.hs 232;" C +ModBulletCollision src/Dodge/Data/Item/Combine.hs 227;" C +ModBulletPayload src/Dodge/Data/Item/Combine.hs 228;" C ModBulletSpawn src/Dodge/Combine/Data.hs 234;" C ModBulletTrajectory src/Dodge/Combine/Data.hs 238;" C -ModBulletTrajectory src/Dodge/Data/Item/Combine.hs 236;" C +ModBulletTrajectory src/Dodge/Data/Item/Combine.hs 232;" C ModDualBeam src/Dodge/Combine/Data.hs 242;" C -ModDualBeam src/Dodge/Data/Item/Combine.hs 240;" C +ModDualBeam src/Dodge/Data/Item/Combine.hs 236;" C ModHeldAttach src/Dodge/Combine/Data.hs 243;" C -ModHeldAttach src/Dodge/Data/Item/Combine.hs 241;" C +ModHeldAttach src/Dodge/Data/Item/Combine.hs 237;" C ModIDID src/Dodge/Data/Modification.hs 23;" C ModIDTimerPoint3Bool src/Dodge/Data/Modification.hs 15;" C ModLauncherHoming src/Dodge/Combine/Data.hs 239;" C -ModLauncherHoming src/Dodge/Data/Item/Combine.hs 237;" C +ModLauncherHoming src/Dodge/Data/Item/Combine.hs 233;" C ModRifleMag src/Dodge/Combine/Data.hs 235;" C -ModRifleMag src/Dodge/Data/Item/Combine.hs 233;" C +ModRifleMag src/Dodge/Data/Item/Combine.hs 229;" C ModTarget src/Dodge/Combine/Data.hs 237;" C -ModTarget src/Dodge/Data/Item/Combine.hs 235;" C +ModTarget src/Dodge/Data/Item/Combine.hs 231;" C ModTeleport src/Dodge/Combine/Data.hs 241;" C -ModTeleport src/Dodge/Data/Item/Combine.hs 239;" C +ModTeleport src/Dodge/Data/Item/Combine.hs 235;" C Modification src/Dodge/Data/Modification.hs 14;" t Modification src/Dodge/Data/Modification.hs 6;" m ModificationEffect src/Dodge/ModificationEffect.hs 1;" m @@ -1630,7 +1629,7 @@ Module src/Dodge/Combine/Module.hs 1;" m Module src/Dodge/Item/Module.hs 1;" m Module src/Dodge/Module.hs 1;" m ModuleSlot src/Dodge/Combine/Data.hs 232;" t -ModuleSlot src/Dodge/Data/Item/Combine.hs 230;" t +ModuleSlot src/Dodge/Data/Item/Combine.hs 226;" t MonadHelp src/MonadHelp.hs 1;" m MountedLS src/Dodge/Data/MountedObject.hs 12;" C MountedObject src/Dodge/Data/MountedObject.hs 11;" t @@ -1653,18 +1652,18 @@ 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 164;" t -MuzzleDetector src/Dodge/Data/Item/Use.hs 161;" C -MuzzleEffect src/Dodge/Data/Item/Use.hs 147;" t +Muzzle src/Dodge/Data/Item/Use.hs 161;" t +MuzzleDetector src/Dodge/Data/Item/Use.hs 158;" C +MuzzleEffect src/Dodge/Data/Item/Use.hs 144;" t MuzzleEffect src/Dodge/Data/MuzzleEffect.hs 5;" m -MuzzleForceField src/Dodge/Data/Item/Use.hs 160;" C -MuzzleLaser src/Dodge/Data/Item/Use.hs 149;" C -MuzzleLauncher src/Dodge/Data/Item/Use.hs 152;" C -MuzzleNozzle src/Dodge/Data/Item/Use.hs 153;" C -MuzzleShatter src/Dodge/Data/Item/Use.hs 159;" C -MuzzleShootBullet src/Dodge/Data/Item/Use.hs 148;" C -MuzzleTesla src/Dodge/Data/Item/Use.hs 150;" C -MuzzleTractor src/Dodge/Data/Item/Use.hs 151;" C +MuzzleForceField src/Dodge/Data/Item/Use.hs 157;" C +MuzzleLaser src/Dodge/Data/Item/Use.hs 146;" C +MuzzleLauncher src/Dodge/Data/Item/Use.hs 149;" C +MuzzleNozzle src/Dodge/Data/Item/Use.hs 150;" C +MuzzleShatter src/Dodge/Data/Item/Use.hs 156;" 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 @@ -1723,7 +1722,7 @@ NoMvType src/Dodge/Data/Creature/Misc.hs 38;" C NoNeedWeapon src/Dodge/Room/NoNeedWeapon.hs 2;" m NoObjShads src/Dodge/Data/Config.hs 100;" C NoParams src/Dodge/Data/Item/Params.hs 17;" C -NoPreviousArcEffect src/Dodge/Data/Item/Params.hs 66;" C +NoPreviousArcEffect src/Dodge/Data/Item/Params.hs 61;" C NoResurrection src/Dodge/Data/Corpse.hs 14;" C NoRightButtonOptions src/Dodge/Data/RightButtonOptions.hs 14;" C NoRoomClipBoundaries src/Dodge/Config/Data.hs 59;" C @@ -1756,7 +1755,7 @@ NotLink src/Dodge/Data/Room.hs 66;" C NotPushed src/Dodge/Data/Door.hs 30;" C Nothing' src/MaybeHelp.hs 13;" C NothingID src/Dodge/Data/CrWlID.hs 12;" C -Nozzle src/Dodge/Data/Item/Params.hs 80;" t +Nozzle src/Dodge/Data/Item/Params.hs 75;" t NumShadowCasters src/Dodge/Data/Config.hs 14;" t NumShadowCasters0 src/Dodge/Data/Config.hs 15;" C NumShadowCasters1 src/Dodge/Data/Config.hs 16;" C @@ -1827,7 +1826,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 188;" C +OneHand src/Dodge/Data/Item/Use.hs 184;" 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 @@ -1860,7 +1859,7 @@ PIERCING src/Dodge/Data/DamageType.hs 11;" C PIPE src/Dodge/Combine/Data.hs 27;" C PIPE src/Dodge/Data/Item/Combine.hs 30;" C PISTOL src/Dodge/Combine/Data.hs 135;" C -PISTOL src/Dodge/Data/Item/Combine.hs 165;" C +PISTOL src/Dodge/Data/Item/Combine.hs 161;" C PJDecTimMvVel src/Dodge/Data/Item/Use/Consumption/Ammo.hs 32;" C PJReduceSpin src/Dodge/Data/Ammo.hs 24;" C PJReduceSpin src/Dodge/Data/Item/Use/Consumption/Ammo.hs 28;" C @@ -1886,11 +1885,11 @@ PLUS src/Dodge/Data/GenParams.hs 20;" C POISONDAM src/Dodge/Data/Damage/Type.hs 23;" C POISONDAM src/Dodge/Data/DamageType.hs 24;" C POISONSPRAYER src/Dodge/Combine/Data.hs 183;" C -POISONSPRAYER src/Dodge/Data/Item/Combine.hs 199;" C +POISONSPRAYER src/Dodge/Data/Item/Combine.hs 195;" C PORTABLEFUSION src/Dodge/Combine/Data.hs 61;" C PORTABLEFUSION src/Dodge/Data/Item/Combine.hs 68;" C POWERLEGS src/Dodge/Combine/Data.hs 113;" C -POWERLEGS src/Dodge/Data/Item/Combine.hs 139;" C +POWERLEGS src/Dodge/Data/Item/Combine.hs 135;" C PPLevelReset src/Dodge/Data/PressPlate.hs 16;" C PRISM src/Dodge/Combine/Data.hs 40;" C PRISM src/Dodge/Data/Item/Combine.hs 45;" C @@ -1906,7 +1905,7 @@ PackAnimal src/Dodge/Data/Creature/Capability.hs 20;" C Padding src/Padding.hs 2;" m Pair src/FoldlHelp.hs 10;" t PaletteColor src/Color/Data.hs 14;" t -ParamMID src/Dodge/Data/Item/Params.hs 59;" C +ParamMID src/Dodge/Data/Item/Params.hs 54;" C Parameters src/Shader/Parameters.hs 1;" m Parameters src/Shape/Parameters.hs 1;" m Params src/Dodge/Data/Item/Params.hs 6;" m @@ -1935,7 +1934,7 @@ Perception src/Dodge/Creature/Perception/Data.hs 29;" t Perception src/Dodge/Data/Creature/Perception.hs 32;" t Perception src/Dodge/Creature/Perception.hs 2;" m Perception src/Dodge/Data/Creature/Perception.hs 6;" m -PerturbTillBreakPreviousArc src/Dodge/Data/Item/Params.hs 66;" C +PerturbTillBreakPreviousArc src/Dodge/Data/Item/Params.hs 61;" C Pic2d src/PolyPic.hs 17;" t PickOnePlacement src/Dodge/Data/GenWorld.hs 87;" C PickUp src/Dodge/Inventory/PickUp.hs 1;" m @@ -1949,7 +1948,7 @@ Pillar src/Dodge/Room/Pillar.hs 1;" m Pipe src/Dodge/Placement/Instance/Pipe.hs 1;" m PistolAI src/Dodge/Data/Creature/Misc.hs 53;" C PistolCrit src/Dodge/Creature/PistolCrit.hs 1;" m -PistolFlare src/Dodge/Data/Item/Use.hs 141;" C +PistolFlare src/Dodge/Data/Item/Use.hs 137;" C PistolMod src/Dodge/Data/Item/HeldUse.hs 69;" C PlaceSpot src/Dodge/Placement/PlaceSpot.hs 4;" m Placement src/Dodge/Data/GenWorld.hs 77;" t @@ -2004,7 +2003,7 @@ PressPlateEvent src/Dodge/Data/PressPlate.hs 14;" t PressPlateId src/Dodge/Data/PressPlate.hs 15;" C PressPlateLayer src/Dodge/Picture/Layer/Data.hs 14;" C PressType src/Dodge/Data/Input.hs 13;" t -PreviousArcEffect src/Dodge/Data/Item/Params.hs 66;" t +PreviousArcEffect src/Dodge/Data/Item/Params.hs 61;" t PrimitiveMode src/Shader/Data.hs 99;" t Prison src/Dodge/Data/Scenario.hs 65;" C Procedural src/Dodge/Room/Procedural.hs 2;" m @@ -2017,7 +2016,7 @@ ProjectileCreate src/Dodge/Data/Ammo.hs 17;" t ProjectileCreate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 21;" t ProjectileDraw src/Dodge/Data/Ammo.hs 14;" t ProjectileDraw src/Dodge/Data/Item/Use/Consumption/Ammo.hs 18;" t -ProjectileParams src/Dodge/Data/Item/Use.hs 115;" C +ProjectileParams src/Dodge/Data/Item/Use.hs 111;" C ProjectileUpdate src/Dodge/Data/Ammo.hs 20;" t ProjectileUpdate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 24;" t Prop src/Dodge/Data/Prop.hs 18;" t @@ -2094,16 +2093,16 @@ RBList src/Dodge/Inventory/RBList.hs 1;" m RBranches src/TreeExtra.hs 48;" C RED src/Color/Data.hs 15;" C REMOTELAUNCHER src/Dodge/Combine/Data.hs 182;" C -REMOTELAUNCHER src/Dodge/Data/Item/Combine.hs 198;" C +REMOTELAUNCHER src/Dodge/Data/Item/Combine.hs 194;" C REPEATER src/Dodge/Combine/Data.hs 150;" C -REVOLVEMAG src/Dodge/Data/Item/Combine.hs 112;" C +REVOLVEMAG src/Dodge/Data/Item/Combine.hs 108;" C REVOLVER src/Dodge/Combine/Data.hs 136;" C REVOLVERX src/Dodge/Combine/Data.hs 137;" C REWINDER src/Dodge/Combine/Data.hs 124;" C -REWINDWATCH src/Dodge/Data/Item/Combine.hs 155;" C +REWINDWATCH src/Dodge/Data/Item/Combine.hs 151;" C RGBA src/Color/Data.hs 31;" t RIFLE src/Dodge/Combine/Data.hs 149;" C -RIFLE src/Dodge/Data/Item/Combine.hs 174;" C +RIFLE src/Dodge/Data/Item/Combine.hs 170;" C RLeaf src/TreeExtra.hs 49;" C ROCKETHOMER src/Dodge/Data/Item/Combine.hs 101;" C ROCKETREMOTESCREEN src/Dodge/Data/Item/Combine.hs 102;" C @@ -2223,34 +2222,33 @@ RoundedFaces src/Shape/Data.hs 18;" C RunPast src/Dodge/Room/RunPast.hs 1;" m RunningSideEffect src/Dodge/Data/Universe.hs 65;" C SCRAPMETAL src/Dodge/Data/Item/Combine.hs 41;" C -SCROLLATTACH src/Dodge/Data/Item/Combine.hs 98;" C -SCROLLWATCH src/Dodge/Data/Item/Combine.hs 156;" C +SCROLLWATCH src/Dodge/Data/Item/Combine.hs 152;" C SHARDGLASS src/Dodge/Combine/Data.hs 36;" C SHATTERGUN src/Dodge/Combine/Data.hs 186;" C -SHATTERGUN src/Dodge/Data/Item/Combine.hs 201;" C +SHATTERGUN src/Dodge/Data/Item/Combine.hs 197;" C SHATTERING src/Dodge/Data/Damage/Type.hs 17;" C SHATTERING src/Dodge/Data/DamageType.hs 16;" C -SHELLMAG src/Dodge/Data/Item/Combine.hs 116;" C +SHELLMAG src/Dodge/Data/Item/Combine.hs 112;" C SHRINKER src/Dodge/Combine/Data.hs 127;" C -SHRINKER src/Dodge/Data/Item/Combine.hs 159;" C +SHRINKER src/Dodge/Data/Item/Combine.hs 155;" C SIZEMODULE src/Dodge/Combine/Data.hs 74;" C SIZEMODULE src/Dodge/Data/Item/Combine.hs 78;" C SMG src/Dodge/Combine/Data.hs 140;" C -SMG src/Dodge/Data/Item/Combine.hs 168;" C +SMG src/Dodge/Data/Item/Combine.hs 164;" C SNIPERRIFLE src/Dodge/Combine/Data.hs 159;" C -SNIPERRIFLE src/Dodge/Data/Item/Combine.hs 182;" C +SNIPERRIFLE src/Dodge/Data/Item/Combine.hs 178;" C SOUNDSENSOR src/Dodge/Combine/Data.hs 55;" C SOUNDSENSOR src/Dodge/Data/Item/Combine.hs 61;" C SPARKGUN src/Dodge/Combine/Data.hs 166;" C -SPARKGUN src/Dodge/Data/Item/Combine.hs 189;" C +SPARKGUN src/Dodge/Data/Item/Combine.hs 185;" C SPARKING src/Dodge/Data/Damage/Type.hs 15;" C SPARKING src/Dodge/Data/DamageType.hs 14;" C SPAWNER src/Dodge/Combine/Data.hs 128;" C -SPAWNER src/Dodge/Data/Item/Combine.hs 160;" C +SPAWNER src/Dodge/Data/Item/Combine.hs 156;" C SPEEDLEGS src/Dodge/Combine/Data.hs 114;" C -SPEEDLEGS src/Dodge/Data/Item/Combine.hs 140;" C +SPEEDLEGS src/Dodge/Data/Item/Combine.hs 136;" C SPLITLAS src/Dodge/Combine/Data.hs 214;" C -SPLITLAS src/Dodge/Data/Item/Combine.hs 217;" C +SPLITLAS src/Dodge/Data/Item/Combine.hs 213;" C SPRING src/Dodge/Combine/Data.hs 30;" C SPRING src/Dodge/Data/Item/Combine.hs 33;" C SPic src/ShapePicture/Data.hs 4;" t @@ -2260,10 +2258,10 @@ SSSExtra src/Dodge/Data/SelectionList.hs 44;" t ST src/Dodge/Tree/Compose/Data.hs 12;" C STATICBUL src/Dodge/Combine/Data.hs 205;" C STATICLAS src/Dodge/Combine/Data.hs 215;" C -STATICLAS src/Dodge/Data/Item/Combine.hs 218;" C +STATICLAS src/Dodge/Data/Item/Combine.hs 214;" C STATICMODULE src/Dodge/Combine/Data.hs 65;" C STEELDRUM src/Dodge/Data/Item/Combine.hs 38;" C -STOPWATCH src/Dodge/Data/Item/Combine.hs 154;" C +STOPWATCH src/Dodge/Data/Item/Combine.hs 150;" C SameConstr src/SameConstr.hs 5;" m Save src/Dodge/Save.hs 1;" m SaveSlot src/Dodge/Data/SaveSlot.hs 9;" t @@ -2284,7 +2282,6 @@ ScreenPos src/Dodge/Data/ScreenPos.hs 9;" t ScreenPos src/Dodge/Data/ScreenPos.hs 3;" m ScreenPos src/Dodge/ScreenPos.hs 1;" m Scroll src/Dodge/Update/Scroll.hs 1;" m -ScrollAttachType src/Dodge/Data/Item/Combine.hs 107;" t ScrollValue src/Dodge/ScrollValue.hs 1;" m SecretCabal src/Dodge/Data/Scenario.hs 44;" C SectionCursor src/Dodge/Data/SelectionList.hs 49;" t @@ -2386,8 +2383,8 @@ Show_walls_near_point_cursor src/Dodge/Data/Config.hs 86;" C Show_walls_near_point_you src/Dodge/Data/Config.hs 87;" C Show_zone_near_point_cursor src/Dodge/Data/Config.hs 88;" C ShrinkGunParams src/Dodge/Data/Item/Params.hs 20;" C -ShrinkGunStatus src/Dodge/Data/Item/Params.hs 63;" t -Shrunk src/Dodge/Data/Item/Params.hs 63;" C +ShrinkGunStatus src/Dodge/Data/Item/Params.hs 58;" t +Shrunk src/Dodge/Data/Item/Params.hs 58;" C SideCluster src/Dodge/Data/RoomCluster.hs 14;" C SideCluster src/Dodge/RoomCluster/Data.hs 12;" C SideEffect src/Dodge/Data/Universe.hs 60;" t @@ -2496,9 +2493,9 @@ SwitchToItem src/Dodge/Data/ActionPlan.hs 38;" C Synonyms src/Dodge/SoundLogic/Synonyms.hs 1;" m TAPE src/Dodge/Data/Item/Combine.hs 35;" C TARGCR src/Dodge/Combine/Data.hs 207;" C -TARGET src/Dodge/Data/Item/Combine.hs 215;" C +TARGET src/Dodge/Data/Item/Combine.hs 211;" C TARGETATTACH src/Dodge/Data/Item/Combine.hs 99;" C -TARGETINGHAT src/Dodge/Data/Item/Combine.hs 137;" C +TARGETINGHAT src/Dodge/Data/Item/Combine.hs 133;" C TARGETLASER src/Dodge/Data/Item/Targeting.hs 12;" C TARGETMODULE src/Dodge/Data/Item/Combine.hs 80;" C TARGLAS src/Dodge/Combine/Data.hs 208;" C @@ -2506,7 +2503,7 @@ TARGPOS src/Dodge/Combine/Data.hs 209;" C TELEPORTMODULE src/Dodge/Combine/Data.hs 72;" C TELEPORTMODULE src/Dodge/Data/Item/Combine.hs 76;" C TESLAGUN src/Dodge/Combine/Data.hs 167;" C -TESLAGUN src/Dodge/Data/Item/Combine.hs 190;" C +TESLAGUN src/Dodge/Data/Item/Combine.hs 186;" C THERMOMETER src/Dodge/Combine/Data.hs 41;" C THERMOMETER src/Dodge/Data/Item/Combine.hs 64;" C THREELINES src/Dodge/Data/GenParams.hs 20;" C @@ -2514,17 +2511,17 @@ TIMEMODULE src/Dodge/Combine/Data.hs 73;" C TIMEMODULE src/Dodge/Data/Item/Combine.hs 77;" C TIN src/Dodge/Combine/Data.hs 33;" C TIN src/Dodge/Data/Item/Combine.hs 37;" C -TINMAG src/Dodge/Data/Item/Combine.hs 113;" C +TINMAG src/Dodge/Data/Item/Combine.hs 109;" C TLS src/Dodge/Data/LightSource.hs 42;" C TLSFade src/Dodge/Data/LightSource.hs 18;" C TLSIntensity src/Dodge/Data/LightSource.hs 16;" t TLSUpdate src/Dodge/Data/LightSource.hs 21;" t TO src/Shader/Data.hs 59;" t TORCH src/Dodge/Combine/Data.hs 191;" C -TORCH src/Dodge/Data/Item/Combine.hs 204;" C +TORCH src/Dodge/Data/Item/Combine.hs 200;" C TORQUEDAM src/Dodge/Data/DamageType.hs 22;" C TRACTORGUN src/Dodge/Combine/Data.hs 178;" C -TRACTORGUN src/Dodge/Data/Item/Combine.hs 195;" C +TRACTORGUN src/Dodge/Data/Item/Combine.hs 191;" C TRANSFORMER src/Dodge/Combine/Data.hs 39;" C TRANSFORMER src/Dodge/Data/Item/Combine.hs 44;" C TRANSMITTER src/Dodge/Combine/Data.hs 46;" C @@ -2623,7 +2620,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 -TeslaGunFlare src/Dodge/Data/Item/Use.hs 145;" C +TeslaGunFlare src/Dodge/Data/Item/Use.hs 141;" C Test src/Dodge/Creature/Test.hs 8;" m Test src/Dodge/Event/Test.hs 1;" m Test src/Picture/Test.hs 1;" m @@ -2713,9 +2710,9 @@ TweakTractionPower src/Dodge/Data/Item/Tweak.hs 22;" C TweakType src/Dodge/Data/Item/Tweak.hs 20;" t Tweakable src/Dodge/Data/Item/Tweak.hs 15;" C TwistGoal src/Dodge/Data/Scenario.hs 15;" C -TwoHandFlat src/Dodge/Data/Item/Use.hs 187;" C -TwoHandOver src/Dodge/Data/Item/Use.hs 186;" C -TwoHandUnder src/Dodge/Data/Item/Use.hs 185;" C +TwoHandFlat src/Dodge/Data/Item/Use.hs 183;" C +TwoHandOver src/Dodge/Data/Item/Use.hs 182;" C +TwoHandUnder src/Dodge/Data/Item/Use.hs 181;" 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 @@ -2781,7 +2778,7 @@ VBO src/Shader/Data.hs 81;" t VF src/Polyhedra/Data.hs 21;" t VIOLET src/Color/Data.hs 22;" C VOLLEYGUN src/Dodge/Combine/Data.hs 148;" C -VOLLEYGUN src/Dodge/Data/Item/Combine.hs 173;" C +VOLLEYGUN src/Dodge/Data/Item/Combine.hs 169;" C VariableRate src/Dodge/Data/Item/Use/Delay.hs 16;" C VariableRate src/Dodge/Data/Item/UseDelay.hs 16;" C VariableSelectionWidth src/Dodge/Data/SelectionList.hs 68;" C @@ -2806,14 +2803,14 @@ Vocalization src/Dodge/Data/Creature/Misc.hs 27;" t Vocalization src/Dodge/Creature/Vocalization.hs 1;" m Volition src/Dodge/Creature/Volition.hs 2;" m WALLDETECTOR src/Dodge/Combine/Data.hs 227;" C -WALLDETECTOR src/Dodge/Data/Item/Combine.hs 227;" C +WALLDETECTOR src/Dodge/Data/Item/Combine.hs 223;" C WASD src/Dodge/WASD.hs 1;" m WEPTELE src/Dodge/Combine/Data.hs 216;" C WHITE src/Color/Data.hs 27;" C WIRE src/Dodge/Combine/Data.hs 58;" C WIRE src/Dodge/Data/Item/Combine.hs 66;" C WRISTARMOUR src/Dodge/Combine/Data.hs 107;" C -WRISTARMOUR src/Dodge/Data/Item/Combine.hs 133;" C +WRISTARMOUR src/Dodge/Data/Item/Combine.hs 129;" C WaitMessage src/Dodge/Data/Menu.hs 5;" C WaitThen src/Dodge/Data/ActionPlan.hs 103;" C WalkCycle src/Dodge/Creature/State/WalkCycle.hs 1;" m @@ -2916,7 +2913,7 @@ YELLOW src/Color/Data.hs 18;" C You src/Dodge/Base/You.hs 1;" m YourAI src/Dodge/Data/Creature/Misc.hs 49;" C YourControl src/Dodge/Creature/YourControl.hs 1;" m -ZOOMSCOPE src/Dodge/Data/Item/Combine.hs 108;" C +ZOOMSCOPE src/Dodge/Data/Item/Combine.hs 98;" C ZombieFaction src/Dodge/Creature/State/Data.hs 31;" C ZombieFaction src/Dodge/Data/Creature/State.hs 36;" C Zone src/Dodge/Zone/Data.hs 8;" t @@ -2940,13 +2937,13 @@ _actionSound src/Dodge/Data/LoadAction.hs 11;" f _actionSound src/Dodge/Data/LoadAction.hs 14;" f _actionTime src/Dodge/Data/LoadAction.hs 11;" f _actionTime src/Dodge/Data/LoadAction.hs 14;" f -_aimHandlePos src/Dodge/Data/Item/Use.hs 134;" f -_aimMuzzles src/Dodge/Data/Item/Use.hs 135;" f -_aimRange src/Dodge/Data/Item/Use.hs 131;" f -_aimStance src/Dodge/Data/Item/Use.hs 133;" f -_aimTurnSpeed src/Dodge/Data/Item/Use.hs 130;" f -_aimWeight src/Dodge/Data/Item/Use.hs 129;" f -_aimZoom src/Dodge/Data/Item/Use.hs 132;" f +_aimHandlePos src/Dodge/Data/Item/Use.hs 130;" f +_aimMuzzles src/Dodge/Data/Item/Use.hs 131;" f +_aimRange src/Dodge/Data/Item/Use.hs 127;" f +_aimStance src/Dodge/Data/Item/Use.hs 129;" f +_aimTurnSpeed src/Dodge/Data/Item/Use.hs 126;" f +_aimWeight src/Dodge/Data/Item/Use.hs 125;" f +_aimZoom src/Dodge/Data/Item/Use.hs 128;" 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 @@ -2971,11 +2968,11 @@ _amagLoadStatus src/Dodge/Data/Item/Use.hs 65;" f _amagParams src/Dodge/Data/Item/Use.hs 66;" f _amagType src/Dodge/Data/Item/Use.hs 67;" f _ambushTarget src/Dodge/Data/ActionPlan.hs 178;" f -_ampBullet src/Dodge/Data/Item/Use.hs 114;" f -_ampCreateGas src/Dodge/Data/Item/Use.hs 120;" f -_ampPayload src/Dodge/Data/Item/Use.hs 116;" f -_ampPjCreation src/Dodge/Data/Item/Use.hs 118;" f -_ampPjDraw src/Dodge/Data/Item/Use.hs 117;" f +_ampBullet src/Dodge/Data/Item/Use.hs 110;" f +_ampCreateGas src/Dodge/Data/Item/Use.hs 116;" f +_ampPayload src/Dodge/Data/Item/Use.hs 112;" f +_ampPjCreation src/Dodge/Data/Item/Use.hs 114;" f +_ampPjDraw src/Dodge/Data/Item/Use.hs 113;" f _amposDir src/Dodge/Item/AmmoPosition.hs 9;" f _amposPos src/Dodge/Item/AmmoPosition.hs 9;" f _apAction src/Dodge/Data/ActionPlan.hs 20;" f @@ -2991,8 +2988,8 @@ _arProgress src/Dodge/Data/Item/Use/Consumption.hs 32;" f _arTime src/Dodge/Data/Item/Consumption.hs 26;" f _arTime src/Dodge/Data/Item/Use/Consumption.hs 31;" f _arbitraryAction src/Dodge/Data/ActionPlan.hs 167;" f -_arcNumber src/Dodge/Data/Item/Params.hs 55;" f -_arcSize src/Dodge/Data/Item/Params.hs 54;" f +_arcNumber src/Dodge/Data/Item/Params.hs 50;" f +_arcSize src/Dodge/Data/Item/Params.hs 49;" f _argList src/Dodge/Data/Terminal.hs 96;" f _argType src/Dodge/Data/Terminal.hs 95;" f _asDir src/Dodge/Data/ArcStep.hs 16;" f @@ -3054,7 +3051,7 @@ _bmRange src/Dodge/Data/Beam.hs 26;" f _bmType src/Dodge/Data/Beam.hs 29;" f _boffEff src/Dodge/Data/Button.hs 42;" f _bonEff src/Dodge/Data/Button.hs 41;" f -_boostPropIX src/Dodge/Data/Item/Params.hs 60;" f +_boostPropIX src/Dodge/Data/Item/Params.hs 55;" f _bpEff src/Dodge/Data/Button.hs 28;" f _bpEvent src/Dodge/Data/Button.hs 26;" f _bpSound src/Dodge/Data/Button.hs 27;" f @@ -3080,9 +3077,9 @@ _buTimer src/Dodge/Data/Bullet.hs 27;" f _buTrajectory src/Dodge/Data/Bullet.hs 21;" f _buVel src/Dodge/Data/Bullet.hs 22;" f _buWidth src/Dodge/Data/Bullet.hs 26;" f -_bulGunSound src/Dodge/Data/Item/Use.hs 83;" f -_bulGunSound src/Dodge/Data/Item/Use.hs 90;" f -_bulGunSound src/Dodge/Data/Item/Use.hs 100;" f +_bulGunSound src/Dodge/Data/Item/Use.hs 84;" f +_bulGunSound src/Dodge/Data/Item/Use.hs 91;" f +_bulGunSound src/Dodge/Data/Item/Use.hs 101;" f _bullets src/Dodge/Data/LWorld.hs 106;" f _buttons src/Dodge/Data/LWorld.hs 136;" f _cClock src/Dodge/Data/CWorld.hs 28;" f @@ -3220,10 +3217,9 @@ _ctActive src/Dodge/Data/Creature.hs 89;" f _ctID src/Dodge/Data/Creature.hs 88;" f _ctPos src/Dodge/Data/Creature.hs 86;" f _ctType src/Dodge/Data/Creature.hs 87;" f -_currentArc src/Dodge/Data/Item/Params.hs 53;" f +_currentArc src/Dodge/Data/Item/Params.hs 48;" f _currentFoot src/Dodge/Creature/Stance/Data.hs 23;" f _currentFoot src/Dodge/Data/Creature/Stance.hs 23;" f -_currentWalkAngle src/Dodge/Data/Item/Params.hs 49;" f _cwGen src/Dodge/Data/CWorld.hs 27;" f _cwTiles src/Dodge/Data/CWorld.hs 30;" f _cwgGameRooms src/Dodge/Data/CWorld.hs 38;" f @@ -3403,7 +3399,7 @@ _futureWorlds src/Dodge/Data/World.hs 64;" f _futureWorlds src/Dodge/Data/World.hs 70;" f _gameplay_rotate_to_wall src/Dodge/Config/Data.hs 25;" f _gameplay_rotate_to_wall src/Dodge/Data/Config.hs 55;" f -_gasCreation src/Dodge/Data/Item/Use.hs 78;" f +_gasCreation src/Dodge/Data/Item/Use.hs 79;" f _genPlacements src/Dodge/Data/GenWorld.hs 26;" f _genRooms src/Dodge/Data/GenWorld.hs 27;" f _getAttentiveTo src/Dodge/Creature/AlertLevel/Data.hs 22;" f @@ -3493,8 +3489,8 @@ _impulseUseAheadPos src/Dodge/Data/ActionPlan.hs 56;" f _impulseUseTarget src/Dodge/Data/ActionPlan.hs 53;" f _impulseUseTargetCID src/Dodge/Data/ActionPlan.hs 50;" f _impulsesListList src/Dodge/Data/ActionPlan.hs 98;" f -_imtBulletTrajectoryType src/Dodge/Data/Item/Combine.hs 214;" f -_imtTargetType src/Dodge/Data/Item/Combine.hs 215;" f +_imtBulletTrajectoryType src/Dodge/Data/Item/Combine.hs 210;" f +_imtTargetType src/Dodge/Data/Item/Combine.hs 211;" f _inInventory src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 21;" f _inNearby src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 23;" f _input src/Dodge/Data/World.hs 43;" f @@ -3539,9 +3535,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 196;" f -_izMax src/Dodge/Data/Item/Use.hs 194;" f -_izMin src/Dodge/Data/Item/Use.hs 195;" f +_izFac src/Dodge/Data/Item/Use.hs 192;" f +_izMax src/Dodge/Data/Item/Use.hs 190;" f +_izMin src/Dodge/Data/Item/Use.hs 191;" 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 @@ -3619,7 +3615,6 @@ _magnets src/Dodge/Data/LWorld.hs 127;" f _mainAction src/Dodge/Data/ActionPlan.hs 171;" f _manObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 15;" f _matUBO src/Data/Preload/Render.hs 39;" f -_maxWalkAngle src/Dodge/Data/Item/Params.hs 48;" f _mbAttach src/Dodge/Tree/Compose/Data.hs 10;" f _mbTree src/Dodge/Tree/Compose/Data.hs 10;" f _mcCloseSound src/Dodge/Data/Machine.hs 43;" f @@ -3665,20 +3660,20 @@ _mtBranches src/Dodge/Tree/Compose/Data.hs 8;" f _mtLabel src/Dodge/Tree/Compose/Data.hs 8;" f _mtTree src/Dodge/Tree/Compose/Data.hs 8;" f _musicData src/Data/Preload.hs 13;" f -_muzVel src/Dodge/Data/Item/Use.hs 94;" f +_muzVel src/Dodge/Data/Item/Use.hs 95;" f _mvAimSpeed src/Dodge/Data/Creature/Misc.hs 44;" f _mvSpeed src/Dodge/Data/Creature/Misc.hs 39;" f _mvToPoint src/Dodge/Data/Creature.hs 98;" f _mvTurnJit src/Dodge/Data/Creature/Misc.hs 43;" f _mvTurnRad src/Dodge/Data/Creature/Misc.hs 42;" f -_mzAmmoSlot src/Dodge/Data/Item/Use.hs 168;" f -_mzChargeRequirement src/Dodge/Data/Item/Use.hs 171;" f -_mzEffect src/Dodge/Data/Item/Use.hs 170;" f -_mzFlareType src/Dodge/Data/Item/Use.hs 169;" f -_mzInaccuracy src/Dodge/Data/Item/Use.hs 167;" f -_mzPos src/Dodge/Data/Item/Use.hs 165;" f -_mzRot src/Dodge/Data/Item/Use.hs 166;" f -_newArcStep src/Dodge/Data/Item/Params.hs 56;" f +_mzAmmoSlot src/Dodge/Data/Item/Use.hs 165;" f +_mzChargeRequirement src/Dodge/Data/Item/Use.hs 168;" f +_mzEffect src/Dodge/Data/Item/Use.hs 167;" f +_mzFlareType src/Dodge/Data/Item/Use.hs 166;" f +_mzInaccuracy src/Dodge/Data/Item/Use.hs 164;" f +_mzPos src/Dodge/Data/Item/Use.hs 162;" f +_mzRot src/Dodge/Data/Item/Use.hs 163;" f +_newArcStep src/Dodge/Data/Item/Params.hs 51;" f _newBeams src/Dodge/Data/LWorld.hs 114;" f _noClip src/Dodge/Debug/Flag/Data.hs 7;" f _nodeMetaTree src/Dodge/Tree/Compose/Data.hs 9;" f @@ -3688,10 +3683,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 32;" f -_nzCurrentWalkAngle src/Dodge/Data/Item/Use.hs 156;" f -_nzMaxWalkAngle src/Dodge/Data/Item/Use.hs 155;" f -_nzPressure src/Dodge/Data/Item/Use.hs 154;" f -_nzWalkSpeed src/Dodge/Data/Item/Use.hs 157;" f +_nzCurrentWalkAngle src/Dodge/Data/Item/Use.hs 153;" f +_nzMaxWalkAngle src/Dodge/Data/Item/Use.hs 152;" f +_nzPressure src/Dodge/Data/Item/Use.hs 151;" f +_nzWalkSpeed src/Dodge/Data/Item/Use.hs 154;" f _offPathFromEdges src/Dodge/Data/Room.hs 74;" f _onPathFromEdges src/Dodge/Data/Room.hs 73;" f _opDraw src/Dodge/Data/Wall.hs 41;" f @@ -3702,7 +3697,7 @@ _opTexture src/Dodge/Data/Wall.hs 42;" f _opticDefaultZoom src/Dodge/Data/Item/Scope.hs 21;" f _opticPos src/Dodge/Data/Item/Scope.hs 17;" f _opticZoom src/Dodge/Data/Item/Scope.hs 20;" f -_paramMID src/Dodge/Data/Item/Params.hs 59;" f +_paramMID src/Dodge/Data/Item/Params.hs 54;" f _partialAction src/Dodge/Data/ActionPlan.hs 145;" f _pastWorlds src/Dodge/Data/World.hs 38;" f _pathGraph src/Dodge/Data/CWorld.hs 31;" f @@ -3795,7 +3790,7 @@ _prVelZ src/Dodge/Data/Prop.hs 27;" f _preloadData src/Dodge/Data/Universe.hs 32;" f _pressPlates src/Dodge/Data/LWorld.hs 135;" f _pressedKeys src/Dodge/Data/Input.hs 22;" f -_previousArcEffect src/Dodge/Data/Item/Params.hs 57;" f +_previousArcEffect src/Dodge/Data/Item/Params.hs 52;" f _prjAcc src/Dodge/Data/Projectile.hs 19;" f _prjDir src/Dodge/Data/Projectile.hs 20;" f _prjDraw src/Dodge/Data/Projectile.hs 22;" f @@ -3850,8 +3845,8 @@ _pyFaces src/Polyhedra/Data.hs 14;" f _radarBlips src/Dodge/Data/LWorld.hs 112;" f _radarSweeps src/Dodge/Data/LWorld.hs 107;" f _randGen src/Dodge/Data/World.hs 40;" f -_randomOffset src/Dodge/Data/Item/Use.hs 81;" f -_randomOffset src/Dodge/Data/Item/Use.hs 98;" f +_randomOffset src/Dodge/Data/Item/Use.hs 82;" f +_randomOffset src/Dodge/Data/Item/Use.hs 99;" f _rateMax src/Dodge/Data/Item/HeldDelay.hs 16;" f _rateMax src/Dodge/Data/Item/Use/Delay.hs 13;" f _rateMax src/Dodge/Data/Item/Use/Delay.hs 17;" f @@ -3873,8 +3868,8 @@ _rbPos src/Dodge/Data/RadarBlip.hs 19;" f _rbRad src/Dodge/Data/RadarBlip.hs 18;" f _rbTime src/Dodge/Data/RadarBlip.hs 16;" f _rboBaseBloom src/Data/Preload/Render.hs 38;" f -_recoil src/Dodge/Data/Item/Use.hs 79;" f -_recoil src/Dodge/Data/Item/Use.hs 96;" f +_recoil src/Dodge/Data/Item/Use.hs 80;" f +_recoil src/Dodge/Data/Item/Use.hs 97;" f _reloadAction src/Dodge/Data/LoadAction.hs 26;" f _remotePos src/Dodge/Data/Item/Scope.hs 25;" f _remoteZoom src/Dodge/Data/Item/Scope.hs 26;" f @@ -3882,7 +3877,7 @@ _renderData src/Data/Preload.hs 11;" f _reverseAmount src/Dodge/Data/World.hs 63;" f _reverseAmount src/Dodge/Data/World.hs 69;" f _reverseAmount src/Dodge/Data/World.hs 73;" f -_rifling src/Dodge/Data/Item/Use.hs 95;" f +_rifling src/Dodge/Data/Item/Use.hs 96;" f _rlDir src/Dodge/Data/Room.hs 26;" f _rlPos src/Dodge/Data/Room.hs 25;" f _rlType src/Dodge/Data/Room.hs 24;" f @@ -4025,8 +4020,8 @@ _siPictures src/Dodge/Data/SelectionList.hs 77;" f _siPictures src/Dodge/Data/SelectionList.hs 85;" f _sideEffect src/Loop/Data.hs 13;" f _sideImpulses src/Dodge/Data/ActionPlan.hs 170;" f -_sidePush src/Dodge/Data/Item/Use.hs 82;" f -_sidePush src/Dodge/Data/Item/Use.hs 99;" f +_sidePush src/Dodge/Data/Item/Use.hs 83;" f +_sidePush src/Dodge/Data/Item/Use.hs 100;" 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 @@ -4165,8 +4160,8 @@ _toPlaySoundVolume src/Sound/Data.hs 43;" f _toPlaySoundVolumeFraction src/Sound/Data.hs 44;" f _toPlaySounds src/Dodge/Data/World.hs 41;" f _topBoxSize src/Shape/Data.hs 17;" f -_torqueAfter src/Dodge/Data/Item/Use.hs 80;" f -_torqueAfter src/Dodge/Data/Item/Use.hs 97;" f +_torqueAfter src/Dodge/Data/Item/Use.hs 81;" f +_torqueAfter src/Dodge/Data/Item/Use.hs 98;" f _tractorBeams src/Dodge/Data/LWorld.hs 121;" f _trieChildren src/SimpleTrie.hs 7;" f _trieMVal src/SimpleTrie.hs 6;" f @@ -4245,7 +4240,6 @@ _vxShadNum src/Picture/Data.hs 18;" f _wCam src/Dodge/Data/World.hs 54;" f _waitThenAction src/Dodge/Data/ActionPlan.hs 105;" f _waitThenTimer src/Dodge/Data/ActionPlan.hs 104;" f -_walkSpeed src/Dodge/Data/Item/Params.hs 50;" f _wallDamages src/Dodge/Data/LWorld.hs 123;" f _wallShader src/Data/Preload/Render.hs 46;" f _wallVBO src/Data/Preload/Render.hs 45;" f @@ -4257,10 +4251,10 @@ _warmSound src/Dodge/Data/Item/HeldDelay.hs 28;" f _warmTime src/Dodge/Data/Item/HeldDelay.hs 26;" f _warmTime src/Dodge/Data/Item/Use/Delay.hs 23;" f _warmTime src/Dodge/Data/Item/UseDelay.hs 23;" f -_weaponInvLock src/Dodge/Data/Item/Use.hs 86;" f -_weaponInvLock src/Dodge/Data/Item/Use.hs 103;" f -_weaponRepeat src/Dodge/Data/Item/Use.hs 87;" f -_weaponRepeat src/Dodge/Data/Item/Use.hs 104;" f +_weaponInvLock src/Dodge/Data/Item/Use.hs 87;" f +_weaponInvLock src/Dodge/Data/Item/Use.hs 104;" f +_weaponRepeat src/Dodge/Data/Item/Use.hs 88;" f +_weaponRepeat src/Dodge/Data/Item/Use.hs 105;" f _windowPosX src/Dodge/Config/Data.hs 23;" f _windowPosX src/Dodge/Data/Config.hs 53;" f _windowPosY src/Dodge/Config/Data.hs 24;" f @@ -4303,9 +4297,9 @@ _xNum src/Dodge/Combine/Data.hs 143;" f _xNum src/Dodge/Combine/Data.hs 147;" f _xNum src/Dodge/Combine/Data.hs 175;" f _xNum src/Dodge/Combine/Data.hs 180;" f -_xNum src/Dodge/Data/Item/Combine.hs 164;" f -_xNum src/Dodge/Data/Item/Combine.hs 171;" f -_xNum src/Dodge/Data/Item/Combine.hs 197;" f +_xNum src/Dodge/Data/Item/Combine.hs 160;" f +_xNum src/Dodge/Data/Item/Combine.hs 167;" f +_xNum src/Dodge/Data/Item/Combine.hs 193;" f _znBounds src/Dodge/Base/Zone.hs 24;" f _znFunc src/Dodge/Data/Zoning.hs 15;" f _znObjects src/Dodge/Base/Zone.hs 22;" f @@ -4527,7 +4521,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 454;" f +bangStickSoundChoice src/Dodge/HeldUse.hs 445;" 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 @@ -4564,7 +4558,7 @@ 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 164;" f +basicMuzFlare src/Dodge/HeldUse.hs 155;" f basicPerceptionUpdateR src/Dodge/Creature/AlertLevel.hs 17;" f basicTerminal src/Dodge/Terminal.hs 32;" f battery src/Dodge/Item/Ammo.hs 76;" f @@ -4662,7 +4656,7 @@ calcTexCoord src/Tile.hs 17;" f canAttachTargeting src/Dodge/Item/Display.hs 19;" f canSee src/Dodge/Base/Collide.hs 228;" f canSeeIndirect src/Dodge/Base/Collide.hs 235;" f -caneStickSoundChoice src/Dodge/HeldUse.hs 449;" f +caneStickSoundChoice src/Dodge/HeldUse.hs 440;" f cardList src/Dodge/Base/CardinalPoint.hs 6;" f cardVec src/Dodge/Base/CardinalPoint.hs 9;" f cardinalVectors src/Dodge/FloorItem.hs 39;" f @@ -4745,7 +4739,7 @@ clickDetector src/Dodge/Item/Held/Utility.hs 53;" f clickGetCreature src/Dodge/Debug.hs 82;" f clickSound src/Dodge/SoundLogic/Synonyms.hs 4;" f clipV src/Geometry/Vector.hs 47;" f -clipZoom src/Dodge/Update/Camera.hs 224;" f +clipZoom src/Dodge/Update/Camera.hs 220;" f clockCycle src/Dodge/Clock.hs 9;" f closeObjEq src/Dodge/Inventory/CloseObject.hs 12;" f closeObjPos src/Dodge/Inventory/CloseObject.hs 7;" f @@ -5206,7 +5200,7 @@ doDrawing src/Dodge/Render.hs 35;" f doDrawing' src/Dodge/Render.hs 46;" f doFloatFloat src/Dodge/FloatFunction.hs 5;" f doFloorEffect src/Dodge/ItEffect.hs 21;" f -doGenFloat src/Dodge/HeldUse.hs 417;" f +doGenFloat src/Dodge/HeldUse.hs 408;" f doInPlacements src/Dodge/Layout.hs 92;" f doIndividualPlacements src/Dodge/Layout.hs 117;" f doInputScreenInput src/Dodge/Update/Input/ScreenLayer.hs 25;" f @@ -5236,7 +5230,7 @@ doRoomInPlacements src/Dodge/Layout.hs 97;" f doRoomOutPlacements src/Dodge/Layout.hs 107;" f doRoomPlacements src/Dodge/Layout.hs 122;" f doRoomShift src/Dodge/Room/Link.hs 33;" f -doScopeZoom src/Dodge/Update/Camera.hs 148;" f +doScopeZoom src/Dodge/Update/Camera.hs 144;" f doSideEffects appDodge/Main.hs 117;" f doStep src/Dodge/ArcStep.hs 9;" f doStrategyActions src/Dodge/Creature/ReaderUpdate.hs 164;" f @@ -5251,7 +5245,7 @@ doTimeScroll src/Dodge/Update.hs 185;" f doTmTm src/Dodge/TmTm.hs 6;" f doTmWdWd src/Dodge/WorldEffect.hs 109;" f doTweak src/Dodge/Tweak.hs 6;" f -doWallRotate src/Dodge/Update/Camera.hs 195;" f +doWallRotate src/Dodge/Update/Camera.hs 191;" f doWdBl src/Dodge/WorldBool.hs 10;" f doWdCrBl src/Dodge/CreatureEffect.hs 37;" f doWdCrCr src/Dodge/CreatureEffect.hs 12;" f @@ -5476,12 +5470,12 @@ fadeTLS src/Dodge/LightSource/Update.hs 14;" f fallSmallBounce src/Dodge/Prop/Moving.hs 28;" f fallSmallBounce' src/Dodge/Prop/Moving.hs 33;" f fallSmallBounceDamage src/Dodge/Prop/Moving.hs 11;" f -farWallDistDirection src/Dodge/Update/Camera.hs 235;" f +farWallDistDirection src/Dodge/Update/Camera.hs 231;" f feet src/Dodge/Creature/Picture.hs 51;" f ffoldM src/Framebuffer/Update.hs 79;" f filter3 src/FoldableHelp.hs 76;" f findBlips src/Dodge/RadarSweep.hs 43;" f -findBoundDists src/Dodge/Update/Camera.hs 244;" f +findBoundDists src/Dodge/Update/Camera.hs 240;" f findClosePoint src/Dodge/LevelGen/StaticWalls.hs 155;" f findClosePoint src/Dodge/LevelGen/StaticWalls/Deprecated.hs 74;" f findIndex src/IntMapHelp.hs 84;" f @@ -5492,7 +5486,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 421;" f +fireRemoteShell src/Dodge/HeldUse.hs 412;" f fireS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 332;" f fireShell src/Dodge/Projectile/Create.hs 58;" f fireSound src/Dodge/SoundLogic/Synonyms.hs 4;" f @@ -5595,7 +5589,7 @@ gameRoomViewpoints src/Dodge/Viewpoints.hs 35;" f gameRoomsFromRooms src/Dodge/Layout.hs 158;" f gameplayMenu src/Dodge/Menu.hs 131;" f gameplayMenuOptions src/Dodge/Menu.hs 134;" f -gasCreate src/Dodge/HeldUse.hs 413;" f +gasCreate src/Dodge/HeldUse.hs 404;" f generateGenParams src/Dodge/LevelGen/LevelStructure.hs 22;" f generateGraphs src/Dodge/LevelGen.hs 39;" f generateLayout src/Dodge/Layout/Generate.hs 10;" f @@ -5606,7 +5600,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 383;" f +getAmmoMagazine src/Dodge/HeldUse.hs 374;" f getArguments src/Dodge/Update/Scroll.hs 150;" f getArguments' src/Dodge/Update/Scroll.hs 138;" f getAvailableListLines src/Dodge/SelectionList.hs 11;" f @@ -5756,7 +5750,7 @@ iShape src/Dodge/Placement/Instance/LightSource.hs 74;" f iShape src/Dodge/Placements/LightSource.hs 32;" f icosahedronPoints src/Polyhedra/Geodesic.hs 11;" f icosohedronFaces src/Polyhedra/Geodesic.hs 18;" f -ifConfigWallRotate src/Dodge/Update/Camera.hs 178;" f +ifConfigWallRotate src/Dodge/Update/Camera.hs 174;" f impulsiveAIBefore src/Dodge/Creature/Impulse.hs 22;" f impulsiveAIR src/Dodge/Creature/Rationality.hs 24;" f inCloseRegex src/Dodge/InputFocus.hs 99;" f @@ -5859,7 +5853,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 185;" f +isAmmoIntLink src/Dodge/HeldUse.hs 176;" 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 @@ -5897,7 +5891,7 @@ itemBlips src/Dodge/Item/Weapon/UseEffect.hs 38;" f itemBlips src/Dodge/RadarSweep.hs 74;" f itemCombinations src/Dodge/Combine/Combinations.hs 54;" f itemCombinationsEdges src/Dodge/Combine/Graph.hs 55;" f -itemDetectorEffect src/Dodge/HeldUse.hs 204;" f +itemDetectorEffect src/Dodge/HeldUse.hs 195;" f itemDisplay src/Dodge/Item/Display.hs 33;" f itemDisplayPad src/Dodge/Item/Display.hs 45;" f itemEffect src/Dodge/Creature/Action/UseItem.hs 28;" f @@ -6044,7 +6038,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 136;" f +loadMuzzle src/Dodge/HeldUse.hs 127;" f loadPartialInsert src/Dodge/Reloading/Action.hs 9;" f loadPrime src/Dodge/Reloading/Action.hs 15;" f loadSaveSlot src/Dodge/Save.hs 74;" f @@ -6101,7 +6095,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 276;" f +makeBullet src/Dodge/HeldUse.hs 267;" f makeButton src/Dodge/LevelGen/Switch.hs 16;" f makeByteStringShaderUsingVAO src/Shader/Compile.hs 137;" f makeCloudAt src/Dodge/WorldEvent/Cloud.hs 18;" f @@ -6131,8 +6125,8 @@ 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 148;" f -makeMuzzleSmoke src/Dodge/HeldUse.hs 171;" f +makeMuzzleFlare src/Dodge/HeldUse.hs 139;" f +makeMuzzleSmoke src/Dodge/HeldUse.hs 162;" f makeOptionsSelectionList src/Dodge/Menu/Option.hs 46;" f makeParagraph src/Justify.hs 6;" f makePathBetween src/Dodge/Path.hs 35;" f @@ -6195,10 +6189,10 @@ 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 469;" f +mcShootLaser src/Dodge/HeldUse.hs 460;" f mcTriggerVal src/Dodge/Machine/Update.hs 75;" f mcTypeUpdate src/Dodge/Machine/Update.hs 24;" f -mcUseHeld src/Dodge/HeldUse.hs 301;" f +mcUseHeld src/Dodge/HeldUse.hs 292;" f mcUseItem src/Dodge/Machine/Update.hs 61;" f medkit src/Dodge/Item/Consumable.hs 8;" f megaBattery src/Dodge/Item/Ammo.hs 71;" f @@ -6838,7 +6832,7 @@ remoteBombUnarmedPic src/Dodge/Item/Weapon/Grenade.hs 268;" f remoteLauncher src/Dodge/Item/Held/Launcher.hs 66;" f remoteShellCollisionCheck src/Dodge/Projectile/Update.hs 42;" f remoteShellShape src/Dodge/Projectile/Draw.hs 39;" f -removeAmmoFromMag src/Dodge/HeldUse.hs 259;" f +removeAmmoFromMag src/Dodge/HeldUse.hs 250;" 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 @@ -6941,8 +6935,8 @@ rotate3x src/Geometry/Vector3D.hs 60;" f rotate3y src/Geometry/Vector3D.hs 66;" f rotate3z src/Geometry/Vector3D.hs 54;" f rotateActionProgress src/Dodge/Reloading.hs 87;" f -rotateCamera src/Dodge/Update/Camera.hs 209;" f -rotateCameraBy src/Dodge/Update/Camera.hs 206;" f +rotateCamera src/Dodge/Update/Camera.hs 205;" f +rotateCameraBy src/Dodge/Update/Camera.hs 202;" f rotateCameraMinusKey src/Dodge/Config/KeyConfig.hs 30;" f rotateCameraPlusKey src/Dodge/Config/KeyConfig.hs 29;" f rotateProp src/Dodge/LightSources/Lamp.hs 111;" f @@ -6952,7 +6946,7 @@ rotateSHq src/Shape.hs 162;" f rotateSHx src/Shape.hs 261;" f rotateSP src/ShapePicture.hs 57;" f rotateTo src/Polyhedra/Geodesic.hs 63;" f -rotateToOverlappingWall src/Dodge/Update/Camera.hs 184;" f +rotateToOverlappingWall src/Dodge/Update/Camera.hs 180;" f rotateToZ src/Quaternion.hs 31;" f rotateV src/Geometry/Vector.hs 105;" f rotateVAround src/Geometry/Vector.hs 112;" f @@ -7088,7 +7082,7 @@ setTile src/Dodge/Layout.hs 68;" f setTiles src/Dodge/Layout.hs 65;" f setToggle src/Dodge/LightSources/Lamp.hs 115;" f setToggle src/Dodge/Prop/Update.hs 46;" f -setViewDistance src/Dodge/Update/Camera.hs 230;" f +setViewDistance src/Dodge/Update/Camera.hs 226;" f setViewPos src/Dodge/Creature/ReaderUpdate.hs 61;" f setViewport src/Dodge/Render.hs 385;" f setVol src/Dodge/Config/Update.hs 30;" f @@ -7152,7 +7146,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/HeldUse.hs 264;" f +shootBullet src/Dodge/HeldUse.hs 255;" 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 @@ -7163,7 +7157,7 @@ shootFlameSpitterRepeat src/Dodge/HeldUse/SprayWeapon.hs 19;" f shootFlameThrower src/Dodge/HeldUse/SprayWeapon.hs 26;" f shootL src/Dodge/Item/Weapon/TriggerType.hs 428;" f shootLaser src/Dodge/Item/Weapon/BatteryGuns.hs 77;" f -shootLaser' src/Dodge/HeldUse.hs 242;" f +shootLaser' src/Dodge/HeldUse.hs 233;" 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 @@ -7174,9 +7168,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 478;" f +shootTeslaArc src/Dodge/HeldUse.hs 469;" f shootTillEmpty src/Dodge/Creature/Volition.hs 18;" f -shootTractorBeam src/Dodge/HeldUse.hs 220;" f +shootTractorBeam src/Dodge/HeldUse.hs 211;" 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 @@ -7532,7 +7526,7 @@ 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 -tractorBeamAt' src/Dodge/HeldUse.hs 231;" f +tractorBeamAt' src/Dodge/HeldUse.hs 222;" 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 98;" f @@ -7670,7 +7664,7 @@ updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 159;" f updateBarrel src/Dodge/Barreloid.hs 45;" f updateBarreloid src/Dodge/Barreloid.hs 13;" f updateBeams src/Dodge/Update.hs 457;" f -updateBounds src/Dodge/Update/Camera.hs 252;" f +updateBounds src/Dodge/Update/Camera.hs 250;" f updateBulVel src/Dodge/Bullet.hs 50;" f updateBullet src/Dodge/Bullet.hs 28;" f updateBullets src/Dodge/Update.hs 425;" f @@ -7742,8 +7736,8 @@ updateRadarSweep src/Dodge/RadarSweep.hs 24;" f updateRadarSweeps src/Dodge/Update.hs 445;" f updateRandNode src/TreeHelp.hs 108;" f updateRenderSplit appDodge/Main.hs 105;" f -updateScopeZoom src/Dodge/Update/Camera.hs 132;" f -updateScopeZoom' src/Dodge/Update/Camera.hs 137;" f +updateScopeZoom src/Dodge/Update/Camera.hs 129;" f +updateScopeZoom' src/Dodge/Update/Camera.hs 134;" f updateScrollTestValue src/Dodge/ScrollValue.hs 6;" f updateSection src/Dodge/DisplayInventory.hs 186;" f updateSectionsPositioning src/Dodge/DisplayInventory.hs 165;" f @@ -7804,9 +7798,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 222;" f -useForceFieldGun src/Dodge/HeldUse.hs 491;" f -useGasParams src/Dodge/HeldUse.hs 392;" f -useHeld src/Dodge/HeldUse.hs 306;" f +useForceFieldGun src/Dodge/HeldUse.hs 482;" f +useGasParams src/Dodge/HeldUse.hs 383;" f +useHeld src/Dodge/HeldUse.hs 297;" 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 @@ -7815,12 +7809,12 @@ 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 189;" f +useLoadedAmmo src/Dodge/HeldUse.hs 180;" f useMagShield src/Dodge/Euse.hs 69;" f useNormalCamera src/Dodge/Camera.hs 6;" f usePayload src/Dodge/Payload.hs 7;" f -usePjCreation src/Dodge/HeldUse.hs 325;" f -usePjCreationX src/Dodge/HeldUse.hs 334;" f +usePjCreation src/Dodge/HeldUse.hs 316;" f +usePjCreationX src/Dodge/HeldUse.hs 325;" f useRewindGun src/Dodge/Luse.hs 41;" f useRoomPosCond src/Dodge/PlacementSpot.hs 178;" f useRoomPosRoomCond src/Dodge/PlacementSpot.hs 181;" f @@ -7865,7 +7859,7 @@ volleyGun src/Dodge/Item/Held/Cane.hs 32;" f volleyGun src/Dodge/Item/Weapon/BulletGun/Cane.hs 43;" f volleyGunShape src/Dodge/Item/Draw/SPic.hs 373;" f waistSP src/Dodge/Creature/HandPos.hs 199;" f -walkNozzle src/Dodge/HeldUse.hs 209;" f +walkNozzle src/Dodge/HeldUse.hs 200;" f walkableNodeNear src/Dodge/Path.hs 48;" f wallBlips src/Dodge/Item/Weapon/UseEffect.hs 43;" f wallBlips src/Dodge/RadarSweep.hs 79;" f @@ -8049,10 +8043,10 @@ zoneps src/Dodge/LevelGen/MoveDoor.hs 26;" f zonesAroundPoint src/Dodge/Zoning/Base.hs 89;" f zonesExtract src/Dodge/Zoning/Base.hs 54;" f zoomFloatingCamera src/Dodge/Update/Camera.hs 65;" f -zoomFromItem src/Dodge/Update/Camera.hs 218;" f +zoomFromItem src/Dodge/Update/Camera.hs 214;" f zoomInKey src/Dodge/Config/KeyConfig.hs 31;" f -zoomInLongGun src/Dodge/Update/Camera.hs 162;" f +zoomInLongGun src/Dodge/Update/Camera.hs 158;" f zoomOutKey src/Dodge/Config/KeyConfig.hs 32;" f -zoomOutLongGun src/Dodge/Update/Camera.hs 170;" f +zoomOutLongGun src/Dodge/Update/Camera.hs 166;" f zoomScope src/Dodge/Item/Scope.hs 11;" f -zoomSpeed src/Dodge/Update/Camera.hs 159;" f +zoomSpeed src/Dodge/Update/Camera.hs 155;" f