From e88b3c7443deefbfaa1a041ed5c00cc455b4660c Mon Sep 17 00:00:00 2001 From: justin Date: Thu, 3 Oct 2024 10:25:08 +0100 Subject: [PATCH] Cleanup --- ghcidOutput | 2 +- src/Dodge/Item/Grammar.hs | 10 +- tags | 283 +++++++++++++++++++------------------- 3 files changed, 144 insertions(+), 151 deletions(-) diff --git a/ghcidOutput b/ghcidOutput index 379a2bff0..e7585d26d 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1 +1 @@ -All good (602 modules, at 10:15:11) +All good (602 modules, at 10:25:01) diff --git a/src/Dodge/Item/Grammar.hs b/src/Dodge/Item/Grammar.hs index 1bd9aebdb..9cbcce928 100644 --- a/src/Dodge/Item/Grammar.hs +++ b/src/Dodge/Item/Grammar.hs @@ -162,18 +162,12 @@ invIndentIM = -- returns an intmap with trees for all root items invTrees :: IM.IntMap Item -> IM.IntMap (LabelDoubleTree ComposeLinkType Item) -invTrees = IM.unions . map (ldtToIM getindex . fmap (^. _1)) . map (bimap _iatType (\(x, y, _) -> (x, y))) . invLDT - where - getindex :: Item -> Int - getindex i = - fromMaybe (error "in invTrees try to get non-inventory item tree") $ - i ^? itLocation . ilInvID +invTrees = fmap (first _iatType) . invTrees' -- returns an intmap with trees for all root items invTrees' :: IM.IntMap Item -> IM.IntMap (LabelDoubleTree ItemLink Item) -invTrees' = IM.unions . map (ldtToIM getindex . fmap (^. _1)) . map (bimap id (\(x, y, _) -> (x, y))) . invLDT +invTrees' = IM.unions . map (ldtToIM getindex . fmap (^. _1)) . map (fmap (\(x, y, _) -> (x, y))) . invLDT where - getindex :: Item -> Int getindex i = fromMaybe (error "in invTrees try to get non-inventory item tree") $ i ^? itLocation . ilInvID diff --git a/tags b/tags index be5ca7a33..0cee2d811 100644 --- a/tags +++ b/tags @@ -23,9 +23,9 @@ AIUNIT src/Dodge/Data/Item/Combine.hs 52;" C AMMOMAG src/Dodge/Data/Item/Combine.hs 22;" C AMR src/Dodge/Data/Item/Combine.hs 146;" C ANTIMATTER src/Dodge/Data/Item/Combine.hs 46;" C -APItEffect src/Dodge/Data/Item/Use.hs 82;" C -APLinkProjectile src/Dodge/Data/Item/Use.hs 80;" C -APNothing src/Dodge/Data/Item/Use.hs 84;" C +APItEffect src/Dodge/Data/Item/Use.hs 78;" C +APLinkProjectile src/Dodge/Data/Item/Use.hs 76;" C +APNothing src/Dodge/Data/Item/Use.hs 80;" C AQUAMARINE src/Color/Data.hs 24;" C ATTACH src/Dodge/Data/Item/Combine.hs 21;" C AUGMENTEDHUD src/Dodge/Data/Item/Combine.hs 83;" C @@ -44,9 +44,9 @@ Add src/Dodge/Inventory/Add.hs 1;" m AddGoal src/Dodge/Data/ActionPlan.hs 45;" C AesonHelp src/AesonHelp.hs 1;" m AimAt src/Dodge/Data/ActionPlan.hs 84;" C -AimParams src/Dodge/Data/Item/Use.hs 126;" t +AimParams src/Dodge/Data/Item/Use.hs 122;" t AimParams src/Dodge/Default/Item/Use/AimParams.hs 1;" m -AimStance src/Dodge/Data/Item/Use.hs 181;" t +AimStance src/Dodge/Data/Item/Use.hs 177;" t Aiming src/Dodge/Data/Creature/Stance.hs 39;" C AirFiltrationSS src/Dodge/Data/Scenario.hs 95;" C Airlock src/Dodge/Room/Airlock.hs 4;" m @@ -62,7 +62,7 @@ AmmoMagSF src/Dodge/Data/ComposedItem.hs 33;" C AmmoMagType src/Dodge/Data/Item/Combine.hs 86;" t AmmoModLink src/Dodge/Data/ComposedItem.hs 18;" C AmmoModifierSF src/Dodge/Data/ComposedItem.hs 36;" C -AmmoParams src/Dodge/Data/Item/Use.hs 120;" t +AmmoParams src/Dodge/Data/Item/Use.hs 116;" t AmmoPayloadLink src/Dodge/Data/ComposedItem.hs 20;" C AmmoPayloadSF src/Dodge/Data/ComposedItem.hs 38;" C AmmoTargetingLink src/Dodge/Data/ComposedItem.hs 19;" C @@ -92,7 +92,7 @@ AsteroidStrike src/Dodge/Data/Scenario.hs 33;" C AtEase src/Dodge/Data/Creature/Stance.hs 40;" C AtomicWaste src/Dodge/Data/Scenario.hs 26;" C Attach src/Dodge/Item/Attach.hs 1;" m -AttachParams src/Dodge/Data/Item/Use.hs 79;" t +AttachParams src/Dodge/Data/Item/Use.hs 75;" t AttachType src/Dodge/Data/Item/Combine.hs 78;" t Attention src/Dodge/Data/Creature/Perception.hs 60;" t AttentiveTo src/Dodge/Data/Creature/Perception.hs 61;" C @@ -103,7 +103,7 @@ AutoAI src/Dodge/Data/Creature/Misc.hs 57;" C AutoCrit src/Dodge/Creature/AutoCrit.hs 1;" m AutoDoorObstacle src/Dodge/Data/PathGraph.hs 51;" C AutoRecharging src/Dodge/Data/Item/Use/Consumption.hs 27;" C -AutoTrigger src/Dodge/Data/Item/Use.hs 76;" C +AutoTrigger src/Dodge/Data/Item/Use.hs 72;" C AuxAddition src/Shader/AuxAddition.hs 1;" m Awareness src/Dodge/Data/Creature/Perception.hs 65;" t Awareness src/Dodge/Creature/Picture/Awareness.hs 1;" m @@ -151,7 +151,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 101;" C +BeamShooterParams src/Dodge/Data/Item/Use.hs 97;" 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 @@ -223,10 +223,10 @@ BulletMod src/Dodge/Data/Item/BulletMod.hs 3;" m BulletModEffect src/Dodge/Data/Item/BulletMod.hs 13;" C BulletModPayload src/Dodge/Data/Item/BulletMod.hs 12;" C BulletModTrajectory src/Dodge/Data/Item/BulletMod.hs 11;" C -BulletModUse src/Dodge/Data/Item/Use.hs 71;" C -BulletParams src/Dodge/Data/Item/Use.hs 121;" C +BulletModUse src/Dodge/Data/Item/Use.hs 67;" C +BulletParams src/Dodge/Data/Item/Use.hs 117;" C BulletPayload src/Dodge/Data/Bullet.hs 42;" t -BulletShooterParams src/Dodge/Data/Item/Use.hs 105;" C +BulletShooterParams src/Dodge/Data/Item/Use.hs 101;" C BulletTrajectory src/Dodge/Data/Bullet.hs 50;" t BulletTrajectoryType src/Dodge/Data/Bullet.hs 57;" t Button src/Dodge/Data/Button.hs 48;" t @@ -406,7 +406,7 @@ Cr_awareness src/Dodge/Data/Config.hs 72;" C Cr_status src/Dodge/Data/Config.hs 71;" C CraftClust src/Dodge/Combine/Graph.hs 16;" C CraftType src/Dodge/Data/Item/Combine.hs 27;" t -CraftUse src/Dodge/Data/Item/Use.hs 57;" C +CraftUse src/Dodge/Data/Item/Use.hs 54;" C Craftable src/Dodge/Item/Craftable.hs 1;" m Create src/Dodge/Projectile/Create.hs 1;" m Create src/Dodge/Prop/Create.hs 1;" m @@ -493,9 +493,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 138;" C +DefaultFlareType src/Dodge/Data/Item/Use.hs 134;" C DefaultForceField src/Dodge/Data/Item/Use/Consumption/Ammo.hs 48;" C -DefaultHeldParams src/Dodge/Data/Item/Use.hs 88;" C +DefaultHeldParams src/Dodge/Data/Item/Use.hs 84;" 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 @@ -645,7 +645,6 @@ 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 EquipSite src/Dodge/Data/Equipment/Misc.hs 11;" t -EquipUse src/Dodge/Data/Item/Use.hs 53;" C Equipment src/Dodge/Data/Item/Use/Equipment.hs 5;" m Equipment src/Dodge/Default/Item/Use/Equipment.hs 1;" m Equipment src/Dodge/Equipment.hs 1;" m @@ -702,7 +701,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 137;" t +FlareType src/Dodge/Data/Item/Use.hs 133;" t Flash src/Dodge/WorldEvent/Flash.hs 11;" m FlashBall src/Dodge/Data/Bullet.hs 33;" C FlatFaces src/Shape/Data.hs 17;" C @@ -765,8 +764,8 @@ GasAmmo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 45;" C GasCloud src/Dodge/Data/Cloud.hs 31;" C GasCreate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 54;" t GasFuel src/Dodge/Data/Item/Use/Consumption/Ammo.hs 51;" t -GasParams src/Dodge/Data/Item/Use.hs 123;" C -GasSprayParams src/Dodge/Data/Item/Use.hs 89;" C +GasParams src/Dodge/Data/Item/Use.hs 119;" C +GasSprayParams src/Dodge/Data/Item/Use.hs 85;" C GenCr src/Dodge/Data/Creature/State.hs 31;" C GenFloat src/Dodge/Data/GenFloat.hs 11;" t GenFloat src/Dodge/Data/GenFloat.hs 5;" m @@ -824,18 +823,18 @@ 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 76;" C +HammerTrigger src/Dodge/Data/Item/Use.hs 72;" 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 141;" C +HeavySmokeFlare src/Dodge/Data/Item/Use.hs 137;" C Held src/Dodge/Item/Held.hs 1;" m HeldDelay src/Dodge/Data/Item/HeldDelay.hs 6;" m HeldItemType src/Dodge/Data/Item/Combine.hs 130;" t HeldOffset src/Dodge/Item/HeldOffset.hs 1;" m -HeldParams src/Dodge/Data/Item/Use.hs 87;" t +HeldParams src/Dodge/Data/Item/Use.hs 83;" t HeldScroll src/Dodge/HeldScroll.hs 1;" m HeldUse src/Dodge/Data/Item/HeldUse.hs 6;" m HeldUse src/Dodge/HeldUse.hs 3;" m @@ -936,7 +935,7 @@ ItEffect src/Dodge/Data/Item/Effect.hs 12;" t ItEffect src/Dodge/ItEffect.hs 1;" m ItID src/Dodge/Data/Item.hs 29;" t ItInvEffect src/Dodge/Data/Item/Effect.hs 19;" t -ItZoom src/Dodge/Data/Item/Use.hs 188;" t +ItZoom src/Dodge/Data/Item/Use.hs 184;" t Item src/Dodge/Data/Item.hs 31;" t Item src/Dodge/Data/Item.hs 4;" m Item src/Dodge/Default/Item.hs 1;" m @@ -1003,7 +1002,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 142;" C +LasGunFlare src/Dodge/Data/Item/Use.hs 138;" C LasSound src/Dodge/Data/SoundOrigin.hs 26;" C LasTurret src/Dodge/Room/LasTurret.hs 1;" m Laser src/Dodge/Data/Laser.hs 30;" t @@ -1165,7 +1164,7 @@ Metapysics src/Dodge/Data/Scenario.hs 17;" t Military src/Dodge/Data/Scenario.hs 45;" C Mine src/Dodge/Data/Scenario.hs 64;" C MiniGunAI src/Dodge/Data/Creature/Misc.hs 59;" C -MiniGunFlare src/Dodge/Data/Item/Use.hs 140;" C +MiniGunFlare src/Dodge/Data/Item/Use.hs 136;" 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 @@ -1194,17 +1193,17 @@ 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 162;" t -MuzzleDetector src/Dodge/Data/Item/Use.hs 159;" C -MuzzleEffect src/Dodge/Data/Item/Use.hs 146;" t +Muzzle src/Dodge/Data/Item/Use.hs 158;" t +MuzzleDetector src/Dodge/Data/Item/Use.hs 155;" C +MuzzleEffect src/Dodge/Data/Item/Use.hs 142;" t MuzzleEffect src/Dodge/Data/MuzzleEffect.hs 5;" m -MuzzleLaser src/Dodge/Data/Item/Use.hs 148;" C -MuzzleLauncher src/Dodge/Data/Item/Use.hs 151;" C -MuzzleNozzle src/Dodge/Data/Item/Use.hs 152;" C -MuzzleShatter src/Dodge/Data/Item/Use.hs 158;" C -MuzzleShootBullet src/Dodge/Data/Item/Use.hs 147;" C -MuzzleTesla src/Dodge/Data/Item/Use.hs 149;" C -MuzzleTractor src/Dodge/Data/Item/Use.hs 150;" C +MuzzleLaser src/Dodge/Data/Item/Use.hs 144;" C +MuzzleLauncher src/Dodge/Data/Item/Use.hs 147;" C +MuzzleNozzle src/Dodge/Data/Item/Use.hs 148;" C +MuzzleShatter src/Dodge/Data/Item/Use.hs 154;" C +MuzzleShootBullet src/Dodge/Data/Item/Use.hs 143;" C +MuzzleTesla src/Dodge/Data/Item/Use.hs 145;" C +MuzzleTractor src/Dodge/Data/Item/Use.hs 146;" C MvForward src/Dodge/Data/ActionPlan.hs 35;" C MvTurnToward src/Dodge/Data/ActionPlan.hs 34;" C MvWalking src/Dodge/Data/Creature/Misc.hs 39;" C @@ -1319,7 +1318,7 @@ OnSpecial src/Dodge/Data/Equipment/Misc.hs 27;" C OnTurret src/Dodge/Data/Item/Location.hs 35;" C OnceSound src/Dodge/Data/SoundOrigin.hs 15;" C OneArgument src/Dodge/Data/Terminal.hs 94;" C -OneHand src/Dodge/Data/Item/Use.hs 185;" C +OneHand src/Dodge/Data/Item/Use.hs 181;" C OnwardCluster src/Dodge/Data/RoomCluster.hs 14;" C OnwardList src/Dodge/Annotation/Data.hs 15;" C Opacity src/Dodge/Data/Wall.hs 38;" t @@ -1398,7 +1397,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 139;" C +PistolFlare src/Dodge/Data/Item/Use.hs 135;" C PlaceSpot src/Dodge/Placement/PlaceSpot.hs 4;" m Placement src/Dodge/Data/GenWorld.hs 77;" t Placement src/Dodge/Placement.hs 1;" m @@ -1451,7 +1450,7 @@ Projectile src/Dodge/Projectile.hs 1;" m ProjectileAmmo src/Dodge/Data/Item/Use/Consumption/Ammo.hs 40;" C ProjectileDraw src/Dodge/Data/Item/Use/Consumption/Ammo.hs 20;" t ProjectileHoming src/Dodge/Data/Item/Use/Consumption/Ammo.hs 23;" t -ProjectileParams src/Dodge/Data/Item/Use.hs 122;" C +ProjectileParams src/Dodge/Data/Item/Use.hs 118;" C ProjectileUpdate src/Dodge/Data/Item/Use/Consumption/Ammo.hs 29;" t Prop src/Dodge/Data/Prop.hs 18;" t Prop src/Dodge/Data/Prop.hs 6;" m @@ -1643,7 +1642,7 @@ ScodeToChar src/Dodge/ScodeToChar.hs 1;" m Scope src/Dodge/Data/Item/Scope.hs 13;" t Scope src/Dodge/Data/Item/Scope.hs 6;" m Scope src/Dodge/Item/Scope.hs 1;" m -ScopeUse src/Dodge/Data/Item/Use.hs 65;" C +ScopeUse src/Dodge/Data/Item/Use.hs 61;" C ScreenLayer src/Dodge/Data/Universe.hs 77;" t ScreenLayer src/Dodge/Update/Input/ScreenLayer.hs 1;" m ScreenPos src/Dodge/Data/ScreenPos.hs 9;" t @@ -1848,7 +1847,7 @@ TargetRBPress src/Dodge/Data/Item/Targeting.hs 13;" C Targeting src/Dodge/Data/Item/Targeting.hs 6;" m TargetingLaser src/Dodge/Data/Laser.hs 18;" C TargetingType src/Dodge/Data/Item/Targeting.hs 11;" t -TargetingUse src/Dodge/Data/Item/Use.hs 66;" C +TargetingUse src/Dodge/Data/Item/Use.hs 62;" C TeleSound src/Dodge/Data/SoundOrigin.hs 33;" C Teleport src/Dodge/Room/Teleport.hs 2;" m TempLightSource src/Dodge/Data/LightSource.hs 42;" t @@ -1894,7 +1893,7 @@ TeslaArc src/Dodge/Data/TeslaArc.hs 15;" t TeslaArc src/Dodge/Data/TeslaArc.hs 6;" m TeslaBall src/Dodge/Data/Bullet.hs 32;" C TeslaBeamCombine src/Dodge/Data/Beam.hs 41;" C -TeslaGunFlare src/Dodge/Data/Item/Use.hs 143;" C +TeslaGunFlare src/Dodge/Data/Item/Use.hs 139;" C Test src/Dodge/Creature/Test.hs 8;" m Test src/Dodge/Event/Test.hs 1;" m Test src/Picture/Test.hs 1;" m @@ -1952,7 +1951,7 @@ TreeHelp src/TreeHelp.hs 12;" m Triangulate src/Geometry/Triangulate.hs 3;" m Trie src/SimpleTrie.hs 8;" t TriggerDoor src/Dodge/Placement/PlaceSpot/TriggerDoor.hs 1;" m -TriggerType src/Dodge/Data/Item/Use.hs 76;" t +TriggerType src/Dodge/Data/Item/Use.hs 72;" t TriggerType src/Dodge/Item/Weapon/TriggerType.hs 6;" m TurbineBaySS src/Dodge/Data/Scenario.hs 110;" C Turn src/Dodge/Data/ActionPlan.hs 30;" C @@ -1965,9 +1964,9 @@ Turret src/Dodge/Data/Machine.hs 57;" t Turret src/Dodge/Placement/Instance/Turret.hs 1;" m TurretInt src/Dodge/Data/Item/Location.hs 20;" t TwistGoal src/Dodge/Data/Scenario.hs 15;" C -TwoHandFlat src/Dodge/Data/Item/Use.hs 184;" C -TwoHandOver src/Dodge/Data/Item/Use.hs 183;" C -TwoHandUnder src/Dodge/Data/Item/Use.hs 182;" C +TwoHandFlat src/Dodge/Data/Item/Use.hs 180;" C +TwoHandOver src/Dodge/Data/Item/Use.hs 179;" C +TwoHandUnder src/Dodge/Data/Item/Use.hs 178;" C Type src/Dodge/Data/Damage/Type.hs 6;" m Typical src/Shape/Data.hs 36;" C UncomposableIsolateSF src/Dodge/Data/ComposedItem.hs 35;" C @@ -2000,10 +1999,11 @@ Update src/Preload/Update.hs 3;" m Use src/Dodge/Data/Item/Use.hs 6;" m Use src/Dodge/Default/Item/Use.hs 1;" m UseAheadPos src/Dodge/Data/ActionPlan.hs 160;" C -UseAmmoMag src/Dodge/Data/Item/Use.hs 60;" C -UseAttach src/Dodge/Data/Item/Use.hs 58;" C +UseAmmoMag src/Dodge/Data/Item/Use.hs 56;" C +UseAttach src/Dodge/Data/Item/Use.hs 55;" C UseConsume src/Dodge/Data/Item/Use.hs 52;" C UseDelay src/Dodge/Data/Item/HeldDelay.hs 13;" t +UseEquip src/Dodge/Data/Item/Use.hs 53;" C UseHeld src/Dodge/Data/Item/Use.hs 37;" C UseHotkey src/Dodge/Data/Item/Use.hs 45;" C UseItem src/Dodge/Data/ActionPlan.hs 37;" C @@ -2134,13 +2134,13 @@ Zoning src/Dodge/Zoning.hs 1;" m __Just' src/MaybeHelp.hs 13;" f _actAction src/Dodge/Data/ActionPlan.hs 81;" f _actLabel src/Dodge/Data/ActionPlan.hs 80;" f -_aimHandlePos src/Dodge/Data/Item/Use.hs 132;" f -_aimMuzzles src/Dodge/Data/Item/Use.hs 133;" f -_aimRange src/Dodge/Data/Item/Use.hs 129;" f -_aimStance src/Dodge/Data/Item/Use.hs 131;" f -_aimTurnSpeed src/Dodge/Data/Item/Use.hs 128;" f -_aimWeight src/Dodge/Data/Item/Use.hs 127;" f -_aimZoom src/Dodge/Data/Item/Use.hs 130;" f +_aimHandlePos src/Dodge/Data/Item/Use.hs 128;" f +_aimMuzzles src/Dodge/Data/Item/Use.hs 129;" f +_aimRange src/Dodge/Data/Item/Use.hs 125;" f +_aimStance src/Dodge/Data/Item/Use.hs 127;" f +_aimTurnSpeed src/Dodge/Data/Item/Use.hs 124;" f +_aimWeight src/Dodge/Data/Item/Use.hs 123;" f +_aimZoom src/Dodge/Data/Item/Use.hs 126;" 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 @@ -2151,18 +2151,18 @@ _allocOldPos src/Dodge/Data/RightButtonOptions.hs 37;" f _allocRemoveID src/Dodge/Data/RightButtonOptions.hs 34;" f _allocSwapID src/Dodge/Data/RightButtonOptions.hs 30;" f _alphaDivideShader src/Data/Preload/Render.hs 18;" f -_amagLoadStatus src/Dodge/Data/Item/Use.hs 61;" f -_amagParams src/Dodge/Data/Item/Use.hs 62;" f -_amagType src/Dodge/Data/Item/Use.hs 63;" f +_amagLoadStatus src/Dodge/Data/Item/Use.hs 57;" f +_amagParams src/Dodge/Data/Item/Use.hs 58;" f +_amagType src/Dodge/Data/Item/Use.hs 59;" f _ambushTarget src/Dodge/Data/ActionPlan.hs 178;" f -_ampBullet src/Dodge/Data/Item/Use.hs 121;" f -_ampCreateGas src/Dodge/Data/Item/Use.hs 123;" f -_ampPayload src/Dodge/Data/Item/Use.hs 122;" f +_ampBullet src/Dodge/Data/Item/Use.hs 117;" f +_ampCreateGas src/Dodge/Data/Item/Use.hs 119;" f +_ampPayload src/Dodge/Data/Item/Use.hs 118;" f _apAction src/Dodge/Data/ActionPlan.hs 20;" f _apGoal src/Dodge/Data/ActionPlan.hs 22;" f _apImpulse src/Dodge/Data/ActionPlan.hs 19;" f -_apItEffect src/Dodge/Data/Item/Use.hs 83;" f -_apLinkedProjectile src/Dodge/Data/Item/Use.hs 81;" f +_apItEffect src/Dodge/Data/Item/Use.hs 79;" f +_apLinkedProjectile src/Dodge/Data/Item/Use.hs 77;" f _apStrategy src/Dodge/Data/ActionPlan.hs 21;" f _arLoaded src/Dodge/Data/Item/Use/Consumption.hs 28;" f _arMax src/Dodge/Data/Item/Use/Consumption.hs 29;" f @@ -2232,7 +2232,7 @@ _buDamages src/Dodge/Data/Bullet.hs 28;" f _buDelayFraction src/Dodge/Data/Bullet.hs 18;" f _buDrag src/Dodge/Data/Bullet.hs 23;" f _buEffect src/Dodge/Data/Bullet.hs 19;" f -_buMod src/Dodge/Data/Item/Use.hs 72;" f +_buMod src/Dodge/Data/Item/Use.hs 68;" f _buOldPos src/Dodge/Data/Bullet.hs 25;" f _buPayload src/Dodge/Data/Bullet.hs 20;" f _buPos src/Dodge/Data/Bullet.hs 24;" f @@ -2240,9 +2240,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 95;" f -_bulGunSound src/Dodge/Data/Item/Use.hs 102;" f -_bulGunSound src/Dodge/Data/Item/Use.hs 112;" f +_bulGunSound src/Dodge/Data/Item/Use.hs 91;" f +_bulGunSound src/Dodge/Data/Item/Use.hs 98;" f +_bulGunSound src/Dodge/Data/Item/Use.hs 108;" f _bullets src/Dodge/Data/LWorld.hs 107;" f _buttons src/Dodge/Data/LWorld.hs 137;" f _cClock src/Dodge/Data/CWorld.hs 28;" f @@ -2477,8 +2477,6 @@ _energyBalls src/Dodge/Data/LWorld.hs 109;" f _eparamID src/Dodge/Data/Item/Use/Equipment.hs 30;" f _eparamInt src/Dodge/Data/Item/Use/Equipment.hs 31;" f _equipEffect src/Dodge/Data/Item/Use.hs 49;" f -_equipEffect src/Dodge/Data/Item/Use.hs 54;" f -_equipTargeting src/Dodge/Data/Item/Use.hs 55;" f _euseAmmoAmount src/Dodge/Data/Item/HeldUse.hs 41;" f _euseAmmoLink src/Dodge/Data/Item/HeldUse.hs 43;" f _euseAmmoMax src/Dodge/Data/Item/HeldUse.hs 42;" f @@ -2533,7 +2531,7 @@ _fullscreenShader src/Data/Preload/Render.hs 20;" f _futureWorlds src/Dodge/Data/World.hs 65;" f _futureWorlds src/Dodge/Data/World.hs 71;" f _gameplay_rotate_to_wall src/Dodge/Data/Config.hs 55;" f -_gasCreation src/Dodge/Data/Item/Use.hs 90;" f +_gasCreation src/Dodge/Data/Item/Use.hs 86;" f _genPlacements src/Dodge/Data/GenWorld.hs 26;" f _genRooms src/Dodge/Data/GenWorld.hs 27;" f _getAttentiveTo src/Dodge/Data/Creature/Perception.hs 61;" f @@ -2627,9 +2625,9 @@ _itParams src/Dodge/Data/Item.hs 40;" f _itType src/Dodge/Data/Item.hs 33;" f _itUse src/Dodge/Data/Item.hs 32;" f _itemLocations src/Dodge/Data/LWorld.hs 101;" f -_izFac src/Dodge/Data/Item/Use.hs 191;" f -_izMax src/Dodge/Data/Item/Use.hs 189;" f -_izMin src/Dodge/Data/Item/Use.hs 190;" f +_izFac src/Dodge/Data/Item/Use.hs 187;" f +_izMax src/Dodge/Data/Item/Use.hs 185;" f +_izMin src/Dodge/Data/Item/Use.hs 186;" f _killTarget src/Dodge/Data/ActionPlan.hs 198;" f _lClock src/Dodge/Data/LWorld.hs 146;" f _lTestInt src/Dodge/Data/LWorld.hs 148;" f @@ -2742,18 +2740,18 @@ _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 106;" f +_muzVel src/Dodge/Data/Item/Use.hs 102;" 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 97;" 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 166;" f -_mzEffect src/Dodge/Data/Item/Use.hs 168;" f -_mzFlareType src/Dodge/Data/Item/Use.hs 167;" f -_mzInaccuracy src/Dodge/Data/Item/Use.hs 165;" f -_mzPos src/Dodge/Data/Item/Use.hs 163;" f -_mzRot src/Dodge/Data/Item/Use.hs 164;" f +_mzAmmoSlot src/Dodge/Data/Item/Use.hs 162;" f +_mzEffect src/Dodge/Data/Item/Use.hs 164;" f +_mzFlareType src/Dodge/Data/Item/Use.hs 163;" f +_mzInaccuracy src/Dodge/Data/Item/Use.hs 161;" f +_mzPos src/Dodge/Data/Item/Use.hs 159;" f +_mzRot src/Dodge/Data/Item/Use.hs 160;" f _newArcStep src/Dodge/Data/Item/Params.hs 25;" f _nodeMetaTree src/Dodge/Tree/Compose/Data.hs 9;" f _nodeTree src/Dodge/Tree/Compose/Data.hs 9;" f @@ -2761,10 +2759,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 155;" f -_nzMaxWalkAngle src/Dodge/Data/Item/Use.hs 154;" f -_nzPressure src/Dodge/Data/Item/Use.hs 153;" f -_nzWalkSpeed src/Dodge/Data/Item/Use.hs 156;" f +_nzCurrentWalkAngle src/Dodge/Data/Item/Use.hs 151;" f +_nzMaxWalkAngle src/Dodge/Data/Item/Use.hs 150;" f +_nzPressure src/Dodge/Data/Item/Use.hs 149;" f +_nzWalkSpeed src/Dodge/Data/Item/Use.hs 152;" 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 @@ -2891,8 +2889,8 @@ _pyFaces src/Polyhedra/Data.hs 14;" f _radarBlips src/Dodge/Data/LWorld.hs 113;" f _radarSweeps src/Dodge/Data/LWorld.hs 108;" f _randGen src/Dodge/Data/World.hs 41;" f -_randomOffset src/Dodge/Data/Item/Use.hs 93;" f -_randomOffset src/Dodge/Data/Item/Use.hs 110;" f +_randomOffset src/Dodge/Data/Item/Use.hs 89;" f +_randomOffset src/Dodge/Data/Item/Use.hs 106;" f _rateMax src/Dodge/Data/Item/HeldDelay.hs 16;" f _rateTime src/Dodge/Data/Item/HeldDelay.hs 17;" f _rbColor src/Dodge/Data/RadarBlip.hs 15;" f @@ -2902,13 +2900,13 @@ _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 91;" f -_recoil src/Dodge/Data/Item/Use.hs 108;" f +_recoil src/Dodge/Data/Item/Use.hs 87;" f +_recoil src/Dodge/Data/Item/Use.hs 104;" f _renderData src/Data/Preload.hs 11;" f _reverseAmount src/Dodge/Data/World.hs 64;" f _reverseAmount src/Dodge/Data/World.hs 70;" f _reverseAmount src/Dodge/Data/World.hs 74;" f -_rifling src/Dodge/Data/Item/Use.hs 107;" f +_rifling src/Dodge/Data/Item/Use.hs 103;" 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 @@ -2962,7 +2960,7 @@ _scOptions src/Dodge/Data/Universe.hs 80;" f _scPositionedMenuOption src/Dodge/Data/Universe.hs 82;" f _scSelectionList src/Dodge/Data/Universe.hs 84;" f _scTitle src/Dodge/Data/Universe.hs 79;" f -_scopeScope src/Dodge/Data/Item/Use.hs 65;" f +_scopeScope src/Dodge/Data/Item/Use.hs 61;" f _screenTextureVAO src/Data/Preload/Render.hs 50;" f _scrollAmount src/Dodge/Data/Input.hs 24;" f _scrollItemID src/Dodge/Data/World.hs 66;" f @@ -3013,8 +3011,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 94;" f -_sidePush src/Dodge/Data/Item/Use.hs 111;" f +_sidePush src/Dodge/Data/Item/Use.hs 90;" f +_sidePush src/Dodge/Data/Item/Use.hs 107;" 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 @@ -3092,9 +3090,9 @@ _teslaArcs src/Dodge/Data/LWorld.hs 117;" f _testFloat src/Dodge/Data/World.hs 45;" f _textInput src/Dodge/Data/Input.hs 30;" f _textureObject src/Shader/Data.hs 95;" f -_tgActive src/Dodge/Data/Item/Use.hs 69;" f -_tgID src/Dodge/Data/Item/Use.hs 68;" f -_tgPos src/Dodge/Data/Item/Use.hs 67;" f +_tgActive src/Dodge/Data/Item/Use.hs 65;" f +_tgID src/Dodge/Data/Item/Use.hs 64;" f +_tgPos src/Dodge/Data/Item/Use.hs 63;" f _tiFocus src/Dodge/Data/Terminal.hs 21;" f _tiSel src/Dodge/Data/Terminal.hs 22;" f _tiText src/Dodge/Data/Terminal.hs 20;" f @@ -3139,8 +3137,8 @@ _toPlaySoundVolume src/Sound/Data.hs 43;" f _toPlaySoundVolumeFraction src/Sound/Data.hs 44;" f _toPlaySounds src/Dodge/Data/World.hs 42;" f _topBoxSize src/Shape/Data.hs 17;" f -_torqueAfter src/Dodge/Data/Item/Use.hs 92;" f -_torqueAfter src/Dodge/Data/Item/Use.hs 109;" f +_torqueAfter src/Dodge/Data/Item/Use.hs 88;" f +_torqueAfter src/Dodge/Data/Item/Use.hs 105;" f _tractorBeams src/Dodge/Data/LWorld.hs 122;" f _trieChildren src/SimpleTrie.hs 10;" f _trieMVal src/SimpleTrie.hs 9;" f @@ -3154,7 +3152,8 @@ _tuFireTime src/Dodge/Data/Machine.hs 60;" f _tuTurnSpeed src/Dodge/Data/Machine.hs 59;" f _tuWeapon src/Dodge/Data/Machine.hs 58;" f _turnToPoint src/Dodge/Data/ActionPlan.hs 92;" f -_uaParams src/Dodge/Data/Item/Use.hs 59;" f +_uaParams src/Dodge/Data/Item/Use.hs 55;" f +_uequipEffect src/Dodge/Data/Item/Use.hs 53;" f _unCombEdge src/Dodge/Combine/Graph.hs 28;" f _unCombNode src/Dodge/Combine/Graph.hs 21;" f _unFBO src/Shader/Data.hs 57;" f @@ -3219,10 +3218,10 @@ _walls src/Dodge/Data/LWorld.hs 123;" f _warmMax src/Dodge/Data/Item/HeldDelay.hs 27;" f _warmSound src/Dodge/Data/Item/HeldDelay.hs 28;" f _warmTime src/Dodge/Data/Item/HeldDelay.hs 26;" f -_weaponInvLock src/Dodge/Data/Item/Use.hs 98;" f -_weaponInvLock src/Dodge/Data/Item/Use.hs 115;" f -_weaponRepeat src/Dodge/Data/Item/Use.hs 99;" f -_weaponRepeat src/Dodge/Data/Item/Use.hs 116;" f +_weaponInvLock src/Dodge/Data/Item/Use.hs 94;" f +_weaponInvLock src/Dodge/Data/Item/Use.hs 111;" f +_weaponRepeat src/Dodge/Data/Item/Use.hs 95;" f +_weaponRepeat src/Dodge/Data/Item/Use.hs 112;" f _windowPosX src/Dodge/Data/Config.hs 53;" f _windowPosY src/Dodge/Data/Config.hs 54;" f _windowShader src/Data/Preload/Render.hs 19;" f @@ -3314,7 +3313,7 @@ advanceSmoothScroll src/Dodge/SmoothScroll.hs 29;" f advanceStepCounter src/Dodge/Creature/Impulse/Movement.hs 45;" f aimDelaySweep src/Dodge/Render/ShapePicture.hs 50;" f aimStanceInfo src/Dodge/Item/Info.hs 214;" f -aimTurn src/Dodge/Creature/YourControl.hs 189;" f +aimTurn src/Dodge/Creature/YourControl.hs 143;" f aimingMuzzleLength src/Dodge/Creature/HandPos.hs 46;" f aimingMuzzlePos src/Dodge/Creature/HandPos.hs 41;" f aimingWeaponHandlePos src/Dodge/Creature/HandPos.hs 28;" f @@ -3327,7 +3326,7 @@ airlockDoor src/Dodge/Room/Airlock.hs 51;" f airlockDoubleDoor src/Dodge/Room/Airlock.hs 54;" f airlockSimple src/Dodge/Room/Airlock.hs 66;" f airlockZ src/Dodge/Room/Airlock.hs 91;" f -allHotkeys src/Dodge/Creature/YourControl.hs 52;" f +allHotkeys src/Dodge/Creature/YourControl.hs 51;" f allVisibleWalls src/Dodge/Base/Collide.hs 131;" f alongSegBy src/Geometry.hs 43;" f ammoMagSPic src/Dodge/Item/Draw/SPic.hs 45;" f @@ -3351,7 +3350,7 @@ applyIndividualDamage' src/Dodge/Creature/Damage.hs 52;" f applyInvLock src/Dodge/HeldUse.hs 66;" f applyMagnetsToBul src/Dodge/Bullet.hs 46;" f applyNoDamage src/Dodge/Creature/Damage.hs 11;" f -applyPastDamages src/Dodge/Creature/State.hs 131;" f +applyPastDamages src/Dodge/Creature/State.hs 128;" f applyPiercingDamage src/Dodge/Creature/Damage.hs 57;" f applyPosition src/Sound.hs 110;" f applyRecoil src/Dodge/HeldUse.hs 85;" f @@ -3534,7 +3533,7 @@ centerVaultRoom src/Dodge/Room/Procedural.hs 288;" f centroid src/Geometry/Polygon.hs 113;" f centroidNum src/Geometry/Polygon.hs 116;" f chainCreatureUpdates src/Dodge/Creature/ChainUpdates.hs 6;" f -chainLinkOrientation src/Dodge/Creature/State.hs 186;" f +chainLinkOrientation src/Dodge/Creature/State.hs 183;" f chainPairs src/Geometry.hs 363;" f changeSwapClose src/Dodge/Inventory.hs 230;" f changeSwapInv src/Dodge/Inventory.hs 246;" f @@ -3551,7 +3550,7 @@ 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 74;" f +checkDeath src/Dodge/Creature/State.hs 73;" f checkEndGame src/Dodge/Update.hs 584;" f checkErrorGL src/Shader/Compile.hs 255;" f checkFBO src/Framebuffer/Check.hs 6;" f @@ -3665,7 +3664,7 @@ copyItemToFloor src/Dodge/FloorItem.hs 17;" f copyItemToFloorID src/Dodge/FloorItem.hs 21;" f corDoor src/Dodge/Room/Room.hs 378;" f cornerList src/Preload/Render.hs 194;" f -corpseOrGib src/Dodge/Creature/State.hs 93;" f +corpseOrGib src/Dodge/Creature/State.hs 90;" f corridor src/Dodge/Room/Corridor.hs 17;" f corridorBoss src/Dodge/LockAndKey.hs 133;" f corridorN src/Dodge/Room/Corridor.hs 52;" f @@ -3866,7 +3865,7 @@ defaultFlIt src/Dodge/Default.hs 30;" f defaultForeground src/Dodge/Default/ForegroundShape.hs 5;" f defaultHUD src/Dodge/Default/World.hs 151;" f defaultHeldItem src/Dodge/Default/Item.hs 19;" f -defaultHeldUse src/Dodge/Default/Item/Use.hs 29;" f +defaultHeldUse src/Dodge/Default/Item/Use.hs 28;" f defaultImpulsive src/Dodge/Humanoid.hs 190;" f defaultInanimate src/Dodge/Default/Creature.hs 69;" f defaultInput src/Dodge/Default/World.hs 14;" f @@ -3972,7 +3971,7 @@ doCrImp src/Dodge/CreatureEffect.hs 28;" f doCrWdAc src/Dodge/CreatureEffect.hs 77;" f doCrWdImp src/Dodge/CreatureEffect.hs 16;" f doCrWdWd src/Dodge/CreatureEffect.hs 20;" f -doDamage src/Dodge/Creature/State.hs 125;" f +doDamage src/Dodge/Creature/State.hs 122;" f doDamagesFL src/Dodge/Flame.hs 58;" f doDeathToggle src/Dodge/WorldEffect.hs 95;" f doDeathTriggers src/Dodge/WorldEffect.hs 90;" f @@ -4146,7 +4145,7 @@ 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 119;" f +dropByState src/Dodge/Creature/State.hs 116;" f dropExcept src/Dodge/Creature/Action.hs 172;" f dropItem src/Dodge/Creature/Action.hs 177;" f drumMag src/Dodge/Item/Ammo.hs 36;" f @@ -4183,7 +4182,7 @@ equipPosition src/Dodge/Item/Draw.hs 31;" f equipSiteInfo src/Dodge/Item/Info.hs 224;" f equipSiteToPositions src/Dodge/Inventory/RBList.hs 77;" f equipSpeed src/Dodge/Creature/Impulse/Movement.hs 99;" f -equipmentEffects src/Dodge/Creature/State.hs 158;" f +equipmentEffects src/Dodge/Creature/State.hs 155;" f equipmentStrValue src/Dodge/Creature/Statistics.hs 22;" f errorAngleVV src/Geometry.hs 62;" f errorClosestPointOnLine src/Geometry.hs 74;" f @@ -4273,7 +4272,7 @@ floorItemSPic src/Dodge/Render/ShapePicture.hs 169;" f floorWire src/Dodge/Wire.hs 13;" f foamSprayFadeOutS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 398;" f foamSprayLoopS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 394;" f -foldCr src/Dodge/Creature/State.hs 43;" f +foldCr src/Dodge/Creature/State.hs 42;" f foldPairs src/ListHelp.hs 37;" f foldrWhileArb src/ListHelp.hs 110;" f followImpulse src/Dodge/Creature/Impulse.hs 37;" f @@ -4406,7 +4405,7 @@ haltSound src/Dodge/SoundLogic.hs 37;" f hammerCheck src/Dodge/Item/Weapon/TriggerType.hs 273;" f hammerCheckL src/Dodge/Item/Weapon/TriggerType.hs 284;" f handleEvent src/Dodge/Event.hs 27;" f -handleHotkeys src/Dodge/Creature/YourControl.hs 42;" f +handleHotkeys src/Dodge/Creature/YourControl.hs 41;" f handleKeyboardEvent src/Dodge/Event/Input.hs 22;" f handleMouseButtonEvent src/Dodge/Event/Input.hs 63;" f handleMouseMotionEvent src/Dodge/Event/Input.hs 47;" f @@ -4453,7 +4452,7 @@ holsterWeapon src/Dodge/Creature/Volition.hs 14;" f homingDrawType src/Dodge/Projectile/Create.hs 12;" f homingModule src/Dodge/Item/Scope.hs 28;" f horPipe src/Dodge/Placement/Instance/Pipe.hs 9;" f -hotkeyToScancode src/Dodge/Creature/YourControl.hs 55;" f +hotkeyToScancode src/Dodge/Creature/YourControl.hs 54;" f hotkeyToString src/Dodge/Inventory/SelectionList.hs 50;" f humanoidAIList src/Dodge/Humanoid.hs 181;" f hvBulletAmmo src/Dodge/Item/Weapon/Bullet.hs 31;" f @@ -4510,7 +4509,7 @@ insertWall src/Dodge/Placement/PlaceSpot/Block.hs 122;" f insertWallInZones src/Dodge/Wall/Zone.hs 20;" f insertWalls src/Dodge/Placement/PlaceSpot/Block.hs 117;" f insertWithNewKeys src/IntMapHelp.hs 72;" f -internalCreatureUpdate src/Dodge/Creature/State.hs 109;" f +internalCreatureUpdate src/Dodge/Creature/State.hs 106;" f interpWith src/Dodge/Creature/Boid.hs 10;" f intersectCircSeg src/Geometry/Intersect.hs 303;" f intersectCircSegFirst src/Geometry/Intersect.hs 314;" f @@ -4540,7 +4539,7 @@ invRootMap src/Dodge/Item/Grammar.hs 137;" f invSelectionItem src/Dodge/Inventory/SelectionList.hs 34;" f invSelectionItem' src/Dodge/Inventory/SelectionList.hs 16;" f invShiftPointBy src/Dodge/ShiftPoint.hs 8;" f -invSideEff src/Dodge/Creature/State.hs 163;" f +invSideEff src/Dodge/Creature/State.hs 160;" f invSize src/Dodge/Inventory/CheckSlots.hs 41;" f invTrees src/Dodge/Item/Grammar.hs 164;" f invTrees' src/Dodge/Item/Grammar.hs 173;" f @@ -4558,7 +4557,7 @@ isAmmoIntLink src/Dodge/HeldUse.hs 174;" 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 -isFrictionless src/Dodge/Creature/State.hs 326;" f +isFrictionless src/Dodge/Creature/State.hs 323;" f isGas src/Dodge/Euse.hs 64;" f isInLnk src/Dodge/PlacementSpot.hs 160;" f isJust' src/MaybeHelp.hs 29;" f @@ -4596,7 +4595,7 @@ itemFromHeldType src/Dodge/Item/Held.hs 25;" f itemFromLeftType src/Dodge/Item.hs 76;" f itemInfo src/Dodge/Item/Info.hs 12;" f itemInvColor src/Dodge/Item/InventoryColor.hs 9;" f -itemInvSideEffect src/Dodge/Creature/State.hs 227;" f +itemInvSideEffect src/Dodge/Creature/State.hs 224;" f itemNumberDisplay src/Dodge/Item/Display.hs 111;" f itemRooms src/Dodge/LockAndKey.hs 39;" f itemRotTreeSPic src/Dodge/Item/Draw/SPic.hs 27;" f @@ -4605,7 +4604,7 @@ itemString src/Dodge/Item/Display.hs 57;" f itemToBreakLists src/Dodge/Item/Grammar.hs 40;" f itemToFunction src/Dodge/Item/Grammar.hs 65;" f itemTreeSPic src/Dodge/Item/Draw/SPic.hs 22;" f -itemUpdate src/Dodge/Creature/State.hs 298;" f +itemUpdate src/Dodge/Creature/State.hs 295;" f itemUseEffect src/Dodge/Creature/Impulse/UseItem.hs 35;" f iterateUntil src/MonadHelp.hs 23;" f iterateWhile src/MonadHelp.hs 30;" f @@ -4908,7 +4907,7 @@ mntLight src/Dodge/Placement/Instance/LightSource.hs 154;" f mntLightLnkCond src/Dodge/Placement/Instance/LightSource.hs 159;" f modClock src/Dodge/Item/Weapon/TriggerType.hs 343;" f modTo src/Geometry/Zone.hs 10;" f -mouseActionsCr src/Dodge/Creature/YourControl.hs 197;" f +mouseActionsCr src/Dodge/Creature/YourControl.hs 153;" f mouseClickOptionsList src/Dodge/Update/Input/ScreenLayer.hs 58;" f mouseCursorType src/Dodge/Render/Picture.hs 74;" f mouseOverSelectionList src/Dodge/Update/Input/ScreenLayer.hs 73;" f @@ -5144,7 +5143,7 @@ pointerToItemLocation src/Dodge/Item/Location.hs 25;" f pointerYourRootItem src/Dodge/Item/Location.hs 42;" f pointerYourSelectedItem src/Dodge/Item/Location.hs 36;" f pointsToPoly src/Geometry/ConvexPoly.hs 39;" f -poisonSPic src/Dodge/Creature/State.hs 106;" f +poisonSPic src/Dodge/Creature/State.hs 103;" f poisonSprayer src/Dodge/Item/Held/SprayGuns.hs 17;" f poke34 src/Shader/Poke.hs 516;" f pokeArrayOff src/Shader/Poke.hs 527;" f @@ -5214,7 +5213,7 @@ preCritStart src/Dodge/Room/Start.hs 92;" f preloadRender src/Preload/Render.hs 30;" f premapMaybe src/FoldlHelp.hs 24;" f prependTwo src/Geometry.hs 165;" f -pressedMBEffectsTopInventory src/Dodge/Creature/YourControl.hs 206;" f +pressedMBEffectsTopInventory src/Dodge/Creature/YourControl.hs 163;" f prettyDT src/Dodge/DoubleTree.hs 179;" f prettyLDT src/Dodge/DoubleTree.hs 183;" f primeS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 422;" f @@ -5481,9 +5480,9 @@ scaleMat src/MatrixHelper.hs 59;" f scaleMatrix src/MatrixHelper.hs 56;" f scaleSH src/Shape.hs 265;" f scalp src/Dodge/Creature/Picture.hs 93;" f -scancodeToHotkey src/Dodge/Creature/YourControl.hs 70;" f +scancodeToHotkey src/Dodge/Creature/YourControl.hs 69;" f scodeToChar src/Dodge/ScodeToChar.hs 6;" f -scorchSPic src/Dodge/Creature/State.hs 103;" f +scorchSPic src/Dodge/Creature/State.hs 100;" 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 @@ -5554,7 +5553,7 @@ setOldPos src/Dodge/Update.hs 351;" f setOutLinks src/Dodge/RoomLink.hs 48;" f setOutLinksByType src/Dodge/RoomLink.hs 57;" f setOutLinksPD src/Dodge/RoomLink.hs 77;" f -setRBCreatureTargeting src/Dodge/Creature/State.hs 277;" f +setRBCreatureTargeting src/Dodge/Creature/State.hs 274;" f setSelectionListRestriction src/Dodge/Update/Input/ScreenLayer.hs 121;" f setShaderSource src/Shader/Compile.hs 290;" f setShadowLimits src/Dodge/Shadows.hs 11;" f @@ -5618,7 +5617,7 @@ shiftRoomBy src/Dodge/Room/Link.hs 37;" f shiftRoomShiftBy src/Dodge/Room/Link.hs 81;" f shiftRoomShiftToLink src/Dodge/Room/Link.hs 70;" f shiftedGrid src/Grid.hs 25;" f -shineTorch src/Dodge/Creature/State.hs 209;" f +shineTorch src/Dodge/Creature/State.hs 206;" f shootBullet src/Dodge/HeldUse.hs 327;" f shootFirstMiss src/Dodge/Creature/Volition.hs 33;" f shootL src/Dodge/Item/Weapon/TriggerType.hs 298;" f @@ -5764,7 +5763,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 61;" f +stateUpdate src/Dodge/Creature/State.hs 60;" f statsModifier src/Dodge/Creature/Info.hs 14;" f stone1S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 386;" f stone2S src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 474;" f @@ -5963,7 +5962,7 @@ triggerSwitchSPicLight src/Dodge/Placement/Instance/Button.hs 31;" f truncFaces src/Polyhedra/Geodesic.hs 52;" f truncate src/Polyhedra/Geodesic.hs 37;" f trunkDepth src/TreeHelp.hs 161;" f -tryAssignHotkey src/Dodge/Creature/YourControl.hs 86;" f +tryAssignHotkey src/Dodge/Creature/YourControl.hs 85;" f tryAttachBulletBelt src/Dodge/Euse.hs 40;" f tryChargeBattery src/Dodge/Euse.hs 43;" f tryCombine src/Dodge/Update/Input/InGame.hs 252;" f @@ -6010,7 +6009,7 @@ upHammer src/Dodge/Default.hs 77;" f upProjectile src/Dodge/Projectile/Update.hs 25;" f updateAllNodes src/TreeHelp.hs 85;" f updateArc src/Dodge/Tesla/Arc.hs 86;" f -updateAutoRecharge src/Dodge/Creature/State.hs 309;" f +updateAutoRecharge src/Dodge/Creature/State.hs 306;" f updateBackspaceRegex src/Dodge/Update/Input/InGame.hs 159;" f updateBarrel src/Dodge/Barreloid.hs 45;" f updateBarreloid src/Dodge/Barreloid.hs 13;" f @@ -6050,11 +6049,11 @@ updateIMl' src/Dodge/Update.hs 391;" f updateInGameCamera src/Dodge/Update/Camera.hs 71;" f updateInitialPressInGame src/Dodge/Update/Input/InGame.hs 108;" f updateInstantBullets src/Dodge/Update.hs 535;" f -updateInv src/Dodge/Creature/State.hs 153;" f +updateInv src/Dodge/Creature/State.hs 150;" f updateInventoryPositioning src/Dodge/DisplayInventory.hs 87;" f updateInventorySectionItems src/Dodge/DisplayInventory.hs 143;" f -updateItemTargeting src/Dodge/Creature/State.hs 233;" f -updateItemWithOrientation src/Dodge/Creature/State.hs 197;" f +updateItemTargeting src/Dodge/Creature/State.hs 230;" f +updateItemWithOrientation src/Dodge/Creature/State.hs 194;" f updateKeyInGame src/Dodge/Update/Input/InGame.hs 102;" f updateKeysInTerminal src/Dodge/Update/Input/InGame.hs 91;" f updateLampoid src/Dodge/Lampoid.hs 13;" f @@ -6065,7 +6064,7 @@ updateLinearShockwave src/Dodge/LinearShockwave/Update.hs 8;" f updateLongPressInGame src/Dodge/Update/Input/InGame.hs 128;" f updateMIM src/Dodge/Update.hs 548;" f updateMachine src/Dodge/Machine/Update.hs 16;" f -updateMovement src/Dodge/Creature/State.hs 316;" f +updateMovement src/Dodge/Creature/State.hs 313;" f updateObjCatMaybes src/Dodge/Update.hs 407;" f updateObjMapMaybe src/Dodge/Update.hs 400;" f updatePastWorlds src/Dodge/Update.hs 305;" f @@ -6083,8 +6082,8 @@ updateRadarSweep src/Dodge/RadarSweep.hs 25;" f updateRadarSweeps src/Dodge/Update.hs 449;" f updateRandNode src/TreeHelp.hs 108;" f updateRenderSplit appDodge/Main.hs 105;" f -updateRootItem src/Dodge/Creature/State.hs 170;" f -updateRootItem' src/Dodge/Creature/State.hs 176;" f +updateRootItem src/Dodge/Creature/State.hs 167;" f +updateRootItem' src/Dodge/Creature/State.hs 173;" f updateRootItemID src/Dodge/Inventory/Location.hs 41;" f updateScopeZoom src/Dodge/Update/Camera.hs 128;" f updateScopeZoom' src/Dodge/Update/Camera.hs 133;" f @@ -6141,9 +6140,9 @@ useBulletPayload src/Dodge/Bullet.hs 105;" f useC src/Dodge/Cuse.hs 8;" f useC' src/Dodge/Cuse.hs 13;" f useE src/Dodge/Euse.hs 24;" f -useEquipment src/Dodge/Creature/State.hs 147;" f +useEquipment src/Dodge/Creature/State.hs 144;" f useGasParams src/Dodge/HeldUse.hs 376;" f -useHotKey src/Dodge/Creature/YourControl.hs 49;" f +useHotKey src/Dodge/Creature/YourControl.hs 48;" f useItemHotkey src/Dodge/Creature/Impulse/UseItem.hs 126;" f useItemLeftClick src/Dodge/Creature/Impulse/UseItem.hs 100;" f useItemLeftClick' src/Dodge/Creature/Impulse/UseItem.hs 113;" f @@ -6162,7 +6161,7 @@ useStopWatch src/Dodge/Luse.hs 24;" f useTimeCheck src/Dodge/Item/Weapon/TriggerType.hs 246;" f useTimeScrollGun src/Dodge/Luse.hs 32;" f useUnusedLnk src/Dodge/PlacementSpot.hs 169;" f -useUpdate src/Dodge/Creature/State.hs 301;" f +useUpdate src/Dodge/Creature/State.hs 298;" f usedRoomInLinkPoss src/Dodge/PlacementSpot.hs 196;" f usedRoomLinkPoss src/Dodge/PlacementSpot.hs 203;" f v2z src/Geometry/Vector3D.hs 93;" f @@ -6203,12 +6202,12 @@ wallLine src/Dodge/Placement/Instance/Wall.hs 71;" f wallsFromRooms src/Dodge/Layout.hs 146;" f wallsToDraw src/Dodge/Render/Walls.hs 17;" f warningRooms src/Dodge/Room/Warning.hs 29;" f -wasdAim src/Dodge/Creature/YourControl.hs 147;" f +wasdAim src/Dodge/Creature/YourControl.hs 106;" f wasdDir src/Dodge/WASD.hs 17;" f wasdM src/Dodge/WASD.hs 9;" f -wasdMovement src/Dodge/Creature/YourControl.hs 177;" f -wasdTwist src/Dodge/Creature/YourControl.hs 156;" f -wasdWithAiming src/Dodge/Creature/YourControl.hs 136;" f +wasdMovement src/Dodge/Creature/YourControl.hs 131;" f +wasdTwist src/Dodge/Creature/YourControl.hs 114;" f +wasdWithAiming src/Dodge/Creature/YourControl.hs 96;" f watchCombinations src/Dodge/Combine/Combinations.hs 15;" f watchUpdateStrat src/Dodge/Creature/ReaderUpdate.hs 177;" f weakenMatS src/Dodge/Material/Sound.hs 18;" f