Cleanup

src/Dodge/Creature/Impulse.hs

@@ -65,10 +65,10 @@ followImpulse cr w imp = case imp of
     ArbitraryImpulseFunction f -> crup $ doWdCrCr f w cr
     ArbitraryImpulse f -> followImpulse cr w (doCrWdImp f cr w)
     ArbitraryImpulseEffect f -> (doCrWdWd f cr, cr)
-    ImpulseUseTargetCID f -> fromMaybe (crup cr) $ do
+--    ImpulseUseTargetCID f -> fromMaybe (crup cr) $ do
-        i <- cr ^? crIntention . targetCr . _Just
+--        i <- cr ^? crIntention . targetCr . _Just
-        tcr <- w ^? cWorld . lWorld . creatures . ix i
+--        tcr <- w ^? cWorld . lWorld . creatures . ix i
-        return $ followImpulse cr w (doIntImp f $ _crID tcr)
+--        return $ followImpulse cr w (doIntImp f $ _crID tcr)
     ImpulseUseTarget f -> fromMaybe (crup cr) $ do
         i <- cr ^? crIntention . targetCr . _Just
         tcr <- w ^? cWorld . lWorld . creatures . ix i

src/Dodge/CreatureEffect.hs

@@ -22,9 +22,9 @@ doCrWdWd :: CrWdWd -> Creature -> World -> World
 doCrWdWd cww = case cww of
     CrWdWdId -> const id
 
-doIntImp :: IntImp -> Int -> Impulse
+--doIntImp :: IntImp -> Int -> Impulse
-doIntImp ii = case ii of
+--doIntImp ii = case ii of
-    NoIntImp -> const ImpulseNothing
+--    NoIntImp -> const ImpulseNothing
 
 doCrImp :: CrImp -> Creature -> Impulse
 doCrImp ci = case ci of

src/Dodge/Data/ActionPlan.hs

@@ -46,9 +46,9 @@ data Impulse
     | ArbitraryImpulseFunction WdCrCr
     | ArbitraryImpulse CrWdImp
     | ArbitraryImpulseEffect CrWdWd
-    | ImpulseUseTargetCID
+--    | ImpulseUseTargetCID
-        { _impulseUseTargetCID :: IntImp
+--        { _impulseUseTargetCID :: IntImp
-        }
+--        }
     | ImpulseUseTarget
         { _impulseUseTarget :: CrImp
         }

src/Dodge/Data/CreatureEffect.hs

@@ -17,8 +17,8 @@ data CrWdImp = NoCrWdImp
 data CrWdWd = CrWdWdId
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data IntImp = NoIntImp
+--data IntImp = NoIntImp
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+--    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CrImp
     = NoCrImp
@@ -42,9 +42,7 @@ data CrBl
     | CrIsAnimate
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data CrAc
+data CrAc = CrTurnAround
-    = CrTurnAround
---    | CrFleeFromTarget
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data P2Ac = P2NoAction
@@ -62,7 +60,7 @@ data CrWdAc
 deriveJSON defaultOptions ''WdCrCr
 deriveJSON defaultOptions ''CrWdImp
 deriveJSON defaultOptions ''CrWdWd
-deriveJSON defaultOptions ''IntImp
+--deriveJSON defaultOptions ''IntImp
 deriveJSON defaultOptions ''CrImp
 deriveJSON defaultOptions ''P2Imp
 deriveJSON defaultOptions ''CrBl

src/Dodge/Humanoid.hs

@@ -10,7 +10,6 @@ import Geometry
 import LensHelp
 import RandomHelp
 
-
 updateHumanoid :: Creature -> World -> World
 updateHumanoid cr = case cr ^?! crType of
     ChaseCrit {} ->

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	202;"	o
+<$>	src/Dodge/Data/ActionPlan.hs	199;"	o
 <$>	src/Dodge/Data/CWorld.hs	47;"	o
 <$>	src/Dodge/Data/Camera.hs	39;"	o
 <$>	src/Dodge/Data/Creature.hs	89;"	o
@@ -47,7 +47,7 @@ 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	176;"	C
+Ambush	src/Dodge/Data/ActionPlan.hs	173;"	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,7 +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	164;"	C
+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
@@ -216,11 +216,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	62;"	C
+ChooseMovementLtAuto	src/Dodge/Data/CreatureEffect.hs	57;"	C
-ChooseMovementSpreadGun	src/Dodge/Data/CreatureEffect.hs	61;"	C
+ChooseMovementSpreadGun	src/Dodge/Data/CreatureEffect.hs	56;"	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	185;"	C
+CloseToMelee	src/Dodge/Data/ActionPlan.hs	182;"	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,12 +253,11 @@ 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	48;"	t
+CrAc	src/Dodge/Data/CreatureEffect.hs	45;"	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
 CrChasm	src/Dodge/Data/SoundOrigin.hs	19;"	C
-CrFleeFromTarget	src/Dodge/Data/CreatureEffect.hs	50;"	C
 CrGroup	src/Dodge/Data/Creature/State.hs	25;"	t
 CrGroupID	src/Dodge/Data/Creature/State.hs	31;"	C
 CrGroupParams	src/Dodge/Data/CrGroupParams.hs	14;"	t
@@ -277,9 +276,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	49;"	C
+CrTurnAround	src/Dodge/Data/CreatureEffect.hs	45;"	C
-CrWdAc	src/Dodge/Data/CreatureEffect.hs	59;"	t
+CrWdAc	src/Dodge/Data/CreatureEffect.hs	54;"	t
-CrWdBFSThenReturn	src/Dodge/Data/CreatureEffect.hs	60;"	C
+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
@@ -351,7 +350,7 @@ 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	167;"	C
+DoImpulsesAlongside	src/Dodge/Data/ActionPlan.hs	164;"	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
@@ -447,7 +446,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	175;"	C
+Flank	src/Dodge/Data/ActionPlan.hs	172;"	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
@@ -455,7 +454,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	189;"	C
+Flee	src/Dodge/Data/ActionPlan.hs	186;"	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
@@ -469,7 +468,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	180;"	C
+FollowImpulses	src/Dodge/Data/ActionPlan.hs	177;"	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
@@ -504,12 +503,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	187;"	C
+GetTo	src/Dodge/Data/ActionPlan.hs	184;"	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	195;"	t
+Goal	src/Dodge/Data/ActionPlan.hs	192;"	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
@@ -607,7 +606,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	182;"	C
+Investigate	src/Dodge/Data/ActionPlan.hs	179;"	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
@@ -638,7 +637,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	197;"	C
+Kill	src/Dodge/Data/ActionPlan.hs	194;"	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
@@ -690,7 +689,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	196;"	C
+LiveLongAndProsper	src/Dodge/Data/ActionPlan.hs	193;"	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
@@ -700,9 +699,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	184;"	C
+LookAround	src/Dodge/Data/ActionPlan.hs	181;"	C
 LtAutoAI	src/Dodge/Data/Creature/Misc.hs	44;"	C
-Lure	src/Dodge/Data/ActionPlan.hs	177;"	C
+Lure	src/Dodge/Data/ActionPlan.hs	174;"	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
@@ -710,8 +709,6 @@ MAGSHIELD	src/Dodge/Data/Item/Combine.hs	121;"	C
 MAPPER	src/Dodge/Data/Item/Combine.hs	26;"	C
 MAXHEALTH	src/Dodge/Data/Item/Combine.hs	47;"	C
 MBranch	src/Dodge/Data/MetaTree.hs	18;"	C
-MCrAc	src/Dodge/Data/CreatureEffect.hs	45;"	t
-MCrNoAction	src/Dodge/Data/CreatureEffect.hs	45;"	C
 MEDKIT	src/Dodge/Data/Item/Combine.hs	116;"	C
 MICROCHIP	src/Dodge/Data/Item/Combine.hs	72;"	C
 MICROPHONE	src/Dodge/Data/Item/Combine.hs	83;"	C
@@ -721,8 +718,8 @@ 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	56;"	t
+MP2Ac	src/Dodge/Data/CreatureEffect.hs	51;"	t
-MP2NoAction	src/Dodge/Data/CreatureEffect.hs	56;"	C
+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
@@ -767,7 +764,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	190;"	C
+MeleeStrike	src/Dodge/Data/ActionPlan.hs	187;"	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
@@ -963,10 +960,10 @@ 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	53;"	t
+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	53;"	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
@@ -990,7 +987,7 @@ PathEdgeNodes	src/Dodge/Data/PathGraph.hs	33;"	t
 PathFromEdge	src/Dodge/Data/Room.hs	77;"	t
 PathTo	src/Dodge/Data/ActionPlan.hs	88;"	C
 Pathing	src/Dodge/Data/Config.hs	76;"	C
-Patrol	src/Dodge/Data/ActionPlan.hs	178;"	C
+Patrol	src/Dodge/Data/ActionPlan.hs	175;"	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
@@ -1121,7 +1118,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	188;"	C
+Reload	src/Dodge/Data/ActionPlan.hs	185;"	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
@@ -1184,7 +1181,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	191;"	C
+Search	src/Dodge/Data/ActionPlan.hs	188;"	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
@@ -1203,7 +1200,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	198;"	C
+SentinelAt	src/Dodge/Data/ActionPlan.hs	195;"	C
 SetLSCol	src/Dodge/Data/WorldEffect.hs	26;"	C
 SetTrigger	src/Dodge/Data/WorldEffect.hs	24;"	C
 ShadNum	src/Picture/Data.hs	35;"	t
@@ -1220,7 +1217,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	179;"	C
+ShootAt	src/Dodge/Data/ActionPlan.hs	176;"	C
 ShortShow	src/ShortShow.hs	6;"	c
 ShortString	src/ShortShow.hs	16;"	t
 Show_bound_box	src/Dodge/Data/Config.hs	80;"	C
@@ -1286,8 +1283,8 @@ StartSentinelPost	src/Dodge/Data/ActionPlan.hs	151;"	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	174;"	t
+Strategy	src/Dodge/Data/ActionPlan.hs	171;"	t
-StrategyActions	src/Dodge/Data/ActionPlan.hs	186;"	C
+StrategyActions	src/Dodge/Data/ActionPlan.hs	183;"	C
 SubInventory	src/Dodge/Data/HUD.hs	16;"	t
 Superfluous	src/Shape/Data.hs	38;"	C
 Surface	src/Shape/Data.hs	41;"	t
@@ -1414,7 +1411,7 @@ 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	158;"	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
@@ -1428,11 +1425,10 @@ 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	161;"	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	155;"	C
+UseSelf	src/Dodge/Data/ActionPlan.hs	152;"	C
-UseTarget	src/Dodge/Data/ActionPlan.hs	152;"	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
@@ -1483,8 +1479,8 @@ 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	183;"	C
+WarningCry	src/Dodge/Data/ActionPlan.hs	180;"	C
-WatchAndWait	src/Dodge/Data/ActionPlan.hs	181;"	C
+WatchAndWait	src/Dodge/Data/ActionPlan.hs	178;"	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
@@ -1536,7 +1532,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	176;"	f
+_ambushTarget	src/Dodge/Data/ActionPlan.hs	173;"	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
@@ -1549,7 +1545,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	165;"	f
+_arbitraryAction	src/Dodge/Data/ActionPlan.hs	162;"	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
@@ -1838,7 +1834,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	175;"	f
+_flankTarget	src/Dodge/Data/ActionPlan.hs	172;"	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
@@ -1943,7 +1939,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	197;"	f
+_killTarget	src/Dodge/Data/ActionPlan.hs	194;"	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
@@ -1996,7 +1992,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	169;"	f
+_mainAction	src/Dodge/Data/ActionPlan.hs	166;"	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
@@ -2040,7 +2036,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	185;"	f
+_meleeTarget	src/Dodge/Data/ActionPlan.hs	182;"	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
@@ -2288,8 +2284,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	198;"	f
+_sentinelDir	src/Dodge/Data/ActionPlan.hs	195;"	f
-_sentinelPos	src/Dodge/Data/ActionPlan.hs	198;"	f
+_sentinelPos	src/Dodge/Data/ActionPlan.hs	195;"	f
 _sfColor	src/Shape/Data.hs	44;"	f
 _sfShadowImportance	src/Shape/Data.hs	45;"	f
 _sfSize	src/Shape/Data.hs	46;"	f
@@ -2311,7 +2307,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	168;"	f
+_sideImpulses	src/Dodge/Data/ActionPlan.hs	165;"	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
@@ -2438,13 +2434,12 @@ _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	159;"	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	162;"	f
+_useMvTargetPos	src/Dodge/Data/ActionPlan.hs	159;"	f
-_useSelf	src/Dodge/Data/ActionPlan.hs	156;"	f
+_useSelf	src/Dodge/Data/ActionPlan.hs	153;"	f
-_useTarget	src/Dodge/Data/ActionPlan.hs	153;"	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
@@ -2667,15 +2662,15 @@ 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	71;"	f
+attentionViewPoint	src/Dodge/Creature/ReaderUpdate.hs	74;"	f
 attribSize	src/Shader/Compile.hs	306;"	f
 autoAmr	src/Dodge/Item/Held/Rod.hs	39;"	f
 autoBS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	488;"	f
-autoCrit	src/Dodge/Creature/AutoCrit.hs	12;"	f
+autoCrit	src/Dodge/Creature/AutoCrit.hs	10;"	f
 autoGunS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	694;"	f
 autoPistol	src/Dodge/Item/Held/Stick.hs	49;"	f
 autoRifle	src/Dodge/Item/Held/Cane.hs	27;"	f
-awakeLevelPerception	src/Dodge/Creature/Perception.hs	163;"	f
+awakeLevelPerception	src/Dodge/Creature/Perception.hs	161;"	f
 axisInt	src/Geometry/Intersect.hs	248;"	f
 azure	src/Color.hs	22;"	f
 bQuadToF	src/Geometry/Bezier.hs	37;"	f
@@ -2706,8 +2701,8 @@ baseShoulder	src/Dodge/Creature/Picture.hs	116;"	f
 baseStickShape	src/Dodge/Item/Draw/SPic.hs	300;"	f
 baseStickShapeX	src/Dodge/Item/Draw/SPic.hs	292;"	f
 baseStickSpread	src/Dodge/HeldUse.hs	319;"	f
-basicAttentionUpdate	src/Dodge/Creature/Perception.hs	128;"	f
+basicAttentionUpdate	src/Dodge/Creature/Perception.hs	127;"	f
-basicAwarenessUpdate	src/Dodge/Creature/Perception.hs	38;"	f
+basicAwarenessUpdate	src/Dodge/Creature/Perception.hs	39;"	f
 basicCrPict	src/Dodge/Creature/Picture.hs	30;"	f
 basicCrShape	src/Dodge/Creature/Picture.hs	36;"	f
 basicDrawBeam	src/Dodge/Beam/Draw.hs	11;"	f
@@ -2720,7 +2715,7 @@ batteryPack	src/Dodge/Item/Equipment.hs	46;"	f
 belowNumX	src/Dodge/Combine/Graph.hs	86;"	f
 beltMag	src/Dodge/Item/Ammo.hs	39;"	f
 bfsNodePoints	src/Dodge/Path.hs	57;"	f
-bfsThenReturn	src/Dodge/Creature/ReaderUpdate.hs	230;"	f
+bfsThenReturn	src/Dodge/Creature/ReaderUpdate.hs	226;"	f
 bgateCalc	src/Dodge/Inventory/SelectionList.hs	118;"	f
 bgunSound	src/Dodge/HeldUse.hs	514;"	f
 bindFBO	src/Render.hs	245;"	f
@@ -2728,10 +2723,10 @@ bingate	src/Dodge/Item/Scope.hs	109;"	f
 black	src/Color.hs	27;"	f
 blank	src/Picture/Base.hs	59;"	f
 blinkAcrossChallenge	src/Dodge/Room/BlinkAcross.hs	14;"	f
-blinkActionFail	src/Dodge/Creature/Action/Blink.hs	89;"	f
+blinkActionFail	src/Dodge/Creature/Action/Blink.hs	86;"	f
 blinkActionMousePos	src/Dodge/Creature/Action/Blink.hs	24;"	f
 blinkDistortions	src/Dodge/Creature/Action/Blink.hs	45;"	f
-blinkShockwave	src/Dodge/Creature/Action/Blink.hs	80;"	f
+blinkShockwave	src/Dodge/Creature/Action/Blink.hs	77;"	f
 blinker	src/Dodge/Item/Held/Utility.hs	30;"	f
 blipAt	src/Dodge/RadarSweep.hs	78;"	f
 blockLine	src/Dodge/Placement/Instance/Wall.hs	41;"	f
@@ -2820,9 +2815,9 @@ charToTuple	src/Picture/Base.hs	317;"	f
 charToTupleGrad	src/Picture/Text.hs	18;"	f
 chartreuse	src/Color.hs	24;"	f
 chaseCrit	src/Dodge/Creature/ChaseCrit.hs	27;"	f
-chaseCritAwarenessUpdate	src/Dodge/Creature/Perception.hs	70;"	f
+chaseCritAwarenessUpdate	src/Dodge/Creature/Perception.hs	65;"	f
-chaseCritMv	src/Dodge/Creature/ReaderUpdate.hs	117;"	f
+chaseCritMv	src/Dodge/Creature/ReaderUpdate.hs	120;"	f
-chaseCritPerceptionUpdate	src/Dodge/Creature/Perception.hs	31;"	f
+chaseCritPerceptionUpdate	src/Dodge/Creature/Perception.hs	32;"	f
 chaseCritVocalization	src/Dodge/Creature/ChaseCrit.hs	37;"	f
 chasmSimpleMaze	src/Dodge/Room/Tutorial.hs	175;"	f
 chasmTest	src/Dodge/Creature/Update.hs	132;"	f
@@ -2847,10 +2842,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	108;"	f
+chooseMovementLtAuto	src/Dodge/CreatureEffect.hs	104;"	f
-chooseMovementPistol	src/Dodge/Humanoid.hs	204;"	f
+chooseMovementPistol	src/Dodge/Humanoid.hs	203;"	f
-chooseMovementPistol'	src/Dodge/Humanoid.hs	209;"	f
+chooseMovementPistol'	src/Dodge/Humanoid.hs	208;"	f
-chooseMovementSpreadGun	src/Dodge/CreatureEffect.hs	91;"	f
+chooseMovementSpreadGun	src/Dodge/CreatureEffect.hs	87;"	f
 circHitWall	src/Dodge/Base/Collide.hs	242;"	f
 circInPolygon	src/Geometry/Polygon.hs	102;"	f
 circOnAnyCr	src/Dodge/Base/Collide.hs	297;"	f
@@ -2897,7 +2892,7 @@ clsNearRect	src/Dodge/Zoning/Cloud.hs	15;"	f
 clsNearSeg	src/Dodge/Zoning/Cloud.hs	12;"	f
 clusterFormatting	src/Dodge/Combine/Graph.hs	125;"	f
 clusterFunc	src/Dodge/Combine/Graph.hs	119;"	f
-cogRaised	src/Dodge/Creature/Perception.hs	102;"	f
+cogRaised	src/Dodge/Creature/Perception.hs	101;"	f
 colCrWall	src/Dodge/WallCreatureCollisions.hs	29;"	f
 colCrsWalls	src/Dodge/WallCreatureCollisions.hs	19;"	f
 collectDamageTypes	src/Dodge/Damage.hs	53;"	f
@@ -2921,7 +2916,7 @@ combinationsDotGraph	src/Dodge/Combine/Graph.hs	95;"	f
 combinationsGraph	src/Dodge/Combine/Graph.hs	74;"	f
 combinationsOf	src/Multiset.hs	46;"	f
 combinationsTrie	src/Dodge/Combine.hs	43;"	f
-combineAwareness	src/Dodge/Creature/Perception.hs	110;"	f
+combineAwareness	src/Dodge/Creature/Perception.hs	109;"	f
 combineFloors	src/Dodge/Room/Procedural.hs	174;"	f
 combineInventoryExtra	src/Dodge/Render/HUD.hs	337;"	f
 combineItemListYouX	src/Dodge/Combine.hs	35;"	f
@@ -2963,7 +2958,7 @@ corridorBoss	src/Dodge/LockAndKey.hs	133;"	f
 corridorN	src/Dodge/Room/Corridor.hs	52;"	f
 corridorWallN	src/Dodge/Room/Corridor.hs	71;"	f
 crAdd	src/Dodge/Room/RezBox.hs	116;"	f
-crAwayFromPost	src/Dodge/Creature/Test.hs	83;"	f
+crAwayFromPost	src/Dodge/Creature/Test.hs	85;"	f
 crBlips	src/Dodge/RadarSweep.hs	88;"	f
 crCamouflage	src/Dodge/Creature/Picture.hs	33;"	f
 crCanSeeCr	src/Dodge/Creature/Test.hs	52;"	f
@@ -2978,10 +2973,10 @@ crHeight	src/Dodge/Base/Collide.hs	175;"	f
 crHit	src/Dodge/WorldEvent/ThingsHit.hs	113;"	f
 crIXsNearCirc	src/Dodge/Zoning/Creature.hs	33;"	f
 crIXsNearPoint	src/Dodge/Zoning/Creature.hs	15;"	f
-crInAimStance	src/Dodge/Creature/Test.hs	91;"	f
+crInAimStance	src/Dodge/Creature/Test.hs	93;"	f
 crIntelligence	src/Dodge/Creature/Statistics.hs	39;"	f
 crIsAiming	src/Dodge/Creature/Test.hs	60;"	f
-crIsArmouredFrom	src/Dodge/Creature/Test.hs	106;"	f
+crIsArmouredFrom	src/Dodge/Creature/Test.hs	108;"	f
 crMass	src/Dodge/Creature/Mass.hs	5;"	f
 crMaterial	src/Dodge/Creature/Material.hs	8;"	f
 crMaxHP	src/Dodge/Creature/MaxHP.hs	6;"	f
@@ -2989,15 +2984,15 @@ crMvAbsolute	src/Dodge/Creature/Impulse/Movement.hs	29;"	f
 crMvBy	src/Dodge/Creature/Impulse/Movement.hs	21;"	f
 crMvForward	src/Dodge/Creature/Impulse/Movement.hs	43;"	f
 crMvType	src/Dodge/Creature/MoveType.hs	6;"	f
-crNearPoint	src/Dodge/Creature/Test.hs	129;"	f
+crNearPoint	src/Dodge/Creature/Test.hs	131;"	f
 crNumFreeSlots	src/Dodge/Inventory/CheckSlots.hs	25;"	f
 crOnWall	src/Dodge/WallCreatureCollisions.hs	88;"	f
 crRad	src/Dodge/Creature/Radius.hs	7;"	f
-crSafeDistFromTarg	src/Dodge/Creature/Test.hs	73;"	f
+crSafeDistFromTarg	src/Dodge/Creature/Test.hs	74;"	f
 crSetRoots	src/Dodge/Inventory/Location.hs	55;"	f
 crShape	src/Dodge/Creature/Shape.hs	8;"	f
 crSpring	src/Dodge/Update.hs	867;"	f
-crStratConMatches	src/Dodge/Creature/Test.hs	78;"	f
+crStratConMatches	src/Dodge/Creature/Test.hs	80;"	f
 crStrength	src/Dodge/Creature/Statistics.hs	29;"	f
 crUpdate	src/Dodge/Creature/Update.hs	59;"	f
 crUpdateInvidLocations	src/Dodge/Inventory/Location.hs	66;"	f
@@ -3110,7 +3105,7 @@ decomposeTree	src/Dodge/Tree/Compose.hs	58;"	f
 decontamRoom	src/Dodge/Room/Airlock.hs	28;"	f
 decoratedBlock	src/Dodge/Placement/Instance/Block.hs	10;"	f
 decorationToShape	src/Dodge/Placement/TopDecoration.hs	9;"	f
-decreaseAwareness	src/Dodge/Creature/Perception.hs	119;"	f
+decreaseAwareness	src/Dodge/Creature/Perception.hs	118;"	f
 decrementTimer	src/Sound.hs	102;"	f
 dedaS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	672;"	f
 dededaS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	454;"	f
@@ -3227,11 +3222,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	62;"	f
+doCrAc	src/Dodge/CreatureEffect.hs	58;"	f
 doCrBl	src/Dodge/CreatureEffect.hs	50;"	f
 doCrGroupUpdate	src/Dodge/CrGroupUpdate.hs	5;"	f
 doCrImp	src/Dodge/CreatureEffect.hs	29;"	f
-doCrWdAc	src/Dodge/CreatureEffect.hs	79;"	f
+doCrWdAc	src/Dodge/CreatureEffect.hs	75;"	f
 doCrWdImp	src/Dodge/CreatureEffect.hs	17;"	f
 doCrWdWd	src/Dodge/CreatureEffect.hs	21;"	f
 doDamage	src/Dodge/Creature/State.hs	43;"	f
@@ -3259,11 +3254,10 @@ 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
-doMCrAc	src/Dodge/CreatureEffect.hs	58;"	f
+doMP2Ac	src/Dodge/CreatureEffect.hs	71;"	f
-doMP2Ac	src/Dodge/CreatureEffect.hs	75;"	f
 doMagnetBuBu	src/Dodge/Bullet.hs	35;"	f
 doModificationEffect	src/Dodge/ModificationEffect.hs	7;"	f
-doP2Ac	src/Dodge/CreatureEffect.hs	71;"	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
@@ -3277,7 +3271,7 @@ doRoomShift	src/Dodge/Room/Link.hs	33;"	f
 doScopeZoom	src/Dodge/Update/Scroll.hs	91;"	f
 doSectionSize	src/Dodge/DisplayInventory.hs	211;"	f
 doSideEffects	appDodge/Main.hs	121;"	f
-doStrategyActions	src/Dodge/Creature/ReaderUpdate.hs	176;"	f
+doStrategyActions	src/Dodge/Creature/ReaderUpdate.hs	172;"	f
 doTestDrawing	src/Dodge/Render.hs	41;"	f
 doTextInputOver	src/Dodge/Update/Input/Text.hs	15;"	f
 doTextInputOverUniverse	src/Dodge/Update/Input/Text.hs	12;"	f
@@ -3482,10 +3476,10 @@ elecCrackleS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	508;"	f
 elephantGun	src/Dodge/Item/Held/Rod.hs	27;"	f
 emptyCorridor	src/Dodge/Room/BlinkAcross.hs	22;"	f
 emptyTrie	src/SimpleTrie.hs	17;"	f
-encircle	src/Dodge/Creature/Boid.hs	117;"	f
+encircle	src/Dodge/Creature/Boid.hs	118;"	f
-encircleCloseP	src/Dodge/Creature/Boid.hs	37;"	f
+encircleCloseP	src/Dodge/Creature/Boid.hs	38;"	f
-encircleDistP	src/Dodge/Creature/Boid.hs	23;"	f
+encircleDistP	src/Dodge/Creature/Boid.hs	24;"	f
-encircleP	src/Dodge/Creature/Boid.hs	29;"	f
+encircleP	src/Dodge/Creature/Boid.hs	30;"	f
 endArcPos	src/Dodge/Tesla.hs	87;"	f
 endCombineRegex	src/Dodge/Update/Input/InGame.hs	271;"	f
 endRegex	src/Dodge/Update/Input/InGame.hs	265;"	f
@@ -3570,20 +3564,18 @@ 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	123;"	f
+fleeFrom	src/Dodge/CreatureEffect.hs	119;"	f
-fleeFromTarget	src/Dodge/CreatureEffect.hs	68;"	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
-flockACC	src/Dodge/Creature/ReaderUpdate.hs	92;"	f
+flockACC	src/Dodge/Creature/ReaderUpdate.hs	95;"	f
 flockArmourChaseCrit	src/Dodge/Creature/ArmourChase.hs	14;"	f
-flockCenterFunc	src/Dodge/Creature/Boid.hs	255;"	f
+flockCenterFunc	src/Dodge/Creature/Boid.hs	259;"	f
-flockChaseTarget	src/Dodge/Creature/Boid.hs	186;"	f
+flockChaseTarget	src/Dodge/Creature/Boid.hs	188;"	f
-flockFunc	src/Dodge/Creature/Boid.hs	242;"	f
+flockFunc	src/Dodge/Creature/Boid.hs	246;"	f
-flockPointTarget	src/Dodge/Creature/Boid.hs	201;"	f
+flockPointTarget	src/Dodge/Creature/Boid.hs	204;"	f
-flockPointTargetR	src/Dodge/Creature/Boid.hs	268;"	f
+flockPointTargetR	src/Dodge/Creature/Boid.hs	272;"	f
-flockToPointUsing	src/Dodge/Creature/Boid.hs	216;"	f
+flockToPointUsing'	src/Dodge/Creature/Boid.hs	232;"	f
-flockToPointUsing'	src/Dodge/Creature/Boid.hs	229;"	f
 floorItemPickupInfo	src/Dodge/Render/HUD.hs	231;"	f
 floorItemSPic	src/Dodge/Render/ShapePicture.hs	121;"	f
 floorWire	src/Dodge/Wire.hs	13;"	f
@@ -3592,12 +3584,12 @@ foamSprayLoopS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	554;"	f
 foldMTRS	src/Dodge/Room/Tutorial.hs	53;"	f
 foldPairs	src/ListHelp.hs	37;"	f
 foldrWhileArb	src/ListHelp.hs	110;"	f
-followImpulse	src/Dodge/Creature/Impulse.hs	38;"	f
+followImpulse	src/Dodge/Creature/Impulse.hs	39;"	f
-followImpulses	src/Dodge/Creature/Impulse.hs	32;"	f
+followImpulses	src/Dodge/Creature/Impulse.hs	33;"	f
 foot1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	486;"	f
 foot2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	510;"	f
 foot3S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	622;"	f
-forbidFlee	src/Dodge/Creature/Boid.hs	44;"	f
+forbidFlee	src/Dodge/Creature/Boid.hs	45;"	f
 forceElements	src/StrictHelp.hs	10;"	f
 forceField	src/Dodge/Wall/ForceField.hs	7;"	f
 forceFoldable	src/StrictHelp.hs	7;"	f
@@ -3697,7 +3689,7 @@ glassSwitchBackCrits	src/Dodge/Room/Room.hs	106;"	f
 glauncherPic	src/Dodge/Item/Draw/SPic.hs	400;"	f
 glushortSize	src/Shader/Parameters.hs	25;"	f
 goToPostStrat	src/Dodge/Creature/Strategy.hs	10;"	f
-goToTarget	src/Dodge/Creature/ReaderUpdate.hs	147;"	f
+goToTarget	src/Dodge/Creature/ReaderUpdate.hs	150;"	f
 grahamEliminate	src/Geometry/Polygon.hs	163;"	f
 grahamScan	src/Geometry/Polygon.hs	154;"	f
 grapeCannon	src/Dodge/Item/Held/Cone.hs	17;"	f
@@ -3781,19 +3773,19 @@ highMesh	src/Dodge/Room/Foreground.hs	25;"	f
 hit1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	580;"	f
 hitEffFromBul	src/Dodge/Bullet.hs	155;"	f
 hitS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	534;"	f
-holdForm	src/Dodge/Creature/Boid.hs	138;"	f
+holdForm	src/Dodge/Creature/Boid.hs	139;"	f
 holsterWeapon	src/Dodge/Creature/Volition.hs	15;"	f
 homingModule	src/Dodge/Item/Scope.hs	48;"	f
 horPipe	src/Dodge/Placement/Instance/Pipe.hs	9;"	f
 hotkeyToChar	src/Dodge/Inventory/SelectionList.hs	188;"	f
 hotkeyToScancode	src/Dodge/Creature/YourControl.hs	82;"	f
 hotkeyToString	src/Dodge/Inventory/SelectionList.hs	185;"	f
-humanoidAIList	src/Dodge/Humanoid.hs	183;"	f
+humanoidAIList	src/Dodge/Humanoid.hs	182;"	f
 iShape	src/Dodge/Placement/Instance/LightSource.hs	87;"	f
 icosahedronPoints	src/Polyhedra/Geodesic.hs	12;"	f
 icosohedronFaces	src/Polyhedra/Geodesic.hs	19;"	f
 ildtPropagate	src/Dodge/DoubleTree.hs	111;"	f
-impulsiveAIBefore	src/Dodge/Creature/Impulse.hs	23;"	f
+impulsiveAIBefore	src/Dodge/Creature/Impulse.hs	24;"	f
 inLink	src/Dodge/RoomLink.hs	128;"	f
 inSegArea	src/Geometry/Intersect.hs	319;"	f
 inSimplePoly	src/Geometry/Polygon.hs	90;"	f
@@ -3826,7 +3818,7 @@ insertWalls	src/Dodge/Placement/PlaceSpot/Block.hs	117;"	f
 insertWithNewKeys	src/IntMapHelp.hs	70;"	f
 intAnno	src/Dodge/Floor.hs	111;"	f
 interactWithCloseObj	src/Dodge/SelectedClose.hs	9;"	f
-interpWith	src/Dodge/Creature/Boid.hs	12;"	f
+interpWith	src/Dodge/Creature/Boid.hs	13;"	f
 intersectCircLine	src/Geometry/Intersect.hs	354;"	f
 intersectCircLineAlong	src/Geometry/Intersect.hs	345;"	f
 intersectCircSeg	src/Geometry/Intersect.hs	324;"	f
@@ -3875,15 +3867,15 @@ inverseSelNumPos	src/Dodge/SelectionSections.hs	193;"	f
 inverseSelSecYint	src/Dodge/SelectionSections.hs	164;"	f
 inverseSelSecYintXPosCheck	src/Dodge/SelectionSections.hs	177;"	f
 inverseShockwaveAt	src/Dodge/WorldEvent/Shockwave.hs	43;"	f
-invertEncircleDistP	src/Dodge/Creature/Boid.hs	15;"	f
+invertEncircleDistP	src/Dodge/Creature/Boid.hs	16;"	f
 invertIntMap	src/IntMapHelp.hs	99;"	f
 invertIntMap	src/Multiset.hs	67;"	f
 invertInventoryToMap	src/Dodge/Combine.hs	56;"	f
 invisibleChaseCrit	src/Dodge/Creature/ChaseCrit.hs	21;"	f
 invisibleWall	src/Dodge/Placement/Instance/Wall.hs	16;"	f
 isAmmoIntLink	src/Dodge/HeldUse.hs	717;"	f
-isAnimate	src/Dodge/Creature/Test.hs	132;"	f
+isAnimate	src/Dodge/Creature/Test.hs	134;"	f
-isCognizant	src/Dodge/Creature/Perception.hs	106;"	f
+isCognizant	src/Dodge/Creature/Perception.hs	105;"	f
 isConnected	src/Dodge/Inventory/Swap.hs	77;"	f
 isCornerLink	src/Dodge/RoomLink.hs	65;"	f
 isElectrical	src/Dodge/Machine/Update.hs	84;"	f
@@ -4037,17 +4029,17 @@ line	src/Picture/Base.hs	226;"	f
 lineCol	src/Picture/Base.hs	230;"	f
 lineGeom	src/Dodge/Base.hs	32;"	f
 lineOnScreenCone	src/Dodge/Debug/Picture.hs	60;"	f
-lineOrth	src/Dodge/Creature/Boid.hs	127;"	f
+lineOrth	src/Dodge/Creature/Boid.hs	128;"	f
 lineOutputTerminal	src/Dodge/Room/Warning.hs	66;"	f
 lineSplit	src/Justify.hs	26;"	f
 lineThick	src/Picture/Base.hs	234;"	f
-lineUp	src/Dodge/Creature/Boid.hs	149;"	f
+lineUp	src/Dodge/Creature/Boid.hs	150;"	f
 linksGridToPath	src/Dodge/Room/Path.hs	36;"	f
 linksOnPath	src/Dodge/Room/CheckConsistency.hs	6;"	f
 listConfig	src/Dodge/Menu.hs	239;"	f
 listControls	src/Dodge/Menu.hs	251;"	f
 listCursorChooseBorderScale	src/Dodge/Render/List.hs	135;"	f
-listGuard	src/Dodge/Creature/ReaderUpdate.hs	200;"	f
+listGuard	src/Dodge/Creature/ReaderUpdate.hs	196;"	f
 listSelectionColorPicture	src/Dodge/DisplayInventory.hs	302;"	f
 litCorridor90	src/Dodge/Room/RoadBlock.hs	26;"	f
 lmt	src/MatrixHelper.hs	43;"	f
@@ -4210,7 +4202,7 @@ mcUseItem	src/Dodge/Machine/Update.hs	89;"	f
 megaBattery	src/Dodge/Item/Ammo.hs	55;"	f
 megaShellMag	src/Dodge/Item/Ammo.hs	44;"	f
 megaTinMag	src/Dodge/Item/Ammo.hs	23;"	f
-meleeHeadingMove	src/Dodge/Creature/Boid.hs	283;"	f
+meleeHeadingMove	src/Dodge/Creature/Boid.hs	287;"	f
 memoBoxEdgeIndices	src/Shader/Poke.hs	352;"	f
 memoBoxSurfaces	src/Shader/Poke.hs	286;"	f
 memoCylinderIndices	src/Shader/Poke.hs	323;"	f
@@ -4304,7 +4296,7 @@ mvGust	src/Dodge/Update.hs	784;"	f
 mvLS	src/Dodge/Placement/PlaceSpot.hs	268;"	f
 mvP	src/Dodge/Wall/Move.hs	54;"	f
 mvPointAlongAtSpeed	src/Dodge/Base.hs	121;"	f
-mvPointMeleeTarg	src/Dodge/Creature/Boid.hs	315;"	f
+mvPointMeleeTarg	src/Dodge/Creature/Boid.hs	319;"	f
 mvPointToward	src/Dodge/Base.hs	136;"	f
 mvPointTowardAtSpeed	src/Dodge/Base.hs	105;"	f
 mvProp	src/Dodge/Placement/PlaceSpot.hs	183;"	f
@@ -4321,9 +4313,9 @@ nearRect	src/Dodge/Zoning/Common.hs	16;"	f
 nearSeg	src/Dodge/Zoning/Common.hs	12;"	f
 nearZeroAngle	src/Geometry/Vector.hs	138;"	f
 nearestAngleRep	src/Geometry.hs	148;"	f
-newExtraAwareness	src/Dodge/Creature/Perception.hs	138;"	f
+newExtraAwareness	src/Dodge/Creature/Perception.hs	137;"	f
 newKey	src/IntMapHelp.hs	60;"	f
-newSounds	src/Dodge/Creature/Perception.hs	171;"	f
+newSounds	src/Dodge/Creature/Perception.hs	169;"	f
 newTextureFramebuffer	src/Framebuffer/Setup.hs	16;"	f
 nextArc	src/Dodge/Tesla.hs	61;"	f
 nextInSectionSS	src/Dodge/SelectionSections.hs	34;"	f
@@ -4357,7 +4349,7 @@ oldMachineBootS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	698;"	f
 onEquipWristShield	src/Dodge/Equipment.hs	37;"	f
 onRemoveWristShield	src/Dodge/Equipment.hs	24;"	f
 onXY	src/Geometry/Vector3D.hs	130;"	f
-oneH	src/Dodge/Creature/Test.hs	94;"	f
+oneH	src/Dodge/Creature/Test.hs	96;"	f
 openConsole	src/Dodge/Update.hs	131;"	f
 optionMenu	src/Dodge/Menu.hs	112;"	f
 optionScreenDefaultEffect	src/Dodge/Update/Input/ScreenLayer.hs	52;"	f
@@ -4393,7 +4385,7 @@ overlapCircWalls	src/Dodge/Base/Collide.hs	231;"	f
 overlapCircWallsClosest	src/Dodge/Base/Collide.hs	277;"	f
 overlapSegCrs	src/Dodge/Base/Collide.hs	61;"	f
 overlapSegWalls	src/Dodge/Base/Collide.hs	213;"	f
-overrideInternal	src/Dodge/Creature/ReaderUpdate.hs	184;"	f
+overrideInternal	src/Dodge/Creature/ReaderUpdate.hs	180;"	f
 overrideMeleeCloseTarget	src/Dodge/Creature/ReaderUpdate.hs	35;"	f
 overwriteLabel	src/Dodge/Tree/Compose.hs	31;"	f
 p	src/ShortShow.hs	48;"	f
@@ -4421,7 +4413,7 @@ peZoneSize	src/Dodge/Zoning/Pathing.hs	46;"	f
 pedestalRoom	src/Dodge/Room/Containing.hs	50;"	f
 penThing	src/Dodge/Bullet.hs	210;"	f
 perMat	src/MatrixHelper.hs	49;"	f
-perceptionUpdate	src/Dodge/Creature/Perception.hs	23;"	f
+perceptionUpdate	src/Dodge/Creature/Perception.hs	24;"	f
 performAction	src/Dodge/Creature/Action.hs	93;"	f
 performActions	src/Dodge/Creature/Action.hs	39;"	f
 performAimAt	src/Dodge/Creature/Action.hs	49;"	f
@@ -4437,10 +4429,10 @@ picMap	src/Picture/Base.hs	67;"	f
 pickUpItem	src/Dodge/Inventory/Add.hs	69;"	f
 pickUpItemAt	src/Dodge/Inventory/Add.hs	74;"	f
 pickUpS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	624;"	f
-pincerP	src/Dodge/Creature/Boid.hs	62;"	f
+pincerP	src/Dodge/Creature/Boid.hs	63;"	f
-pincerP'	src/Dodge/Creature/Boid.hs	95;"	f
+pincerP'	src/Dodge/Creature/Boid.hs	96;"	f
-pincerP''	src/Dodge/Creature/Boid.hs	105;"	f
+pincerP''	src/Dodge/Creature/Boid.hs	106;"	f
-pincerP'''	src/Dodge/Creature/Boid.hs	76;"	f
+pincerP'''	src/Dodge/Creature/Boid.hs	77;"	f
 pingPongBetween	src/Render.hs	221;"	f
 pipe	src/Dodge/Item/Craftable.hs	32;"	f
 pistol	src/Dodge/Item/Held/Stick.hs	40;"	f
@@ -4720,7 +4712,7 @@ regexList	src/Dodge/DisplayInventory.hs	308;"	f
 reload1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	602;"	f
 reloadLevelStart	src/Dodge/Save.hs	71;"	f
 reloadS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	600;"	f
-rememberSounds	src/Dodge/Creature/Perception.hs	178;"	f
+rememberSounds	src/Dodge/Creature/Perception.hs	176;"	f
 remoteDetonator	src/Dodge/Item/Scope.hs	144;"	f
 remoteScreen	src/Dodge/Item/Scope.hs	139;"	f
 removeAimPosture	src/Dodge/Creature/YourControl.hs	159;"	f
@@ -4738,7 +4730,7 @@ renderLayer	src/Render.hs	234;"	f
 renderLightingNoShadows	src/Render.hs	48;"	f
 renderListAt	src/Dodge/Render/List.hs	192;"	f
 renderShadows	src/Render.hs	117;"	f
-replaceNullWith	src/Dodge/Creature/ReaderUpdate.hs	172;"	f
+replaceNullWith	src/Dodge/Creature/ReaderUpdate.hs	168;"	f
 replacePutID	src/Dodge/Placement/Instance/Wall.hs	102;"	f
 resetCrVocCoolDown	src/Dodge/Creature/Vocalization.hs	47;"	f
 resetPLUse	src/Dodge/PlacementSpot.hs	92;"	f
@@ -4753,8 +4745,8 @@ restrictLinkType	src/Dodge/RoomLink.hs	34;"	f
 restrictOutLinks	src/Dodge/RoomLink.hs	47;"	f
 restrictRMInLinksPD	src/Dodge/Room/Link.hs	25;"	f
 resumeSound	src/Dodge/SoundLogic.hs	48;"	f
-retreatActionsPistol	src/Dodge/Humanoid.hs	250;"	f
+retreatActionsPistol	src/Dodge/Humanoid.hs	249;"	f
-retreatFireLauncher	src/Dodge/Humanoid.hs	271;"	f
+retreatFireLauncher	src/Dodge/Humanoid.hs	270;"	f
 retreatPointForFrom	src/Dodge/Creature/Impulse/Flee.hs	9;"	f
 reversePair	src/Dodge/LevelGen.hs	85;"	f
 rewinder	src/Dodge/Item/Held/Utility.hs	36;"	f
@@ -4886,7 +4878,7 @@ seagullCry2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	576;"	f
 seagullCryS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	588;"	f
 seagullWhistle1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	502;"	f
 seagullWhistleS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	718;"	f
-searchIfDamaged	src/Dodge/Creature/ReaderUpdate.hs	217;"	f
+searchIfDamaged	src/Dodge/Creature/ReaderUpdate.hs	213;"	f
 secondColumnLDP	src/Dodge/ListDisplayParams.hs	43;"	f
 sectionsDesiredLines	src/Dodge/DisplayInventory.hs	198;"	f
 sectionsSizes	src/Dodge/DisplayInventory.hs	201;"	f
@@ -4911,8 +4903,8 @@ sensorSPic	src/Dodge/Machine/Draw.hs	81;"	f
 sensorTut	src/Dodge/Room/Tutorial.hs	332;"	f
 sensorTypeDamages	src/Dodge/Machine/Update.hs	234;"	f
 sentinelAI	src/Dodge/Creature/SentinelAI.hs	20;"	f
-sentinelExtraWatchUpdate	src/Dodge/Creature/SentinelAI.hs	83;"	f
+sentinelExtraWatchUpdate	src/Dodge/Creature/SentinelAI.hs	82;"	f
-sentinelFireType	src/Dodge/Creature/SentinelAI.hs	50;"	f
+sentinelFireType	src/Dodge/Creature/SentinelAI.hs	49;"	f
 setAimPosture	src/Dodge/Creature/YourControl.hs	145;"	f
 setChannelPos	src/Sound.hs	150;"	f
 setClickWorldPos	src/Dodge/Update.hs	101;"	f
@@ -4928,7 +4920,7 @@ setLayer	src/Picture/Base.hs	139;"	f
 setLinkType	src/Dodge/RoomLink.hs	78;"	f
 setLinkTypePD	src/Dodge/RoomLink.hs	85;"	f
 setMusicVolume	src/Sound.hs	162;"	f
-setMvPos	src/Dodge/Creature/ReaderUpdate.hs	56;"	f
+setMvPos	src/Dodge/Creature/ReaderUpdate.hs	58;"	f
 setOldPos	src/Dodge/Update.hs	502;"	f
 setOutLinks	src/Dodge/RoomLink.hs	50;"	f
 setOutLinksByType	src/Dodge/RoomLink.hs	75;"	f
@@ -4940,13 +4932,13 @@ setSelectionListRestriction	src/Dodge/Update/Input/ScreenLayer.hs	87;"	f
 setShaderSource	src/Shader/Compile.hs	290;"	f
 setShadowLimits	src/Dodge/Shadows.hs	11;"	f
 setSoundVolume	src/Sound.hs	157;"	f
-setTargetMv	src/Dodge/Creature/ReaderUpdate.hs	79;"	f
+setTargetMv	src/Dodge/Creature/ReaderUpdate.hs	82;"	f
 setTile	src/Dodge/Layout.hs	66;"	f
 setTiles	src/Dodge/Layout.hs	63;"	f
 setToggle	src/Dodge/Prop/Update.hs	44;"	f
 setTreeInts	src/Dodge/Room/Tutorial.hs	67;"	f
 setViewDistance	src/Dodge/Update/Camera.hs	236;"	f
-setViewPos	src/Dodge/Creature/ReaderUpdate.hs	66;"	f
+setViewPos	src/Dodge/Creature/ReaderUpdate.hs	69;"	f
 setViewport	src/Dodge/Render.hs	440;"	f
 setVol	src/Dodge/Config.hs	47;"	f
 setWristShieldPos	src/Dodge/Equipment.hs	49;"	f
@@ -5078,7 +5070,7 @@ someCrits	src/Dodge/LockAndKey.hs	120;"	f
 soundAngle	src/Dodge/SoundLogic.hs	163;"	f
 soundContinue	src/Dodge/SoundLogic.hs	131;"	f
 soundContinueVol	src/Dodge/SoundLogic.hs	145;"	f
-soundIsClose	src/Dodge/Creature/Perception.hs	184;"	f
+soundIsClose	src/Dodge/Creature/Perception.hs	182;"	f
 soundMenu	src/Dodge/Menu.hs	160;"	f
 soundMenuOptions	src/Dodge/Menu.hs	163;"	f
 soundMultiFrom	src/Dodge/SoundLogic.hs	187;"	f
@@ -5118,7 +5110,7 @@ spreadAroundCenter	src/Dodge/Base.hs	173;"	f
 spreadCenter	src/Dodge/Base.hs	187;"	f
 spreadFromCenter	src/Dodge/Base.hs	176;"	f
 spreadGunCrit	src/Dodge/Creature/SpreadGunCrit.hs	11;"	f
-spreadOut	src/Dodge/Creature/Boid.hs	159;"	f
+spreadOut	src/Dodge/Creature/Boid.hs	160;"	f
 sps	src/Dodge/LevelGen/PlacementHelper.hs	30;"	f
 sps0	src/Dodge/LevelGen/PlacementHelper.hs	42;"	f
 square	src/Geometry/Polygon.hs	48;"	f
@@ -5183,7 +5175,7 @@ swapIndices	src/ListHelp.hs	50;"	f
 swapInvItems	src/Dodge/Inventory/Swap.hs	22;"	f
 swapItemWith	src/Dodge/Inventory.hs	164;"	f
 swarmCrit	src/Dodge/Creature/SwarmCrit.hs	10;"	f
-swarmUsingCenter	src/Dodge/Creature/Boid.hs	173;"	f
+swarmUsingCenter	src/Dodge/Creature/Boid.hs	174;"	f
 switchDoor	src/Dodge/Placement/Instance/Door.hs	104;"	f
 switchWallCol	src/Dodge/Default/Door.hs	12;"	f
 t	src/ShortShow.hs	48;"	f
@@ -5213,7 +5205,7 @@ targCorner	src/Dodge/Targeting/Draw.hs	35;"	f
 targetCursorPic	src/Dodge/Targeting/Draw.hs	41;"	f
 targetYouCognizant	src/Dodge/Creature/ChooseTarget.hs	14;"	f
 targetYouLOS	src/Dodge/Creature/ChooseTarget.hs	8;"	f
-targetYouWhenCognizant	src/Dodge/Creature/ReaderUpdate.hs	206;"	f
+targetYouWhenCognizant	src/Dodge/Creature/ReaderUpdate.hs	202;"	f
 targetYouWhenCognizant	src/Dodge/Creature/SetTarget.hs	9;"	f
 targetingScope	src/Dodge/Item/Scope.hs	38;"	f
 teleS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	528;"	f
@@ -5366,7 +5358,7 @@ tryDrawToCapacitor	src/Dodge/Creature/State.hs	151;"	f
 tryDropSelected	src/Dodge/Update/Input/InGame.hs	138;"	f
 tryGetChannel	src/Sound.hs	97;"	f
 tryGetRootAttachedFromInvID	src/Dodge/Inventory/Location.hs	22;"	f
-tryMeleeAttack	src/Dodge/Creature/ReaderUpdate.hs	38;"	f
+tryMeleeAttack	src/Dodge/Creature/ReaderUpdate.hs	40;"	f
 tryPickupSelected	src/Dodge/Update/Input/InGame.hs	145;"	f
 tryPlay	src/Sound.hs	84;"	f
 tryPutItemInInv	src/Dodge/Inventory/Add.hs	24;"	f
@@ -5389,8 +5381,8 @@ tutorialMessage1	src/Dodge/Room/Tutorial.hs	367;"	f
 tweenAngles	src/Geometry/Vector.hs	190;"	f
 twinSlowDoorChasers	src/Dodge/Room/LongDoor.hs	81;"	f
 twinSlowDoorRoom	src/Dodge/Room/LongDoor.hs	29;"	f
-twists	src/Dodge/Creature/Test.hs	100;"	f
+twists	src/Dodge/Creature/Test.hs	102;"	f
-twoFlat	src/Dodge/Creature/Test.hs	97;"	f
+twoFlat	src/Dodge/Creature/Test.hs	99;"	f
 twoFlatHRot	src/Dodge/Item/HeldOffset.hs	80;"	f
 twoHandTwistAmount	src/Dodge/Creature/YourControl.hs	166;"	f
 twoRoomPoss	src/Dodge/PlacementSpot.hs	146;"	f
@@ -5459,7 +5451,7 @@ updateFloatingCamera	src/Dodge/Update/Camera.hs	35;"	f
 updateFunctionKey	src/Dodge/Update/Input/InGame.hs	363;"	f
 updateFunctionKeys	src/Dodge/Update/Input/InGame.hs	359;"	f
 updateGusts	src/Dodge/Update.hs	781;"	f
-updateHumanoid	src/Dodge/Humanoid.hs	14;"	f
+updateHumanoid	src/Dodge/Humanoid.hs	13;"	f
 updateIMl	src/Dodge/Update.hs	531;"	f
 updateIMl'	src/Dodge/Update.hs	534;"	f
 updateInGameCamera	src/Dodge/Update/Camera.hs	79;"	f
@@ -5596,7 +5588,7 @@ viewDistanceFromItems	src/Dodge/Update/Camera.hs	194;"	f
 viewTarget	src/Dodge/Creature/ReaderUpdate.hs	155;"	f
 violet	src/Color.hs	21;"	f
 visibleWalls	src/Dodge/Base/Collide.hs	217;"	f
-visionCheck	src/Dodge/Creature/Perception.hs	153;"	f
+visionCheck	src/Dodge/Creature/Perception.hs	152;"	f
 vocalizationTest	src/Dodge/Creature/Vocalization.hs	42;"	f
 volleyGun	src/Dodge/Item/Held/Cane.hs	15;"	f
 volleyGunShape	src/Dodge/Item/Draw/SPic.hs	357;"	f
@@ -5617,7 +5609,7 @@ wasdM	src/Dodge/WASD.hs	9;"	f
 wasdMovement	src/Dodge/Creature/YourControl.hs	169;"	f
 wasdWithAiming	src/Dodge/Creature/YourControl.hs	126;"	f
 watchCombinations	src/Dodge/Combine/Combinations.hs	16;"	f
-watchUpdateStrat	src/Dodge/Creature/ReaderUpdate.hs	189;"	f
+watchUpdateStrat	src/Dodge/Creature/ReaderUpdate.hs	185;"	f
 weakenMatS	src/Dodge/Material/Sound.hs	18;"	f
 weaponBehindPillar	src/Dodge/Room/Room.hs	186;"	f
 weaponBetweenPillars	src/Dodge/Room/Room.hs	202;"	f