Add HoverCrit

src/Dodge/Creature/MoveType.hs

@@ -7,6 +7,7 @@ crMvType :: Creature -> CrMvType
 crMvType cr = case _crType cr of
     Avatar {_avMoveSpeed = s} -> MvWalking s
     ChaseCrit {} -> defaultChaseMvType
+    HoverCrit {} -> defaultChaseMvType
     SwarmCrit -> defaultChaseMvType
     AutoCrit -> defaultAimMvType
     BarrelCrit {} -> defaultAimMvType

src/Dodge/Creature/Shape.hs

@@ -9,6 +9,7 @@ crShape :: CreatureType -> CreatureShape
 crShape = \case
     Avatar{} -> Humanoid (greyN 0.9) (lightx4 black) (greyN 0.3)
     ChaseCrit {} -> Humanoid (greyN 0.9) (lightx4 green) (greyN 0.3)
+    HoverCrit {} -> Humanoid (greyN 0.9) (lightx4 blue) (greyN 0.3)
     SwarmCrit -> Humanoid (greyN 0.9) (lightx4 yellow) (greyN 0.3)
     AutoCrit -> Humanoid (greyN 0.9) (lightx4 red) (greyN 0.3)
     BarrelCrit {} -> Barreloid

src/Dodge/Creature/Statistics.hs

@@ -20,6 +20,7 @@ crDexterity :: Creature -> Int
 crDexterity cr = case cr ^. crType of
     Avatar { _avDexterity = x } -> x
     ChaseCrit {} -> 46
+    HoverCrit {} -> 46
     SwarmCrit -> 46
     AutoCrit -> 46
     BarrelCrit {} -> 0
@@ -29,6 +30,7 @@ crStrength :: Creature -> Int
 crStrength cr = case cr ^. crType of
     Avatar { _avStrength = x } -> x
     ChaseCrit {} -> 46
+    HoverCrit {} -> 46
     SwarmCrit -> 40
     AutoCrit -> 46
     BarrelCrit {} -> 0
@@ -38,6 +40,7 @@ crIntelligence :: Creature -> Int
 crIntelligence  cr = case cr ^. crType of
     Avatar { _avIntelligence = x } -> x
     ChaseCrit {} -> 20
+    HoverCrit {} -> 20
     SwarmCrit -> 20
     AutoCrit -> 20
     BarrelCrit {} -> 0

src/Dodge/Creature/Vocalization.hs

@@ -17,6 +17,7 @@ crVocalizationSound :: Creature -> Maybe SoundID
 crVocalizationSound cr = case cr ^. crType of
     Avatar{} -> Nothing
     ChaseCrit{} -> Just seagullChatterS
+    HoverCrit{} -> Nothing
     SwarmCrit -> Nothing
     AutoCrit -> Nothing
     BarrelCrit{} -> Nothing
@@ -35,6 +36,7 @@ crWarningSounds cr = case cr ^. crType of
         , seagullCry1S
         , seagullCry2S
         ]
+    HoverCrit {} -> mempty
     SwarmCrit -> mempty
     AutoCrit -> mempty
     BarrelCrit{} -> mempty
@@ -44,6 +46,7 @@ crDeathSounds :: Creature -> DeathType -> [SoundID]
 crDeathSounds cr dt = case cr ^. crType of
     Avatar{} -> mempty
     ChaseCrit{} -> defaultDeathSounds dt
+    HoverCrit{} -> defaultDeathSounds dt
     SwarmCrit -> mempty
     AutoCrit -> mempty
     BarrelCrit{} -> mempty

src/Dodge/Data/Creature/Misc.hs

@@ -77,8 +77,6 @@ data BarrelType
 
 makeLenses ''Pulse
 makeLenses ''BarrelType
-
---makeLenses ''CreatureStatistics
 makeLenses ''Vocalization
 makeLenses ''CrMvType
 makeLenses ''CreatureType

tags

@@ -73,12 +73,11 @@ AttachType	src/Dodge/Data/Item/Combine.hs	91;"	t
 Attention	src/Dodge/Data/Creature/Perception.hs	58;"	t
 AttentiveTo	src/Dodge/Data/Creature/Perception.hs	59;"	C
 Audition	src/Dodge/Data/Creature/Perception.hs	45;"	t
-AutoAI	src/Dodge/Data/Creature/Misc.hs	46;"	C
+AutoCrit	src/Dodge/Data/Creature/Misc.hs	57;"	C
-AutoCrit	src/Dodge/Data/Creature/Misc.hs	71;"	C
 AutoTrigger	src/Dodge/Data/TriggerType.hs	8;"	C
-AvPosture	src/Dodge/Data/Creature/Misc.hs	75;"	C
+AvPosture	src/Dodge/Data/Creature/Misc.hs	61;"	C
-Avatar	src/Dodge/Data/Creature/Misc.hs	60;"	C
+Avatar	src/Dodge/Data/Creature/Misc.hs	45;"	C
-AvatarPosture	src/Dodge/Data/Creature/Misc.hs	75;"	t
+AvatarPosture	src/Dodge/Data/Creature/Misc.hs	61;"	t
 Awareness	src/Dodge/Data/Creature/Perception.hs	63;"	t
 BANGCONE	src/Dodge/Data/Item/Combine.hs	149;"	C
 BANGROD	src/Dodge/Data/Item/Combine.hs	158;"	C
@@ -104,10 +103,10 @@ BURSTRIFLE	src/Dodge/Data/Item/Combine.hs	157;"	C
 BackdropCurs	src/Dodge/Data/SelectionList.hs	22;"	C
 BackgroundSound	src/Dodge/Data/SoundOrigin.hs	13;"	C
 Bark	src/Dodge/Data/ActionPlan.hs	39;"	C
-BarrelCrit	src/Dodge/Data/Creature/Misc.hs	72;"	C
+BarrelCrit	src/Dodge/Data/Creature/Misc.hs	58;"	C
 BarrelHiss	src/Dodge/Data/SoundOrigin.hs	33;"	C
-BarrelType	src/Dodge/Data/Creature/Misc.hs	88;"	t
+BarrelType	src/Dodge/Data/Creature/Misc.hs	73;"	t
-Barreloid	src/Dodge/Data/Creature/Misc.hs	84;"	C
+Barreloid	src/Dodge/Data/Creature/Misc.hs	69;"	C
 BasicBeamDraw	src/Dodge/Data/Beam.hs	32;"	C
 BasicBulletTrajectory	src/Dodge/Data/Bullet.hs	41;"	C
 BasicBulletTrajectoryType	src/Dodge/Data/Bullet.hs	48;"	C
@@ -204,8 +203,7 @@ CardinalPointBetween	src/Dodge/Data/CardinalPoint.hs	20;"	t
 Carriage	src/Dodge/Data/Creature/Stance.hs	22;"	t
 ChangePosture	src/Dodge/Data/ActionPlan.hs	41;"	C
 ChangeStrategy	src/Dodge/Data/ActionPlan.hs	43;"	C
-ChaseAI	src/Dodge/Data/Creature/Misc.hs	39;"	C
+ChaseCrit	src/Dodge/Data/Creature/Misc.hs	54;"	C
-ChaseCrit	src/Dodge/Data/Creature/Misc.hs	69;"	C
 ChaseCritters	src/Dodge/Data/Creature/State.hs	16;"	C
 ChasmObstacle	src/Dodge/Data/PathGraph.hs	51;"	C
 ChemFuel	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	14;"	C
@@ -281,8 +279,8 @@ CreateFlame	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	17;"	C
 CreatePoisonGas	src/Dodge/Data/Item/Use/Consumption/Ammo.hs	17;"	C
 Creature	src/Dodge/Data/Creature.hs	35;"	t
 CreaturePart	src/Dodge/Data/Wall/Structure.hs	16;"	C
-CreatureShape	src/Dodge/Data/Creature/Misc.hs	77;"	t
+CreatureShape	src/Dodge/Data/Creature/Misc.hs	63;"	t
-CreatureType	src/Dodge/Data/Creature/Misc.hs	59;"	t
+CreatureType	src/Dodge/Data/Creature/Misc.hs	44;"	t
 Crushing	src/Dodge/Data/Damage.hs	19;"	C
 CryoReleaseCloud	src/Dodge/Data/Cloud.hs	23;"	C
 CryostatisSS	src/Dodge/Data/Scenario.hs	91;"	C
@@ -400,7 +398,7 @@ Explosion	src/Dodge/Data/SoundOrigin.hs	38;"	C
 ExplosionPayload	src/Dodge/Data/Payload.hs	9;"	C
 Explosive	src/Dodge/Data/Damage.hs	25;"	C
 ExplosiveBall	src/Dodge/Data/EnergyBall/Type.hs	14;"	C
-ExplosiveBarrel	src/Dodge/Data/Creature/Misc.hs	90;"	C
+ExplosiveBarrel	src/Dodge/Data/Creature/Misc.hs	75;"	C
 ExplosivePutty	src/Dodge/Data/AmmoType.hs	16;"	C
 ExtraMenuOption	src/Dodge/Data/Universe.hs	76;"	t
 Eyes	src/Dodge/Data/Creature/Perception.hs	39;"	C
@@ -451,7 +449,6 @@ FloatFloat	src/Dodge/Data/FloatFunction.hs	9;"	t
 FloatID	src/Dodge/Data/FloatFunction.hs	10;"	C
 FloatLessCheck	src/Dodge/Data/FloatFunction.hs	12;"	C
 Floating	src/Dodge/Data/Creature/Stance.hs	24;"	C
-FlockArmourChaseAI	src/Dodge/Data/Creature/Misc.hs	47;"	C
 Floor	src/Data/Tile.hs	11;"	t
 FloorItem	src/Dodge/Data/FloorItem.hs	11;"	t
 Flying	src/Dodge/Data/Creature/Stance.hs	25;"	C
@@ -552,9 +549,9 @@ HotkeyR	src/Dodge/Data/Equipment/Misc.hs	34;"	C
 HotkeyV	src/Dodge/Data/Equipment/Misc.hs	38;"	C
 HotkeyX	src/Dodge/Data/Equipment/Misc.hs	36;"	C
 HotkeyZ	src/Dodge/Data/Equipment/Misc.hs	35;"	C
+HoverCrit	src/Dodge/Data/Creature/Misc.hs	55;"	C
 Huge	src/Shape/Data.hs	23;"	C
-Humanoid	src/Dodge/Data/Creature/Misc.hs	78;"	C
+Humanoid	src/Dodge/Data/Creature/Misc.hs	64;"	C
-HumanoidAI	src/Dodge/Data/Creature/Misc.hs	38;"	t
 IMSI	src/Dodge/Data/SelectionList.hs	40;"	t
 IMSS	src/Dodge/Data/SelectionList.hs	38;"	t
 INTROSCAN	src/Dodge/Data/Item/Combine.hs	32;"	C
@@ -578,7 +575,6 @@ InRealWorld	src/Dodge/Data/Scenario.hs	18;"	C
 InSimulation	src/Dodge/Data/Scenario.hs	20;"	C
 InVoid	src/Dodge/Data/Item/Location.hs	39;"	C
 Inanimate	src/Dodge/Data/ActionPlan.hs	15;"	C
-InanimateAI	src/Dodge/Data/Creature/Misc.hs	40;"	C
 IncendiaryBall	src/Dodge/Data/EnergyBall/Type.hs	11;"	C
 InheritFloor	src/Data/Tile.hs	12;"	C
 Input	src/Dodge/Data/Input.hs	33;"	t
@@ -642,7 +638,7 @@ LabLink	src/Dodge/Data/Room.hs	50;"	C
 LabSS	src/Dodge/Data/Scenario.hs	97;"	C
 LabelCluster	src/Dodge/Data/RoomCluster.hs	13;"	C
 Laboratory	src/Dodge/Data/Scenario.hs	61;"	C
-LampCrit	src/Dodge/Data/Creature/Misc.hs	73;"	C
+LampCrit	src/Dodge/Data/Creature/Misc.hs	59;"	C
 Large	src/Shape/Data.hs	24;"	C
 LasBeamCombine	src/Dodge/Data/Beam.hs	38;"	C
 LasGunFlare	src/Dodge/Data/Muzzle.hs	34;"	C
@@ -652,7 +648,6 @@ LaserSensor	src/Dodge/Data/Machine/Sensor.hs	13;"	C
 LaserType	src/Dodge/Data/Laser.hs	14;"	t
 LaserWeaponXSF	src/Dodge/Data/ComposedItem.hs	41;"	C
 Lasering	src/Dodge/Data/Damage.hs	22;"	C
-LauncherAI	src/Dodge/Data/Creature/Misc.hs	44;"	C
 LauncherAmmo	src/Dodge/Data/AmmoType.hs	9;"	C
 LaundrySS	src/Dodge/Data/Scenario.hs	115;"	C
 LayVars	src/Dodge/Data/MetaTree.hs	30;"	C
@@ -682,9 +677,7 @@ LoadingScreen	src/Dodge/Data/Universe.hs	93;"	C
 LocDT	src/Dodge/Data/DoubleTree.hs	42;"	C
 LocationDT	src/Dodge/Data/DoubleTree.hs	42;"	t
 LoneWolf	src/Dodge/Data/Creature/State.hs	24;"	C
-LongAI	src/Dodge/Data/Creature/Misc.hs	49;"	C
 LookAround	src/Dodge/Data/ActionPlan.hs	138;"	C
-LtAutoAI	src/Dodge/Data/Creature/Misc.hs	43;"	C
 Lure	src/Dodge/Data/ActionPlan.hs	131;"	C
 MACHINEPISTOL	src/Dodge/Data/Item/Combine.hs	146;"	C
 MAGENTA	src/Color/Data.hs	17;"	C
@@ -762,7 +755,6 @@ MetalDebris	src/Dodge/Data/Prop.hs	24;"	C
 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	48;"	C
 MiniGunFlare	src/Dodge/Data/Muzzle.hs	32;"	C
 ModIDID	src/Dodge/Data/Modification.hs	21;"	C
 ModIDTimerPoint3Bool	src/Dodge/Data/Modification.hs	13;"	C
@@ -781,7 +773,6 @@ Move	src/Dodge/Data/ActionPlan.hs	26;"	C
 MoveEquipment	src/Dodge/Data/RightButtonOptions.hs	20;"	C
 MoveForward	src/Dodge/Data/ActionPlan.hs	27;"	C
 MoveNoStride	src/Dodge/Data/ActionPlan.hs	28;"	C
-MultGunAI	src/Dodge/Data/Creature/Misc.hs	50;"	C
 Mute	src/Dodge/Data/Creature/Misc.hs	19;"	C
 Muzzle	src/Dodge/Data/Muzzle.hs	9;"	t
 MuzzleBlink	src/Dodge/Data/Muzzle.hs	55;"	C
@@ -856,7 +847,7 @@ NoWorldEffect	src/Dodge/Data/WorldEffect.hs	26;"	C
 Noclip	src/Dodge/Data/Config.hs	83;"	C
 NodeMTree	src/Dodge/Data/MetaTree.hs	17;"	C
 NodeTree	src/Dodge/Data/MetaTree.hs	16;"	C
-NonDrawnCreature	src/Dodge/Data/Creature/Misc.hs	85;"	C
+NonDrawnCreature	src/Dodge/Data/Creature/Misc.hs	70;"	C
 NonInf	src/Dodge/Data/CardinalPoint.hs	44;"	C
 NormalOptions	src/Dodge/Data/Universe.hs	71;"	C
 NormalSpark	src/Dodge/Data/Spark.hs	19;"	C
@@ -995,10 +986,9 @@ PhysicalSensor	src/Dodge/Data/Machine/Sensor.hs	16;"	C
 Picture	src/Picture/Data.hs	41;"	t
 Piercing	src/Dodge/Data/Damage.hs	16;"	C
 Piezoelectric	src/Dodge/Data/Material.hs	23;"	C
-PistolAI	src/Dodge/Data/Creature/Misc.hs	42;"	C
 Placement	src/Dodge/Data/GenWorld.hs	113;"	t
 PlacementSpot	src/Dodge/Data/GenWorld.hs	97;"	t
-PlainBarrel	src/Dodge/Data/Creature/Misc.hs	89;"	C
+PlainBarrel	src/Dodge/Data/Creature/Misc.hs	74;"	C
 PlainDeath	src/Dodge/Data/Creature.hs	69;"	C
 PlantNurserySS	src/Dodge/Data/Scenario.hs	96;"	C
 PlasmaBall	src/Dodge/Data/PlasmaBall.hs	13;"	t
@@ -1036,12 +1026,12 @@ ProxSensor	src/Dodge/Data/Machine/Sensor.hs	24;"	C
 ProximityRequirement	src/Dodge/Data/Machine/Sensor.hs	33;"	t
 ProximitySensor	src/Dodge/Data/Machine/Sensor.hs	24;"	t
 ProximitySensorType	src/Dodge/Data/Machine/Sensor.hs	29;"	t
-Pulse	src/Dodge/Data/Creature/Misc.hs	53;"	t
+Pulse	src/Dodge/Data/Creature/Misc.hs	38;"	t
 PulseBall	src/Dodge/Data/PulseLaser.hs	20;"	t
 PulseBallSF	src/Dodge/Data/ComposedItem.hs	45;"	C
 PulseLaser	src/Dodge/Data/PulseLaser.hs	11;"	t
 PulseLaserSF	src/Dodge/Data/ComposedItem.hs	42;"	C
-PulseStatus	src/Dodge/Data/Creature/Misc.hs	53;"	C
+PulseStatus	src/Dodge/Data/Creature/Misc.hs	38;"	C
 PumpSF	src/Dodge/Data/ComposedItem.hs	48;"	C
 PushSource	src/Dodge/Data/Door.hs	23;"	t
 PushedBy	src/Dodge/Data/Door.hs	25;"	C
@@ -1265,7 +1255,6 @@ SpawnSound	src/Dodge/Data/SoundOrigin.hs	43;"	C
 SpawnedBy	src/Dodge/Data/Creature/State.hs	17;"	C
 SplashOptions	src/Dodge/Data/Universe.hs	73;"	C
 SplitBeamCombine	src/Dodge/Data/Beam.hs	40;"	C
-SpreadGunAI	src/Dodge/Data/Creature/Misc.hs	41;"	C
 StabOrthReduce	src/Dodge/Projectile/Create.hs	17;"	C
 StabSpinIncrease	src/Dodge/Projectile/Create.hs	18;"	C
 Stance	src/Dodge/Data/Creature/Stance.hs	15;"	t
@@ -1283,8 +1272,7 @@ Survive	src/Dodge/Data/Scenario.hs	5;"	C
 Suspicious	src/Dodge/Data/Creature/Perception.hs	64;"	C
 SwapEquipment	src/Dodge/Data/RightButtonOptions.hs	24;"	C
 Swarm	src/Dodge/Data/Creature/State.hs	25;"	C
-SwarmAI	src/Dodge/Data/Creature/Misc.hs	45;"	C
+SwarmCrit	src/Dodge/Data/Creature/Misc.hs	56;"	C
-SwarmCrit	src/Dodge/Data/Creature/Misc.hs	70;"	C
 TAPE	src/Dodge/Data/Item/Combine.hs	55;"	C
 TARGETING	src/Dodge/Data/Item/Combine.hs	21;"	C
 TCBase	src/Dodge/Data/Terminal.hs	49;"	C
@@ -1548,15 +1536,15 @@ _asDir	src/Dodge/Data/ArcStep.hs	14;"	f
 _asObject	src/Dodge/Data/ArcStep.hs	15;"	f
 _asPos	src/Dodge/Data/ArcStep.hs	13;"	f
 _auDist	src/Dodge/Data/Creature/Perception.hs	46;"	f
-_avDexterity	src/Dodge/Data/Creature/Misc.hs	64;"	f
+_avDexterity	src/Dodge/Data/Creature/Misc.hs	49;"	f
-_avIntelligence	src/Dodge/Data/Creature/Misc.hs	65;"	f
+_avIntelligence	src/Dodge/Data/Creature/Misc.hs	50;"	f
-_avMoveSpeed	src/Dodge/Data/Creature/Misc.hs	66;"	f
+_avMoveSpeed	src/Dodge/Data/Creature/Misc.hs	51;"	f
-_avPosture	src/Dodge/Data/Creature/Misc.hs	67;"	f
+_avPosture	src/Dodge/Data/Creature/Misc.hs	52;"	f
-_avStrength	src/Dodge/Data/Creature/Misc.hs	63;"	f
+_avStrength	src/Dodge/Data/Creature/Misc.hs	48;"	f
-_avatarMaterial	src/Dodge/Data/Creature/Misc.hs	62;"	f
+_avatarMaterial	src/Dodge/Data/Creature/Misc.hs	47;"	f
-_avatarPulse	src/Dodge/Data/Creature/Misc.hs	61;"	f
+_avatarPulse	src/Dodge/Data/Creature/Misc.hs	46;"	f
 _barrelShader	src/Data/Preload/Render.hs	27;"	f
-_barrelType	src/Dodge/Data/Creature/Misc.hs	72;"	f
+_barrelType	src/Dodge/Data/Creature/Misc.hs	58;"	f
 _bdColor	src/Dodge/Data/Prop.hs	23;"	f
 _bdMaxX	src/Dodge/Data/Bounds.hs	12;"	f
 _bdMaxY	src/Dodge/Data/Bounds.hs	14;"	f
@@ -1882,7 +1870,6 @@ _heldWorldPos	src/Dodge/Data/Input.hs	45;"	f
 _highlightItems	src/Dodge/Data/CWorld.hs	36;"	f
 _hotkeys	src/Dodge/Data/LWorld.hs	145;"	f
 _hud	src/Dodge/Data/World.hs	46;"	f
-_humanoidAI	src/Dodge/Data/Creature/Misc.hs	82;"	f
 _ibtAmmoMag	src/Dodge/Data/Item/Combine.hs	20;"	f
 _ibtAttach	src/Dodge/Data/Item/Combine.hs	19;"	f
 _ibtBulletMod	src/Dodge/Data/Item/Combine.hs	22;"	f
@@ -1943,9 +1930,9 @@ _lInvLock	src/Dodge/Data/LWorld.hs	148;"	f
 _lTestInt	src/Dodge/Data/LWorld.hs	144;"	f
 _lTestString	src/Dodge/Data/LWorld.hs	143;"	f
 _lWorld	src/Dodge/Data/CWorld.hs	24;"	f
-_lampColor	src/Dodge/Data/Creature/Misc.hs	73;"	f
+_lampColor	src/Dodge/Data/Creature/Misc.hs	59;"	f
-_lampHeight	src/Dodge/Data/Creature/Misc.hs	73;"	f
+_lampHeight	src/Dodge/Data/Creature/Misc.hs	59;"	f
-_lampLSID	src/Dodge/Data/Creature/Misc.hs	73;"	f
+_lampLSID	src/Dodge/Data/Creature/Misc.hs	59;"	f
 _lasWepXSF	src/Dodge/Data/ComposedItem.hs	41;"	f
 _laserEmmiter	src/Dodge/Data/Laser.hs	16;"	f
 _laserTypeDamage	src/Dodge/Data/Laser.hs	15;"	f
@@ -2033,7 +2020,7 @@ _mdPoint3	src/Dodge/Data/Modification.hs	18;"	f
 _mdTimer	src/Dodge/Data/Modification.hs	17;"	f
 _mdUpdate	src/Dodge/Data/Modification.hs	16;"	f
 _mdUpdate	src/Dodge/Data/Modification.hs	25;"	f
-_meleeCooldown	src/Dodge/Data/Creature/Misc.hs	69;"	f
+_meleeCooldown	src/Dodge/Data/Creature/Misc.hs	54;"	f
 _meleeTarget	src/Dodge/Data/ActionPlan.hs	139;"	f
 _mgField	src/Dodge/Data/Magnet.hs	23;"	f
 _mgPos	src/Dodge/Data/Magnet.hs	22;"	f
@@ -2100,7 +2087,7 @@ _phTargetingID	src/Dodge/Data/Projectile.hs	42;"	f
 _pickUpLevel	src/Dodge/Layout/Generate.hs	15;"	f
 _pickUps	src/Dodge/Layout/Generate.hs	16;"	f
 _pictureShaders	src/Data/Preload/Render.hs	31;"	f
-_piercedPoints	src/Dodge/Data/Creature/Misc.hs	90;"	f
+_piercedPoints	src/Dodge/Data/Creature/Misc.hs	75;"	f
 _pjBarrelSpin	src/Dodge/Data/Projectile.hs	23;"	f
 _pjDetonatorID	src/Dodge/Data/Projectile.hs	25;"	f
 _pjDir	src/Dodge/Data/Projectile.hs	18;"	f
@@ -2146,8 +2133,8 @@ _psSelect	src/Dodge/Data/GenWorld.hs	101;"	f
 _pullWallShader	src/Data/Preload/Render.hs	22;"	f
 _pulseBalls	src/Dodge/Data/LWorld.hs	119;"	f
 _pulseLasers	src/Dodge/Data/LWorld.hs	118;"	f
-_pulseProgress	src/Dodge/Data/Creature/Misc.hs	55;"	f
+_pulseProgress	src/Dodge/Data/Creature/Misc.hs	40;"	f
-_pulseRate	src/Dodge/Data/Creature/Misc.hs	54;"	f
+_pulseRate	src/Dodge/Data/Creature/Misc.hs	39;"	f
 _putBlock	src/Dodge/Data/GenWorld.hs	43;"	f
 _putButton	src/Dodge/Data/GenWorld.hs	39;"	f
 _putChasmChasms	src/Dodge/Data/GenWorld.hs	60;"	f
@@ -2310,9 +2297,9 @@ _skOldPos	src/Dodge/Data/Spark.hs	14;"	f
 _skPos	src/Dodge/Data/Spark.hs	13;"	f
 _skType	src/Dodge/Data/Spark.hs	15;"	f
 _skVel	src/Dodge/Data/Spark.hs	12;"	f
-_skinHead	src/Dodge/Data/Creature/Misc.hs	79;"	f
+_skinHead	src/Dodge/Data/Creature/Misc.hs	65;"	f
-_skinLower	src/Dodge/Data/Creature/Misc.hs	81;"	f
+_skinLower	src/Dodge/Data/Creature/Misc.hs	67;"	f
-_skinUpper	src/Dodge/Data/Creature/Misc.hs	80;"	f
+_skinUpper	src/Dodge/Data/Creature/Misc.hs	66;"	f
 _slInt	src/Dodge/Data/HUD.hs	39;"	f
 _slSec	src/Dodge/Data/HUD.hs	39;"	f
 _slSet	src/Dodge/Data/HUD.hs	39;"	f
@@ -3286,7 +3273,7 @@ doQuicksave	src/Dodge/Save.hs	77;"	f
 doRandImpulse	src/Dodge/RandImpulse.hs	8;"	f
 doRegexInput	src/Dodge/Update/Input/InGame.hs	423;"	f
 doRoomPlacements	src/Dodge/Layout.hs	116;"	f
-doRoomShift	src/Dodge/Room/Link.hs	33;"	f
+doRoomShift	src/Dodge/Room/Link.hs	34;"	f
 doScopeZoom	src/Dodge/Update/Scroll.hs	89;"	f
 doSectionSize	src/Dodge/DisplayInventory.hs	215;"	f
 doSideEffects	appDodge/Main.hs	117;"	f
@@ -4271,7 +4258,7 @@ moveCombineSel	src/Dodge/Update/Scroll.hs	119;"	f
 moveInverseShockwave	src/Dodge/Shockwave/Update.hs	31;"	f
 movePenBullet	src/Dodge/Bullet.hs	203;"	f
 moveProjectile	src/Dodge/Projectile/Update.hs	249;"	f
-moveRoomBy	src/Dodge/Room/Link.hs	58;"	f
+moveRoomBy	src/Dodge/Room/Link.hs	57;"	f
 moveShockwave	src/Dodge/Shockwave/Update.hs	13;"	f
 moveStuckGrenade	src/Dodge/Projectile/Update.hs	228;"	f
 moveToSideNthOutLink	src/Dodge/Room/Warning.hs	106;"	f
@@ -4727,7 +4714,7 @@ respawn	src/Dodge/SpawnAt.hs	11;"	f
 restrictInLinks	src/Dodge/RoomLink.hs	43;"	f
 restrictLinkType	src/Dodge/RoomLink.hs	33;"	f
 restrictOutLinks	src/Dodge/RoomLink.hs	46;"	f
-restrictRMInLinksPD	src/Dodge/Room/Link.hs	25;"	f
+restrictRMInLinksPD	src/Dodge/Room/Link.hs	26;"	f
 resumeSound	src/Dodge/SoundLogic.hs	48;"	f
 retreatPointForFrom	src/Dodge/Creature/Impulse/Flee.hs	9;"	f
 revCard	src/Dodge/Data/CardinalPoint.hs	13;"	f
@@ -4958,20 +4945,20 @@ shiftInBy	src/Dodge/PlacementSpot.hs	254;"	f
 shiftInvItems	src/Dodge/Update/Input/InGame.hs	294;"	f
 shiftInvItemsDown	src/Dodge/Inventory.hs	181;"	f
 shiftInvItemsUp	src/Dodge/Inventory.hs	191;"	f
-shiftLinkBy	src/Dodge/Room/Link.hs	92;"	f
+shiftLinkBy	src/Dodge/Room/Link.hs	89;"	f
 shiftPSBy	src/Dodge/Placement/Shift.hs	12;"	f
-shiftPathBy	src/Dodge/Room/Link.hs	97;"	f
+shiftPathBy	src/Dodge/Room/Link.hs	94;"	f
 shiftPlacement	src/Dodge/Placement/Shift.hs	21;"	f
 shiftPoint3By	src/Dodge/ShiftPoint.hs	20;"	f
 shiftPointBy	src/Dodge/ShiftPoint.hs	8;"	f
-shiftPosDirBy	src/Dodge/Room/Link.hs	89;"	f
+shiftPosDirBy	src/Dodge/Room/Link.hs	86;"	f
 shiftRelativeToPS	src/Dodge/Placement/Shift.hs	18;"	f
-shiftRoomBy	src/Dodge/Room/Link.hs	37;"	f
+shiftRoomBy	src/Dodge/Room/Link.hs	38;"	f
-shiftRoomShiftBy	src/Dodge/Room/Link.hs	86;"	f
+shiftRoomShiftBy	src/Dodge/Room/Link.hs	83;"	f
-shiftRoomShiftToLink	src/Dodge/Room/Link.hs	75;"	f
+shiftRoomShiftToLink	src/Dodge/Room/Link.hs	74;"	f
 shiftSetDown	src/Dodge/Inventory.hs	174;"	f
 shiftSetUp	src/Dodge/Inventory.hs	168;"	f
-shiftTile	src/Dodge/Room/Link.hs	48;"	f
+shiftTile	src/Dodge/Room/Link.hs	49;"	f
 shineTargetLaser	src/Dodge/Creature/State.hs	201;"	f
 shineTorch	src/Dodge/Creature/State.hs	237;"	f
 shootBullet	src/Dodge/HeldUse.hs	995;"	f
@@ -5005,7 +4992,7 @@ showTimeFlow	src/Dodge/TestString.hs	87;"	f
 shrinkPolyOnEdges	src/Geometry/Polygon.hs	198;"	f
 shrinkVert	src/Geometry/Polygon.hs	202;"	f
 shuffle	src/RandomHelp.hs	68;"	f
-shuffleLinks	src/Dodge/Room/Link.hs	30;"	f
+shuffleLinks	src/Dodge/Room/Link.hs	31;"	f
 shufflePair	src/RandomHelp.hs	166;"	f
 shuffleRoomPos	src/Dodge/Layout.hs	98;"	f
 shuffleTail	src/RandomHelp.hs	78;"	f