From 315e6b1c043733bae2d07601c346ebd0c9cea039 Mon Sep 17 00:00:00 2001 From: justin Date: Wed, 15 Oct 2025 23:04:23 +0100 Subject: [PATCH] Cleanup, fix debug drawing --- src/Dodge/Data/ActionPlan.hs | 7 +- src/Dodge/Render/ShapePicture.hs | 3 +- tags | 284 ++++++++++++++----------------- 3 files changed, 130 insertions(+), 164 deletions(-) diff --git a/src/Dodge/Data/ActionPlan.hs b/src/Dodge/Data/ActionPlan.hs index c547354d8..220ea2f16 100644 --- a/src/Dodge/Data/ActionPlan.hs +++ b/src/Dodge/Data/ActionPlan.hs @@ -140,10 +140,9 @@ data Action | UseSelf { _useSelf :: CrAc } - | ArbitraryAction - {_arbitraryAction :: CrWdAc} - | -- | Repeatedly perform impulses alongside a main action until the main action terminates - DoImpulsesAlongside + | ArbitraryAction {_arbitraryAction :: CrWdAc} +-- | Repeatedly perform impulses alongside a main action until the main action terminates + | DoImpulsesAlongside { _sideImpulses :: [Impulse] , _mainAction :: Action } diff --git a/src/Dodge/Render/ShapePicture.hs b/src/Dodge/Render/ShapePicture.hs index ea62c1281..40cf47030 100644 --- a/src/Dodge/Render/ShapePicture.hs +++ b/src/Dodge/Render/ShapePicture.hs @@ -2,7 +2,6 @@ module Dodge.Render.ShapePicture (worldSPic) where import Dodge.Debug -import qualified Data.Map.Strict as M import Control.Lens import Data.Foldable import Data.Strict.Tuple @@ -113,7 +112,7 @@ extraPics cfig u = <> _flares lw <> foldMap drawLightSource (_lightSources lw) <> viewClipBounds cfig w - <> foldMap (drawDebug u) (M.keys $ _uvDebug u) + <> foldMap (drawDebug u) (u ^. uvConfig . debug_booleans) where w = u ^. uvWorld lw = w ^. cWorld . lWorld diff --git a/tags b/tags index 84630a05b..2da721bca 100644 --- a/tags +++ b/tags @@ -12,7 +12,7 @@ .++~ src/LensHelp.hs 33;" o .+.+~ src/LensHelp.hs 23;" o .:~ src/LensHelp.hs 14;" o -<$> src/Dodge/Data/ActionPlan.hs 199;" o +<$> src/Dodge/Data/ActionPlan.hs 181;" o <$> src/Dodge/Data/CWorld.hs 47;" o <$> src/Dodge/Data/Camera.hs 39;" o <$> src/Dodge/Data/Creature.hs 89;" o @@ -36,18 +36,18 @@ AUTOPISTOL src/Dodge/Data/Item/Combine.hs 146;" C AUTORIFLE src/Dodge/Data/Item/Combine.hs 155;" C AZURE src/Color/Data.hs 23;" C AccessTerminal src/Dodge/Data/WorldEffect.hs 27;" C -Action src/Dodge/Data/ActionPlan.hs 78;" t -ActionNothing src/Dodge/Data/ActionPlan.hs 83;" C +Action src/Dodge/Data/ActionPlan.hs 66;" t +ActionNothing src/Dodge/Data/ActionPlan.hs 71;" C ActionPlan src/Dodge/Data/ActionPlan.hs 16;" t AddGoal src/Dodge/Data/ActionPlan.hs 45;" C -AimAt src/Dodge/Data/ActionPlan.hs 84;" C +AimAt src/Dodge/Data/ActionPlan.hs 72;" C AimStance src/Dodge/Data/AimStance.hs 11;" t Aiming src/Dodge/Data/Creature/Stance.hs 39;" C AirFiltrationSS src/Dodge/Data/Scenario.hs 95;" C AlienContact src/Dodge/Data/Scenario.hs 30;" C AllRoomClipBoundaries src/Dodge/Data/Config.hs 106;" C AlteRifleSwitch src/Dodge/Data/Item/Params.hs 20;" C -Ambush src/Dodge/Data/ActionPlan.hs 173;" C +Ambush src/Dodge/Data/ActionPlan.hs 155;" C AmmoEffectSF src/Dodge/Data/ComposedItem.hs 33;" C AmmoExtractPosition src/Dodge/Data/Muzzle.hs 21;" t AmmoMagSF src/Dodge/Data/ComposedItem.hs 24;" C @@ -58,10 +58,7 @@ AmmoPayloadSF src/Dodge/Data/ComposedItem.hs 32;" C AmmoPerShot src/Dodge/Data/Muzzle.hs 61;" t AmmoTargetingSF src/Dodge/Data/ComposedItem.hs 31;" C AmmoType src/Dodge/Data/AmmoType.hs 5;" t -ArbitraryAction src/Dodge/Data/ActionPlan.hs 161;" C -ArbitraryImpulse src/Dodge/Data/ActionPlan.hs 47;" C -ArbitraryImpulseEffect src/Dodge/Data/ActionPlan.hs 48;" C -ArbitraryImpulseFunction src/Dodge/Data/ActionPlan.hs 46;" C +ArbitraryAction src/Dodge/Data/ActionPlan.hs 143;" C ArcNodeType src/Dodge/Data/LWorld.hs 157;" t ArcShad src/Picture/Data.hs 38;" C ArcStep src/Dodge/Data/ArcStep.hs 14;" t @@ -216,11 +213,11 @@ ChaseAI src/Dodge/Data/Creature/Misc.hs 40;" C ChaseCrit src/Dodge/Data/Creature/Misc.hs 70;" C ChaseCritters src/Dodge/Data/Creature/State.hs 18;" C ChemFuel src/Dodge/Data/Item/Use/Consumption/Ammo.hs 14;" C -ChooseMovementLtAuto src/Dodge/Data/CreatureEffect.hs 57;" C -ChooseMovementSpreadGun src/Dodge/Data/CreatureEffect.hs 56;" C +ChooseMovementLtAuto src/Dodge/Data/CreatureEffect.hs 31;" C +ChooseMovementSpreadGun src/Dodge/Data/CreatureEffect.hs 30;" C Circ_collision_test src/Dodge/Data/Config.hs 85;" C Climate src/Dodge/Data/Scenario.hs 32;" C -CloseToMelee src/Dodge/Data/ActionPlan.hs 182;" C +CloseToMelee src/Dodge/Data/ActionPlan.hs 164;" C Close_shape_culling src/Dodge/Data/Config.hs 79;" C Cloud src/Dodge/Data/Cloud.hs 14;" t CloudType src/Dodge/Data/Cloud.hs 22;" t @@ -253,10 +250,10 @@ ConvexPoly src/Geometry/ConvexPoly.hs 25;" t CookingDamage src/Dodge/Data/Damage/Type.hs 5;" C Corporation src/Dodge/Data/Scenario.hs 46;" C Cosmic src/Dodge/Data/Scenario.hs 74;" C -CrAc src/Dodge/Data/CreatureEffect.hs 45;" t +CrAc src/Dodge/Data/CreatureEffect.hs 25;" t CrArcNode src/Dodge/Data/LWorld.hs 162;" C -CrBl src/Dodge/Data/CreatureEffect.hs 39;" t -CrCanShoot src/Dodge/Data/CreatureEffect.hs 40;" C +CrBl src/Dodge/Data/CreatureEffect.hs 22;" t +CrCanShoot src/Dodge/Data/CreatureEffect.hs 22;" C CrChasm src/Dodge/Data/SoundOrigin.hs 19;" C CrGroup src/Dodge/Data/Creature/State.hs 25;" t CrGroupID src/Dodge/Data/Creature/State.hs 31;" C @@ -265,10 +262,10 @@ CrGroupUpdate src/Dodge/Data/CrGroupParams.hs 22;" t CrHP src/Dodge/Data/Creature.hs 70;" t CrHitSound src/Dodge/Data/SoundOrigin.hs 33;" C CrID src/Dodge/Data/CrWlID.hs 12;" C -CrImp src/Dodge/Data/CreatureEffect.hs 23;" t +CrImp src/Dodge/Data/CreatureEffect.hs 11;" t CrInt src/Dodge/Data/Item/Location.hs 21;" t -CrIsAiming src/Dodge/Data/CreatureEffect.hs 41;" C -CrIsAnimate src/Dodge/Data/CreatureEffect.hs 42;" C +CrIsAiming src/Dodge/Data/CreatureEffect.hs 22;" C +CrIsAnimate src/Dodge/Data/CreatureEffect.hs 22;" C CrIsCorpse src/Dodge/Data/Creature.hs 72;" C CrIsGibs src/Dodge/Data/Creature.hs 73;" C CrIsPitted src/Dodge/Data/Creature.hs 74;" C @@ -276,12 +273,9 @@ CrMouth src/Dodge/Data/SoundOrigin.hs 18;" C CrMvType src/Dodge/Data/Creature/Misc.hs 28;" t CrMvType src/Dodge/Data/Creature/Misc.hs 31;" C CrSound src/Dodge/Data/SoundOrigin.hs 17;" C -CrTurnAround src/Dodge/Data/CreatureEffect.hs 45;" C -CrWdAc src/Dodge/Data/CreatureEffect.hs 54;" t -CrWdBFSThenReturn src/Dodge/Data/CreatureEffect.hs 55;" 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 +CrTurnAround src/Dodge/Data/CreatureEffect.hs 25;" C +CrWdAc src/Dodge/Data/CreatureEffect.hs 28;" t +CrWdBFSThenReturn src/Dodge/Data/CreatureEffect.hs 29;" C CrWeaponFailSound src/Dodge/Data/SoundOrigin.hs 22;" C CrWeaponSound src/Dodge/Data/SoundOrigin.hs 20;" C CrWlID src/Dodge/Data/CrWlID.hs 12;" t @@ -342,18 +336,18 @@ DisplayTerminal src/Dodge/Data/HUD.hs 29;" C Display_debug src/Dodge/Data/Config.hs 68;" C Distortion src/Dodge/Data/Distortion.hs 12;" t DivineRetribution src/Dodge/Data/Scenario.hs 35;" C -DoActionIf src/Dodge/Data/ActionPlan.hs 114;" C -DoActionIfElse src/Dodge/Data/ActionPlan.hs 118;" C -DoActionThen src/Dodge/Data/ActionPlan.hs 131;" C -DoActionWhile src/Dodge/Data/ActionPlan.hs 105;" C -DoActionWhileInterrupt src/Dodge/Data/ActionPlan.hs 123;" C -DoActionWhilePartial src/Dodge/Data/ActionPlan.hs 109;" C -DoActions src/Dodge/Data/ActionPlan.hs 128;" C -DoImpulses src/Dodge/Data/ActionPlan.hs 98;" C -DoImpulsesAlongside src/Dodge/Data/ActionPlan.hs 164;" C +DoActionIf src/Dodge/Data/ActionPlan.hs 102;" C +DoActionIfElse src/Dodge/Data/ActionPlan.hs 106;" C +DoActionThen src/Dodge/Data/ActionPlan.hs 119;" C +DoActionWhile src/Dodge/Data/ActionPlan.hs 93;" C +DoActionWhileInterrupt src/Dodge/Data/ActionPlan.hs 111;" C +DoActionWhilePartial src/Dodge/Data/ActionPlan.hs 97;" C +DoActions src/Dodge/Data/ActionPlan.hs 116;" C +DoImpulses src/Dodge/Data/ActionPlan.hs 86;" C +DoImpulsesAlongside src/Dodge/Data/ActionPlan.hs 146;" C DoNotMoveEquipment src/Dodge/Data/RightButtonOptions.hs 20;" C -DoReplicate src/Dodge/Data/ActionPlan.hs 138;" C -DoReplicatePartial src/Dodge/Data/ActionPlan.hs 142;" C +DoReplicate src/Dodge/Data/ActionPlan.hs 126;" C +DoReplicatePartial src/Dodge/Data/ActionPlan.hs 130;" C DockingBaySS src/Dodge/Data/Scenario.hs 92;" C Door src/Dodge/Data/Door.hs 34;" t DoorClosed src/Dodge/Data/Door.hs 23;" C @@ -446,7 +440,7 @@ FlameSound src/Dodge/Data/SoundOrigin.hs 29;" C FlameletBall src/Dodge/Data/EnergyBall/Type.hs 14;" C Flamer src/Dodge/Data/SoundOrigin.hs 27;" C Flaming src/Dodge/Data/Damage.hs 25;" C -Flank src/Dodge/Data/ActionPlan.hs 172;" C +Flank src/Dodge/Data/ActionPlan.hs 154;" C FlareType src/Dodge/Data/Muzzle.hs 28;" t FlashBall src/Dodge/Data/EnergyBall/Type.hs 17;" C Flashing src/Dodge/Data/Damage.hs 27;" C @@ -454,7 +448,7 @@ FlatFaces src/Shape/Data.hs 17;" C FlatShieldParams src/Dodge/Data/Item/Params.hs 16;" C FlechetteTrajectory src/Dodge/Data/Bullet.hs 45;" C FlechetteTrajectoryType src/Dodge/Data/Bullet.hs 52;" C -Flee src/Dodge/Data/ActionPlan.hs 186;" C +Flee src/Dodge/Data/ActionPlan.hs 168;" C Flesh src/Dodge/Data/Material.hs 11;" C FloatAbsCheckGreaterLess src/Dodge/Data/FloatFunction.hs 16;" C FloatConst src/Dodge/Data/FloatFunction.hs 17;" C @@ -468,7 +462,7 @@ FlockArmourChaseAI src/Dodge/Data/Creature/Misc.hs 48;" C Floor src/Data/Tile.hs 11;" t FloorItem src/Dodge/Data/FloorItem.hs 15;" t Flying src/Dodge/Data/Creature/Stance.hs 31;" C -FollowImpulses src/Dodge/Data/ActionPlan.hs 177;" C +FollowImpulses src/Dodge/Data/ActionPlan.hs 159;" C FootForward src/Dodge/Data/Creature/Stance.hs 35;" t FootstepSound src/Dodge/Data/SoundOrigin.hs 31;" C ForceFieldType src/Dodge/Data/Item/Use/Consumption/Ammo.hs 11;" t @@ -503,12 +497,12 @@ GenParams src/Dodge/Data/GenParams.hs 15;" t GenWorld src/Dodge/Data/GenWorld.hs 24;" t GenericFaction src/Dodge/Data/Creature/State.hs 15;" C GeoObjShads src/Dodge/Data/Config.hs 100;" C -GetTo src/Dodge/Data/ActionPlan.hs 184;" C +GetTo src/Dodge/Data/ActionPlan.hs 166;" C GetToPoint src/Dodge/Data/Scenario.hs 12;" C Gib src/Dodge/Data/Prop.hs 43;" C Glass src/Dodge/Data/Material.hs 11;" C GlassBreakSound src/Dodge/Data/SoundOrigin.hs 35;" C -Goal src/Dodge/Data/ActionPlan.hs 192;" t +Goal src/Dodge/Data/ActionPlan.hs 174;" t GoesOnBack src/Dodge/Data/Equipment/Misc.hs 14;" C GoesOnChest src/Dodge/Data/Equipment/Misc.hs 13;" C GoesOnHead src/Dodge/Data/Equipment/Misc.hs 12;" C @@ -573,11 +567,9 @@ ImmediateEffect src/Loop/Data.hs 8;" C Importance src/Shape/Data.hs 34;" t Important src/Shape/Data.hs 35;" C Impulse src/Dodge/Data/ActionPlan.hs 27;" t -ImpulseNothing src/Dodge/Data/ActionPlan.hs 58;" C -ImpulseUseAheadPos src/Dodge/Data/ActionPlan.hs 55;" C -ImpulseUseTarget src/Dodge/Data/ActionPlan.hs 52;" C -ImpulseUseTargetCID src/Dodge/Data/ActionPlan.hs 49;" C -ImpulsesList src/Dodge/Data/ActionPlan.hs 95;" C +ImpulseNothing src/Dodge/Data/ActionPlan.hs 47;" C +ImpulseUseTarget src/Dodge/Data/ActionPlan.hs 46;" C +ImpulsesList src/Dodge/Data/ActionPlan.hs 83;" C InDivineZone src/Dodge/Data/Scenario.hs 22;" C InDream src/Dodge/Data/Scenario.hs 19;" C InInv src/Dodge/Data/Item/Location.hs 27;" C @@ -596,7 +588,6 @@ Inspect_wall src/Dodge/Data/Config.hs 92;" C Institution src/Dodge/Data/Scenario.hs 42;" t Int2 src/Geometry/Data.hs 21;" t IntID src/Dodge/Data/Universe.hs 101;" t -IntImp src/Dodge/Data/CreatureEffect.hs 20;" t Intention src/Dodge/Data/Creature.hs 76;" t IntersectingRoomClipBoundaries src/Dodge/Data/Config.hs 106;" C IntroScanSF src/Dodge/Data/ComposedItem.hs 21;" C @@ -606,7 +597,7 @@ InventoryChange src/Dodge/Data/World.hs 32;" C InventoryConnectSound src/Dodge/Data/SoundOrigin.hs 14;" C InventoryPathing src/Dodge/Data/Item/Combine.hs 39;" t InventorySound src/Dodge/Data/SoundOrigin.hs 13;" C -Investigate src/Dodge/Data/ActionPlan.hs 179;" C +Investigate src/Dodge/Data/ActionPlan.hs 161;" C Invisible src/Dodge/Data/CamouflageStatus.hs 7;" C InwardShockwave src/Dodge/Data/Shockwave.hs 14;" C IsolationUnitSS src/Dodge/Data/Scenario.hs 101;" C @@ -637,7 +628,7 @@ JoystickSF src/Dodge/Data/ComposedItem.hs 26;" C Just' src/MaybeHelp.hs 13;" C JustStartedPlaying src/Sound/Data.hs 24;" C KEYCARD src/Dodge/Data/Item/Combine.hs 177;" C -Kill src/Dodge/Data/ActionPlan.hs 194;" C +Kill src/Dodge/Data/ActionPlan.hs 176;" C LASER src/Dodge/Data/Item/Combine.hs 36;" C LDT src/Dodge/Data/DoubleTree.hs 34;" C LDTBottomNode src/Dodge/Data/DoubleTree.hs 29;" C @@ -654,7 +645,7 @@ LSParam src/Dodge/Data/LightSource.hs 16;" t LWorld src/Dodge/Data/LWorld.hs 95;" t LabLink src/Dodge/Data/Room.hs 46;" C LabSS src/Dodge/Data/Scenario.hs 97;" C -LabelAction src/Dodge/Data/ActionPlan.hs 79;" C +LabelAction src/Dodge/Data/ActionPlan.hs 67;" C LabelCluster src/Dodge/Data/RoomCluster.hs 13;" C LabelDoubleTreeNodeType src/Dodge/Data/DoubleTree.hs 24;" t Laboratory src/Dodge/Data/Scenario.hs 61;" C @@ -674,7 +665,7 @@ LaundrySS src/Dodge/Data/Scenario.hs 115;" C LayVars src/Dodge/Data/MetaTree.hs 29;" C Layer src/Picture/Data.hs 22;" t LayoutVars src/Dodge/Data/MetaTree.hs 29;" t -LeadTarget src/Dodge/Data/ActionPlan.hs 147;" C +LeadTarget src/Dodge/Data/ActionPlan.hs 135;" C LeftForward src/Dodge/Data/Creature/Stance.hs 35;" C LeftwardDT src/Dodge/Data/DoubleTree.hs 86;" C LeftwardLDT src/Dodge/Data/DoubleTree.hs 44;" C @@ -689,7 +680,7 @@ LimitedFood src/Dodge/Data/Scenario.hs 39;" C LimitedWater src/Dodge/Data/Scenario.hs 40;" C LinearShockwave src/Dodge/Data/LinearShockwave.hs 13;" t ListDisplayParams src/Dodge/Data/SelectionList.hs 13;" t -LiveLongAndProsper src/Dodge/Data/ActionPlan.hs 193;" C +LiveLongAndProsper src/Dodge/Data/ActionPlan.hs 175;" C LivingComplex src/Dodge/Data/Scenario.hs 68;" C LoadingBaySS src/Dodge/Data/Scenario.hs 93;" C LoadingScreen src/Dodge/Data/Universe.hs 64;" C @@ -699,9 +690,9 @@ LocationDT src/Dodge/Data/DoubleTree.hs 101;" t LocationLDT src/Dodge/Data/DoubleTree.hs 61;" t LoneWolf src/Dodge/Data/Creature/State.hs 26;" C LongAI src/Dodge/Data/Creature/Misc.hs 50;" C -LookAround src/Dodge/Data/ActionPlan.hs 181;" C +LookAround src/Dodge/Data/ActionPlan.hs 163;" C LtAutoAI src/Dodge/Data/Creature/Misc.hs 44;" C -Lure src/Dodge/Data/ActionPlan.hs 174;" C +Lure src/Dodge/Data/ActionPlan.hs 156;" C MACHINEPISTOL src/Dodge/Data/Item/Combine.hs 145;" C MAGENTA src/Color/Data.hs 20;" C MAGNET src/Dodge/Data/Item/Combine.hs 68;" C @@ -718,8 +709,6 @@ MODBlockedString src/Dodge/Data/Universe.hs 87;" C MODString src/Dodge/Data/Universe.hs 86;" C MODStringOption src/Dodge/Data/Universe.hs 88;" C MOTOR src/Dodge/Data/Item/Combine.hs 64;" C -MP2Ac src/Dodge/Data/CreatureEffect.hs 51;" t -MP2NoAction src/Dodge/Data/CreatureEffect.hs 51;" C MPO src/Dodge/Base/Collide.hs 98;" t MTRS src/Dodge/Data/MTRS.hs 6;" t MTree src/Dodge/Data/MetaTree.hs 11;" C @@ -764,7 +753,7 @@ MdWdWd src/Dodge/Data/WorldEffect.hs 45;" t MedBaySS src/Dodge/Data/Scenario.hs 100;" C Medium src/Shape/Data.hs 30;" C Melee src/Dodge/Data/ActionPlan.hs 41;" C -MeleeStrike src/Dodge/Data/ActionPlan.hs 187;" C +MeleeStrike src/Dodge/Data/ActionPlan.hs 169;" C Memory src/Dodge/Data/Creature/Memory.hs 13;" t MenuOption src/Dodge/Data/Universe.hs 90;" t MenuOptionDisplay src/Dodge/Data/Universe.hs 85;" t @@ -835,18 +824,15 @@ NewInt src/NewInt.hs 17;" t NewIntMap src/NewInt.hs 23;" t NewIntSet src/NewInt.hs 20;" t NewSideEffect src/Dodge/Data/Universe.hs 56;" C -NoAction src/Dodge/Data/ActionPlan.hs 150;" C +NoAction src/Dodge/Data/ActionPlan.hs 138;" C NoAmmoRequired src/Dodge/Data/Muzzle.hs 25;" C NoBeamCombine src/Dodge/Data/Beam.hs 43;" C NoConcurrentEffect src/Loop/Data.hs 7;" C -NoCrImp src/Dodge/Data/CreatureEffect.hs 24;" C -NoCrWdImp src/Dodge/Data/CreatureEffect.hs 14;" C -NoCreatureEffect src/Dodge/Data/CreatureEffect.hs 11;" C +NoCrImp src/Dodge/Data/CreatureEffect.hs 11;" C NoExtraMenuOption src/Dodge/Data/Universe.hs 70;" C NoFaction src/Dodge/Data/Creature/State.hs 20;" C NoFlare src/Dodge/Data/Muzzle.hs 29;" C NoHoming src/Dodge/Data/Projectile.hs 42;" C -NoIntImp src/Dodge/Data/CreatureEffect.hs 20;" C NoItTargeting src/Dodge/Data/Item.hs 44;" C NoItemScroll src/Dodge/Data/Item.hs 39;" C NoItemZone src/Dodge/Data/Machine/Sensor.hs 34;" C @@ -960,10 +946,6 @@ OverInvSelect src/Dodge/Data/Input.hs 23;" C OverTerminal src/Dodge/Data/Input.hs 29;" C OverreachingAI src/Dodge/Data/Scenario.hs 31;" C Overstrung src/Dodge/Data/Creature/Perception.hs 57;" C -P2Ac src/Dodge/Data/CreatureEffect.hs 48;" t -P2Imp src/Dodge/Data/CreatureEffect.hs 28;" t -P2ImpNo src/Dodge/Data/CreatureEffect.hs 28;" C -P2NoAction src/Dodge/Data/CreatureEffect.hs 48;" C PBSound src/Dodge/Data/SoundOrigin.hs 43;" C PIPE src/Dodge/Data/Item/Combine.hs 51;" C PISTOL src/Dodge/Data/Item/Combine.hs 144;" C @@ -985,9 +967,9 @@ PaletteColor src/Color/Data.hs 14;" t PathEdge src/Dodge/Data/PathGraph.hs 40;" t PathEdgeNodes src/Dodge/Data/PathGraph.hs 33;" t PathFromEdge src/Dodge/Data/Room.hs 77;" t -PathTo src/Dodge/Data/ActionPlan.hs 88;" C +PathTo src/Dodge/Data/ActionPlan.hs 76;" C Pathing src/Dodge/Data/Config.hs 76;" C -Patrol src/Dodge/Data/ActionPlan.hs 175;" C +Patrol src/Dodge/Data/ActionPlan.hs 157;" C PausedTimeFlow src/Dodge/Data/World.hs 79;" C Payload src/Dodge/Data/Payload.hs 11;" t PenetrateBullet src/Dodge/Data/Bullet.hs 31;" C @@ -1106,9 +1088,9 @@ RProps src/Dodge/Layout/Generate.hs 13;" C RadarBlip src/Dodge/Data/RadarBlip.hs 14;" t RadarSweep src/Dodge/Data/RadarSweep.hs 19;" t RadialDistortion src/Dodge/Data/Distortion.hs 13;" C -RandImpulse src/Dodge/Data/ActionPlan.hs 62;" t -RandImpulseCircMove src/Dodge/Data/ActionPlan.hs 64;" C -RandImpulseList src/Dodge/Data/ActionPlan.hs 63;" C +RandImpulse src/Dodge/Data/ActionPlan.hs 50;" t +RandImpulseCircMove src/Dodge/Data/ActionPlan.hs 52;" C +RandImpulseList src/Dodge/Data/ActionPlan.hs 51;" C RandPS src/Dodge/Data/GenWorld.hs 58;" C RandomImpulse src/Dodge/Data/ActionPlan.hs 32;" C RandomTurn src/Dodge/Data/ActionPlan.hs 31;" C @@ -1118,7 +1100,7 @@ RectRoomType src/Dodge/Data/Room.hs 33;" C ReducedRocketSmoke src/Dodge/Data/Projectile.hs 55;" C ReigonalGovernment src/Dodge/Data/Scenario.hs 50;" C Religion src/Dodge/Data/Scenario.hs 47;" C -Reload src/Dodge/Data/ActionPlan.hs 185;" C +Reload src/Dodge/Data/ActionPlan.hs 167;" C RemoteDetonatorSF src/Dodge/Data/ComposedItem.hs 27;" C RemoteScreenSF src/Dodge/Data/ComposedItem.hs 25;" C RemoveEquipment src/Dodge/Data/RightButtonOptions.hs 35;" C @@ -1181,7 +1163,7 @@ SaveSlotNum src/Dodge/Data/SaveSlot.hs 12;" C Scope src/Dodge/Data/Item/Scope.hs 13;" t ScreenLayer src/Dodge/Data/Universe.hs 72;" t ScreenPos src/Dodge/Data/ScreenPos.hs 12;" t -Search src/Dodge/Data/ActionPlan.hs 188;" C +Search src/Dodge/Data/ActionPlan.hs 170;" C SecretCabal src/Dodge/Data/Scenario.hs 44;" C SectionCursor src/Dodge/Data/SelectionList.hs 23;" t SeeAbove src/Dodge/Data/Wall.hs 42;" C @@ -1200,7 +1182,7 @@ SelfTree src/Dodge/Data/MetaTree.hs 20;" t SemiAutoTrigger src/Dodge/Data/TriggerType.hs 9;" C SensorType src/Dodge/Data/Machine/Sensor.hs 14;" t SensorWithRequirement src/Dodge/Data/Machine/Sensor.hs 33;" C -SentinelAt src/Dodge/Data/ActionPlan.hs 195;" C +SentinelAt src/Dodge/Data/ActionPlan.hs 177;" C SetLSCol src/Dodge/Data/WorldEffect.hs 26;" C SetTrigger src/Dodge/Data/WorldEffect.hs 24;" C ShadNum src/Picture/Data.hs 35;" t @@ -1217,7 +1199,7 @@ ShellSound src/Dodge/Data/SoundOrigin.hs 28;" C ShieldGroup src/Dodge/Data/Creature/State.hs 32;" C Shockwave src/Dodge/Data/Shockwave.hs 17;" t ShockwaveDirection src/Dodge/Data/Shockwave.hs 14;" t -ShootAt src/Dodge/Data/ActionPlan.hs 176;" C +ShootAt src/Dodge/Data/ActionPlan.hs 158;" C ShortShow src/ShortShow.hs 6;" c ShortString src/ShortShow.hs 16;" t Show_bound_box src/Dodge/Data/Config.hs 80;" C @@ -1279,12 +1261,12 @@ StabSpinIncrease src/Dodge/Projectile/Create.hs 18;" C Stance src/Dodge/Data/Creature/Stance.hs 17;" t StandaloneWall src/Dodge/Data/Wall/Structure.hs 13;" C Standing src/Dodge/Data/Creature/Stance.hs 29;" C -StartSentinelPost src/Dodge/Data/ActionPlan.hs 151;" C +StartSentinelPost src/Dodge/Data/ActionPlan.hs 139;" C StayInArea src/Dodge/Data/Scenario.hs 13;" C Stone src/Dodge/Data/Material.hs 11;" C StorageSS src/Dodge/Data/Scenario.hs 94;" C -Strategy src/Dodge/Data/ActionPlan.hs 171;" t -StrategyActions src/Dodge/Data/ActionPlan.hs 183;" C +Strategy src/Dodge/Data/ActionPlan.hs 153;" t +StrategyActions src/Dodge/Data/ActionPlan.hs 165;" C SubInventory src/Dodge/Data/HUD.hs 16;" t Superfluous src/Shape/Data.hs 38;" C Surface src/Shape/Data.hs 41;" t @@ -1388,9 +1370,9 @@ TriggerType src/Dodge/Data/TriggerType.hs 7;" t TurbineBaySS src/Dodge/Data/Scenario.hs 110;" C Turn src/Dodge/Data/ActionPlan.hs 30;" C TurnTo src/Dodge/Data/ActionPlan.hs 36;" C -TurnToPoint src/Dodge/Data/ActionPlan.hs 89;" C +TurnToPoint src/Dodge/Data/ActionPlan.hs 77;" C TurnToward src/Dodge/Data/ActionPlan.hs 33;" C -TurnTowardCr src/Dodge/Data/CreatureEffect.hs 25;" C +TurnTowardCr src/Dodge/Data/CreatureEffect.hs 11;" C Turret src/Dodge/Data/Machine.hs 51;" t TurretInt src/Dodge/Data/Item/Location.hs 19;" t TwistGoal src/Dodge/Data/Scenario.hs 15;" C @@ -1411,7 +1393,6 @@ Universe src/Dodge/Data/Universe.hs 30;" t UnloadedWeaponSF src/Dodge/Data/ComposedItem.hs 13;" C UnlockInv src/Dodge/Data/WorldEffect.hs 28;" C UnusedLink src/Dodge/Data/Room.hs 68;" C -UseAheadPos src/Dodge/Data/ActionPlan.hs 155;" C UseAttach src/Dodge/Data/Item/Use.hs 32;" C UseBulletMod src/Dodge/Data/Item/Use.hs 37;" C UseCondition src/Dodge/Data/UseCondition.hs 4;" t @@ -1425,10 +1406,9 @@ UseInvItem src/Dodge/Data/WorldEffect.hs 35;" C UseItem src/Dodge/Data/ActionPlan.hs 37;" C UseItemWidth src/Dodge/Data/SelectionList.hs 39;" C UseMapper src/Dodge/Data/Item/Use.hs 39;" C -UseMvTargetPos src/Dodge/Data/ActionPlan.hs 158;" C UseNothing src/Dodge/Data/Item/Use.hs 34;" C UseScope src/Dodge/Data/Item/Use.hs 36;" C -UseSelf src/Dodge/Data/ActionPlan.hs 152;" C +UseSelf src/Dodge/Data/ActionPlan.hs 140;" C UseToggle src/Dodge/Data/Item/Use.hs 38;" C UseUpTo src/Dodge/Data/Muzzle.hs 63;" C UseValue src/Dodge/Data/Item/Use.hs 35;" C @@ -1463,7 +1443,7 @@ WHITE src/Color/Data.hs 27;" C WIRE src/Dodge/Data/Item/Combine.hs 86;" C WRISTARMOUR src/Dodge/Data/Item/Combine.hs 124;" C WRIST_ECG src/Dodge/Data/Item/Combine.hs 136;" C -WaitThen src/Dodge/Data/ActionPlan.hs 101;" C +WaitThen src/Dodge/Data/ActionPlan.hs 89;" C Walking src/Dodge/Data/Creature/Stance.hs 25;" C Wall src/Dodge/Data/Wall.hs 20;" t WallArcNode src/Dodge/Data/LWorld.hs 158;" C @@ -1479,21 +1459,20 @@ War src/Dodge/Data/Scenario.hs 28;" C WarmTime src/Dodge/Data/Item/Params.hs 21;" C WarmUpCoolDown src/Dodge/Data/TriggerType.hs 14;" C WarmUpNoDelay src/Dodge/Data/TriggerType.hs 19;" C -WarningCry src/Dodge/Data/ActionPlan.hs 180;" C -WatchAndWait src/Dodge/Data/ActionPlan.hs 178;" C +WarningCry src/Dodge/Data/ActionPlan.hs 162;" C +WatchAndWait src/Dodge/Data/ActionPlan.hs 160;" C WdBl src/Dodge/Data/WorldEffect.hs 52;" t WdBlBtOn src/Dodge/Data/WorldEffect.hs 58;" C WdBlConst src/Dodge/Data/WorldEffect.hs 55;" C WdBlCrFilterNearPoint src/Dodge/Data/WorldEffect.hs 57;" C WdBlDoorMoving src/Dodge/Data/WorldEffect.hs 54;" C WdBlNegate src/Dodge/Data/WorldEffect.hs 56;" C -WdCrBl src/Dodge/Data/CreatureEffect.hs 31;" t -WdCrBlfromCrBl src/Dodge/Data/CreatureEffect.hs 33;" C -WdCrCr src/Dodge/Data/CreatureEffect.hs 11;" t -WdCrLOSTarget src/Dodge/Data/CreatureEffect.hs 35;" C -WdCrNegate src/Dodge/Data/CreatureEffect.hs 34;" C -WdCrSafeDistFromTarget src/Dodge/Data/CreatureEffect.hs 36;" C -WdCrTrue src/Dodge/Data/CreatureEffect.hs 32;" C +WdCrBl src/Dodge/Data/CreatureEffect.hs 14;" t +WdCrBlfromCrBl src/Dodge/Data/CreatureEffect.hs 16;" C +WdCrLOSTarget src/Dodge/Data/CreatureEffect.hs 18;" C +WdCrNegate src/Dodge/Data/CreatureEffect.hs 17;" C +WdCrSafeDistFromTarget src/Dodge/Data/CreatureEffect.hs 19;" C +WdCrTrue src/Dodge/Data/CreatureEffect.hs 15;" C WdP2 src/Dodge/Data/WorldEffect.hs 40;" t WdP2Const src/Dodge/Data/WorldEffect.hs 41;" C WdP2f src/Dodge/Data/WorldEffect.hs 62;" t @@ -1519,8 +1498,8 @@ YELLOW src/Color/Data.hs 18;" C ZOOMSCOPE src/Dodge/Data/Item/Combine.hs 92;" C ZombieFaction src/Dodge/Data/Creature/State.hs 16;" C __Just' src/MaybeHelp.hs 13;" f -_actAction src/Dodge/Data/ActionPlan.hs 81;" f -_actLabel src/Dodge/Data/ActionPlan.hs 80;" f +_actAction src/Dodge/Data/ActionPlan.hs 69;" f +_actLabel src/Dodge/Data/ActionPlan.hs 68;" f _aimStance src/Dodge/Data/Creature/Stance.hs 39;" f _allocNewPos src/Dodge/Data/RightButtonOptions.hs 21;" f _allocNewPos src/Dodge/Data/RightButtonOptions.hs 27;" f @@ -1532,7 +1511,7 @@ _allocRemoveID src/Dodge/Data/RightButtonOptions.hs 33;" f _allocSwapID src/Dodge/Data/RightButtonOptions.hs 29;" f _alphaDivideShader src/Data/Preload/Render.hs 18;" f _alteRifleSwitch src/Dodge/Data/Item/Params.hs 20;" f -_ambushTarget src/Dodge/Data/ActionPlan.hs 173;" f +_ambushTarget src/Dodge/Data/ActionPlan.hs 155;" f _ampBullet src/Dodge/Data/Item/Use.hs 52;" f _ampCreateGas src/Dodge/Data/Item/Use.hs 54;" f _ampPayload src/Dodge/Data/Item/Use.hs 53;" f @@ -1545,7 +1524,7 @@ _apInt src/Dodge/Data/Item/Use.hs 47;" f _apProjectiles src/Dodge/Data/Item/Use.hs 46;" f _apStrategy src/Dodge/Data/ActionPlan.hs 21;" f _aps src/Dodge/Data/Muzzle.hs 22;" f -_arbitraryAction src/Dodge/Data/ActionPlan.hs 162;" f +_arbitraryAction src/Dodge/Data/ActionPlan.hs 144;" f _arcNode src/Dodge/Data/LWorld.hs 113;" f _asDir src/Dodge/Data/ArcStep.hs 16;" f _asObject src/Dodge/Data/ArcStep.hs 17;" f @@ -1762,27 +1741,27 @@ _dmPos src/Dodge/Data/Damage.hs 27;" f _dmVector src/Dodge/Data/Damage.hs 20;" f _dmVector src/Dodge/Data/Damage.hs 23;" f _dmVector src/Dodge/Data/Damage.hs 26;" f -_doActionIfAction src/Dodge/Data/ActionPlan.hs 116;" f -_doActionIfCondition src/Dodge/Data/ActionPlan.hs 115;" f -_doActionIfElseCondition src/Dodge/Data/ActionPlan.hs 120;" f -_doActionIfElseElseAction src/Dodge/Data/ActionPlan.hs 121;" f -_doActionIfElseIfAction src/Dodge/Data/ActionPlan.hs 119;" f -_doActionThenFirst src/Dodge/Data/ActionPlan.hs 132;" f -_doActionThenSecond src/Dodge/Data/ActionPlan.hs 133;" f -_doActionWhileAction src/Dodge/Data/ActionPlan.hs 107;" f -_doActionWhileAction src/Dodge/Data/ActionPlan.hs 112;" f -_doActionWhileCondition src/Dodge/Data/ActionPlan.hs 106;" f -_doActionWhileCondition src/Dodge/Data/ActionPlan.hs 111;" f -_doActionWhilePartial src/Dodge/Data/ActionPlan.hs 110;" f -_doActionWhileThenCondition src/Dodge/Data/ActionPlan.hs 125;" f -_doActionWhileThenDo src/Dodge/Data/ActionPlan.hs 124;" f -_doActionWhileThenThen src/Dodge/Data/ActionPlan.hs 126;" f -_doActionsList src/Dodge/Data/ActionPlan.hs 129;" f -_doImpulsesList src/Dodge/Data/ActionPlan.hs 99;" f -_doReplicateAction src/Dodge/Data/ActionPlan.hs 140;" f -_doReplicateAction src/Dodge/Data/ActionPlan.hs 145;" f -_doReplicateTimes src/Dodge/Data/ActionPlan.hs 139;" f -_doReplicateTimes src/Dodge/Data/ActionPlan.hs 144;" f +_doActionIfAction src/Dodge/Data/ActionPlan.hs 104;" f +_doActionIfCondition src/Dodge/Data/ActionPlan.hs 103;" f +_doActionIfElseCondition src/Dodge/Data/ActionPlan.hs 108;" f +_doActionIfElseElseAction src/Dodge/Data/ActionPlan.hs 109;" f +_doActionIfElseIfAction src/Dodge/Data/ActionPlan.hs 107;" f +_doActionThenFirst src/Dodge/Data/ActionPlan.hs 120;" f +_doActionThenSecond src/Dodge/Data/ActionPlan.hs 121;" f +_doActionWhileAction src/Dodge/Data/ActionPlan.hs 95;" f +_doActionWhileAction src/Dodge/Data/ActionPlan.hs 100;" f +_doActionWhileCondition src/Dodge/Data/ActionPlan.hs 94;" f +_doActionWhileCondition src/Dodge/Data/ActionPlan.hs 99;" f +_doActionWhilePartial src/Dodge/Data/ActionPlan.hs 98;" f +_doActionWhileThenCondition src/Dodge/Data/ActionPlan.hs 113;" f +_doActionWhileThenDo src/Dodge/Data/ActionPlan.hs 112;" f +_doActionWhileThenThen src/Dodge/Data/ActionPlan.hs 114;" f +_doActionsList src/Dodge/Data/ActionPlan.hs 117;" f +_doImpulsesList src/Dodge/Data/ActionPlan.hs 87;" f +_doReplicateAction src/Dodge/Data/ActionPlan.hs 128;" f +_doReplicateAction src/Dodge/Data/ActionPlan.hs 133;" f +_doReplicateTimes src/Dodge/Data/ActionPlan.hs 127;" f +_doReplicateTimes src/Dodge/Data/ActionPlan.hs 132;" f _doors src/Dodge/Data/LWorld.hs 122;" f _drClosePos src/Dodge/Data/Door.hs 42;" f _drDeath src/Dodge/Data/Door.hs 44;" f @@ -1834,7 +1813,7 @@ _flPos src/Dodge/Data/Flame.hs 15;" f _flTimer src/Dodge/Data/Flame.hs 14;" f _flVel src/Dodge/Data/Flame.hs 16;" f _flames src/Dodge/Data/LWorld.hs 108;" f -_flankTarget src/Dodge/Data/ActionPlan.hs 172;" f +_flankTarget src/Dodge/Data/ActionPlan.hs 154;" f _flares src/Dodge/Data/LWorld.hs 111;" f _flatShieldWlMIX src/Dodge/Data/Item/Params.hs 16;" f _floorItems src/Dodge/Data/LWorld.hs 129;" f @@ -1914,10 +1893,8 @@ _imRootSelectedItem src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 26;" f _imSelectedItem src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 25;" f _immediateEffect src/Loop/Data.hs 9;" f _immediateUpdate src/Loop/Data.hs 12;" f -_impulseUseAheadPos src/Dodge/Data/ActionPlan.hs 56;" f -_impulseUseTarget src/Dodge/Data/ActionPlan.hs 53;" f -_impulseUseTargetCID src/Dodge/Data/ActionPlan.hs 50;" f -_impulsesListList src/Dodge/Data/ActionPlan.hs 96;" f +_impulseUseTarget src/Dodge/Data/ActionPlan.hs 46;" f +_impulsesListList src/Dodge/Data/ActionPlan.hs 84;" f _input src/Dodge/Data/World.hs 43;" f _isWarming src/Dodge/Data/Item/Params.hs 23;" f _ispCloseButton src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 33;" f @@ -1939,7 +1916,7 @@ _items src/Dodge/Data/LWorld.hs 98;" f _itsInt src/Dodge/Data/Item.hs 40;" f _itsMax src/Dodge/Data/Item.hs 41;" f _itsRangeInt src/Dodge/Data/Item.hs 41;" f -_killTarget src/Dodge/Data/ActionPlan.hs 194;" f +_killTarget src/Dodge/Data/ActionPlan.hs 176;" f _lAimPos src/Dodge/Data/LWorld.hs 145;" f _lClock src/Dodge/Data/LWorld.hs 140;" f _lInvLock src/Dodge/Data/LWorld.hs 146;" f @@ -1958,7 +1935,7 @@ _ldpVerticalGap src/Dodge/Data/SelectionList.hs 16;" f _ldtLeft src/Dodge/Data/DoubleTree.hs 36;" f _ldtRight src/Dodge/Data/DoubleTree.hs 37;" f _ldtValue src/Dodge/Data/DoubleTree.hs 35;" f -_leadTargetBy src/Dodge/Data/ActionPlan.hs 148;" f +_leadTargetBy src/Dodge/Data/ActionPlan.hs 136;" f _lightSources src/Dodge/Data/LWorld.hs 135;" f _lightingCapShader src/Data/Preload/Render.hs 16;" f _lightingLineShadowShader src/Data/Preload/Render.hs 15;" f @@ -1992,7 +1969,7 @@ _lyGen src/Dodge/Data/MetaTree.hs 30;" f _machines src/Dodge/Data/LWorld.hs 123;" f _magBelowID src/Dodge/Data/Muzzle.hs 22;" f _magnets src/Dodge/Data/LWorld.hs 126;" f -_mainAction src/Dodge/Data/ActionPlan.hs 166;" f +_mainAction src/Dodge/Data/ActionPlan.hs 148;" f _manObject src/Dodge/Data/Item/Use/Consumption/LoadAction.hs 17;" f _mapInvItmID src/Dodge/Data/HUD.hs 22;" f _mapInvOffset src/Dodge/Data/HUD.hs 20;" f @@ -2036,7 +2013,7 @@ _mdTimer src/Dodge/Data/Modification.hs 19;" f _mdUpdate src/Dodge/Data/Modification.hs 18;" f _mdUpdate src/Dodge/Data/Modification.hs 27;" f _meleeCooldown src/Dodge/Data/Creature/Misc.hs 70;" f -_meleeTarget src/Dodge/Data/ActionPlan.hs 182;" f +_meleeTarget src/Dodge/Data/ActionPlan.hs 164;" f _mgField src/Dodge/Data/Magnet.hs 25;" f _mgPos src/Dodge/Data/Magnet.hs 24;" f _moEff src/Dodge/Data/Universe.hs 92;" f @@ -2089,10 +2066,10 @@ _opTexture src/Dodge/Data/Wall.hs 44;" f _opticDefaultZoom src/Dodge/Data/Item/Scope.hs 20;" f _opticPos src/Dodge/Data/Item/Scope.hs 16;" f _opticZoom src/Dodge/Data/Item/Scope.hs 19;" f -_partialAction src/Dodge/Data/ActionPlan.hs 143;" f +_partialAction src/Dodge/Data/ActionPlan.hs 131;" f _pastWorlds src/Dodge/Data/World.hs 38;" f _pathGraph src/Dodge/Data/CWorld.hs 28;" f -_pathToPoint src/Dodge/Data/ActionPlan.hs 88;" f +_pathToPoint src/Dodge/Data/ActionPlan.hs 76;" f _pbID src/Dodge/Data/PulseLaser.hs 24;" f _pbPos src/Dodge/Data/PulseLaser.hs 22;" f _pbTimer src/Dodge/Data/PulseLaser.hs 23;" f @@ -2284,8 +2261,8 @@ _sensAmount src/Dodge/Data/Machine/Sensor.hs 22;" f _sensThreshold src/Dodge/Data/Machine/Sensor.hs 24;" f _sensType src/Dodge/Data/Machine/Sensor.hs 23;" f _sensorCoding src/Dodge/Data/GenParams.hs 16;" f -_sentinelDir src/Dodge/Data/ActionPlan.hs 195;" f -_sentinelPos src/Dodge/Data/ActionPlan.hs 195;" f +_sentinelDir src/Dodge/Data/ActionPlan.hs 177;" f +_sentinelPos src/Dodge/Data/ActionPlan.hs 177;" f _sfColor src/Shape/Data.hs 44;" f _sfShadowImportance src/Shape/Data.hs 45;" f _sfSize src/Shape/Data.hs 46;" f @@ -2307,7 +2284,7 @@ _siPayload src/Dodge/Data/SelectionList.hs 49;" f _siPictures src/Dodge/Data/SelectionList.hs 43;" f _siWidth src/Dodge/Data/SelectionList.hs 45;" f _sideEffect src/Loop/Data.hs 13;" f -_sideImpulses src/Dodge/Data/ActionPlan.hs 165;" f +_sideImpulses src/Dodge/Data/ActionPlan.hs 147;" f _silhouetteEBO src/Data/Preload/Render.hs 27;" f _skOldPos src/Dodge/Data/Spark.hs 17;" f _skPos src/Dodge/Data/Spark.hs 16;" f @@ -2361,8 +2338,8 @@ _taArcSteps src/Dodge/Data/TeslaArc.hs 19;" f _taColor src/Dodge/Data/TeslaArc.hs 20;" f _taTimer src/Dodge/Data/TeslaArc.hs 18;" f _targetCr src/Dodge/Data/Creature.hs 77;" f -_targetID src/Dodge/Data/ActionPlan.hs 85;" f -_targetSeenAt src/Dodge/Data/ActionPlan.hs 86;" f +_targetID src/Dodge/Data/ActionPlan.hs 73;" f +_targetSeenAt src/Dodge/Data/ActionPlan.hs 74;" f _tbPos src/Dodge/Data/TractorBeam.hs 14;" f _tbStartPos src/Dodge/Data/TractorBeam.hs 15;" f _tbTime src/Dodge/Data/TractorBeam.hs 17;" f @@ -2415,7 +2392,7 @@ _tuDir src/Dodge/Data/Machine.hs 55;" f _tuFireTime src/Dodge/Data/Machine.hs 54;" f _tuTurnSpeed src/Dodge/Data/Machine.hs 53;" f _tuWeapon src/Dodge/Data/Machine.hs 52;" f -_turnToPoint src/Dodge/Data/ActionPlan.hs 90;" f +_turnToPoint src/Dodge/Data/ActionPlan.hs 78;" f _uInt src/Dodge/Data/Item/Use.hs 33;" f _uScope src/Dodge/Data/Item/Use.hs 36;" f _uValue src/Dodge/Data/Item/Use.hs 35;" f @@ -2434,12 +2411,10 @@ _unTO src/Shader/Data.hs 59;" f _unfiredBarrels src/Dodge/Data/Item/Params.hs 19;" f _unpauseClock src/Dodge/Data/World.hs 56;" f _unputTerminal src/Dodge/Data/GenWorld.hs 43;" f -_useAheadPos src/Dodge/Data/ActionPlan.hs 156;" f _useExactly src/Dodge/Data/Muzzle.hs 62;" f _useMapperLines src/Dodge/Data/Item/Use.hs 40;" f _useMapperPoints src/Dodge/Data/Item/Use.hs 41;" f -_useMvTargetPos src/Dodge/Data/ActionPlan.hs 159;" f -_useSelf src/Dodge/Data/ActionPlan.hs 153;" f +_useSelf src/Dodge/Data/ActionPlan.hs 141;" f _useToggle src/Dodge/Data/Item/Use.hs 38;" f _useUpTo src/Dodge/Data/Muzzle.hs 63;" f _uvCanContinue src/Dodge/Data/Universe.hs 38;" f @@ -2486,8 +2461,8 @@ _vxPos src/Picture/Data.hs 14;" f _vxShadNum src/Picture/Data.hs 18;" f _wCam src/Dodge/Data/World.hs 55;" f _wTime src/Dodge/Data/Item/Params.hs 22;" f -_waitThenAction src/Dodge/Data/ActionPlan.hs 103;" f -_waitThenTimer src/Dodge/Data/ActionPlan.hs 102;" f +_waitThenAction src/Dodge/Data/ActionPlan.hs 91;" f +_waitThenTimer src/Dodge/Data/ActionPlan.hs 90;" f _wallDamages src/Dodge/Data/LWorld.hs 121;" f _wallShader src/Data/Preload/Render.hs 48;" f _wallVBO src/Data/Preload/Render.hs 47;" f @@ -2842,10 +2817,10 @@ chooseCursorBorders src/Dodge/Render/List.hs 156;" f chooseEquipPosition src/Dodge/Inventory/RBList.hs 41;" f chooseFootSound src/Dodge/Creature/State/WalkCycle.hs 35;" f chooseFreeSite src/Dodge/Inventory/RBList.hs 47;" f -chooseMovementLtAuto src/Dodge/CreatureEffect.hs 104;" f +chooseMovementLtAuto src/Dodge/CreatureEffect.hs 76;" f chooseMovementPistol src/Dodge/Humanoid.hs 203;" f chooseMovementPistol' src/Dodge/Humanoid.hs 208;" f -chooseMovementSpreadGun src/Dodge/CreatureEffect.hs 87;" f +chooseMovementSpreadGun src/Dodge/CreatureEffect.hs 59;" f circHitWall src/Dodge/Base/Collide.hs 242;" f circInPolygon src/Geometry/Polygon.hs 102;" f circOnAnyCr src/Dodge/Base/Collide.hs 297;" f @@ -3222,13 +3197,11 @@ doBounce src/Dodge/Base/Collide.hs 69;" f doButtonEvent src/Dodge/Button/Event.hs 9;" f doConLoop src/Loop.hs 137;" f doConLoop' src/Loop.hs 226;" f -doCrAc src/Dodge/CreatureEffect.hs 58;" f -doCrBl src/Dodge/CreatureEffect.hs 50;" f +doCrAc src/Dodge/CreatureEffect.hs 38;" f +doCrBl src/Dodge/CreatureEffect.hs 30;" f doCrGroupUpdate src/Dodge/CrGroupUpdate.hs 5;" f -doCrImp src/Dodge/CreatureEffect.hs 29;" f -doCrWdAc src/Dodge/CreatureEffect.hs 75;" f -doCrWdImp src/Dodge/CreatureEffect.hs 17;" f -doCrWdWd src/Dodge/CreatureEffect.hs 21;" f +doCrImp src/Dodge/CreatureEffect.hs 13;" f +doCrWdAc src/Dodge/CreatureEffect.hs 47;" f doDamage src/Dodge/Creature/State.hs 43;" f doDeathToggle src/Dodge/WorldEffect.hs 86;" f doDeathTriggers src/Dodge/WorldEffect.hs 79;" f @@ -3251,14 +3224,10 @@ doHeldUseEffect src/Dodge/HeldUse.hs 351;" f doInPlacements src/Dodge/Layout.hs 83;" f doIndividualPlacements src/Dodge/Layout.hs 97;" f doInputScreenInput src/Dodge/Update/Input/ScreenLayer.hs 28;" f -doIntImp src/Dodge/CreatureEffect.hs 25;" f doItemTimeScroll src/Dodge/Update.hs 193;" f doLoop src/Loop.hs 60;" f -doMP2Ac src/Dodge/CreatureEffect.hs 71;" f doMagnetBuBu src/Dodge/Bullet.hs 35;" f doModificationEffect src/Dodge/ModificationEffect.hs 7;" f -doP2Ac src/Dodge/CreatureEffect.hs 67;" f -doP2Imp src/Dodge/CreatureEffect.hs 34;" f doPrWdLsLs src/Dodge/PrWdLsLs.hs 8;" f doPreload appDodge/Main.hs 136;" f doPropUpdates src/Dodge/Prop/Update.hs 34;" f @@ -3280,8 +3249,7 @@ doTimeScroll src/Dodge/Update.hs 198;" f doTmWdWd src/Dodge/WorldEffect.hs 89;" f doWallRotate src/Dodge/Update/Camera.hs 220;" f doWdBl src/Dodge/WorldBool.hs 10;" f -doWdCrBl src/Dodge/CreatureEffect.hs 38;" f -doWdCrCr src/Dodge/CreatureEffect.hs 13;" f +doWdCrBl src/Dodge/CreatureEffect.hs 18;" f doWdP2f src/Dodge/WdP2f.hs 12;" f doWdWd src/Dodge/WorldEffect.hs 28;" f doWorldEvents src/Dodge/Update.hs 428;" f @@ -3437,9 +3405,9 @@ drawZoneCirc src/Dodge/Debug/Picture.hs 292;" f drawZoneCol src/Dodge/Debug/Picture.hs 149;" f drawZoneNearPointCursor src/Dodge/Debug/Picture.hs 285;" f dropAll src/Dodge/Creature/Update.hs 129;" f -dropExcept src/Dodge/Creature/Action.hs 168;" f +dropExcept src/Dodge/Creature/Action.hs 166;" f dropInventoryPath src/Dodge/HeldUse.hs 1351;" f -dropItem src/Dodge/Creature/Action.hs 175;" f +dropItem src/Dodge/Creature/Action.hs 173;" f dropper src/Dodge/Item/Scope.hs 76;" f drumMag src/Dodge/Item/Ammo.hs 34;" f dsZoneSize src/Dodge/Zoning/Cloud.hs 42;" f @@ -3564,7 +3532,7 @@ flatItemCombinations src/Dodge/Combine/Combinations.hs 51;" f flatLookupItems src/Dodge/Combine.hs 38;" f flatShield src/Dodge/Item/Held/Utility.hs 17;" f flatShieldEquipSPic src/Dodge/Item/Draw/SPic.hs 440;" f -fleeFrom src/Dodge/CreatureEffect.hs 119;" f +fleeFrom src/Dodge/CreatureEffect.hs 91;" f flickerMod src/Dodge/Placement/Instance/LightSource/Flicker.hs 10;" f flickerUpdate src/Dodge/Placement/Instance/LightSource/Flicker.hs 24;" f floatSize src/Shader/Parameters.hs 17;" f @@ -5252,7 +5220,7 @@ thingsHit src/Dodge/WorldEvent/ThingsHit.hs 36;" f thingsHitExceptCr src/Dodge/WorldEvent/ThingsHit.hs 119;" f thingsHitZ src/Dodge/WorldEvent/ThingsHit.hs 44;" f threeLineDecoration src/Dodge/Placement/TopDecoration.hs 61;" f -throwItem src/Dodge/Creature/Action.hs 212;" f +throwItem src/Dodge/Creature/Action.hs 210;" f tileTexCoords src/Tile.hs 11;" f tilesFromRooms src/Dodge/Layout.hs 192;" f tilesToLine src/Shader/AuxAddition.hs 66;" f @@ -5679,7 +5647,7 @@ yIntercepts' src/Dodge/Zoning/Base.hs 76;" f yV2 src/Geometry/Vector.hs 205;" f yellow src/Color.hs 17;" f you src/Dodge/Base/You.hs 13;" f -youDropItem src/Dodge/Creature/Action.hs 197;" f +youDropItem src/Dodge/Creature/Action.hs 195;" f yourAugmentedItem src/Dodge/Render/HUD.hs 238;" f yourControl src/Dodge/Creature/YourControl.hs 28;" f yourDefaultStrideLength src/Dodge/Default/Creature.hs 110;" f