diff --git a/ghcidOutput b/ghcidOutput index 79ccba416..435492750 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1,86 +1 @@ -/home/justin/Haskell/loop/src/Dodge/Creature/State.hs:26:1-22: warning: [-Wunused-imports] - The import of ‘Dodge.Reloading’ is redundant - | -26 | import Dodge.Reloading - | ^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Creature/Impulse/UseItem.hs:20:1-22: warning: [-Wunused-imports] - The import of ‘Dodge.Reloading’ is redundant - | -20 | import Dodge.Reloading - | ^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Creature/Impulse/UseItem.hs:118:5-14: warning: [-Wunused-local-binds] - Defined but not used: ‘hammerTest’ - | -118 | hammerTest f = case _crHammerPosition cr of - | ^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Creature/Impulse/UseItem.hs:121:5-15: warning: [-Wunused-local-binds] - Defined but not used: ‘setuhamdown’ - | -121 | setuhamdown = cWorld . lWorld . creatures . ix (_crID cr) . crHammerPosition .~ HammerDown - | ^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Inventory.hs:28:1-22: warning: [-Wunused-imports] - The import of ‘Dodge.Reloading’ is redundant - | -28 | import Dodge.Reloading - | ^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Item/Ammo.hs:7:1-29: warning: [-Wunused-imports] - The import of ‘Dodge.Reloading.Action’ is redundant - | -7 | import Dodge.Reloading.Action - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Reloading/Action.hs:3:1-49: warning: [-Wunused-imports] - The import of ‘Dodge.Data.Item.Use.Consumption.LoadAction’ is redundant - | -3 | import Dodge.Data.Item.Use.Consumption.LoadAction - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Reloading/Action.hs:4:1-49: warning: [-Wunused-imports] - The import of ‘Dodge.SoundLogic.ExternallyGeneratedSounds’ is redundant - | -4 | import Dodge.SoundLogic.ExternallyGeneratedSounds - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/CreatureEffect.hs:(50,13)-(54,28): warning: [-Wincomplete-patterns] - Pattern match(es) are non-exhaustive - In a case alternative: Patterns not matched: CrIsReloading - | -50 | doCrBl cb = case cb of - | ^^^^^^^^^^... -/home/justin/Haskell/loop/src/Dodge/Creature/Statistics.hs:8:1-26: warning: [-Wunused-imports] - The import of ‘Dodge.Creature.Test’ is redundant - | -8 | import Dodge.Creature.Test - | ^^^^^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Item/Weapon/TriggerType.hs:72:1-22: warning: [-Wunused-imports] - The import of ‘Dodge.Reloading’ is redundant - | -72 | import Dodge.Reloading - | ^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Projectile/Create.hs:4:1-22: warning: [-Wunused-imports] - The import of ‘Dodge.Reloading’ is redundant - | -4 | import Dodge.Reloading - | ^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Reloading.hs:7:1-19: warning: [-Wunused-imports] - The import of ‘Control.Lens’ is redundant - | -7 | import Control.Lens - | ^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Reloading.hs:8:1-17: warning: [-Wunused-imports] - The import of ‘Data.Maybe’ is redundant - | -8 | import Data.Maybe - | ^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Reloading.hs:9:1-26: warning: [-Wunused-imports] - The import of ‘Dodge.Data.Creature’ is redundant - | -9 | import Dodge.Data.Creature - | ^^^^^^^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Reloading.hs:10:1-20: warning: [-Wunused-imports] - The import of ‘Control.Monad’ is redundant - | -10 | import Control.Monad - | ^^^^^^^^^^^^^^^^^^^^ -/home/justin/Haskell/loop/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs:11:1-17: warning: [-Wunused-imports] - The import of ‘Sound.Data’ is redundant - | -11 | import Sound.Data - | ^^^^^^^^^^^^^^^^^ +All good (613 modules, at 10:30:52) diff --git a/src/Dodge/Creature/Impulse/UseItem.hs b/src/Dodge/Creature/Impulse/UseItem.hs index b56ed1324..be58ef076 100644 --- a/src/Dodge/Creature/Impulse/UseItem.hs +++ b/src/Dodge/Creature/Impulse/UseItem.hs @@ -17,7 +17,6 @@ import Dodge.Hotkey import Dodge.Inventory import Dodge.Item.Location import Dodge.Luse -import Dodge.Reloading import qualified IntMapHelp as IM useItemRightClick :: Creature -> World -> World @@ -115,10 +114,10 @@ useItemLeftClick cr w = fromMaybe w $ do --AmmoMagUse{} -> return $ hammerTest (cWorld . lWorld . creatures . ix (_crID cr) %~ crReloadToggle) _ -> Nothing where - hammerTest f = case _crHammerPosition cr of - HammerUp -> f w & setuhamdown - _ -> w & setuhamdown - setuhamdown = cWorld . lWorld . creatures . ix (_crID cr) . crHammerPosition .~ HammerDown + --hammerTest f = case _crHammerPosition cr of + -- HammerUp -> f w & setuhamdown + -- _ -> w & setuhamdown + --setuhamdown = cWorld . lWorld . creatures . ix (_crID cr) . crHammerPosition .~ HammerDown useItemHotkey :: Int -> Int -> World -> World useItemHotkey crid invid w = fromMaybe w $ do diff --git a/src/Dodge/Creature/ReaderUpdate.hs b/src/Dodge/Creature/ReaderUpdate.hs index 7b604f3df..5f106087a 100644 --- a/src/Dodge/Creature/ReaderUpdate.hs +++ b/src/Dodge/Creature/ReaderUpdate.hs @@ -4,7 +4,6 @@ module Dodge.Creature.ReaderUpdate ( targetYouWhenCognizant, overrideMeleeCloseTarget, watchUpdateStrat, - reloadOverride, overrideInternal, searchIfDamaged, goToTarget, @@ -24,7 +23,7 @@ import LensHelp import Data.Bifunctor import Data.Maybe import Dodge.Base -import Dodge.Creature.Volition +--import Dodge.Creature.Volition import Dodge.Data.CreatureEffect import Dodge.Data.World import Dodge.Zoning.Creature @@ -170,22 +169,6 @@ doStrategyActions cr = case cr ^? crActionPlan . apStrategy of & crActionPlan . apStrategy .~ strat _ -> cr -reloadOverride :: Creature -> Creature -reloadOverride cr = fromMaybe cr $ do - guard $ cr ^. crStance . posture == Aiming - itRef <- cr ^? crManipulation . manObject . inInventory . ispItem - guard $ cr ^? crInv . ix (itRef + 1) . itUse . amagLoadStatus . iaLoaded == Just 0 - return $ cr & crActionPlan . apStrategy .~ StrategyActions Reload reloadActions - where - reloadActions = - [ holsterWeapon - , 1 - `WaitThen` DoActionWhileInterrupt - NoAction - (WdCrBlfromCrBl CrIsReloading) - (DoImpulses [ChangeStrategy WatchAndWait]) - ] - overrideInternal :: (Creature -> Bool) -> (Creature -> Creature) -> Creature -> Creature overrideInternal test update cr | test cr = update cr diff --git a/src/Dodge/Creature/SentinelAI.hs b/src/Dodge/Creature/SentinelAI.hs index 130b4f359..1cacd647a 100644 --- a/src/Dodge/Creature/SentinelAI.hs +++ b/src/Dodge/Creature/SentinelAI.hs @@ -19,8 +19,7 @@ import Geometry.Data sentinelAI :: World -> Creature -> Creature sentinelAI w = - reloadOverride - . sentinelExtraWatchUpdate + sentinelExtraWatchUpdate [ ( crHasTargetLOS , \_ cr -> @@ -66,7 +65,6 @@ sentinelFireType f = , perceptionUpdate [0] , -- , Left $ perceptionUp 0 const doStrategyActions - , const reloadOverride , targetYouWhenCognizant , const $ overrideInternal diff --git a/src/Dodge/Creature/State.hs b/src/Dodge/Creature/State.hs index 8a71cdb3b..82137681c 100644 --- a/src/Dodge/Creature/State.hs +++ b/src/Dodge/Creature/State.hs @@ -23,7 +23,6 @@ import Dodge.Hammer import Dodge.ItEffect import Dodge.LightSource.Torch import Dodge.Prop.Gib -import Dodge.Reloading import Dodge.SoundLogic import Dodge.Targeting import Geometry diff --git a/src/Dodge/Creature/Statistics.hs b/src/Dodge/Creature/Statistics.hs index c76f241d6..00f34f4b3 100644 --- a/src/Dodge/Creature/Statistics.hs +++ b/src/Dodge/Creature/Statistics.hs @@ -5,7 +5,7 @@ module Dodge.Creature.Statistics ( import Data.IntMap.Merge.Strict import Data.Maybe -import Dodge.Creature.Test +--import Dodge.Creature.Test import Dodge.Data.Creature import qualified IntMapHelp as IM import LensHelp diff --git a/src/Dodge/Data/CreatureEffect.hs b/src/Dodge/Data/CreatureEffect.hs index 7bd123d8f..9692e4895 100644 --- a/src/Dodge/Data/CreatureEffect.hs +++ b/src/Dodge/Data/CreatureEffect.hs @@ -38,7 +38,6 @@ data WdCrBl data CrBl = CrCanShoot - | CrIsReloading | CrIsAiming | CrIsAnimate deriving (Eq, Ord, Show, Read) --Generic, Flat) diff --git a/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs b/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs index abf8e5c67..b324db101 100644 --- a/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs +++ b/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs @@ -8,7 +8,7 @@ module Dodge.Data.Item.Use.Consumption.LoadAction where import Control.Lens import Data.Aeson import Data.Aeson.TH -import Sound.Data +--import Sound.Data data Manipulation -- should be ManipulatedObject? -- = InvSel {_isel :: SelPos} diff --git a/src/Dodge/Humanoid.hs b/src/Dodge/Humanoid.hs index 973dda764..1b8318ff2 100644 --- a/src/Dodge/Humanoid.hs +++ b/src/Dodge/Humanoid.hs @@ -45,7 +45,6 @@ updateHumanoid cr = case cr ^?! crType . humanoidAI of ] , perceptionUpdate [0] , const doStrategyActions - , const reloadOverride , targetYouWhenCognizant , const $ overrideInternal @@ -68,7 +67,6 @@ updateHumanoid cr = case cr ^?! crType . humanoidAI of ] , perceptionUpdate [0] , const doStrategyActions - , const reloadOverride , targetYouWhenCognizant , const $ overrideInternal @@ -95,7 +93,6 @@ updateHumanoid cr = case cr ^?! crType . humanoidAI of ] , perceptionUpdate [0] , const doStrategyActions - , const reloadOverride , targetYouWhenCognizant , const $ overrideInternal @@ -112,7 +109,6 @@ updateHumanoid cr = case cr ^?! crType . humanoidAI of ] , perceptionUpdate [0] , const doStrategyActions - , const reloadOverride , targetYouWhenCognizant , const $ overrideInternal @@ -178,7 +174,8 @@ updateHumanoid cr = case cr ^?! crType . humanoidAI of drawwp = DoActionIfElse NoAction (WdCrBlfromCrBl CrIsAiming) (DoActionThen drawWeapon (WaitThen 50 NoAction)) reloadActions = [ holsterWeapon - , WaitThen 1 $ DoActionWhileInterrupt NoAction (WdCrBlfromCrBl CrIsReloading) (DoImpulses [ChangeStrategy WatchAndWait]) + --, WaitThen 1 $ DoActionWhileInterrupt NoAction (WdCrBlfromCrBl CrIsReloading) (DoImpulses [ChangeStrategy WatchAndWait]) + , WaitThen 1 $ (DoImpulses [ChangeStrategy WatchAndWait]) ] humanoidAIList :: diff --git a/src/Dodge/Inventory.hs b/src/Dodge/Inventory.hs index dbe821f65..547604e9f 100644 --- a/src/Dodge/Inventory.hs +++ b/src/Dodge/Inventory.hs @@ -25,7 +25,6 @@ import Dodge.Euse import Dodge.Inventory.CheckSlots import Dodge.Inventory.CloseObject import Dodge.ItEffect -import Dodge.Reloading import Dodge.SelectionSections import Geometry import qualified IntMapHelp as IM diff --git a/src/Dodge/Item/Ammo.hs b/src/Dodge/Item/Ammo.hs index 9ec94bc2a..f1a98d17c 100644 --- a/src/Dodge/Item/Ammo.hs +++ b/src/Dodge/Item/Ammo.hs @@ -4,7 +4,6 @@ import Control.Lens import Dodge.Data.World import Dodge.Default.Item import Dodge.Item.Weapon.Bullet -import Dodge.Reloading.Action tinMag :: Item tinMag = diff --git a/src/Dodge/Item/Weapon/TriggerType.hs b/src/Dodge/Item/Weapon/TriggerType.hs index 78f1a22ce..39d931119 100644 --- a/src/Dodge/Item/Weapon/TriggerType.hs +++ b/src/Dodge/Item/Weapon/TriggerType.hs @@ -69,7 +69,6 @@ import Dodge.Creature.Test import Dodge.Data.World import Dodge.Inventory.Lock import Dodge.LightSource -import Dodge.Reloading import Dodge.SoundLogic import Dodge.WorldEvent import Geometry diff --git a/src/Dodge/Projectile/Create.hs b/src/Dodge/Projectile/Create.hs index c2daaf4a5..5e3f8b9ca 100644 --- a/src/Dodge/Projectile/Create.hs +++ b/src/Dodge/Projectile/Create.hs @@ -1,7 +1,6 @@ module Dodge.Projectile.Create where import Dodge.SoundLogic -import Dodge.Reloading import Control.Monad import Data.Maybe import Dodge.Data.World diff --git a/src/Dodge/Projectile/Update.hs b/src/Dodge/Projectile/Update.hs index ba4e46141..95bffa3da 100644 --- a/src/Dodge/Projectile/Update.hs +++ b/src/Dodge/Projectile/Update.hs @@ -16,7 +16,6 @@ import Dodge.Item.Weapon.Shell import Dodge.Item.Weapon.TriggerType import Dodge.Movement.Turn import Dodge.Payload -import Dodge.Reloading.Action import Dodge.SoundLogic import Dodge.SoundLogic.LoadSound import Dodge.WorldEvent.Cloud diff --git a/src/Dodge/Reloading.hs b/src/Dodge/Reloading.hs deleted file mode 100644 index abd5dbbfc..000000000 --- a/src/Dodge/Reloading.hs +++ /dev/null @@ -1,117 +0,0 @@ -module Dodge.Reloading ( --- crCancelReloading, --- crReloadToggle, --- stepReloading, -) where - -import Control.Lens -import Data.Maybe -import Dodge.Data.Creature -import Control.Monad ---import Data.Monoid - -----crCancelReloading :: Creature -> Creature ---crCancelReloading cr = --- cr --- & updateProgress --- & crManipulation . manObject . inInventory . iselAction .~ NoInvSelAction --- where --- updateProgress = fromMaybe id $ do --- InInventory (SelItem i _) <- cr ^? crManipulation . manObject --- return $ --- crInv . ix (i + 1) . itUse . amagLoadStatus . iaProgress --- %~ const Nothing --- ---stepReloading :: Creature -> Creature ---stepReloading cr = case cr ^? crManipulation . manObject . inInventory of --- Just (SelItem _ (ReloadAction x la j)) --- | x > 0 -> --- cr & crManipulation . manObject . inInventory . iselAction . actionProgress -~ 1 --- | otherwise -> --- cr --- & crInv . ix j . itUse . amagLoadStatus %~ doLoadAction la --- & crInv . ix j . itUse . amagLoadStatus %~ rotateActionProgress --- & tryNextLoadAction --- _ -> cr --- ---tryNextLoadAction :: Creature -> Creature ---tryNextLoadAction cr = case cr ^? crManipulation . manObject . inInventory of --- Just (SelItem i _) -> case cr ^? crInv . ix (i + 1) . itUse . amagLoadStatus . iaProgress . _Just . ix 0 of --- Nothing -> cr & crManipulation . manObject . inInventory . iselAction .~ NoInvSelAction --- Just la -> --- cr & crManipulation . manObject . inInventory . iselAction . actionProgress .~ _actionTime la --- & crManipulation . manObject . inInventory . iselAction . reloadAction .~ la --- _ -> cr --- ---crReloadToggle :: Creature -> Creature ---crReloadToggle cr = case cr ^? crManipulation . manObject . inInventory . iselAction of --- Just NoInvSelAction -> cr & tryStartLoading --- _ -> cr & crManipulation . manObject . inInventory . iselAction .~ NoInvSelAction --- ---tryStartLoading :: Creature -> Creature ---tryStartLoading cr = fromMaybe cr $ do --- i <- cr ^? crManipulation . manObject . inInventory . ispItem --- magtypes <- cr ^? crInv . ix i . itUse . heldConsumption --- --let mags = cr ^.. crInv . dropping (i + 1) traverse -- note this gets all items below the manipulated --- let mags = cr ^.. crInv . dropping i traverse --- iaj <- listToMaybe . catMaybes $ zipWith tryStartLoadMagazine mags magtypes --- return $ startLoading iaj cr --- ---tryStartLoadMagazine :: Item -> AmmoType -> Maybe (ReloadStatus, Int) ---tryStartLoadMagazine mag atype = do --- magat <- mag ^? itUse . amagType --- guard $ magat == atype --- ia <- mag ^? itUse . amagLoadStatus --- maxammo <- ia ^? iaMax --- loadedammo <- ia ^? iaLoaded --- guard $ loadedammo < maxammo --- j <- mag ^? itLocation . ipInvID --- return (ia, j) --- ----- case as of ----- InternalSource ia -> return $ startLoading ia cr ----- AboveSource -> return cr --- ---startLoading :: (ReloadStatus,Int) -> Creature -> Creature ---startLoading (ic,j) cr = case ic ^? iaProgress . _Just . ix 0 of --- Just la -> cr & startLoadingStep la j --- Nothing -> case ic ^. iaCycle of --- [] -> error "item has empty load cycle" --- _ | _iaLoaded ic >= _iaMax ic -> cr -- THIS SHOULD TRY PUSHING TO THE NEXT MAGAZINE --- (la : las) -> fromMaybe (error "item loading error") $ do --- i <- cr ^? crManipulation . manObject . inInventory . ispItem --- return $ --- cr & startLoadingStep la i --- & crInv . ix i . itUse . amagLoadStatus . iaProgress ?~ (la : las) --- ---startLoadingStep :: LoadAction --- -> Int -- i think this is the inventory position? --- -> Creature -> Creature ---startLoadingStep la j cr = cr & crManipulation . manObject . inInventory . iselAction .~ ReloadAction (_actionTime la) la j --- ---rotateActionProgress :: ReloadStatus -> ReloadStatus ---rotateActionProgress ic = case ic ^. iaProgress of --- Just (_ : la : las) -> ic & iaProgress . _Just .~ (la : las) --- _ | _iaLoaded ic < _iaMax ic -> ic & iaProgress ?~ _iaCycle ic --- _ -> ic & iaProgress .~ Nothing --- ---doLoadAction :: LoadAction -> ReloadStatus -> ReloadStatus ---doLoadAction la ic = case la of --- LoadEject{} -> ic & iaLoaded .~ 0 & iaPrimed .~ False --- LoadInsert{} -> ic & iaLoaded .~ _iaMax ic --- LoadAdd{_insertMax = x} -> --- ic & iaLoaded +~ min x (_iaMax ic - _iaLoaded ic) --- LoadPrime{} -> ic & iaPrimed .~ True --- -----{- | Start reloading if clip is empty. -} -----crAutoReload :: Creature -> Creature -----crAutoReload cr = case cr ^? ptrItConsumption' . ammoLoaded of ----- Just 0 | _posture (_crStance cr) /= Aiming ----- -> cr & ptrItConsumption . reloadState .~ strictify reloadT ----- & ptrItConsumption . ammoLoaded %~ (`fromMaybe` maxA) ----- _ -> cr ----- where ----- ptrItConsumption = crInv . ix (_crInvSel cr) . itConsumption ----- ptrItConsumption' = crInv . ix (_crInvSel cr) . itConsumption ----- reloadT = cr ^? ptrItConsumption' . reloadTime ----- maxA = fmap itMaxAmmo $ cr ^? crInv . ix (_crInvSel cr) diff --git a/src/Dodge/Reloading/Action.hs b/src/Dodge/Reloading/Action.hs deleted file mode 100644 index 9a5f9e76f..000000000 --- a/src/Dodge/Reloading/Action.hs +++ /dev/null @@ -1,16 +0,0 @@ -module Dodge.Reloading.Action where - -import Dodge.Data.Item.Use.Consumption.LoadAction -import Dodge.SoundLogic.ExternallyGeneratedSounds - ---loadInsert :: Int -> LoadAction ---loadInsert x = LoadInsert x insertS --- ---loadPartialInsert :: Int -> Int -> LoadAction ---loadPartialInsert x = LoadAdd x insertOneS --- ---loadEject :: Int -> LoadAction ---loadEject x = LoadEject x ejectS --- ---loadPrime :: Int -> LoadAction ---loadPrime x = LoadPrime x primeS diff --git a/tags b/tags index f72c94bf2..16e61ddd1 100644 --- a/tags +++ b/tags @@ -149,7 +149,7 @@ AutoDoorObstacle src/Dodge/Data/PathGraph.hs 51;" C AutoGun src/Dodge/Item/Weapon/AutoGun.hs 1;" m AutoPistolMod src/Dodge/Data/Item/HeldUse.hs 96;" C AutoRecharging src/Dodge/Data/Item/Consumption.hs 23;" C -AutoRecharging src/Dodge/Data/Item/Use/Consumption.hs 30;" C +AutoRecharging src/Dodge/Data/Item/Use/Consumption.hs 28;" C AutoRifleMod src/Dodge/Data/Item/HeldUse.hs 88;" C AuxAddition src/Shader/AuxAddition.hs 1;" m AwakeLevel src/Dodge/Creature/AlertLevel/Data.hs 14;" t @@ -286,7 +286,7 @@ Branch src/Dodge/Room/Branch.hs 4;" m Breather src/Dodge/Room/Breather.hs 1;" m BrigSS src/Dodge/Data/Scenario.hs 102;" C Brute src/Dodge/Data/Creature/Capability.hs 19;" C -Brute src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 24;" C +Brute src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 17;" C BtNoLabel src/Dodge/Data/Button.hs 63;" C BtOff src/Dodge/Data/Button.hs 63;" C BtOn src/Dodge/Data/Button.hs 63;" C @@ -376,7 +376,7 @@ Carriage src/Dodge/Data/Creature/Stance.hs 20;" t Carte src/Dodge/Render/HUD/Carte.hs 1;" m ChainAnos src/Dodge/Layout/Tree/Annotate.hs 28;" C ChainEffect src/Dodge/ChainEffect.hs 4;" t -ChainEffect src/Dodge/Item/Weapon/TriggerType.hs 82;" t +ChainEffect src/Dodge/Item/Weapon/TriggerType.hs 81;" t ChainEffect src/Dodge/ChainEffect.hs 1;" m ChainUpdates src/Dodge/Creature/ChainUpdates.hs 1;" m ChangePosture src/Dodge/Data/ActionPlan.hs 42;" C @@ -385,7 +385,7 @@ CharScrollParams src/Dodge/Data/Item/Use.hs 98;" C ChargeIfEquipped src/Dodge/Data/Item/Effect.hs 22;" C ChargeIfInInventory src/Dodge/Data/Item/Effect.hs 23;" C ChargeableAmmo src/Dodge/Data/Item/Consumption.hs 29;" C -ChargeableAmmo src/Dodge/Data/Item/Use/Consumption.hs 36;" C +ChargeableAmmo src/Dodge/Data/Item/Use/Consumption.hs 34;" C ChaseAI src/Dodge/Data/Creature/Misc.hs 50;" C ChaseCrit src/Dodge/Creature/ChaseCrit.hs 1;" m ChaseCritters src/Dodge/Creature/State/Data.hs 33;" C @@ -393,8 +393,8 @@ ChaseCritters src/Dodge/Data/Creature/State.hs 38;" C Check src/Framebuffer/Check.hs 1;" m CheckConsistency src/Dodge/Room/CheckConsistency.hs 1;" m CheckSlots src/Dodge/Inventory/CheckSlots.hs 1;" m -ChooseMovementLtAuto src/Dodge/Data/CreatureEffect.hs 63;" C -ChooseMovementSpreadGun src/Dodge/Data/CreatureEffect.hs 62;" C +ChooseMovementLtAuto src/Dodge/Data/CreatureEffect.hs 62;" C +ChooseMovementSpreadGun src/Dodge/Data/CreatureEffect.hs 61;" C ChooseTarget src/Dodge/Creature/ChooseTarget.hs 1;" m CircFlare src/Dodge/Data/Flare.hs 21;" C CircleLaserMod src/Dodge/Data/Item/HeldUse.hs 76;" C @@ -484,10 +484,10 @@ Corridor src/Dodge/Layout/Tree/Annotate.hs 17;" C Corridor src/Dodge/Room/Corridor.hs 3;" m Cosmic src/Dodge/Data/Scenario.hs 74;" C Cover src/Dodge/Placement/Instance/LightSource/Cover.hs 1;" m -CrAc src/Dodge/Data/CreatureEffect.hs 49;" t +CrAc src/Dodge/Data/CreatureEffect.hs 48;" t CrBl src/Dodge/Data/CreatureEffect.hs 39;" t CrCanShoot src/Dodge/Data/CreatureEffect.hs 40;" C -CrFleeFromTarget src/Dodge/Data/CreatureEffect.hs 51;" C +CrFleeFromTarget src/Dodge/Data/CreatureEffect.hs 50;" C CrGroup src/Dodge/Creature/State/Data.hs 42;" t CrGroup src/Dodge/Data/Creature/State.hs 45;" t CrGroupID src/Dodge/Creature/State/Data.hs 48;" C @@ -499,9 +499,8 @@ CrGroupUpdate src/Dodge/CrGroupUpdate.hs 1;" m CrHitSound src/Dodge/Data/SoundOrigin.hs 30;" C CrID src/Dodge/Data/CrWlID.hs 12;" C CrImp src/Dodge/Data/CreatureEffect.hs 23;" t -CrIsAiming src/Dodge/Data/CreatureEffect.hs 42;" C -CrIsAnimate src/Dodge/Data/CreatureEffect.hs 43;" C -CrIsReloading src/Dodge/Data/CreatureEffect.hs 41;" C +CrIsAiming src/Dodge/Data/CreatureEffect.hs 41;" C +CrIsAnimate src/Dodge/Data/CreatureEffect.hs 42;" C CrLayer src/Dodge/Picture/Layer/Data.hs 6;" C CrMouth src/Dodge/Data/SoundOrigin.hs 17;" C CrMvType src/Dodge/Data/Creature/Misc.hs 37;" t @@ -512,9 +511,9 @@ CrSound src/Dodge/Data/SoundOrigin.hs 16;" C CrSpState src/Dodge/Creature/State/Data.hs 22;" t CrSpState src/Dodge/Data/Creature/State.hs 29;" t CrSt src/Dodge/Data/Creature/State.hs 16;" C -CrTurnAround src/Dodge/Data/CreatureEffect.hs 50;" C -CrWdAc src/Dodge/Data/CreatureEffect.hs 60;" t -CrWdBFSThenReturn src/Dodge/Data/CreatureEffect.hs 61;" C +CrTurnAround src/Dodge/Data/CreatureEffect.hs 49;" C +CrWdAc src/Dodge/Data/CreatureEffect.hs 59;" t +CrWdBFSThenReturn src/Dodge/Data/CreatureEffect.hs 60;" C CrWdImp src/Dodge/Data/CreatureEffect.hs 14;" t CrWdWd src/Dodge/Data/CreatureEffect.hs 17;" t CrWdWdId src/Dodge/Data/CreatureEffect.hs 17;" C @@ -1187,10 +1186,10 @@ InDivineZone src/Dodge/Data/Scenario.hs 22;" C InDream src/Dodge/Data/Scenario.hs 19;" C InGame src/Dodge/Update/Input/InGame.hs 1;" m InInv src/Dodge/Data/Item/Location.hs 12;" C -InInventory src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 28;" C +InInventory src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 21;" C InLink src/Dodge/Data/Room.hs 44;" C InLink src/Dodge/Room/Data.hs 44;" C -InNearby src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 30;" C +InNearby src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 23;" C InParallelUniverse src/Dodge/Data/Scenario.hs 21;" C InPlacement src/Dodge/Data/GenWorld.hs 133;" t InRealWorld src/Dodge/Data/Scenario.hs 18;" C @@ -1238,13 +1237,13 @@ InvLayer src/Dodge/Picture/Layer/Data.hs 12;" C InvSel src/Dodge/Data/Creature/InvSel.hs 13;" t InvSel src/Dodge/Data/LoadAction.hs 19;" t InvSel src/Dodge/Data/Creature/InvSel.hs 5;" m -InvSelAction src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 43;" t +InvSelAction src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 36;" t InvSelAction src/Dodge/Data/LoadAction.hs 24;" t Inventory src/Dodge/Inventory.hs 2;" m InventoryChange src/Dodge/Data/World.hs 32;" C InventoryColor src/Dodge/Item/InventoryColor.hs 1;" m InventoryDisplay src/Dodge/Item/Weapon/InventoryDisplay.hs 4;" m -InventoryManipulation src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 38;" t +InventoryManipulation src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 31;" t InventorySound src/Dodge/Data/SoundOrigin.hs 13;" C Investigate src/Dodge/Data/ActionPlan.hs 184;" C Invisible src/Dodge/Data/CamouflageStatus.hs 13;" C @@ -1253,7 +1252,7 @@ IsClose src/Dodge/Data/Machine/Sensor.hs 39;" C IsClose src/Dodge/Data/Sensor.hs 33;" C IsolationUnitSS src/Dodge/Data/Scenario.hs 101;" C ItAmount src/Dodge/Data/Item/Use/Amount.hs 9;" t -ItAmount src/Dodge/Data/Item/Use/Consumption.hs 42;" t +ItAmount src/Dodge/Data/Item/Use/Consumption.hs 40;" t ItAttachment src/Dodge/Data/Item/Attachment.hs 11;" t ItAttachment src/Dodge/Item/Attachment/Data.hs 11;" t ItCrWdId src/Dodge/Data/WorldEffect.hs 17;" C @@ -1395,7 +1394,7 @@ Left src/Dodge/Default/Item/Left.hs 1;" m Left src/Dodge/Item/Left.hs 1;" m LeftButton src/Dodge/Terminal/LeftButton.hs 1;" m LeftClickFamily src/Dodge/Item/Family.hs 6;" C -LeftConsumption src/Dodge/Data/Item/Use/Consumption.hs 29;" t +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 @@ -1438,18 +1437,13 @@ Listed src/Dodge/Room/Listed.hs 1;" m LiveLongAndProsper src/Dodge/Data/ActionPlan.hs 197;" C LivingComplex src/Dodge/Data/Scenario.hs 68;" C Load src/Dodge/Config/Load.hs 1;" m -LoadAction src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 13;" t LoadAction src/Dodge/Data/LoadAction.hs 10;" t LoadAction src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 6;" m LoadAction src/Dodge/Data/LoadAction.hs 4;" m -LoadAdd src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 16;" C LoadAdd src/Dodge/Data/LoadAction.hs 13;" C LoadConfig src/LoadConfig.hs 3;" m -LoadEject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 14;" C LoadEject src/Dodge/Data/LoadAction.hs 11;" C -LoadInsert src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 15;" C LoadInsert src/Dodge/Data/LoadAction.hs 12;" C -LoadPrime src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 17;" C LoadPrime src/Dodge/Data/LoadAction.hs 14;" C LoadSeed src/Dodge/LoadSeed.hs 1;" m LoadSound src/Dodge/SoundLogic/LoadSound.hs 1;" m @@ -1493,8 +1487,8 @@ MAGNETTRAJ src/Dodge/Combine/Data.hs 210;" C MAGSHIELD src/Dodge/Combine/Data.hs 104;" 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 46;" t -MCrNoAction src/Dodge/Data/CreatureEffect.hs 46;" 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 119;" C MICROCHIP src/Dodge/Combine/Data.hs 47;" C @@ -1509,8 +1503,8 @@ MODString src/Dodge/Data/Universe.hs 95;" C MODStringOption src/Dodge/Data/Universe.hs 97;" C MOTOR src/Dodge/Combine/Data.hs 38;" C MOTOR src/Dodge/Data/Item/Combine.hs 43;" C -MP2Ac src/Dodge/Data/CreatureEffect.hs 57;" t -MP2NoAction src/Dodge/Data/CreatureEffect.hs 57;" C +MP2Ac src/Dodge/Data/CreatureEffect.hs 56;" t +MP2NoAction src/Dodge/Data/CreatureEffect.hs 56;" C MTRS src/Dodge/Annotation/Data.hs 11;" t MTree src/Dodge/Tree/Compose/Data.hs 8;" C MULTIGUN src/Dodge/Data/Item/Combine.hs 170;" C @@ -1542,9 +1536,9 @@ Make src/Dodge/Corpse/Make.hs 1;" m MakeDefaultCorpse src/Dodge/Data/Creature.hs 92;" C MakeSound src/Dodge/Data/ActionPlan.hs 43;" C MakeStartCloudAt src/Dodge/Data/WorldEffect.hs 29;" C -ManipulatedObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 27;" t -Manipulation src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 20;" t -Manipulator src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 22;" C +ManipulatedObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 20;" t +Manipulation src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 13;" t +Manipulator src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 15;" C MapHelp src/MapHelp.hs 1;" m Material src/Dodge/Data/Material.hs 11;" t Material src/Dodge/Data/Material.hs 6;" m @@ -1665,7 +1659,7 @@ NearCosmicRays src/Dodge/Data/Scenario.hs 84;" C NearDustBelt src/Dodge/Data/Scenario.hs 85;" C NearGravityFlux src/Dodge/Data/Scenario.hs 83;" C NearSolar src/Dodge/Data/Scenario.hs 82;" C -NearbyManipulation src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 33;" t +NearbyManipulation src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 26;" t NewID src/Dodge/Base/NewID.hs 1;" m NewSideEffect src/Dodge/Data/Universe.hs 61;" C NextArcStep src/Dodge/Data/ArcStep.hs 21;" t @@ -1698,7 +1692,7 @@ NoHammer src/Dodge/Data/Hammer.hs 13;" C NoIntImp src/Dodge/Data/CreatureEffect.hs 20;" C NoInvEffect src/Dodge/Data/ItEffect.hs 37;" C NoInvEffect src/Dodge/Data/Item/Effect.hs 21;" C -NoInvSelAction src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 44;" C +NoInvSelAction src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 37;" C NoInvSelAction src/Dodge/Data/LoadAction.hs 25;" C NoItAttachment src/Dodge/Data/Item/Attachment.hs 18;" C NoItAttachment src/Dodge/Item/Attachment/Data.hs 20;" C @@ -1833,10 +1827,10 @@ OverreachingAI src/Dodge/Data/Scenario.hs 31;" C Overstrung src/Dodge/Creature/AlertLevel/Data.hs 19;" C Overstrung src/Dodge/Creature/Perception/Data.hs 60;" C Overstrung src/Dodge/Data/Creature/Perception.hs 57;" C -P2Ac src/Dodge/Data/CreatureEffect.hs 54;" t +P2Ac src/Dodge/Data/CreatureEffect.hs 53;" t P2Imp src/Dodge/Data/CreatureEffect.hs 28;" t P2ImpNo src/Dodge/Data/CreatureEffect.hs 28;" C -P2NoAction src/Dodge/Data/CreatureEffect.hs 54;" C +P2NoAction src/Dodge/Data/CreatureEffect.hs 53;" C PENBUL src/Dodge/Combine/Data.hs 204;" C PENMODULE src/Dodge/Combine/Data.hs 70;" C PIERCING src/Dodge/Data/Damage/Type.hs 12;" C @@ -2127,7 +2121,6 @@ Regex src/Regex.hs 1;" m ReigonalGovernment src/Dodge/Data/Scenario.hs 50;" C Religion src/Dodge/Data/Scenario.hs 47;" C Reload src/Dodge/Data/ActionPlan.hs 190;" C -ReloadAction src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 45;" C ReloadAction src/Dodge/Data/LoadAction.hs 26;" C ReloadStatus src/Dodge/Data/Item/Use/Consumption.hs 20;" t Reloading src/Dodge/Reloading.hs 1;" m @@ -2274,9 +2267,9 @@ SecretCabal src/Dodge/Data/Scenario.hs 44;" C SectionCursor src/Dodge/Data/SelectionList.hs 49;" t SeeAbove src/Dodge/Data/Wall.hs 40;" C SeeThrough src/Dodge/Data/Wall.hs 39;" C -SelCloseObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 35;" C -SelItem src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 40;" C -SelNothing src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 29;" C +SelCloseObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 28;" C +SelItem src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 33;" C +SelNothing src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 22;" C Select_creature src/Dodge/Data/Config.hs 92;" C SelectionInfo src/Dodge/Data/SelectionList.hs 84;" C SelectionIntMap src/SelectionIntMap.hs 1;" m @@ -2394,8 +2387,8 @@ SmoothScroll src/Dodge/SmoothScroll.hs 1;" m SocialUpheaval src/Dodge/Data/Scenario.hs 27;" C SolarGovernment src/Dodge/Data/Scenario.hs 53;" C SonicGuns src/Dodge/Item/Weapon/SonicGuns.hs 1;" m -SortInventory src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 39;" C -SortNearby src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 34;" C +SortInventory src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 32;" C +SortNearby src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 27;" C Sound src/Sound/Data.hs 49;" t Sound src/Dodge/Material/Sound.hs 1;" m Sound src/Dodge/WorldEvent/Sound.hs 1;" m @@ -2919,14 +2912,9 @@ __Just' src/MaybeHelp.hs 13;" f _actAction src/Dodge/Data/ActionPlan.hs 81;" f _actLabel src/Dodge/Data/ActionPlan.hs 80;" f _actionHammer src/Dodge/Data/LoadAction.hs 26;" f -_actionProgress src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 45;" f _actionProgress src/Dodge/Data/LoadAction.hs 26;" f -_actionSound src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 14;" f -_actionSound src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 17;" f _actionSound src/Dodge/Data/LoadAction.hs 11;" f _actionSound src/Dodge/Data/LoadAction.hs 14;" f -_actionTime src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 14;" f -_actionTime src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 17;" f _actionTime src/Dodge/Data/LoadAction.hs 11;" f _actionTime src/Dodge/Data/LoadAction.hs 14;" f _aimHandlePos src/Dodge/Data/Item/Use.hs 107;" f @@ -2972,13 +2960,13 @@ _apGoal src/Dodge/Data/ActionPlan.hs 22;" f _apImpulse src/Dodge/Data/ActionPlan.hs 19;" f _apStrategy src/Dodge/Data/ActionPlan.hs 21;" f _arLoaded src/Dodge/Data/Item/Consumption.hs 24;" f -_arLoaded src/Dodge/Data/Item/Use/Consumption.hs 31;" f +_arLoaded src/Dodge/Data/Item/Use/Consumption.hs 29;" f _arMax src/Dodge/Data/Item/Consumption.hs 25;" f -_arMax src/Dodge/Data/Item/Use/Consumption.hs 32;" f +_arMax src/Dodge/Data/Item/Use/Consumption.hs 30;" f _arProgress src/Dodge/Data/Item/Consumption.hs 27;" f -_arProgress src/Dodge/Data/Item/Use/Consumption.hs 34;" f +_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 33;" 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 56;" f _arcSize src/Dodge/Data/Item/Params.hs 55;" f @@ -3394,7 +3382,7 @@ _getCrZoning src/Dodge/Data/Zoning.hs 19;" f _getFixated src/Dodge/Creature/AlertLevel/Data.hs 23;" f _getFixated src/Dodge/Creature/Perception/Data.hs 67;" f _getFixated src/Dodge/Data/Creature/Perception.hs 62;" f -_getItAmount src/Dodge/Data/Item/Use/Consumption.hs 42;" f +_getItAmount src/Dodge/Data/Item/Use/Consumption.hs 40;" f _getSoundID src/Sound/Data.hs 32;" f _grBound src/Dodge/GameRoom.hs 18;" f _grDir src/Dodge/GameRoom.hs 20;" f @@ -3437,11 +3425,8 @@ _hsCharMode src/Dodge/Data/Item/HeldScroll.hs 17;" f _hud src/Dodge/Data/World.hs 46;" f _hudElement src/Dodge/Data/HUD.hs 36;" f _humanoidAI src/Dodge/Data/Creature/Misc.hs 69;" f -_iaCycle src/Dodge/Data/Item/Use/Consumption.hs 24;" f _iaLoaded src/Dodge/Data/Item/Use/Consumption.hs 22;" f _iaMax src/Dodge/Data/Item/Use/Consumption.hs 21;" f -_iaPrimed src/Dodge/Data/Item/Use/Consumption.hs 23;" f -_iaProgress src/Dodge/Data/Item/Use/Consumption.hs 25;" f _ibtAmmoMag src/Dodge/Data/Item/Combine.hs 92;" f _ibtAttach src/Dodge/Data/Item/Combine.hs 91;" f _ibtAttachTarget src/Dodge/Data/Item/Combine.hs 99;" f @@ -3475,10 +3460,9 @@ _impulseUseTargetCID src/Dodge/Data/ActionPlan.hs 50;" f _impulsesListList src/Dodge/Data/ActionPlan.hs 98;" f _imtBulletTrajectoryType src/Dodge/Data/Item/Combine.hs 211;" f _imtTargetType src/Dodge/Data/Item/Combine.hs 212;" f -_inInventory src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 28;" f -_inNearby src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 30;" 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 -_insertMax src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 16;" f _insertMax src/Dodge/Data/LoadAction.hs 13;" f _instantBullets src/Dodge/Data/LWorld.hs 105;" f _intelligence src/Dodge/Data/Creature/Misc.hs 23;" f @@ -3491,15 +3475,15 @@ _ipTuID src/Dodge/Data/Item/Location.hs 13;" f _isLooping src/Sound/Data.hs 19;" f _iselAction src/Dodge/Data/Creature/Capability.hs 23;" f _iselAction src/Dodge/Data/Creature/InvSel.hs 15;" f -_iselAction src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 40;" f +_iselAction src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 33;" f _iselAction src/Dodge/Data/LoadAction.hs 19;" f _iselMItem src/Dodge/Data/Creature/Capability.hs 24;" f _iselMItem src/Dodge/Data/Creature/InvSel.hs 16;" f _iselPos src/Dodge/Data/Creature/Capability.hs 22;" f _iselPos src/Dodge/Data/Creature/InvSel.hs 14;" f _iselPos src/Dodge/Data/LoadAction.hs 19;" f -_ispCloseObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 35;" f -_ispItem src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 40;" f +_ispCloseObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 28;" f +_ispItem src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 33;" f _itAttachments src/Dodge/Data/Item.hs 46;" f _itCurseStatus src/Dodge/Data/Item.hs 42;" f _itDimension src/Dodge/Data/Item.hs 41;" f @@ -3593,7 +3577,7 @@ _machines src/Dodge/Data/LWorld.hs 125;" f _magShieldMgMIX src/Dodge/Data/Item/Params.hs 19;" f _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 22;" 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 49;" f _mbAttach src/Dodge/Tree/Compose/Data.hs 10;" f @@ -3851,9 +3835,7 @@ _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 72;" f -_reloadAction src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 45;" f _reloadAction src/Dodge/Data/LoadAction.hs 26;" f -_reloadInvID src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 45;" f _remotePos src/Dodge/Data/Item/Scope.hs 17;" f _remoteZoom src/Dodge/Data/Item/Scope.hs 18;" f _renderData src/Data/Preload.hs 11;" f @@ -4268,9 +4250,9 @@ _wlZoning src/Dodge/Data/World.hs 50;" f _worldEventFlags src/Dodge/Data/World.hs 47;" f _worldEvents src/Dodge/Data/LWorld.hs 133;" f _wpCharge src/Dodge/Data/Item/Consumption.hs 31;" f -_wpCharge src/Dodge/Data/Item/Use/Consumption.hs 38;" f +_wpCharge src/Dodge/Data/Item/Use/Consumption.hs 36;" f _wpMaxCharge src/Dodge/Data/Item/Consumption.hs 30;" f -_wpMaxCharge src/Dodge/Data/Item/Use/Consumption.hs 37;" f +_wpMaxCharge src/Dodge/Data/Item/Use/Consumption.hs 35;" f _wsBlock src/Dodge/Data/Wall.hs 52;" f _wsDoor src/Dodge/Data/Wall.hs 50;" f _wsMachine src/Dodge/Data/Wall.hs 51;" f @@ -4366,7 +4348,7 @@ advanceScrollAmount src/Dodge/Update.hs 297;" f advanceSmoothScroll src/Dodge/SmoothScroll.hs 29;" f advanceStepCounter src/Dodge/Creature/Action/Movement.hs 56;" f advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 45;" f -afterRecoil src/Dodge/Item/Weapon/TriggerType.hs 291;" f +afterRecoil src/Dodge/Item/Weapon/TriggerType.hs 290;" f aimDelaySweep src/Dodge/Render/ShapePicture.hs 44;" f aimStanceInfo src/Dodge/Item/Info.hs 230;" f aimTurn src/Dodge/Creature/YourControl.hs 188;" f @@ -4385,7 +4367,7 @@ airlockZ src/Dodge/Room/Airlock.hs 91;" f allHotkeys src/Dodge/Creature/YourControl.hs 52;" f allVisibleWalls src/Dodge/Base/Collide.hs 131;" f alongSegBy src/Geometry.hs 43;" f -ammoCheckI src/Dodge/Item/Weapon/TriggerType.hs 144;" f +ammoCheckI src/Dodge/Item/Weapon/TriggerType.hs 143;" f ammoTweakStrings src/Dodge/Render/HUD.hs 268;" f amr src/Dodge/Item/Held/Rod.hs 50;" f amr src/Dodge/Item/Weapon/BulletGun/Rod.hs 56;" f @@ -4410,7 +4392,7 @@ applyIndividualDamage' src/Dodge/Creature/Damage.hs 52;" f applyMagnetsToBul src/Dodge/Bullet.hs 44;" f applyModules src/Dodge/Combine/Module.hs 53;" f applyNoDamage src/Dodge/Creature/Damage.hs 11;" f -applyPastDamages src/Dodge/Creature/State.hs 170;" f +applyPastDamages src/Dodge/Creature/State.hs 169;" f applyPiercingDamage src/Dodge/Creature/Damage.hs 57;" f applyPosition src/Sound.hs 110;" f applyResFactor src/Dodge/Data/Config.hs 108;" f @@ -4462,7 +4444,7 @@ attachList' src/Dodge/Tree/Compose.hs 80;" f attachOnward src/Dodge/Tree/Compose.hs 95;" f attachOnward' src/Dodge/Tree/Compose.hs 98;" f attachTree src/Dodge/Tree/Compose.hs 38;" f -attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 67;" f +attentionViewPoint src/Dodge/Creature/ReaderUpdate.hs 66;" f attribSize src/Shader/Compile.hs 352;" f autoAmr src/Dodge/Item/Held/Rod.hs 55;" f autoAmr src/Dodge/Item/Weapon/BulletGun/Rod.hs 62;" f @@ -4536,17 +4518,17 @@ basicMachineApplyDamage src/Dodge/Machine/Damage.hs 6;" f basicMachineUpdate src/Dodge/Machine.hs 13;" f basicPerceptionUpdateR src/Dodge/Creature/AlertLevel.hs 17;" f basicTerminal src/Dodge/Terminal.hs 32;" f -battery src/Dodge/Item/Ammo.hs 69;" f +battery src/Dodge/Item/Ammo.hs 61;" f batteryGuns src/Dodge/Combine/Combinations.hs 220;" f batteryModules src/Dodge/Item/Held/BatteryGuns.hs 111;" f batteryPack src/Dodge/Item/Equipment.hs 58;" f belowNumX src/Dodge/Combine/Graph.hs 77;" f -beltMag src/Dodge/Item/Ammo.hs 42;" f +beltMag src/Dodge/Item/Ammo.hs 37;" f bezierGun src/Dodge/Item/Weapon/Bezier.hs 24;" f bfsNodePoints src/Dodge/Path.hs 58;" f -bfsThenReturn src/Dodge/Creature/ReaderUpdate.hs 233;" f +bfsThenReturn src/Dodge/Creature/ReaderUpdate.hs 216;" f bindFBO src/Render.hs 244;" f -blCheck src/Dodge/Item/Weapon/TriggerType.hs 381;" f +blCheck src/Dodge/Item/Weapon/TriggerType.hs 380;" f black src/Color.hs 27;" f blank src/Picture/Base.hs 59;" f blinkAcrossChallenge src/Dodge/Room/BlinkAcross.hs 14;" f @@ -4572,7 +4554,7 @@ blood5S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 380;" f blood6S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 500;" f blood7S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 342;" f blood8S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 330;" f -bloodPuddleAt src/Dodge/Creature/State.hs 133;" f +bloodPuddleAt src/Dodge/Creature/State.hs 132;" f blowTorch src/Dodge/Item/Held/SprayGuns.hs 44;" f blowTorch src/Dodge/Item/Weapon/SprayGuns.hs 49;" f blue src/Color.hs 16;" f @@ -4645,10 +4627,10 @@ chain src/Dodge/LightSources/Lamp.hs 119;" f chainCreatureUpdates src/Dodge/Creature/ChainUpdates.hs 6;" f chainPairs src/Geometry.hs 363;" f changeFuse src/Dodge/Item/Attachment.hs 25;" f -changeSwapClose src/Dodge/Inventory.hs 151;" f -changeSwapInv src/Dodge/Inventory.hs 167;" f -changeSwapSel src/Dodge/Inventory.hs 143;" f -changeSwapWith src/Dodge/Inventory.hs 202;" f +changeSwapClose src/Dodge/Inventory.hs 150;" f +changeSwapInv src/Dodge/Inventory.hs 166;" f +changeSwapSel src/Dodge/Inventory.hs 142;" f +changeSwapWith src/Dodge/Inventory.hs 201;" f changeTweakParam src/Dodge/Update/Scroll.hs 115;" f changeZonedWall src/Dodge/LevelGen/MoveDoor.hs 33;" f charFiringStratI src/Dodge/Item/Attachment.hs 15;" f @@ -4660,11 +4642,11 @@ chargeIfInInventory src/Dodge/ItEffect.hs 43;" f chartreuse src/Color.hs 24;" f chaseCrit src/Dodge/Creature/ChaseCrit.hs 33;" f chaseCritAwarenessUpdate src/Dodge/Creature/Perception.hs 69;" f -chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 113;" f +chaseCritMv src/Dodge/Creature/ReaderUpdate.hs 112;" f chaseCritPerceptionUpdate src/Dodge/Creature/Perception.hs 30;" f chaseCritVocalization src/Dodge/Creature/ChaseCrit.hs 46;" f checkBlockHP src/Dodge/Block.hs 46;" f -checkDeath src/Dodge/Creature/State.hs 77;" f +checkDeath src/Dodge/Creature/State.hs 76;" f checkEndGame src/Dodge/Update.hs 577;" f checkErrorGL src/Shader/Compile.hs 301;" f checkFBO src/Framebuffer/Check.hs 6;" f @@ -4679,8 +4661,8 @@ chooseEquipmentPosition src/Dodge/Inventory/RBList.hs 36;" f chooseFootSound src/Dodge/Creature/State/WalkCycle.hs 39;" f chooseFreeSite src/Dodge/Inventory/RBList.hs 42;" f chooseMovementLtAuto src/Dodge/CreatureEffect.hs 104;" f -chooseMovementPistol src/Dodge/Humanoid.hs 205;" f -chooseMovementPistol' src/Dodge/Humanoid.hs 210;" f +chooseMovementPistol src/Dodge/Humanoid.hs 202;" f +chooseMovementPistol' src/Dodge/Humanoid.hs 207;" f chooseMovementSpreadGun src/Dodge/CreatureEffect.hs 87;" f circOnAnyCr src/Dodge/Base/Collide.hs 193;" f circOnSeg src/Geometry.hs 104;" f @@ -4803,7 +4785,7 @@ copyItemToFloor src/Dodge/FloorItem.hs 15;" f copyItemToFloorID src/Dodge/FloorItem.hs 19;" f corDoor src/Dodge/Room/Room.hs 378;" f cornerList src/Preload/Render.hs 194;" f -corpseOrGib src/Dodge/Creature/State.hs 96;" f +corpseOrGib src/Dodge/Creature/State.hs 95;" f corridor src/Dodge/Room/Corridor.hs 17;" f corridorBoss src/Dodge/LockAndKey.hs 142;" f corridorN src/Dodge/Room/Corridor.hs 52;" f @@ -4819,7 +4801,7 @@ crCrSpring src/Dodge/Update.hs 648;" f crCurrentEquipment src/Dodge/Creature/Statistics.hs 28;" f crDisplayAwareness src/Dodge/Creature/Picture/Awareness.hs 37;" f crDisplayVigilance src/Dodge/Creature/Picture/Awareness.hs 51;" f -crGetTargeting src/Dodge/Creature/State.hs 277;" f +crGetTargeting src/Dodge/Creature/State.hs 276;" f crHasTarget src/Dodge/Creature/Test.hs 59;" f crHasTargetLOS src/Dodge/Creature/Test.hs 62;" f crHit src/Dodge/WorldEvent/ThingsHit.hs 68;" f @@ -4830,7 +4812,6 @@ crInvSize src/Dodge/Inventory/CheckSlots.hs 38;" f crIsAiming src/Dodge/Creature/Test.hs 56;" f crIsArmouredFrom src/Dodge/Creature/Property.hs 16;" f crIsArmouredFrom src/Dodge/Creature/Test.hs 109;" f -crIsReloading src/Dodge/Creature/Test.hs 36;" f crMvAbsolute src/Dodge/Creature/Action/Movement.hs 32;" f crMvAbsolute src/Dodge/Creature/Impulse/Movement.hs 20;" f crMvBy src/Dodge/Creature/Action/Movement.hs 14;" f @@ -4855,7 +4836,7 @@ craftInfo src/Dodge/Item/Info.hs 155;" f crankSlowS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 420;" f createAndSelectItem src/Dodge/Inventory/Add.hs 43;" f createArc src/Dodge/Tesla/Arc.hs 67;" f -createAttachLight src/Dodge/Creature/State.hs 253;" f +createAttachLight src/Dodge/Creature/State.hs 252;" f createBarrelSpark src/Dodge/Particle/Spark.hs 21;" f createBarrelSpark src/Dodge/Spark.hs 44;" f createFlIt src/Dodge/Placement/PlaceSpot.hs 176;" f @@ -4866,7 +4847,7 @@ createHeldLight src/Dodge/ItEffect.hs 70;" f createLightMap src/Render.hs 26;" f createNewArc src/Dodge/Tesla/Arc.hs 76;" f createPathGrid src/Dodge/Room/Path.hs 21;" f -createProjectile src/Dodge/Projectile/Create.hs 13;" f +createProjectile src/Dodge/Projectile/Create.hs 12;" f createPutItem src/Dodge/Inventory/Add.hs 52;" f createShieldWall src/Dodge/Euse.hs 134;" f createTorchLightOffset src/Dodge/LightSource/Torch.hs 9;" f @@ -5048,7 +5029,7 @@ defaultHUD src/Dodge/Default/World.hs 148;" f defaultHeldItem src/Dodge/Default/Item.hs 21;" f defaultHeldUse src/Dodge/Default/Item/Held.hs 12;" f defaultHeldUse src/Dodge/Default/Item/Use.hs 29;" f -defaultImpulsive src/Dodge/Humanoid.hs 193;" f +defaultImpulsive src/Dodge/Humanoid.hs 190;" f defaultInanimate src/Dodge/Default/Creature.hs 69;" f defaultInput src/Dodge/Default/Input.hs 9;" f defaultInput src/Dodge/Default/World.hs 13;" f @@ -5166,7 +5147,7 @@ doCrImp src/Dodge/CreatureEffect.hs 28;" f doCrWdAc src/Dodge/CreatureEffect.hs 76;" f doCrWdImp src/Dodge/CreatureEffect.hs 16;" f doCrWdWd src/Dodge/CreatureEffect.hs 20;" f -doDamage src/Dodge/Creature/State.hs 161;" f +doDamage src/Dodge/Creature/State.hs 160;" f doDamages src/Dodge/Particle/HitEffect/ExpireAndDamage.hs 20;" f doDamagesFL src/Dodge/Flame.hs 58;" f doDeathToggle src/Dodge/WorldEffect.hs 89;" f @@ -5201,7 +5182,7 @@ doPropUpdates src/Dodge/Prop/Update.hs 36;" f doQuickload src/Dodge/Save.hs 82;" f doQuicksave src/Dodge/Save.hs 77;" f doRandImpulse src/Dodge/RandImpulse.hs 7;" f -doRegexInput src/Dodge/Update/Input/InGame.hs 134;" f +doRegexInput src/Dodge/Update/Input/InGame.hs 133;" f doRoomInPlacements src/Dodge/Layout.hs 97;" f doRoomOutPlacements src/Dodge/Layout.hs 107;" f doRoomPlacements src/Dodge/Layout.hs 122;" f @@ -5209,14 +5190,14 @@ doRoomShift src/Dodge/Room/Link.hs 33;" f doScopeZoom src/Dodge/Update/Camera.hs 147;" f doSideEffects appDodge/Main.hs 117;" f doStep src/Dodge/ArcStep.hs 9;" f -doStrategyActions src/Dodge/Creature/ReaderUpdate.hs 165;" f +doStrategyActions src/Dodge/Creature/ReaderUpdate.hs 164;" f doTerminalBootProgram src/Dodge/WorldEffect.hs 98;" f doTerminalCommandEffect src/Dodge/Terminal.hs 133;" f doTerminalEffectLB src/Dodge/Terminal/LeftButton.hs 12;" f doTestDrawing src/Dodge/Render.hs 42;" f doTextInputOver src/Dodge/Update/Input/Text.hs 12;" f doTextInputOver' src/Dodge/Update/Input/Text.hs 15;" f -doThrust src/Dodge/Projectile/Update.hs 103;" f +doThrust src/Dodge/Projectile/Update.hs 102;" f doTimeScroll src/Dodge/Update.hs 185;" f doTmTm src/Dodge/TmTm.hs 6;" f doTmWdWd src/Dodge/WorldEffect.hs 103;" f @@ -5358,21 +5339,21 @@ drawWlIDs src/Dodge/Debug/Picture.hs 327;" f drawZoneCol src/Dodge/Debug/Picture.hs 115;" f drawZoneNearPointCursor src/Dodge/Debug/Picture.hs 247;" f droneLauncher src/Dodge/Item/Weapon/Drone.hs 11;" f -dropByState src/Dodge/Creature/State.hs 155;" f +dropByState src/Dodge/Creature/State.hs 154;" f dropExcept src/Dodge/Creature/Action.hs 178;" f dropItem src/Dodge/Creature/Action.hs 183;" f dropItemKey src/Dodge/Config/KeyConfig.hs 24;" f -drumMag src/Dodge/Item/Ammo.hs 36;" f +drumMag src/Dodge/Item/Ammo.hs 31;" f dualBeam src/Dodge/Item/Held/BatteryGuns.hs 136;" f dualBeamPic src/Dodge/Item/Draw/SPic.hs 463;" f dualRayAt src/Dodge/Item/Weapon/BatteryGuns.hs 144;" f dummyMenuOption src/Dodge/Menu/Option.hs 81;" f -duplicateItem src/Dodge/Item/Weapon/TriggerType.hs 712;" f -duplicateLoaded src/Dodge/Item/Weapon/TriggerType.hs 663;" f -duplicateLoadedBarrels src/Dodge/Item/Weapon/TriggerType.hs 685;" f -duplicateNumBarrels src/Dodge/Item/Weapon/TriggerType.hs 671;" f -duplicateOffsetsFocus src/Dodge/Item/Weapon/TriggerType.hs 693;" f -duplicateOffsetsV2 src/Dodge/Item/Weapon/TriggerType.hs 717;" f +duplicateItem src/Dodge/Item/Weapon/TriggerType.hs 711;" f +duplicateLoaded src/Dodge/Item/Weapon/TriggerType.hs 662;" f +duplicateLoadedBarrels src/Dodge/Item/Weapon/TriggerType.hs 684;" f +duplicateNumBarrels src/Dodge/Item/Weapon/TriggerType.hs 670;" f +duplicateOffsetsFocus src/Dodge/Item/Weapon/TriggerType.hs 692;" f +duplicateOffsetsV2 src/Dodge/Item/Weapon/TriggerType.hs 716;" f ebFlicker src/Dodge/EnergyBall.hs 94;" f edgeFormatting src/Dodge/Combine/Graph.hs 119;" f edgeToPic src/Dodge/Debug/Picture.hs 392;" f @@ -5400,7 +5381,7 @@ equipSiteInfo src/Dodge/Item/Info.hs 242;" f equipSiteToPositions src/Dodge/Inventory/RBList.hs 77;" f equipSpeed src/Dodge/Creature/Action/Movement.hs 106;" f equipSpeed src/Dodge/Creature/Impulse/Movement.hs 99;" f -equipmentEffects src/Dodge/Creature/State.hs 229;" f +equipmentEffects src/Dodge/Creature/State.hs 228;" f equipmentStrValue src/Dodge/Creature/Statistics.hs 22;" f errorAngleVV src/Geometry.hs 62;" f errorClosestPointOnLine src/Geometry.hs 74;" f @@ -5493,7 +5474,7 @@ flickerMod src/Dodge/Placement/Instance/LightSource/Flicker.hs 10;" f flickerUpdate src/Dodge/Placement/Instance/LightSource/Flicker.hs 24;" f flipSwitch src/Dodge/Button/Event.hs 21;" f floatSize src/Shader/Parameters.hs 16;" f -flockACC src/Dodge/Creature/ReaderUpdate.hs 88;" f +flockACC src/Dodge/Creature/ReaderUpdate.hs 87;" f flockArmourChaseCrit src/Dodge/Creature/ArmourChase.hs 15;" f flockCenterFunc src/Dodge/Creature/Boid.hs 253;" f flockChaseTarget src/Dodge/Creature/Boid.hs 184;" f @@ -5510,7 +5491,7 @@ foamSpray src/Dodge/SoundLogic/Synonyms.hs 27;" f foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 398;" f foamSprayFadeOutSound src/Dodge/SoundLogic/Synonyms.hs 29;" f foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 394;" f -foldCr src/Dodge/Creature/State.hs 37;" f +foldCr src/Dodge/Creature/State.hs 36;" f foldPairs src/ListHelp.hs 35;" f foldrWhileArb src/ListHelp.hs 108;" f followImpulse src/Dodge/Creature/Impulse.hs 36;" f @@ -5569,7 +5550,7 @@ geometryTests test/Spec.hs 17;" f geometryUnitTests test/Spec.hs 22;" f geqConstr src/SameConstr.hs 21;" f getAmmoMagazine src/Dodge/HeldUse.hs 435;" f -getAmmoMags src/Dodge/Creature/Impulse/UseItem.hs 35;" f +getAmmoMags src/Dodge/Creature/Impulse/UseItem.hs 34;" f getArguments src/Dodge/Update/Scroll.hs 147;" f getArguments' src/Dodge/Update/Scroll.hs 135;" f getAvailableListLines src/Dodge/SelectionList.hs 11;" f @@ -5615,7 +5596,7 @@ glassWallDamage src/Dodge/Wall/DamageEffect.hs 48;" f glushortSize src/Shader/Parameters.hs 24;" f goToPostStrat src/Dodge/Creature/ActionRat.hs 18;" f goToPostStrat src/Dodge/Creature/Strategy.hs 10;" f -goToTarget src/Dodge/Creature/ReaderUpdate.hs 137;" f +goToTarget src/Dodge/Creature/ReaderUpdate.hs 136;" f gotoTerminal src/Dodge/Update.hs 118;" f grahamEliminate src/Geometry/Polygon.hs 108;" f grahamScan src/Geometry/Polygon.hs 101;" f @@ -5647,7 +5628,7 @@ 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 37;" f -hammerCheckL src/Dodge/Item/Weapon/TriggerType.hs 389;" f +hammerCheckL src/Dodge/Item/Weapon/TriggerType.hs 388;" f handleEvent src/Dodge/Event.hs 27;" f handleHotkeys src/Dodge/Creature/YourControl.hs 42;" f handleKeyboardEvent src/Dodge/Event/Input.hs 22;" f @@ -5680,7 +5661,7 @@ healthAnalyserByDoor src/Dodge/Room/LasTurret.hs 72;" f healthTest src/Dodge/Room/LasTurret.hs 93;" f heavyBulDams src/Dodge/Item/Weapon/Bullet.hs 38;" f heightWallPS src/Dodge/Placement/Instance/Wall.hs 13;" f -heldAimEffects src/Dodge/Creature/State.hs 69;" f +heldAimEffects src/Dodge/Creature/State.hs 68;" f heldBounds src/Dodge/Item/Module.hs 27;" f heldInfo src/Dodge/Item/Info.hs 61;" f heldItemOffset src/Dodge/Item/HeldOffset.hs 24;" f @@ -5704,7 +5685,7 @@ homingLaunchers src/Dodge/Combine/Combinations.hs 217;" f horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f hotkeyToScancode src/Dodge/Creature/YourControl.hs 55;" f hotkeyToString src/Dodge/Inventory/SelectionList.hs 35;" f -humanoidAIList src/Dodge/Humanoid.hs 184;" f +humanoidAIList src/Dodge/Humanoid.hs 181;" f hvBulDams src/Dodge/Particle/Damage.hs 13;" f hvBulHitCr src/Dodge/Particle/Bullet/HitEffect.hs 17;" f hvBulHitWall src/Dodge/Particle/Bullet/HitEffect.hs 54;" f @@ -5770,7 +5751,7 @@ insertWallInZones src/Dodge/Wall/Zone.hs 20;" f insertWalls src/Dodge/Placement/PlaceSpot/Block.hs 117;" f insertWithNewKeys src/IntMapHelp.hs 69;" f intToBulAmmo src/Dodge/TweakBullet.hs 23;" f -internalHammerUpdate src/Dodge/Creature/State.hs 144;" f +internalHammerUpdate src/Dodge/Creature/State.hs 143;" f interpWith src/Dodge/Creature/Boid.hs 10;" f intersectBeamBeams src/Dodge/Update.hs 482;" f intersectCircSeg src/Geometry/Intersect.hs 303;" f @@ -5800,7 +5781,7 @@ invDisplayParams src/Dodge/ListDisplayParams.hs 29;" f invHead src/Dodge/Render/HUD.hs 276;" f invSelectionItem src/Dodge/Inventory/SelectionList.hs 16;" f invShiftPointBy src/Dodge/ShiftPoint.hs 8;" f -invSideEff src/Dodge/Creature/State.hs 233;" f +invSideEff src/Dodge/Creature/State.hs 232;" f invSize src/Dodge/Inventory/CheckSlots.hs 41;" f inventoryX src/Dodge/Creature.hs 115;" f inverseShockwaveAt src/Dodge/WorldEvent/Shockwave.hs 43;" f @@ -5813,7 +5794,7 @@ isAnimate src/Dodge/Creature/Test.hs 138;" f isCognizant src/Dodge/Creature/Perception.hs 105;" f isElectrical src/Dodge/Data/Damage.hs 42;" f isElectrical src/Dodge/Data/DamageType.hs 44;" f -isFrictionless src/Dodge/Creature/State.hs 315;" f +isFrictionless src/Dodge/Creature/State.hs 314;" f isGas src/Dodge/Euse.hs 64;" f isInLnk src/Dodge/PlacementSpot.hs 160;" f isJust' src/MaybeHelp.hs 29;" f @@ -5840,7 +5821,7 @@ itBounds src/Dodge/Item/Module.hs 22;" f itSlotsTaken src/Dodge/Inventory/ItemSpace.hs 9;" f itSlotsTaken src/Dodge/Item/SlotsTaken.hs 9;" f itStackAmount src/Dodge/Item/Amount.hs 7;" f -itUseCharge src/Dodge/Item/Weapon/TriggerType.hs 157;" f +itUseCharge src/Dodge/Item/Weapon/TriggerType.hs 156;" f itemBaseName src/Dodge/Item/Display.hs 75;" f itemBlips src/Dodge/Item/Weapon/UseEffect.hs 38;" f itemBlips src/Dodge/RadarSweep.hs 74;" f @@ -5850,7 +5831,7 @@ itemDisplay src/Dodge/Item/Display.hs 47;" f itemDisplayOffset src/Dodge/Item/Display.hs 21;" f itemDisplayPad src/Dodge/Item/Display.hs 59;" f itemEffect src/Dodge/Creature/Action/UseItem.hs 28;" f -itemEffect src/Dodge/Creature/Impulse/UseItem.hs 40;" f +itemEffect src/Dodge/Creature/Impulse/UseItem.hs 39;" f itemEquipPict src/Dodge/Item/Draw.hs 17;" f itemFromAmmoMag src/Dodge/Item.hs 29;" f itemFromAttachType src/Dodge/Item.hs 38;" f @@ -5861,12 +5842,12 @@ itemFromHeldType src/Dodge/Item/Held.hs 25;" f itemFromLeftType src/Dodge/Item.hs 71;" f itemInfo src/Dodge/Item/Info.hs 10;" f itemInvColor src/Dodge/Item/InventoryColor.hs 7;" f -itemInvSideEffect src/Dodge/Creature/State.hs 246;" f +itemInvSideEffect src/Dodge/Creature/State.hs 245;" f itemNumberDisplay src/Dodge/Item/Display.hs 118;" f itemRooms src/Dodge/LockAndKey.hs 41;" f itemSPic src/Dodge/Item/Draw/SPic.hs 18;" f itemString src/Dodge/Item/Display.hs 72;" f -itemUpdate src/Dodge/Creature/State.hs 258;" f +itemUpdate src/Dodge/Creature/State.hs 257;" f iterateUntil src/MonadHelp.hs 23;" f iterateWhile src/MonadHelp.hs 30;" f itmBaseInfo src/Dodge/Item/Info.hs 21;" f @@ -5973,7 +5954,7 @@ linksOnPath src/Dodge/Room/CheckConsistency.hs 7;" f listConfig src/Dodge/Menu.hs 199;" f listControls src/Dodge/Menu.hs 212;" f listCursorChooseBorderScale src/Dodge/Render/List.hs 105;" f -listGuard src/Dodge/Creature/ReaderUpdate.hs 205;" f +listGuard src/Dodge/Creature/ReaderUpdate.hs 188;" f litCorridor90 src/Dodge/Room/RoadBlock.hs 26;" f lmt src/MatrixHelper.hs 43;" f lnkBothAnd src/Dodge/Room/Procedural.hs 120;" f @@ -5997,7 +5978,7 @@ loadingScreen src/Dodge/Menu/Loading.hs 7;" f loadme src/Dodge/Debug/Terminal.hs 135;" f lockAndKeyRoomList src/Dodge/Room/LockAndKeyList.hs 11;" f lockInv src/Dodge/Inventory/Lock.hs 6;" f -lockInvFor src/Dodge/Item/Weapon/TriggerType.hs 90;" f +lockInvFor src/Dodge/Item/Weapon/TriggerType.hs 89;" f lockRoomKeyItems src/Dodge/LockAndKey.hs 25;" f lockRoomMultiItems src/Dodge/LockAndKey.hs 14;" f lockedStart src/Dodge/Room/RunPast.hs 34;" f @@ -6120,13 +6101,13 @@ maybeClearPath src/Dodge/Block.hs 72;" f maybeClearPaths src/Dodge/Block.hs 69;" f maybeDestroyBlock src/Dodge/Wall/Damage.hs 26;" f maybeDestroyDoor src/Dodge/Wall/Damage.hs 31;" f -maybeExitCombine src/Dodge/Update/Input/InGame.hs 259;" f +maybeExitCombine src/Dodge/Update/Input/InGame.hs 258;" f maybeOpenTerminal src/Dodge/Update.hs 113;" f -maybeRateStatus src/Dodge/Item/Display.hs 193;" f +maybeRateStatus src/Dodge/Item/Display.hs 196;" f maybeReadFile src/Dodge/LoadSeed.hs 10;" f maybeTakeOne src/Dodge/RandomHelp.hs 96;" f maybeTakeOne src/RandomHelp.hs 107;" f -maybeWarmupStatus src/Dodge/Item/Display.hs 183;" f +maybeWarmupStatus src/Dodge/Item/Display.hs 186;" f mcApplyDamage src/Dodge/Machine/Update.hs 90;" f mcKillBut src/Dodge/Machine/Destroy.hs 34;" f mcKillTerm src/Dodge/Machine/Destroy.hs 26;" f @@ -6212,7 +6193,7 @@ mntLight src/Dodge/Placement/Instance/LightSource.hs 154;" f mntLight src/Dodge/Placements/LightSource.hs 89;" f mntLightLnkCond src/Dodge/Placement/Instance/LightSource.hs 159;" f mntLightLnkCond src/Dodge/Placements/LightSource.hs 94;" f -modClock src/Dodge/Item/Weapon/TriggerType.hs 448;" f +modClock src/Dodge/Item/Weapon/TriggerType.hs 447;" f modTo src/Geometry/Zone.hs 10;" f modifierKey src/Dodge/Config/KeyConfig.hs 34;" f moduleAttachPosition src/Dodge/Item/Module.hs 6;" f @@ -6263,7 +6244,7 @@ moveWallID src/Dodge/Wall/Move.hs 24;" f moveWallIDToward src/Dodge/Wall/Move.hs 47;" f moveWallIDUnsafe src/Dodge/Wall/Move.hs 19;" f moveZoomCamera src/Dodge/Update/Camera.hs 80;" f -movementSideEff src/Dodge/Creature/State.hs 186;" f +movementSideEff src/Dodge/Creature/State.hs 185;" f mtTopLabels src/Dodge/Tree/Compose.hs 49;" f mtUnderLabels src/Dodge/Tree/Compose.hs 52;" f muchWlDustAt src/Dodge/Wall/Dust.hs 15;" f @@ -6387,8 +6368,8 @@ overlapCircWallsClosest src/Dodge/Base/Collide.hs 168;" f overlapSegCrs src/Dodge/Base/Collide.hs 58;" f overlapSegWalls src/Dodge/Base/Collide.hs 119;" f overlapSelectionItems src/Dodge/DisplayInventory.hs 250;" f -overrideInternal src/Dodge/Creature/ReaderUpdate.hs 189;" f -overrideMeleeCloseTarget src/Dodge/Creature/ReaderUpdate.hs 34;" f +overrideInternal src/Dodge/Creature/ReaderUpdate.hs 172;" f +overrideMeleeCloseTarget src/Dodge/Creature/ReaderUpdate.hs 33;" f overwriteLabel src/Dodge/Tree/Compose.hs 31;" f pContID src/Dodge/LevelGen/Data.hs 15;" f pContID src/Dodge/LevelGen/PlacementHelper.hs 15;" f @@ -6406,7 +6387,7 @@ parseNum src/Dodge/Debug/Terminal.hs 72;" f pathConnected src/Dodge/Room/CheckConsistency.hs 14;" f pathEdgeObstructed src/Dodge/Path.hs 43;" f pauseAndFloatCam src/Dodge/Camera.hs 10;" f -pauseGame src/Dodge/Update/Input/InGame.hs 213;" f +pauseGame src/Dodge/Update/Input/InGame.hs 212;" f pauseKey src/Dodge/Config/KeyConfig.hs 22;" f pauseMenu src/Dodge/Menu.hs 53;" f pauseMenuOptions src/Dodge/Menu.hs 58;" f @@ -6452,7 +6433,7 @@ pistol src/Dodge/Item/Held/Stick.hs 38;" f pistol src/Dodge/Item/Weapon/BulletGun/Stick.hs 59;" f pistolCrit src/Dodge/Creature/PistolCrit.hs 13;" f pistolerRoom src/Dodge/Room/Room.hs 323;" f -pjTrack src/Dodge/Projectile/Update.hs 141;" f +pjTrack src/Dodge/Projectile/Update.hs 140;" f plBlock src/Dodge/Placement/PlaceSpot/Block.hs 18;" f plDoor src/Dodge/Placement/PlaceSpot/TriggerDoor.hs 22;" f plLineBlock src/Dodge/Placement/PlaceSpot/Block.hs 50;" f @@ -6481,7 +6462,7 @@ placeSpotUsingLink src/Dodge/Placement/PlaceSpot.hs 59;" f placeString src/Dodge/Render/MenuScreen.hs 54;" f placeWallPoly src/Dodge/Placement/PlaceSpot.hs 154;" f plainRegex src/Dodge/DisplayInventory.hs 151;" f -plainShellCollisionCheck src/Dodge/Projectile/Update.hs 47;" f +plainShellCollisionCheck src/Dodge/Projectile/Update.hs 46;" f plateCraft src/Dodge/Item/Craftable.hs 47;" f playIfFree src/Sound.hs 136;" f playPositionalSoundQueue src/Sound.hs 144;" f @@ -6516,7 +6497,7 @@ pointerToItem src/Dodge/Item/Location.hs 36;" f pointerToItemLocation src/Dodge/Item/Location.hs 21;" f pointerYourItem src/Dodge/Item/Location.hs 31;" f pointsToPoly src/Geometry/ConvexPoly.hs 39;" f -poisonSPic src/Dodge/Creature/State.hs 121;" f +poisonSPic src/Dodge/Creature/State.hs 120;" f poisonSprayer src/Dodge/Item/Held/SprayGuns.hs 16;" f poisonSprayer src/Dodge/Item/Weapon/SprayGuns.hs 16;" f poke34 src/Shader/Poke.hs 516;" f @@ -6744,7 +6725,7 @@ randsOnCirc src/RandomHelp.hs 118;" f randsSpread src/Dodge/RandomHelp.hs 100;" f randsSpread src/RandomHelp.hs 111;" f ratIntersectLineLine src/Geometry/Intersect.hs 195;" f -rateIncAB src/Dodge/Item/Weapon/TriggerType.hs 167;" f +rateIncAB src/Dodge/Item/Weapon/TriggerType.hs 166;" f readSaveSlot src/Dodge/Save.hs 45;" f rectNESW src/Geometry/Polygon.hs 13;" f rectNSWE src/Geometry/Polygon.hs 19;" f @@ -6753,7 +6734,7 @@ rectXH src/Geometry/Polygon.hs 36;" f rectXY src/Geometry/Polygon.hs 39;" f rectanglePairs src/Dodge/LevelGen/DoorPane.hs 7;" f red src/Color.hs 14;" f -reduceSpinBy src/Dodge/Projectile/Update.hs 155;" f +reduceSpinBy src/Dodge/Projectile/Update.hs 154;" f reflDirWall src/Dodge/Base/Wall.hs 16;" f reflDirWall src/Dodge/Wall/Reflect.hs 6;" f reflVelWall src/Dodge/Base/Wall.hs 24;" f @@ -6773,13 +6754,12 @@ regexScope src/Dodge/InputFocus.hs 27;" f reload1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 428;" f reloadKey src/Dodge/Config/KeyConfig.hs 26;" f reloadLevelStart src/Dodge/Save.hs 71;" f -reloadOverride src/Dodge/Creature/ReaderUpdate.hs 173;" f reloadS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 426;" f reloadSound src/Dodge/SoundLogic/Synonyms.hs 4;" f rememberSounds src/Dodge/Creature/Perception.hs 177;" f remoteBombUnarmedPic src/Dodge/Item/Weapon/Grenade.hs 268;" f remoteLauncher src/Dodge/Item/Held/Launcher.hs 50;" f -remoteShellCollisionCheck src/Dodge/Projectile/Update.hs 44;" f +remoteShellCollisionCheck src/Dodge/Projectile/Update.hs 43;" f remoteShellShape src/Dodge/Projectile/Draw.hs 39;" f removeEither src/Dodge/Layout/Tree/Either.hs 41;" f removeHotkey src/Dodge/Hotkey.hs 41;" f @@ -6795,11 +6775,11 @@ renderLayer src/Render.hs 233;" f renderLightingNoShadows src/Render.hs 48;" f renderListAt src/Dodge/Render/List.hs 160;" f renderShadows src/Render.hs 117;" f -repeatOnFrames src/Dodge/Item/Weapon/TriggerType.hs 651;" f -repeatTransformed src/Dodge/Item/Weapon/TriggerType.hs 95;" f +repeatOnFrames src/Dodge/Item/Weapon/TriggerType.hs 650;" f +repeatTransformed src/Dodge/Item/Weapon/TriggerType.hs 94;" f repeater src/Dodge/Item/Held/Cane.hs 72;" f repeater src/Dodge/Item/Weapon/BulletGun/Cane.hs 89;" f -replaceNullWith src/Dodge/Creature/ReaderUpdate.hs 161;" f +replaceNullWith src/Dodge/Creature/ReaderUpdate.hs 160;" f replacePutID src/Dodge/Placement/Instance/Wall.hs 102;" f replacePutID src/Dodge/Placements/Wall.hs 85;" f replacePutID src/Dodge/Room/Placement.hs 114;" f @@ -6815,13 +6795,13 @@ restrictLinkType src/Dodge/RoomLink.hs 32;" f restrictOutLinks src/Dodge/RoomLink.hs 45;" f restrictRMInLinksPD src/Dodge/Room/Link.hs 25;" f resumeSound src/Dodge/SoundLogic.hs 45;" f -retireRemoteProj src/Dodge/Projectile/Update.hs 82;" f -retreatActionsPistol src/Dodge/Humanoid.hs 251;" f -retreatFireLauncher src/Dodge/Humanoid.hs 272;" f +retireRemoteProj src/Dodge/Projectile/Update.hs 81;" f +retreatActionsPistol src/Dodge/Humanoid.hs 248;" f +retreatFireLauncher src/Dodge/Humanoid.hs 269;" f retreatPointForFrom src/Dodge/Creature/Action/Flee.hs 7;" f retreatPointForFrom src/Dodge/Creature/Impulse/Flee.hs 7;" f reversePair src/Dodge/LevelGen.hs 82;" f -revolveMag src/Dodge/Item/Ammo.hs 28;" f +revolveMag src/Dodge/Item/Ammo.hs 24;" f revolver src/Dodge/Item/Weapon/BulletGun/Stick.hs 49;" f revolverX src/Dodge/Item/Weapon/BulletGun/Stick.hs 104;" f rewindWatch src/Dodge/Item/Weapon/Utility.hs 37;" f @@ -6843,10 +6823,10 @@ rightPad src/Padding.hs 22;" f rightPadNoSquash src/Padding.hs 26;" f rlPosDir src/Dodge/RoomLink.hs 94;" f rmInLinks src/Dodge/RoomLink.hs 138;" f -rmInvItem src/Dodge/Inventory.hs 39;" f +rmInvItem src/Dodge/Inventory.hs 38;" f rmLinksOfType src/Dodge/RoomLink.hs 135;" f rmOutLinks src/Dodge/RoomLink.hs 138;" f -rmSelectedInvItem src/Dodge/Inventory.hs 103;" f +rmSelectedInvItem src/Dodge/Inventory.hs 102;" f roomC src/Dodge/Room/Room.hs 39;" f roomCCrits src/Dodge/Room/Room.hs 262;" f roomCenterPillar src/Dodge/Room/Room.hs 121;" f @@ -6938,13 +6918,13 @@ scaleSH src/Shape.hs 265;" f scalp src/Dodge/Creature/Picture.hs 123;" f scancodeToHotkey src/Dodge/Creature/YourControl.hs 70;" f scodeToChar src/Dodge/ScodeToChar.hs 6;" f -scorchSPic src/Dodge/Creature/State.hs 116;" f +scorchSPic src/Dodge/Creature/State.hs 115;" f screenBox src/Dodge/Base/Window.hs 53;" f screenPolygon src/Dodge/Base/Window.hs 17;" f screenPolygonBord src/Dodge/Base/Window.hs 27;" f screenPosAbs src/Dodge/ScreenPos.hs 15;" f screenToWorldPos src/Dodge/Base/Coordinate.hs 53;" f -scrollAugInvSel src/Dodge/Inventory.hs 208;" f +scrollAugInvSel src/Dodge/Inventory.hs 207;" f scrollCommandStrings src/Dodge/Update/Scroll.hs 130;" f scrollCommands src/Dodge/Update/Scroll.hs 127;" f scrollDebugInfoInt src/Dodge/Debug.hs 46;" f @@ -6961,7 +6941,7 @@ seagullCry2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 410;" f seagullCryS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 418;" f seagullWhistle1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 360;" f seagullWhistleS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 512;" f -searchIfDamaged src/Dodge/Creature/ReaderUpdate.hs 220;" f +searchIfDamaged src/Dodge/Creature/ReaderUpdate.hs 203;" f secondColumnParams src/Dodge/ListDisplayParams.hs 42;" f seedStartMenu src/Dodge/Menu.hs 79;" f seedStartOptions src/Dodge/Menu.hs 82;" f @@ -6972,7 +6952,7 @@ selSecSelCol src/Dodge/Render/HUD.hs 358;" f selSecSelSize src/Dodge/SelectionSections.hs 124;" f selSecYint src/Dodge/SelectionSections.hs 127;" f selectCreatureDebugItem src/Dodge/Debug.hs 38;" f -selectedCloseObject src/Dodge/Inventory.hs 232;" f +selectedCloseObject src/Dodge/Inventory.hs 231;" f sensAboveDoor src/Dodge/Room/SensorDoor.hs 63;" f sensInsideDoor src/Dodge/Room/SensorDoor.hs 69;" f senseDamage src/Dodge/Machine/Update.hs 134;" f @@ -6988,8 +6968,8 @@ sensorSPic src/Dodge/Placements/Sensor.hs 49;" f sensorUpdate src/Dodge/Machine/Sensor.hs 35;" f sensorUpdate src/Dodge/Placements/Sensor.hs 34;" f sentinelAI src/Dodge/Creature/SentinelAI.hs 20;" f -sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 84;" f -sentinelFireType src/Dodge/Creature/SentinelAI.hs 50;" f +sentinelExtraWatchUpdate src/Dodge/Creature/SentinelAI.hs 82;" f +sentinelFireType src/Dodge/Creature/SentinelAI.hs 49;" f setChannelPos src/Sound.hs 149;" f setClickWorldPos src/Dodge/Update.hs 97;" f setClusterID src/Dodge/Combine/Graph.hs 104;" f @@ -7002,7 +6982,7 @@ setHotkey src/Dodge/Hotkey.hs 38;" f setInLinks src/Dodge/RoomLink.hs 51;" f setInLinksByType src/Dodge/RoomLink.hs 54;" f setInLinksPD src/Dodge/RoomLink.hs 74;" f -setInvPosFromSS src/Dodge/Inventory.hs 216;" f +setInvPosFromSS src/Dodge/Inventory.hs 215;" f setItemCharge src/Dodge/ItEffect.hs 36;" f setLayer src/Picture/Base.hs 139;" f setLinkType src/Dodge/RoomLink.hs 60;" f @@ -7010,26 +6990,26 @@ setLinkTypePD src/Dodge/RoomLink.hs 67;" f setLocalPS src/Dodge/Placements/Spot.hs 21;" f setMinInvSize src/Dodge/Creature/Action.hs 151;" f setMusicVolume src/Sound.hs 161;" f -setMvPos src/Dodge/Creature/ReaderUpdate.hs 52;" f +setMvPos src/Dodge/Creature/ReaderUpdate.hs 51;" f setOldPos src/Dodge/Update.hs 349;" f setOutLinks src/Dodge/RoomLink.hs 48;" f setOutLinksByType src/Dodge/RoomLink.hs 57;" f setOutLinksPD src/Dodge/RoomLink.hs 77;" f setPS src/Dodge/Placements/Spot.hs 9;" f -setRemoteDir src/Dodge/Projectile/Update.hs 91;" f +setRemoteDir src/Dodge/Projectile/Update.hs 90;" f setRemoteScope src/Dodge/Item/Weapon/Remote.hs 9;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 121;" f setShaderSource src/Shader/Compile.hs 336;" f setShadowLimits src/Dodge/Shadows.hs 11;" f setShownIntMap src/SelectionIntMap.hs 11;" f setSoundVolume src/Sound.hs 156;" f -setTargetMv src/Dodge/Creature/ReaderUpdate.hs 75;" f +setTargetMv src/Dodge/Creature/ReaderUpdate.hs 74;" f 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 242;" f -setViewPos src/Dodge/Creature/ReaderUpdate.hs 62;" f +setViewPos src/Dodge/Creature/ReaderUpdate.hs 61;" f setViewport src/Dodge/Render.hs 385;" f setVol src/Dodge/Config/Update.hs 30;" f setWristShieldPos src/Dodge/Euse.hs 100;" f @@ -7062,8 +7042,8 @@ shardShape src/Dodge/Block/Debris.hs 181;" f shatterGun src/Dodge/Item/Held/Weapons.hs 7;" f shatterGunSPic src/Dodge/Item/Draw/SPic.hs 231;" f shatterWall src/Dodge/Item/Weapon/Shatter.hs 26;" f -shellCollisionCheck src/Dodge/Projectile/Update.hs 32;" f -shellMag src/Dodge/Item/Ammo.hs 48;" f +shellCollisionCheck src/Dodge/Projectile/Update.hs 31;" f +shellMag src/Dodge/Item/Ammo.hs 43;" f shellShape src/Dodge/Projectile/Draw.hs 24;" f shellTrailCloud src/Dodge/WorldEvent/Cloud.hs 65;" f shieldWall src/Dodge/Euse.hs 114;" f @@ -7101,7 +7081,7 @@ shootFirstMiss src/Dodge/Creature/Volition.hs 33;" f shootFlameSpitter src/Dodge/HeldUse/SprayWeapon.hs 9;" f shootFlameSpitterRepeat src/Dodge/HeldUse/SprayWeapon.hs 19;" f shootFlameThrower src/Dodge/HeldUse/SprayWeapon.hs 26;" f -shootL src/Dodge/Item/Weapon/TriggerType.hs 403;" f +shootL src/Dodge/Item/Weapon/TriggerType.hs 402;" f shootLaser src/Dodge/Item/Weapon/BatteryGuns.hs 77;" f shootMachineGun src/Dodge/HeldUse/BulletWeapon.hs 218;" f shootMachinePistol src/Dodge/HeldUse/BulletWeapon.hs 62;" f @@ -7135,9 +7115,8 @@ showInt src/Dodge/Item/Info.hs 30;" f showIntKMG src/Dodge/Item/Info.hs 47;" f showIntKMG' src/Dodge/Item/Info.hs 54;" f showIntsString src/Dodge/Tree/Compose.hs 129;" f -showLoadActionType src/Dodge/Item/Display.hs 174;" f +showLoadedAmount src/Dodge/Item/Display.hs 155;" f showPhaseV src/Dodge/Tweak/Show.hs 16;" f -showReloadProgress src/Dodge/Item/Display.hs 155;" f showTerminalError src/Dodge/Debug/Terminal.hs 75;" f showTimeFlow src/Dodge/TestString.hs 59;" f showTractionPower src/Dodge/Tweak/Show.hs 22;" f @@ -7151,7 +7130,7 @@ shuffleLinks src/Dodge/Room/Link.hs 30;" f shuffleRoomPos src/Dodge/Layout.hs 78;" f shuffleTail src/Dodge/RandomHelp.hs 50;" f shuffleTail src/RandomHelp.hs 55;" f -sideEffectOnFrame src/Dodge/Item/Weapon/TriggerType.hs 631;" f +sideEffectOnFrame src/Dodge/Item/Weapon/TriggerType.hs 630;" f sideEffectUpdatePreload src/Dodge/PreloadData.hs 7;" f sigmoid src/Dodge/Base.hs 129;" f simpleCrSprings src/Dodge/Update.hs 639;" f @@ -7213,7 +7192,7 @@ soundVolID src/Dodge/SoundLogic/Synonyms.hs 41;" f soundWithStatus src/Dodge/SoundLogic.hs 98;" f soundWithStatusVolume src/Dodge/SoundLogic.hs 48;" f southPillarsRoom src/Dodge/Room/LongDoor.hs 84;" f -spaceAction src/Dodge/Update/Input/InGame.hs 216;" f +spaceAction src/Dodge/Update/Input/InGame.hs 215;" f spaceActionKey src/Dodge/Config/KeyConfig.hs 28;" f spanColLightBlackI src/Dodge/Placement/Instance/LightSource.hs 186;" f spanColLightI src/Dodge/Placement/Instance/LightSource.hs 179;" f @@ -7288,7 +7267,7 @@ startNewGameInSlot src/Dodge/StartNewGame.hs 15;" f startRoom src/Dodge/Room/Start.hs 62;" f startSeedGame src/Dodge/StartNewGame.hs 20;" f startSeedGameConc src/Dodge/StartNewGame.hs 27;" f -stateUpdate src/Dodge/Creature/State.hs 55;" f +stateUpdate src/Dodge/Creature/State.hs 54;" f statsModifier src/Dodge/Creature/Info.hs 14;" f stepReloading src/Dodge/Reloading.hs 24;" f stone1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 386;" f @@ -7366,7 +7345,7 @@ targetRBPressUpdate src/Dodge/Targeting.hs 68;" f targetSimpleDraw src/Dodge/Targeting/Draw.hs 22;" f targetYouCognizant src/Dodge/Creature/ChooseTarget.hs 13;" f targetYouLOS src/Dodge/Creature/ChooseTarget.hs 7;" f -targetYouWhenCognizant src/Dodge/Creature/ReaderUpdate.hs 211;" f +targetYouWhenCognizant src/Dodge/Creature/ReaderUpdate.hs 194;" f targetYouWhenCognizant src/Dodge/Creature/SetTarget.hs 9;" f targetingHat src/Dodge/Item/Equipment.hs 111;" f targetingInfo src/Dodge/Item/Info.hs 142;" f @@ -7427,7 +7406,7 @@ tilesToLine src/Shader/AuxAddition.hs 66;" f timeFlowUpdate src/Dodge/Update.hs 158;" f timeModule src/Dodge/Item/Craftable.hs 35;" f timerTLS src/Dodge/LightSource/Update.hs 22;" f -tinMag src/Dodge/Item/Ammo.hs 9;" f +tinMag src/Dodge/Item/Ammo.hs 8;" f tinitusS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 402;" f titleOptionsMenu src/Dodge/Menu.hs 99;" f titleOptionsNoWrite src/Dodge/Menu.hs 102;" f @@ -7451,11 +7430,11 @@ toV3 src/Geometry/Data.hs 38;" f toV4 src/Geometry/Data.hs 40;" f toggleCombineInv src/Dodge/DisplayInventory.hs 30;" f toggleCommand src/Dodge/Terminal.hs 194;" f -toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 60;" f +toggleEquipmentAt src/Dodge/Creature/Impulse/UseItem.hs 59;" f toggleJust src/MaybeHelp.hs 41;" f -toggleMap src/Dodge/Update/Input/InGame.hs 237;" f +toggleMap src/Dodge/Update/Input/InGame.hs 236;" f toggleMapKey src/Dodge/Config/KeyConfig.hs 25;" f -toggleTweakInv src/Dodge/Update/Input/InGame.hs 244;" f +toggleTweakInv src/Dodge/Update/Input/InGame.hs 243;" f togglesToEffects src/Dodge/Terminal.hs 244;" f tone440S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 460;" f tone440sawtoothS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 430;" f @@ -7465,10 +7444,10 @@ topPrismEdgeIndices src/Shader/Poke.hs 327;" f topPrismIndices src/Shader/Poke.hs 402;" f torch src/Dodge/Item/Held/Utility.hs 26;" f torchShape src/Dodge/Item/Draw/SPic.hs 195;" f -torqueBefore src/Dodge/Item/Weapon/TriggerType.hs 561;" f -torqueBeforeAtLeast src/Dodge/Item/Weapon/TriggerType.hs 584;" f +torqueBefore src/Dodge/Item/Weapon/TriggerType.hs 560;" f +torqueBeforeAtLeast src/Dodge/Item/Weapon/TriggerType.hs 583;" f torqueCr src/Dodge/WorldEffect.hs 64;" f -torqueSideEffect src/Dodge/Item/Weapon/TriggerType.hs 639;" f +torqueSideEffect src/Dodge/Item/Weapon/TriggerType.hs 638;" f torso src/Dodge/Creature/Picture.hs 132;" f tractCr src/Dodge/TractorBeam/Update.hs 27;" f tractFlIt src/Dodge/TractorBeam/Update.hs 22;" f @@ -7532,7 +7511,7 @@ treePost src/TreeHelp.hs 45;" f triLootRoom src/Dodge/Room/Treasure.hs 22;" f triangulate src/Shader/Poke/Triangulate.hs 5;" f triangulateIndices src/Shader/Poke/Triangulate.hs 9;" f -trigDoAlso src/Dodge/Item/Weapon/TriggerType.hs 102;" f +trigDoAlso src/Dodge/Item/Weapon/TriggerType.hs 101;" f triggerDoorRoom src/Dodge/Room/Door.hs 30;" f triggerSwitch src/Dodge/Placement/Instance/Button.hs 47;" f triggerSwitch src/Dodge/Placements/Button.hs 35;" f @@ -7551,15 +7530,15 @@ trunkDepth src/TreeHelp.hs 161;" f tryAssignHotkey src/Dodge/Creature/YourControl.hs 86;" f tryAttachBulletBelt src/Dodge/Euse.hs 40;" f tryChargeBattery src/Dodge/Euse.hs 43;" f -tryCombine src/Dodge/Update/Input/InGame.hs 252;" f +tryCombine src/Dodge/Update/Input/InGame.hs 251;" f tryGetChannel src/Sound.hs 96;" f -tryMeleeAttack src/Dodge/Creature/ReaderUpdate.hs 37;" f +tryMeleeAttack src/Dodge/Creature/ReaderUpdate.hs 36;" f tryNextLoadAction src/Dodge/Reloading.hs 36;" f tryPlay src/Sound.hs 83;" f tryPutItemInInv src/Dodge/Inventory/Add.hs 27;" f trySeedFromClipboard src/Dodge/Menu.hs 88;" f trySiphonFuel src/Dodge/Euse.hs 46;" f -trySpinByCID src/Dodge/Projectile/Update.hs 124;" f +trySpinByCID src/Dodge/Projectile/Update.hs 123;" f tryStartLoadMagazine src/Dodge/Reloading.hs 57;" f tryStartLoading src/Dodge/Reloading.hs 50;" f tryUseItem src/Dodge/Creature/Action/UseItem.hs 20;" f @@ -7602,11 +7581,11 @@ unusedSpotAwayFromLink src/Dodge/PlacementSpot.hs 122;" f unusedSpotNearInLink src/Dodge/PlacementSpot.hs 191;" f upCT src/Dodge/Targeting.hs 34;" f upHammer src/Dodge/Default.hs 77;" f -upProjectile src/Dodge/Projectile/Update.hs 56;" f +upProjectile src/Dodge/Projectile/Update.hs 55;" f updateAllNodes src/TreeHelp.hs 85;" f updateArc src/Dodge/Tesla/Arc.hs 86;" f -updateAutoRecharge src/Dodge/Creature/State.hs 267;" f -updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 159;" f +updateAutoRecharge src/Dodge/Creature/State.hs 266;" f +updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 158;" f updateBarrel src/Dodge/Barreloid.hs 45;" f updateBarreloid src/Dodge/Barreloid.hs 13;" f updateBeams src/Dodge/Update.hs 457;" f @@ -7615,7 +7594,7 @@ updateBulVel src/Dodge/Bullet.hs 48;" f updateBullet src/Dodge/Bullet.hs 26;" f updateBullets src/Dodge/Update.hs 425;" f updateCamera src/Dodge/Update/Camera.hs 32;" f -updateCloseObjects src/Dodge/Inventory.hs 109;" f +updateCloseObjects src/Dodge/Inventory.hs 108;" f updateCloud src/Dodge/Update.hs 605;" f updateClouds src/Dodge/Update.hs 454;" f updateCombinePositioning src/Dodge/DisplayInventory.hs 35;" f @@ -7630,7 +7609,7 @@ updateDistortion src/Dodge/Distortion.hs 5;" f updateDistortions src/Dodge/Update.hs 412;" f updateEnergyBall src/Dodge/EnergyBall.hs 46;" f updateEnergyBalls src/Dodge/Update.hs 442;" f -updateEnterRegex src/Dodge/Update/Input/InGame.hs 188;" f +updateEnterRegex src/Dodge/Update/Input/InGame.hs 187;" f updateExpBarrel src/Dodge/Barreloid.hs 19;" f updateFBOTO src/Framebuffer/Update.hs 97;" f updateFBOTO3 src/Framebuffer/Update.hs 131;" f @@ -7645,23 +7624,23 @@ updateHumanoid src/Dodge/Humanoid.hs 12;" f updateIMl src/Dodge/Update.hs 385;" f updateIMl' src/Dodge/Update.hs 388;" f updateInGameCamera src/Dodge/Update/Camera.hs 71;" f -updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 108;" f +updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 107;" f updateInstantBullets src/Dodge/Update.hs 531;" f -updateInv src/Dodge/Creature/State.hs 225;" f +updateInv src/Dodge/Creature/State.hs 224;" f updateInventoryPositioning src/Dodge/DisplayInventory.hs 85;" f updateInventorySectionItems src/Dodge/DisplayInventory.hs 139;" f -updateKeyInGame src/Dodge/Update/Input/InGame.hs 102;" f -updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 91;" f +updateKeyInGame src/Dodge/Update/Input/InGame.hs 101;" f +updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 90;" f updateLampoid src/Dodge/Lampoid.hs 13;" f updateLaser src/Dodge/Laser/Update.hs 10;" f updateLasers src/Dodge/Update.hs 314;" f updateLightSources src/Dodge/Update.hs 415;" f updateLinearShockwave src/Dodge/Item/Weapon/Booster.hs 75;" f updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f -updateLongPressInGame src/Dodge/Update/Input/InGame.hs 128;" f +updateLongPressInGame src/Dodge/Update/Input/InGame.hs 127;" f updateMIM src/Dodge/Update.hs 544;" f updateMachine src/Dodge/Machine/Update.hs 16;" f -updateMovement src/Dodge/Creature/State.hs 304;" f +updateMovement src/Dodge/Creature/State.hs 303;" f updateObjCatMaybes src/Dodge/Update.hs 403;" f updateObjMapMaybe src/Dodge/Update.hs 396;" f updatePS src/Dodge/Placements/Spot.hs 26;" f @@ -7671,9 +7650,9 @@ updatePosEvent src/Dodge/PosEvent.hs 11;" f updatePosEvents src/Dodge/Update.hs 451;" f updatePreload src/Dodge/PreloadData.hs 12;" f updatePreload src/Preload/Update.hs 20;" f -updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 66;" f -updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 69;" f -updateProjectile src/Dodge/Projectile/Update.hs 28;" f +updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 65;" f +updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 68;" f +updateProjectile src/Dodge/Projectile/Update.hs 27;" f updateProp src/Dodge/Prop/Update.hs 11;" f updateRBList src/Dodge/Inventory/RBList.hs 16;" f updateRadarBlip src/Dodge/RadarBlip.hs 8;" f @@ -7709,7 +7688,7 @@ updateUniverse src/Dodge/Update.hs 71;" f updateUniverseFirst src/Dodge/Update.hs 82;" f updateUniverseLast src/Dodge/Update.hs 123;" f updateUniverseMid src/Dodge/Update.hs 142;" f -updateUseInputInGame src/Dodge/Update/Input/InGame.hs 32;" f +updateUseInputInGame src/Dodge/Update/Input/InGame.hs 31;" f updateUseInputOnScreen src/Dodge/Update/Input/ScreenLayer.hs 20;" f updateUsingInput src/Dodge/Update/UsingInput.hs 21;" f updateWalkCycle src/Dodge/Creature/State/WalkCycle.hs 12;" f @@ -7737,22 +7716,22 @@ upperPrismPolyST src/Shape.hs 106;" f upperPrismPolySU src/Shape.hs 112;" f upperPrismPolyTS src/Shape.hs 118;" f upperRounded src/Shape.hs 181;" f -upsProjectile src/Dodge/Projectile/Update.hs 53;" f -useAllAmmo src/Dodge/Item/Weapon/TriggerType.hs 342;" f -useAmmoAmount src/Dodge/Item/Weapon/TriggerType.hs 359;" f +upsProjectile src/Dodge/Projectile/Update.hs 52;" f +useAllAmmo src/Dodge/Item/Weapon/TriggerType.hs 341;" f +useAmmoAmount src/Dodge/Item/Weapon/TriggerType.hs 358;" f useAmmoParams src/Dodge/Item/Weapon/AmmoParams.hs 17;" f -useAmmoUpTo src/Dodge/Item/Weapon/TriggerType.hs 350;" f +useAmmoUpTo src/Dodge/Item/Weapon/TriggerType.hs 349;" f useC src/Dodge/Cuse.hs 6;" f useE src/Dodge/Euse.hs 24;" f -useEquipment src/Dodge/Creature/State.hs 219;" f +useEquipment src/Dodge/Creature/State.hs 218;" f useForceFieldGun src/Dodge/HeldUse.hs 527;" f useGasParams src/Dodge/HeldUse.hs 444;" f useHeld src/Dodge/HeldUse.hs 361;" 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 120;" f -useItemLeftClick src/Dodge/Creature/Impulse/UseItem.hs 103;" f -useItemRightClick src/Dodge/Creature/Impulse/UseItem.hs 23;" f +useItemHotkey src/Dodge/Creature/Impulse/UseItem.hs 122;" f +useItemLeftClick src/Dodge/Creature/Impulse/UseItem.hs 102;" f +useItemRightClick src/Dodge/Creature/Impulse/UseItem.hs 22;" f useL src/Dodge/Luse.hs 13;" f useLeftItem src/Dodge/Creature/Action/UseItem.hs 38;" f useLnkRoomPos src/Dodge/PlacementSpot.hs 244;" f @@ -7768,10 +7747,10 @@ useRoomPosRoomCond src/Dodge/PlacementSpot.hs 181;" f useShrinkGun src/Dodge/Luse.hs 59;" f useStopWatch src/Dodge/Luse.hs 24;" f useTargetPos src/Dodge/Item/Weapon/Targeting.hs 9;" f -useTimeCheck src/Dodge/Item/Weapon/TriggerType.hs 370;" f +useTimeCheck src/Dodge/Item/Weapon/TriggerType.hs 369;" f useTimeScrollGun src/Dodge/Luse.hs 32;" f useUnusedLnk src/Dodge/PlacementSpot.hs 169;" f -useUpdate src/Dodge/Creature/State.hs 211;" f +useUpdate src/Dodge/Creature/State.hs 210;" f usedRoomInLinkPoss src/Dodge/PlacementSpot.hs 196;" f usedRoomLinkPoss src/Dodge/PlacementSpot.hs 203;" f v2z src/Geometry/Vector3D.hs 93;" f @@ -7797,7 +7776,7 @@ verticalPipe src/Dodge/Placement/Instance/Pipe.hs 6;" f verticalWire src/Dodge/Wire.hs 24;" f viewBoundaries src/Dodge/Debug/Picture.hs 272;" f viewClipBounds src/Dodge/Debug/Picture.hs 281;" f -viewTarget src/Dodge/Creature/ReaderUpdate.hs 145;" f +viewTarget src/Dodge/Creature/ReaderUpdate.hs 144;" f violet src/Color.hs 21;" f visibleWalls src/Dodge/Base/Collide.hs 123;" f visionCheck src/Dodge/Creature/Perception.hs 152;" f @@ -7832,7 +7811,7 @@ wasdMovement src/Dodge/Creature/YourControl.hs 176;" f wasdTwist src/Dodge/Creature/YourControl.hs 155;" f wasdWithAiming src/Dodge/Creature/YourControl.hs 136;" f watchCombinations src/Dodge/Combine/Combinations.hs 13;" f -watchUpdateStrat src/Dodge/Creature/ReaderUpdate.hs 194;" f +watchUpdateStrat src/Dodge/Creature/ReaderUpdate.hs 177;" f wdth src/Dodge/Machine/Sensor.hs 54;" f wdth src/Dodge/Placements/Sensor.hs 53;" f wdth src/Dodge/Placements/Turret.hs 90;" f @@ -7841,7 +7820,6 @@ weaponBehindPillar src/Dodge/Room/Room.hs 177;" f weaponBetweenPillars src/Dodge/Room/Room.hs 193;" f weaponEmptyRoom src/Dodge/Room/Room.hs 139;" f weaponLongCorridor src/Dodge/Room/Room.hs 218;" f -weaponReloadSounds src/Dodge/Creature/State.hs 291;" f weaponRoom src/Dodge/Room/Room.hs 251;" f weaponUnderCrits src/Dodge/Room/Room.hs 156;" f wedgeGeom src/Dodge/Base.hs 47;" f @@ -7865,36 +7843,36 @@ windowxsize src/LoadConfig.hs 12;" f windowysize src/LoadConfig.hs 13;" f withAlpha src/Color.hs 10;" f withByteString src/Shader/Compile.hs 370;" f -withCrPos src/Dodge/Item/Weapon/TriggerType.hs 486;" f -withCrPosShift src/Dodge/Item/Weapon/TriggerType.hs 489;" f -withFlare src/Dodge/Item/Weapon/TriggerType.hs 453;" f -withItem src/Dodge/Item/Weapon/TriggerType.hs 426;" f -withItemUpdate src/Dodge/Item/Weapon/TriggerType.hs 435;" f -withItemUpdateFirst src/Dodge/Item/Weapon/TriggerType.hs 430;" f -withMuzFlare src/Dodge/Item/Weapon/TriggerType.hs 465;" f -withOldDir src/Dodge/Item/Weapon/TriggerType.hs 503;" f -withPosDirWallCheck src/Dodge/Item/Weapon/TriggerType.hs 543;" f -withPositionOffset src/Dodge/Item/Weapon/TriggerType.hs 527;" f -withPositionWallCheck src/Dodge/Item/Weapon/TriggerType.hs 534;" f -withRandomDirI src/Dodge/Item/Weapon/TriggerType.hs 495;" f -withRandomItem src/Dodge/Item/Weapon/TriggerType.hs 522;" f -withRandomItemParams src/Dodge/Item/Weapon/TriggerType.hs 517;" f -withRandomItemUpdate src/Dodge/Item/Weapon/TriggerType.hs 510;" f -withRandomOffset src/Dodge/Item/Weapon/TriggerType.hs 553;" f -withRecoil src/Dodge/Item/Weapon/TriggerType.hs 300;" f -withSidePushAfterI src/Dodge/Item/Weapon/TriggerType.hs 329;" f -withSidePushI src/Dodge/Item/Weapon/TriggerType.hs 310;" f -withSmoke src/Dodge/Item/Weapon/TriggerType.hs 115;" f -withSoundContinue src/Dodge/Item/Weapon/TriggerType.hs 253;" f -withSoundForI src/Dodge/Item/Weapon/TriggerType.hs 266;" f -withSoundForVol src/Dodge/Item/Weapon/TriggerType.hs 279;" f -withSoundItemChoiceStart src/Dodge/Item/Weapon/TriggerType.hs 224;" f -withSoundStart src/Dodge/Item/Weapon/TriggerType.hs 240;" f -withTempLight src/Dodge/Item/Weapon/TriggerType.hs 440;" f -withThickSmokeI src/Dodge/Item/Weapon/TriggerType.hs 133;" f -withThinSmokeI src/Dodge/Item/Weapon/TriggerType.hs 124;" f -withTorqueAfter src/Dodge/Item/Weapon/TriggerType.hs 610;" f -withWarmUp src/Dodge/Item/Weapon/TriggerType.hs 204;" f +withCrPos src/Dodge/Item/Weapon/TriggerType.hs 485;" f +withCrPosShift src/Dodge/Item/Weapon/TriggerType.hs 488;" f +withFlare src/Dodge/Item/Weapon/TriggerType.hs 452;" f +withItem src/Dodge/Item/Weapon/TriggerType.hs 425;" f +withItemUpdate src/Dodge/Item/Weapon/TriggerType.hs 434;" f +withItemUpdateFirst src/Dodge/Item/Weapon/TriggerType.hs 429;" f +withMuzFlare src/Dodge/Item/Weapon/TriggerType.hs 464;" f +withOldDir src/Dodge/Item/Weapon/TriggerType.hs 502;" f +withPosDirWallCheck src/Dodge/Item/Weapon/TriggerType.hs 542;" f +withPositionOffset src/Dodge/Item/Weapon/TriggerType.hs 526;" f +withPositionWallCheck src/Dodge/Item/Weapon/TriggerType.hs 533;" f +withRandomDirI src/Dodge/Item/Weapon/TriggerType.hs 494;" f +withRandomItem src/Dodge/Item/Weapon/TriggerType.hs 521;" f +withRandomItemParams src/Dodge/Item/Weapon/TriggerType.hs 516;" f +withRandomItemUpdate src/Dodge/Item/Weapon/TriggerType.hs 509;" f +withRandomOffset src/Dodge/Item/Weapon/TriggerType.hs 552;" f +withRecoil src/Dodge/Item/Weapon/TriggerType.hs 299;" f +withSidePushAfterI src/Dodge/Item/Weapon/TriggerType.hs 328;" f +withSidePushI src/Dodge/Item/Weapon/TriggerType.hs 309;" f +withSmoke src/Dodge/Item/Weapon/TriggerType.hs 114;" f +withSoundContinue src/Dodge/Item/Weapon/TriggerType.hs 252;" f +withSoundForI src/Dodge/Item/Weapon/TriggerType.hs 265;" f +withSoundForVol src/Dodge/Item/Weapon/TriggerType.hs 278;" f +withSoundItemChoiceStart src/Dodge/Item/Weapon/TriggerType.hs 223;" f +withSoundStart src/Dodge/Item/Weapon/TriggerType.hs 239;" f +withTempLight src/Dodge/Item/Weapon/TriggerType.hs 439;" f +withThickSmokeI src/Dodge/Item/Weapon/TriggerType.hs 132;" f +withThinSmokeI src/Dodge/Item/Weapon/TriggerType.hs 123;" f +withTorqueAfter src/Dodge/Item/Weapon/TriggerType.hs 609;" f +withWarmUp src/Dodge/Item/Weapon/TriggerType.hs 203;" f wlDustAt src/Dodge/Wall/Dust.hs 10;" f wlIXsNearCirc src/Dodge/Zoning/Wall.hs 32;" f wlIXsNearPoint src/Dodge/Zoning/Wall.hs 22;" f