Remove creature move type record

src/Dodge/Creature.hs

@@ -100,8 +100,8 @@ startCr =
         & crHP .~ 10000
         & crInv .~ startInventory
         & crFaction .~ PlayerFaction
-        & crMvType .~ MvWalking yourDefaultSpeed
+--        & crMvType .~ MvWalking yourDefaultSpeed
-        & crType .~ Avatar (PulseStatus 55 0) Flesh
+        & crType .~ Avatar (PulseStatus 55 0) Flesh 50 50 50 3
 
 -- | Items you start with.
 startInvList :: [Item]

src/Dodge/Creature/Action.hs

@@ -13,6 +13,7 @@ module Dodge.Creature.Action (
     youDropItem,
 ) where
 
+import Dodge.Creature.MoveType
 import Dodge.Creature.Radius
 import Dodge.Item.BackgroundEffect
 import Control.Applicative
@@ -49,7 +50,7 @@ performAimAt cr w tcid p = ([TurnToward tpos aimSp], Just $ AimAt tcid tpos)
     cdir = _crDir cr
     cpos = _crPos cr
     canSee' = canSee (_crID cr) tcid w
-    aimSp = case cr ^? crMvType . mvAimSpeed of
+    aimSp = case crMvType cr ^? mvAimSpeed of
         Just f -> doFloatFloat f $ safeAngleVV (unitVectorAtAngle cdir) (tpos - cpos)
         Nothing -> error "creature without aiming type"
     tpos
@@ -72,7 +73,7 @@ performPathTo cr w p
         _ -> ([], Nothing)
   where
     cpos = _crPos cr
-    jit = _mvTurnJit $ _crMvType cr
+    jit = _mvTurnJit $ crMvType cr
 
 performTurnToA :: Creature -> Point2 -> OutAction
 performTurnToA cr p
@@ -82,7 +83,7 @@ performTurnToA cr p
     cpos = _crPos cr
     cdirv = unitVectorAtAngle (_crDir cr)
     dirv = p -.- cpos
-    jit = _mvTurnJit $ _crMvType cr
+    jit = _mvTurnJit $ crMvType cr
 
 {- | Performing an action on a frame creates an OutAction:
   adds impulses and updates or deletes the action itself.

src/Dodge/Creature/ArmourChase.hs

@@ -7,7 +7,6 @@ import Dodge.Data.Equipment.Misc
 import Control.Lens
 import Dodge.Creature.ChaseCrit
 import Dodge.Data.Creature
-import Dodge.Data.FloatFunction
 import Dodge.Default
 import Dodge.Item.Equipment
 import qualified IntMapHelp as IM
@@ -29,7 +28,7 @@ flockArmourChaseCrit =
                 , _apGoal = [Kill 0]
                 }
         , _crGroup = ShieldGroup
-        , _crMvType = defaultChaseMvType
+--        , _crMvType = defaultChaseMvType
         }
 --        & crType . humanoidAI .~ FlockArmourChaseAI
 
@@ -42,6 +41,6 @@ armourChaseCrit =
             IM.fromList
                 [ (0, frontArmour)
                 ]
-        , _crMvType = defaultChaseMvType{_mvTurnRad = FloatConst 0.05}
+--        , _crMvType = defaultChaseMvType{_mvTurnRad = FloatConst 0.05}
         }
         & crEquipment . at OnChest ?~ 0

src/Dodge/Creature/AutoCrit.hs

@@ -14,7 +14,7 @@ autoCrit =
     defaultCreature
         { _crInv = IM.fromList [(0, autoRifle)]
         , _crHP = 300
-        , _crMvType = defaultAimMvType
+--        , _crMvType = defaultAimMvType
         }
 --        & crType . skinUpper .~ lightx4 red
 --        & crType . humanoidAI .~ AutoAI

src/Dodge/Creature/ChaseCrit.hs

@@ -16,13 +16,11 @@ smallChaseCrit =
     chaseCrit
         { _crHP = 1
         , _crInv = mempty
---        , _crCorpse = MakeDefaultCorpse
         }
 
 invisibleChaseCrit :: Creature
 invisibleChaseCrit =
     chaseCrit
---        & crCamouflage .~ Invisible
         & crInv . at 0 ?~ wristInvisibility
         & crEquipment . at OnLeftWrist ?~ 0
 
@@ -34,12 +32,7 @@ chaseCrit =
         , _crInv = mempty
         , _crFaction = ColorFaction green
         , _crVocalization = chaseCritVocalization
-        , _crMvType = defaultChaseMvType
         }
---        & crType . humanoidAI .~ ChaseAI
 
 chaseCritVocalization :: Vocalization
-chaseCritVocalization =
+chaseCritVocalization = Vocalization (50, 200) 0
-    Vocalization
-        (50, 200)
-        0

src/Dodge/Creature/Impulse.hs

@@ -4,6 +4,7 @@ module Dodge.Creature.Impulse (
     impulsiveAIBefore,
 ) where
 
+import Dodge.Creature.MoveType
 import Data.Foldable
 import Control.Monad.State
 import Data.Bifunctor
@@ -76,7 +77,7 @@ followImpulse cr w imp = case imp of
             creatureTurnToward p (turnRad $ safeAngleVV (p -.- cpos) (unitVectorAtAngle cdir)) cr
   where
     crup = (id,)
-    mvType = _crMvType cr
+    mvType = crMvType cr
     speed = _mvSpeed mvType
     turnRad = doFloatFloat $ _mvTurnRad mvType
     cpos = _crPos cr

src/Dodge/Creature/Info.hs

@@ -2,6 +2,7 @@ module Dodge.Creature.Info (
     yourInfo,
 ) where
 
+import Dodge.Creature.Statistics
 import Dodge.Inventory.CheckSlots
 import Dodge.Data.Creature
 import LensHelp
@@ -28,8 +29,8 @@ yourStatsInfo cr =
     "You are " ++ statsModifier str "weak" "strength" "strong" ++ conj
         ++ statsModifier dex "clumsy." "dexterity." "dexterous."
   where
-    str = cr ^. crStatistics . strength
+    str = cr & crStrength
-    dex = cr ^. crStatistics . dexterity
+    dex = cr & crDexterity
     conj
         | (str < 45 && dex < 45) || (str > 55 && dex > 55) || (mid str && mid dex) =
             " and "

src/Dodge/Creature/Statistics.hs

@@ -1,7 +1,9 @@
 {-# LANGUAGE LambdaCase #-}
 module Dodge.Creature.Statistics (
     getCrMoveSpeed,
-    getCrDexterity,
+    crStrength,
+    crDexterity,
+    crIntelligence,
 ) where
 
 import Data.Maybe
@@ -9,11 +11,39 @@ import Dodge.Data.Creature
 import qualified IntMapHelp as IM
 import LensHelp
 
-getCrDexterity :: Creature -> Int
+crDexterity :: Creature -> Int
-getCrDexterity = _dexterity . _crStatistics
+crDexterity cr = case cr ^. crType of
+    Avatar { _avDexterity = x } -> x
+    AvatarDead -> 0
+    ChaseCrit {} -> 46
+    SwarmCrit -> 46
+    AutoCrit -> 46
+    BarrelCrit {} -> 0
+    LampCrit {} -> 0
+
+crStrength :: Creature -> Int
+crStrength cr = case cr ^. crType of
+    Avatar { _avStrength = x } -> x
+    AvatarDead -> 0
+    ChaseCrit {} -> 46
+    SwarmCrit -> 40
+    AutoCrit -> 46
+    BarrelCrit {} -> 0
+    LampCrit {} -> 0
+
+crIntelligence :: Creature -> Int
+crIntelligence  cr = case cr ^. crType of
+    Avatar { _avIntelligence = x } -> x
+    AvatarDead -> 0
+    ChaseCrit {} -> 20
+    SwarmCrit -> 20
+    AutoCrit -> 20
+    BarrelCrit {} -> 0
+    LampCrit {} -> 0
+    
 
 getCrMoveSpeed :: Creature -> Int
-getCrMoveSpeed cr = strFromHeldItem cr + strFromEquipment cr + _strength (_crStatistics cr)
+getCrMoveSpeed cr = strFromHeldItem cr + strFromEquipment cr + crStrength cr
 
 strFromEquipment :: Creature -> Int
 strFromEquipment = sum . fmap equipmentStrValue . crCurrentEquipment

src/Dodge/Creature/YourControl.hs

@@ -4,6 +4,7 @@ module Dodge.Creature.YourControl (
     yourControl,
 ) where
 
+import Dodge.Creature.MoveType
 import Dodge.Data.Equipment.Misc
 import Control.Monad
 import qualified Data.Map.Strict as M
@@ -118,7 +119,7 @@ scancodeToHotkey x = case x of
 wasdWithAiming :: World -> Creature -> Creature
 wasdWithAiming w cr = wasdAim inp w $ wasdMovement inp cam speed cr
   where
-    speed = _mvSpeed $ _crMvType cr
+    speed = _mvSpeed $ crMvType cr
     inp = w ^. input
     cam = w ^. wCam
 

src/Dodge/Data/Creature.hs

@@ -54,9 +54,8 @@ data Creature = Creature
     , _crFaction :: Faction
     , _crGroup :: CrGroup
     , _crIntention :: Intention
-    , _crMvType :: CrMvType
+--    , _crMvType :: CrMvType
     , _crName :: String
-    , _crStatistics :: CreatureStatistics
     , _crDeathTimer :: Int
     }
 

src/Dodge/Data/Creature/Misc.hs

@@ -1,5 +1,5 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -8,27 +8,25 @@ module Dodge.Data.Creature.Misc (
     module Dodge.Data.CamouflageStatus,
 ) where
 
-import Dodge.Data.Material
 import Color
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.CamouflageStatus
 import Dodge.Data.FloatFunction
+import Dodge.Data.Material
 import Geometry.Data
 
-data CreatureStatistics = CreatureStatistics
+--data CreatureStatistics = CreatureStatistics
-    { _strength :: Int
+--    { _strength :: Int
-    , _dexterity :: Int
+--    , _dexterity :: Int
-    , _intelligence :: Int
+--    , _intelligence :: Int
-    }
+--    }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+--    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Vocalization
     = Mute
     | Vocalization
---        { _vcSound :: SoundID
---        , _vcWarnings :: [SoundID]
         { _vcMaxCoolDown :: (Int, Int)
         , _vcCoolDown :: Int
         }
@@ -67,12 +65,19 @@ data Pulse = PulseStatus
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CreatureType
-    = Avatar { _avatarPulse :: Pulse , _avatarMaterial :: Material}
+    = Avatar
+        { _avatarPulse :: Pulse
+        , _avatarMaterial :: Material
+        , _avStrength :: Int
+        , _avDexterity :: Int
+        , _avIntelligence :: Int
+        , _avMoveSpeed :: Float
+        }
     | AvatarDead
     | ChaseCrit {_meleeCooldown :: Int}
     | SwarmCrit
     | AutoCrit
-    | BarrelCrit{_barrelType :: BarrelType}
+    | BarrelCrit {_barrelType :: BarrelType}
     | LampCrit {_lampHeight :: Float, _lampColor :: Point3, _lampLSID :: Maybe Int}
 
 data CreatureShape
@@ -90,14 +95,14 @@ data BarrelType = PlainBarrel | ExplosiveBarrel
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Pulse
-makeLenses ''CreatureStatistics
+--makeLenses ''CreatureStatistics
 makeLenses ''Vocalization
 makeLenses ''CrMvType
 makeLenses ''CreatureType
 deriveJSON defaultOptions ''Pulse
-deriveJSON defaultOptions ''CreatureStatistics
+--deriveJSON defaultOptions ''CreatureStatistics
 deriveJSON defaultOptions ''Vocalization
-deriveJSON defaultOptions ''CrMvType
+--deriveJSON defaultOptions ''CrMvType
 deriveJSON defaultOptions ''HumanoidAI
 deriveJSON defaultOptions ''BarrelType
 deriveJSON defaultOptions ''CreatureType

src/Dodge/Debug/Terminal.hs

@@ -46,13 +46,13 @@ applyTerminalCommandArguments command args u = case command of
         return $ u & uvWorld %~ flip (foldl' (&)) (replicate n (snd . createItemYou (itemFromBase ibt)))
     "DEX" -> fromMaybe u $ do
         x <- readMaybe =<< args ^? _head
-        return $ u & ypoint . crStatistics . dexterity .~ x
+        return $ u & ypoint . crType . avDexterity .~ x
     "STR" -> fromMaybe u $ do
         x <- readMaybe =<< args ^? _head
-        return $ u & ypoint . crStatistics . strength .~ x
+        return $ u & ypoint . crType . avStrength .~ x
     "INT" -> fromMaybe u $ do
         x <- readMaybe =<< args ^? _head
-        return $ u & ypoint . crStatistics . intelligence .~ x
+        return $ u & ypoint . crType . avIntelligence .~ x
     _ -> u
   where
     ypoint = uvWorld . cWorld . lWorld . creatures . ix 0
@@ -85,7 +85,8 @@ applySetTerminalString var = case key' of
     "hp" -> uvWorld . cWorld . lWorld . creatures . ix 0 . crHP .~ round (fromJust val')
 --    "invcap" -> uvWorld . cWorld . lWorld . creatures . ix 0 . crInvCapacity .~ round (fromJust val')
 --    "mass" -> uvWorld . cWorld . lWorld . creatures . ix 0 . crMass .~ fromJust val'
-    "mvspeed" -> uvWorld . cWorld . lWorld . creatures . ix 0 . crMvType . mvSpeed .~ fromJust val'
+--    "mvspeed" -> uvWorld . cWorld . lWorld . creatures . ix 0 . crMvType . mvSpeed .~ fromJust val'
+    "mvspeed" -> uvWorld . cWorld . lWorld . creatures . ix 0 . crType . avMoveSpeed .~ fromJust val'
     _ -> showTerminalError ("set " ++ var) ("Invalid set command: " ++ key) -- never reached?
   where
     (key, val) = getSplitString var

src/Dodge/Default/Creature.hs

@@ -47,10 +47,10 @@ defaultCreature =
         , _crFaction = NoFaction
         , _crIntention = defaultIntention
         , _crGroup = LoneWolf
-        , _crMvType = defaultAimMvType
+--        , _crMvType = defaultAimMvType
 --        , _crHammerPosition = HammerUp
         , _crName = "DEFAULTCRNAME"
-        , _crStatistics = CreatureStatistics 50 50 50
+--        , _crStatistics = CreatureStatistics 50 50 50
         , _crDeathTimer = 0
         }
 
@@ -101,29 +101,9 @@ defaultIntention =
         , _viewPoint = Nothing
         }
 
-defaultChaseMvType :: CrMvType
-defaultChaseMvType =
-    CrMvType
-        { _mvSpeed = 2
-        , _mvTurnRad = FloatAbsCheckGreaterLess (pi / 4) 0.2 0.05
-        , _mvTurnJit = 0.2
-        , _mvAimSpeed = FloatAbsCheckGreaterLess (pi / 8) 0.2 0.01
-        }
-
-defaultAimMvType :: CrMvType
-defaultAimMvType =
-    CrMvType
-        { _mvSpeed = 3
-        , _mvTurnRad = FloatConst 0.2
-        , _mvTurnJit = 0.05
-        , _mvAimSpeed = FloatAbsCheckGreaterLess (pi / 8) 0.2 0.01
-        }
 
 defaultAimingCrit :: Creature
-defaultAimingCrit = defaultCreature{_crMvType = defaultAimMvType}
+defaultAimingCrit = defaultCreature
-
-yourDefaultSpeed :: Float
-yourDefaultSpeed = 3
 
 yourDefaultStrideLength :: Int
 yourDefaultStrideLength = 40

src/Dodge/Inventory/Lock.hs

@@ -7,9 +7,7 @@ import Control.Lens
 import Dodge.Data.World
 
 lockInv :: World -> World
---lockInv cid = cWorld . lWorld . creatures . ix cid . crInvLock ||~ True
 lockInv = cWorld . lWorld . lInvLock .~ True
 
---unlockInv :: Int -> World -> World
 unlockInv :: World -> World
 unlockInv = cWorld . lWorld . lInvLock .~ False

tags

@@ -16,7 +16,7 @@
 <$>	src/Dodge/Data/ActionPlan.hs	203;"	o
 <$>	src/Dodge/Data/CWorld.hs	45;"	o
 <$>	src/Dodge/Data/Camera.hs	39;"	o
-<$>	src/Dodge/Data/Creature.hs	77;"	o
+<$>	src/Dodge/Data/Creature.hs	76;"	o
 <$>	src/Dodge/Data/LWorld.hs	182;"	o
 <$>	src/Dodge/Data/Terminal.hs	127;"	o
 ABSOLUTE	src/Dodge/Data/Item/Combine.hs	39;"	C
@@ -108,15 +108,15 @@ AttachType	src/Dodge/Data/Item/Combine.hs	91;"	t
 Attention	src/Dodge/Data/Creature/Perception.hs	60;"	t
 AttentiveTo	src/Dodge/Data/Creature/Perception.hs	61;"	C
 Audition	src/Dodge/Data/Creature/Perception.hs	47;"	t
-AutoAI	src/Dodge/Data/Creature/Misc.hs	57;"	C
+AutoAI	src/Dodge/Data/Creature/Misc.hs	54;"	C
-AutoCrit	src/Dodge/Data/Creature/Misc.hs	75;"	C
+AutoCrit	src/Dodge/Data/Creature/Misc.hs	78;"	C
 AutoCrit	src/Dodge/Creature/AutoCrit.hs	1;"	m
 AutoDoorObstacle	src/Dodge/Data/PathGraph.hs	51;"	C
 AutoRecharging	src/Dodge/Data/Item/Use/Consumption.hs	26;"	C
 AutoTrigger	src/Dodge/Data/TriggerType.hs	10;"	C
 AuxAddition	src/Shader/AuxAddition.hs	1;"	m
-Avatar	src/Dodge/Data/Creature/Misc.hs	71;"	C
+Avatar	src/Dodge/Data/Creature/Misc.hs	68;"	C
-AvatarDead	src/Dodge/Data/Creature/Misc.hs	72;"	C
+AvatarDead	src/Dodge/Data/Creature/Misc.hs	75;"	C
 Awareness	src/Dodge/Data/Creature/Perception.hs	65;"	t
 Awareness	src/Dodge/Creature/Picture/Awareness.hs	1;"	m
 BANGCONE	src/Dodge/Data/Item/Combine.hs	147;"	C
@@ -146,10 +146,10 @@ BackgroundSound	src/Dodge/Data/SoundOrigin.hs	15;"	C
 Ball	src/Dodge/Tesla/Ball.hs	1;"	m
 Bark	src/Dodge/Data/ActionPlan.hs	40;"	C
 Barrel	src/Dodge/Data/Creature/State.hs	30;"	C
-BarrelCrit	src/Dodge/Data/Creature/Misc.hs	76;"	C
+BarrelCrit	src/Dodge/Data/Creature/Misc.hs	79;"	C
 BarrelHiss	src/Dodge/Data/SoundOrigin.hs	32;"	C
-BarrelType	src/Dodge/Data/Creature/Misc.hs	90;"	t
+BarrelType	src/Dodge/Data/Creature/Misc.hs	93;"	t
-Barreloid	src/Dodge/Data/Creature/Misc.hs	86;"	C
+Barreloid	src/Dodge/Data/Creature/Misc.hs	89;"	C
 Barreloid	src/Dodge/Barreloid.hs	1;"	m
 Base	src/Dodge/Base.hs	8;"	m
 Base	src/Dodge/Zoning/Base.hs	2;"	m
@@ -302,8 +302,8 @@ ChangePosture	src/Dodge/Data/ActionPlan.hs	42;"	C
 ChangeStrategy	src/Dodge/Data/ActionPlan.hs	44;"	C
 CharacterEnums	src/Dodge/CharacterEnums.hs	1;"	m
 ChargeableAmmo	src/Dodge/Data/Item/Use/Consumption.hs	32;"	C
-ChaseAI	src/Dodge/Data/Creature/Misc.hs	50;"	C
+ChaseAI	src/Dodge/Data/Creature/Misc.hs	47;"	C
-ChaseCrit	src/Dodge/Data/Creature/Misc.hs	73;"	C
+ChaseCrit	src/Dodge/Data/Creature/Misc.hs	76;"	C
 ChaseCrit	src/Dodge/Creature/ChaseCrit.hs	1;"	m
 ChaseCritters	src/Dodge/Data/Creature/State.hs	38;"	C
 Check	src/Framebuffer/Check.hs	1;"	m
@@ -404,8 +404,8 @@ CrInt	src/Dodge/Data/Item/Location.hs	23;"	t
 CrIsAiming	src/Dodge/Data/CreatureEffect.hs	41;"	C
 CrIsAnimate	src/Dodge/Data/CreatureEffect.hs	42;"	C
 CrMouth	src/Dodge/Data/SoundOrigin.hs	18;"	C
-CrMvType	src/Dodge/Data/Creature/Misc.hs	38;"	t
+CrMvType	src/Dodge/Data/Creature/Misc.hs	35;"	t
-CrMvType	src/Dodge/Data/Creature/Misc.hs	41;"	C
+CrMvType	src/Dodge/Data/Creature/Misc.hs	38;"	C
 CrSound	src/Dodge/Data/SoundOrigin.hs	17;"	C
 CrSpState	src/Dodge/Data/Creature/State.hs	29;"	t
 CrSt	src/Dodge/Data/Creature/State.hs	16;"	C
@@ -440,10 +440,9 @@ CreatureDropType	src/Dodge/Data/Creature/State.hs	23;"	t
 CreatureEffect	src/Dodge/CreatureEffect.hs	1;"	m
 CreatureEffect	src/Dodge/Data/CreatureEffect.hs	6;"	m
 CreaturePart	src/Dodge/Data/Wall/Structure.hs	17;"	C
-CreatureShape	src/Dodge/Data/Creature/Misc.hs	79;"	t
+CreatureShape	src/Dodge/Data/Creature/Misc.hs	82;"	t
 CreatureState	src/Dodge/Data/Creature/State.hs	16;"	t
-CreatureStatistics	src/Dodge/Data/Creature/Misc.hs	21;"	t
+CreatureType	src/Dodge/Data/Creature/Misc.hs	67;"	t
-CreatureType	src/Dodge/Data/Creature/Misc.hs	70;"	t
 CryostatisSS	src/Dodge/Data/Scenario.hs	91;"	C
 Crystal	src/Dodge/Data/Material.hs	11;"	C
 Cull_more_lights	src/Dodge/Data/Config.hs	78;"	C
@@ -661,7 +660,7 @@ Explore	src/Dodge/Data/Scenario.hs	4;"	C
 Explosion	src/Dodge/Data/SoundOrigin.hs	37;"	C
 Explosion	src/Dodge/WorldEvent/Explosion.hs	4;"	m
 ExplosionPayload	src/Dodge/Data/Payload.hs	11;"	C
-ExplosiveBarrel	src/Dodge/Data/Creature/Misc.hs	90;"	C
+ExplosiveBarrel	src/Dodge/Data/Creature/Misc.hs	93;"	C
 ExplosivePutty	src/Dodge/Data/AmmoType.hs	17;"	C
 ExternallyGeneratedSounds	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	2;"	m
 ExtraEffect	src/Dodge/Item/Weapon/ExtraEffect.hs	6;"	m
@@ -715,7 +714,7 @@ FloatFunction	src/Dodge/FloatFunction.hs	1;"	m
 FloatID	src/Dodge/Data/FloatFunction.hs	12;"	C
 FloatLessCheck	src/Dodge/Data/FloatFunction.hs	14;"	C
 Floating	src/Dodge/Data/Creature/Stance.hs	26;"	C
-FlockArmourChaseAI	src/Dodge/Data/Creature/Misc.hs	58;"	C
+FlockArmourChaseAI	src/Dodge/Data/Creature/Misc.hs	55;"	C
 Floor	src/Data/Tile.hs	10;"	t
 Floor	src/Dodge/Floor.hs	2;"	m
 Floor	src/Shader/Poke/Floor.hs	1;"	m
@@ -867,9 +866,9 @@ HotkeyV	src/Dodge/Data/Equipment/Misc.hs	39;"	C
 HotkeyX	src/Dodge/Data/Equipment/Misc.hs	37;"	C
 HotkeyZ	src/Dodge/Data/Equipment/Misc.hs	36;"	C
 Huge	src/Shape/Data.hs	28;"	C
-Humanoid	src/Dodge/Data/Creature/Misc.hs	80;"	C
+Humanoid	src/Dodge/Data/Creature/Misc.hs	83;"	C
 Humanoid	src/Dodge/Humanoid.hs	1;"	m
-HumanoidAI	src/Dodge/Data/Creature/Misc.hs	49;"	t
+HumanoidAI	src/Dodge/Data/Creature/Misc.hs	46;"	t
 ILink	src/Dodge/Data/ComposedItem.hs	72;"	C
 IMSS	src/Dodge/Data/SelectionList.hs	37;"	t
 INTROSCAN	src/Dodge/Data/Item/Combine.hs	33;"	C
@@ -899,7 +898,7 @@ InSimulation	src/Dodge/Data/Scenario.hs	20;"	C
 InVoid	src/Dodge/Data/Item/Location.hs	39;"	C
 Inanimate	src/Dodge/Data/ActionPlan.hs	17;"	C
 Inanimate	src/Dodge/Creature/Inanimate.hs	5;"	m
-InanimateAI	src/Dodge/Data/Creature/Misc.hs	51;"	C
+InanimateAI	src/Dodge/Data/Creature/Misc.hs	48;"	C
 IncBall	src/Dodge/Data/Bullet.hs	31;"	C
 Info	src/Dodge/Creature/Info.hs	1;"	m
 Info	src/Dodge/Item/Info.hs	3;"	m
@@ -923,7 +922,7 @@ IntAnno	src/Dodge/Annotation/Data.hs	17;"	C
 IntID	src/Dodge/Data/Universe.hs	113;"	t
 IntImp	src/Dodge/Data/CreatureEffect.hs	20;"	t
 IntMapHelp	src/IntMapHelp.hs	8;"	m
-Intention	src/Dodge/Data/Creature.hs	65;"	t
+Intention	src/Dodge/Data/Creature.hs	64;"	t
 Intention	src/Dodge/Creature/Intention.hs	1;"	m
 Intersect	src/Geometry/Intersect.hs	5;"	m
 IntersectingRoomClipBoundaries	src/Dodge/Data/Config.hs	107;"	C
@@ -1020,7 +1019,7 @@ LabelDoubleTree	src/Dodge/Data/DoubleTree.hs	40;"	t
 LabelDoubleTreeNodeType	src/Dodge/Data/DoubleTree.hs	23;"	t
 Laboratory	src/Dodge/Data/Scenario.hs	61;"	C
 Lamp	src/Dodge/Creature/Lamp.hs	1;"	m
-LampCrit	src/Dodge/Data/Creature/Misc.hs	77;"	C
+LampCrit	src/Dodge/Data/Creature/Misc.hs	80;"	C
 Lampoid	src/Dodge/Lampoid.hs	1;"	m
 Large	src/Shape/Data.hs	29;"	C
 LasBeamCombine	src/Dodge/Data/Beam.hs	40;"	C
@@ -1032,7 +1031,7 @@ Laser	src/Dodge/Data/Laser.hs	6;"	m
 LaserPath	src/Dodge/Item/Weapon/LaserPath.hs	1;"	m
 LaserType	src/Dodge/Data/Laser.hs	16;"	t
 Launcher	src/Dodge/Item/Held/Launcher.hs	1;"	m
-LauncherAI	src/Dodge/Data/Creature/Misc.hs	55;"	C
+LauncherAI	src/Dodge/Data/Creature/Misc.hs	52;"	C
 LauncherAmmo	src/Dodge/Data/AmmoType.hs	10;"	C
 LauncherCrit	src/Dodge/Creature/LauncherCrit.hs	1;"	m
 LaundrySS	src/Dodge/Data/Scenario.hs	115;"	C
@@ -1088,14 +1087,14 @@ LocationLDT	src/Dodge/Data/DoubleTree.hs	67;"	t
 Lock	src/Dodge/Inventory/Lock.hs	1;"	m
 LockAndKey	src/Dodge/LockAndKey.hs	1;"	m
 LoneWolf	src/Dodge/Data/Creature/State.hs	46;"	C
-LongAI	src/Dodge/Data/Creature/Misc.hs	60;"	C
+LongAI	src/Dodge/Data/Creature/Misc.hs	57;"	C
 LongDoor	src/Dodge/Room/LongDoor.hs	2;"	m
 LongPress	src/Dodge/Data/Input.hs	18;"	C
 LongRoom	src/Dodge/Room/LongRoom.hs	1;"	m
 LookAround	src/Dodge/Data/ActionPlan.hs	186;"	C
 Loop	src/Loop.hs	11;"	m
 Lorem	src/Lorem.hs	1;"	m
-LtAutoAI	src/Dodge/Data/Creature/Misc.hs	54;"	C
+LtAutoAI	src/Dodge/Data/Creature/Misc.hs	51;"	C
 LtAutoCrit	src/Dodge/Creature/LtAutoCrit.hs	1;"	m
 Lure	src/Dodge/Data/ActionPlan.hs	179;"	C
 Luse	src/Dodge/Luse.hs	2;"	m
@@ -1198,7 +1197,7 @@ Metal	src/Dodge/Data/Material.hs	11;"	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	59;"	C
+MiniGunAI	src/Dodge/Data/Creature/Misc.hs	56;"	C
 MiniGunFlare	src/Dodge/Data/Muzzle.hs	25;"	C
 Misc	src/Dodge/Data/Creature/Misc.hs	6;"	m
 Misc	src/Dodge/Data/Equipment/Misc.hs	6;"	m
@@ -1226,13 +1225,14 @@ Move	src/Dodge/Data/ActionPlan.hs	28;"	C
 Move	src/Dodge/Wall/Move.hs	3;"	m
 MoveEquipment	src/Dodge/Data/RightButtonOptions.hs	23;"	C
 MoveForward	src/Dodge/Data/ActionPlan.hs	29;"	C
+MoveType	src/Dodge/Creature/MoveType.hs	1;"	m
 Movement	src/Dodge/Creature/Impulse/Movement.hs	1;"	m
 Moving	src/Dodge/Prop/Moving.hs	1;"	m
-MultGunAI	src/Dodge/Data/Creature/Misc.hs	61;"	C
+MultGunAI	src/Dodge/Data/Creature/Misc.hs	58;"	C
 Multiset	src/Multiset.hs	4;"	m
 Music	src/Music.hs	1;"	m
 MusicData	src/Music.hs	7;"	t
-Mute	src/Dodge/Data/Creature/Misc.hs	29;"	C
+Mute	src/Dodge/Data/Creature/Misc.hs	28;"	C
 Muzzle	src/Dodge/Data/Muzzle.hs	9;"	t
 Muzzle	src/Dodge/Data/Muzzle.hs	3;"	m
 MuzzleBlink	src/Dodge/Data/Muzzle.hs	45;"	C
@@ -1253,7 +1253,7 @@ MuzzleTractor	src/Dodge/Data/Muzzle.hs	35;"	C
 MuzzleUnsafeBlink	src/Dodge/Data/Muzzle.hs	46;"	C
 MvForward	src/Dodge/Data/ActionPlan.hs	35;"	C
 MvTurnToward	src/Dodge/Data/ActionPlan.hs	34;"	C
-MvWalking	src/Dodge/Data/Creature/Misc.hs	40;"	C
+MvWalking	src/Dodge/Data/Creature/Misc.hs	37;"	C
 NAILBOX	src/Dodge/Data/Item/Combine.hs	78;"	C
 NInt	src/NewInt.hs	15;"	C
 NIntMap	src/NewInt.hs	18;"	C
@@ -1299,7 +1299,7 @@ NoItemScroll	src/Dodge/Data/Item.hs	52;"	C
 NoLightFlare	src/Dodge/Data/Muzzle.hs	24;"	C
 NoLighting	src/Dodge/Data/Config.hs	104;"	C
 NoMouseContext	src/Dodge/Data/Input.hs	22;"	C
-NoMvType	src/Dodge/Data/Creature/Misc.hs	39;"	C
+NoMvType	src/Dodge/Data/Creature/Misc.hs	36;"	C
 NoNeedWeapon	src/Dodge/Room/NoNeedWeapon.hs	2;"	m
 NoObjShads	src/Dodge/Data/Config.hs	102;"	C
 NoParams	src/Dodge/Data/Item/Params.hs	14;"	C
@@ -1317,7 +1317,7 @@ NodeMTree	src/Dodge/Data/MetaTree.hs	14;"	C
 NodeMTree	src/Dodge/Tree/Compose/Data.hs	9;"	C
 NodeTree	src/Dodge/Data/MetaTree.hs	13;"	C
 NodeTree	src/Dodge/Tree/Compose/Data.hs	9;"	C
-NonDrawnCreature	src/Dodge/Data/Creature/Misc.hs	87;"	C
+NonDrawnCreature	src/Dodge/Data/Creature/Misc.hs	90;"	C
 NormalOptions	src/Dodge/Data/Universe.hs	72;"	C
 NormalTimeFlow	src/Dodge/Data/World.hs	60;"	C
 North	src/Dodge/Data/CardinalPoint.hs	4;"	C
@@ -1464,7 +1464,7 @@ Picture	src/Dodge/Render/Picture.hs	1;"	m
 Picture	src/Picture.hs	3;"	m
 Pillar	src/Dodge/Room/Pillar.hs	1;"	m
 Pipe	src/Dodge/Placement/Instance/Pipe.hs	1;"	m
-PistolAI	src/Dodge/Data/Creature/Misc.hs	53;"	C
+PistolAI	src/Dodge/Data/Creature/Misc.hs	50;"	C
 PistolCrit	src/Dodge/Creature/PistolCrit.hs	1;"	m
 PlaceSpot	src/Dodge/Placement/PlaceSpot.hs	5;"	m
 Placement	src/Dodge/Data/GenWorld.hs	75;"	t
@@ -1473,7 +1473,7 @@ PlacementHelper	src/Dodge/LevelGen/PlacementHelper.hs	1;"	m
 PlacementSpot	src/Dodge/Data/GenWorld.hs	61;"	t
 PlacementSpot	src/Dodge/PlacementSpot.hs	2;"	m
 PlacementUsingPos	src/Dodge/Data/GenWorld.hs	83;"	C
-PlainBarrel	src/Dodge/Data/Creature/Misc.hs	90;"	C
+PlainBarrel	src/Dodge/Data/Creature/Misc.hs	93;"	C
 PlantNurserySS	src/Dodge/Data/Scenario.hs	96;"	C
 PlayStatus	src/Sound/Data.hs	23;"	t
 PlayerFaction	src/Dodge/Data/Creature/State.hs	42;"	C
@@ -1549,8 +1549,8 @@ PropVerticalLampCover	src/Dodge/Data/Prop.hs	49;"	C
 PropZ	src/Dodge/Data/Prop.hs	19;"	C
 ProximityRequirement	src/Dodge/Data/Machine/Sensor.hs	32;"	t
 ProximitySensor	src/Dodge/Data/Machine/Sensor.hs	24;"	C
-Pulse	src/Dodge/Data/Creature/Misc.hs	64;"	t
+Pulse	src/Dodge/Data/Creature/Misc.hs	61;"	t
-PulseStatus	src/Dodge/Data/Creature/Misc.hs	64;"	C
+PulseStatus	src/Dodge/Data/Creature/Misc.hs	61;"	C
 PushBackDamage	src/Dodge/Data/Damage.hs	28;"	C
 PushDamage	src/Dodge/Data/Damage.hs	22;"	C
 PushPop	src/Dodge/Menu/PushPop.hs	1;"	m
@@ -1855,7 +1855,7 @@ SpawnedBy	src/Dodge/Data/Creature/State.hs	39;"	C
 SplashOptions	src/Dodge/Data/Universe.hs	72;"	C
 SplitBeamCombine	src/Dodge/Data/Beam.hs	42;"	C
 SprayGuns	src/Dodge/Item/Held/SprayGuns.hs	1;"	m
-SpreadGunAI	src/Dodge/Data/Creature/Misc.hs	52;"	C
+SpreadGunAI	src/Dodge/Data/Creature/Misc.hs	49;"	C
 SpreadGunCrit	src/Dodge/Creature/SpreadGunCrit.hs	1;"	m
 StabOrthReduce	src/Dodge/Projectile/Create.hs	19;"	C
 StabSpinIncrease	src/Dodge/Projectile/Create.hs	20;"	C
@@ -1890,8 +1890,8 @@ Suspicious	src/Dodge/Data/Creature/Perception.hs	66;"	C
 Swap	src/Dodge/Inventory/Swap.hs	1;"	m
 SwapEquipment	src/Dodge/Data/RightButtonOptions.hs	27;"	C
 Swarm	src/Dodge/Data/Creature/State.hs	47;"	C
-SwarmAI	src/Dodge/Data/Creature/Misc.hs	56;"	C
+SwarmAI	src/Dodge/Data/Creature/Misc.hs	53;"	C
-SwarmCrit	src/Dodge/Data/Creature/Misc.hs	74;"	C
+SwarmCrit	src/Dodge/Data/Creature/Misc.hs	77;"	C
 SwarmCrit	src/Dodge/Creature/SwarmCrit.hs	1;"	m
 SwarmPlacement	src/Dodge/LevelGen/SwarmPlacement.hs	1;"	m
 Switch	src/Dodge/LevelGen/Switch.hs	1;"	m
@@ -2137,7 +2137,7 @@ Vigilance	src/Dodge/Data/Creature/Perception.hs	52;"	t
 Vigilant	src/Dodge/Data/Creature/Perception.hs	56;"	C
 Virus	src/Dodge/Data/Scenario.hs	25;"	C
 Vision	src/Dodge/Data/Creature/Perception.hs	41;"	t
-Vocalization	src/Dodge/Data/Creature/Misc.hs	28;"	t
+Vocalization	src/Dodge/Data/Creature/Misc.hs	27;"	t
 Vocalization	src/Dodge/Creature/Vocalization.hs	1;"	m
 Volition	src/Dodge/Creature/Volition.hs	2;"	m
 VolleyUnfiredBarrels	src/Dodge/Data/Item/Params.hs	18;"	C
@@ -2274,10 +2274,13 @@ _asDir	src/Dodge/Data/ArcStep.hs	16;"	f
 _asObject	src/Dodge/Data/ArcStep.hs	17;"	f
 _asPos	src/Dodge/Data/ArcStep.hs	15;"	f
 _auDist	src/Dodge/Data/Creature/Perception.hs	48;"	f
-_avatarMaterial	src/Dodge/Data/Creature/Misc.hs	71;"	f
+_avDexterity	src/Dodge/Data/Creature/Misc.hs	72;"	f
-_avatarPulse	src/Dodge/Data/Creature/Misc.hs	71;"	f
+_avIntelligence	src/Dodge/Data/Creature/Misc.hs	73;"	f
+_avStrength	src/Dodge/Data/Creature/Misc.hs	71;"	f
+_avatarMaterial	src/Dodge/Data/Creature/Misc.hs	70;"	f
+_avatarPulse	src/Dodge/Data/Creature/Misc.hs	69;"	f
 _barrelShader	src/Data/Preload/Render.hs	23;"	f
-_barrelType	src/Dodge/Data/Creature/Misc.hs	76;"	f
+_barrelType	src/Dodge/Data/Creature/Misc.hs	79;"	f
 _bdMaxX	src/Dodge/Data/Bounds.hs	14;"	f
 _bdMaxY	src/Dodge/Data/Bounds.hs	16;"	f
 _bdMinX	src/Dodge/Data/Bounds.hs	13;"	f
@@ -2410,7 +2413,7 @@ _cpSPic	src/Dodge/Data/Corpse.hs	21;"	f
 _cpVigilance	src/Dodge/Data/Creature/Perception.hs	33;"	f
 _cpVision	src/Dodge/Data/Creature/Perception.hs	36;"	f
 _crActionPlan	src/Dodge/Data/Creature.hs	50;"	f
-_crDeathTimer	src/Dodge/Data/Creature.hs	60;"	f
+_crDeathTimer	src/Dodge/Data/Creature.hs	59;"	f
 _crDir	src/Dodge/Data/Creature.hs	38;"	f
 _crEquipment	src/Dodge/Data/Creature.hs	46;"	f
 _crFaction	src/Dodge/Data/Creature.hs	54;"	f
@@ -2428,7 +2431,6 @@ _crManipulation	src/Dodge/Data/Creature.hs	45;"	f
 _crMemory	src/Dodge/Data/Creature.hs	52;"	f
 _crMvAim	src/Dodge/Data/Creature.hs	40;"	f
 _crMvDir	src/Dodge/Data/Creature.hs	39;"	f
-_crMvType	src/Dodge/Data/Creature.hs	57;"	f
 _crName	src/Dodge/Data/Creature.hs	58;"	f
 _crOldPos	src/Dodge/Data/Creature.hs	37;"	f
 _crPastDamage	src/Dodge/Data/Creature.hs	48;"	f
@@ -2436,7 +2438,6 @@ _crPerception	src/Dodge/Data/Creature.hs	51;"	f
 _crPos	src/Dodge/Data/Creature.hs	36;"	f
 _crStance	src/Dodge/Data/Creature.hs	49;"	f
 _crState	src/Dodge/Data/Creature.hs	47;"	f
-_crStatistics	src/Dodge/Data/Creature.hs	59;"	f
 _crType	src/Dodge/Data/Creature.hs	41;"	f
 _crVocalization	src/Dodge/Data/Creature.hs	53;"	f
 _crZoning	src/Dodge/Data/World.hs	47;"	f
@@ -2473,7 +2474,6 @@ _debugV3	src/Dodge/Data/Universe.hs	59;"	f
 _debug_booleans	src/Dodge/Data/Config.hs	57;"	f
 _debug_view_clip_bounds	src/Dodge/Data/Config.hs	56;"	f
 _delayedEvents	src/Dodge/Data/LWorld.hs	136;"	f
-_dexterity	src/Dodge/Data/Creature/Misc.hs	23;"	f
 _diCloseFilter	src/Dodge/Data/HUD.hs	24;"	f
 _diInvFilter	src/Dodge/Data/HUD.hs	23;"	f
 _diSections	src/Dodge/Data/HUD.hs	21;"	f
@@ -2617,7 +2617,7 @@ _heldWorldPos	src/Dodge/Data/Input.hs	56;"	f
 _hotkeys	src/Dodge/Data/LWorld.hs	149;"	f
 _hud	src/Dodge/Data/World.hs	45;"	f
 _hudElement	src/Dodge/Data/HUD.hs	45;"	f
-_humanoidAI	src/Dodge/Data/Creature/Misc.hs	84;"	f
+_humanoidAI	src/Dodge/Data/Creature/Misc.hs	87;"	f
 _iaLoaded	src/Dodge/Data/Item/Use/Consumption.hs	21;"	f
 _iatOrient	src/Dodge/Data/ComposedItem.hs	74;"	f
 _iatType	src/Dodge/Data/ComposedItem.hs	73;"	f
@@ -2653,7 +2653,6 @@ _impulseUseTarget	src/Dodge/Data/ActionPlan.hs	53;"	f
 _impulseUseTargetCID	src/Dodge/Data/ActionPlan.hs	50;"	f
 _impulsesListList	src/Dodge/Data/ActionPlan.hs	98;"	f
 _input	src/Dodge/Data/World.hs	42;"	f
-_intelligence	src/Dodge/Data/Creature/Misc.hs	24;"	f
 _ipPlacement	src/Dodge/Data/GenWorld.hs	132;"	f
 _ipPlacementID	src/Dodge/Data/GenWorld.hs	133;"	f
 _ispCloseButton	src/Dodge/Data/Item/Use/Consumption/LoadAction.hs	31;"	f
@@ -2682,9 +2681,9 @@ _lInvLock	src/Dodge/Data/LWorld.hs	152;"	f
 _lTestInt	src/Dodge/Data/LWorld.hs	148;"	f
 _lTestString	src/Dodge/Data/LWorld.hs	147;"	f
 _lWorld	src/Dodge/Data/CWorld.hs	24;"	f
-_lampColor	src/Dodge/Data/Creature/Misc.hs	77;"	f
+_lampColor	src/Dodge/Data/Creature/Misc.hs	80;"	f
-_lampHeight	src/Dodge/Data/Creature/Misc.hs	77;"	f
+_lampHeight	src/Dodge/Data/Creature/Misc.hs	80;"	f
-_lampLSID	src/Dodge/Data/Creature/Misc.hs	77;"	f
+_lampLSID	src/Dodge/Data/Creature/Misc.hs	80;"	f
 _laserEmmiter	src/Dodge/Data/Laser.hs	18;"	f
 _laserTypeDamage	src/Dodge/Data/Laser.hs	17;"	f
 _lasers	src/Dodge/Data/LWorld.hs	119;"	f
@@ -2774,7 +2773,7 @@ _mdPoint3	src/Dodge/Data/Modification.hs	20;"	f
 _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	73;"	f
+_meleeCooldown	src/Dodge/Data/Creature/Misc.hs	76;"	f
 _meleeTarget	src/Dodge/Data/ActionPlan.hs	187;"	f
 _mgField	src/Dodge/Data/Magnet.hs	25;"	f
 _mgPos	src/Dodge/Data/Magnet.hs	24;"	f
@@ -2798,11 +2797,11 @@ _mtLabel	src/Dodge/Tree/Compose/Data.hs	8;"	f
 _mtTree	src/Dodge/Data/MetaTree.hs	10;"	f
 _mtTree	src/Dodge/Tree/Compose/Data.hs	8;"	f
 _musicData	src/Data/Preload.hs	13;"	f
-_mvAimSpeed	src/Dodge/Data/Creature/Misc.hs	45;"	f
+_mvAimSpeed	src/Dodge/Data/Creature/Misc.hs	42;"	f
-_mvSpeed	src/Dodge/Data/Creature/Misc.hs	40;"	f
+_mvSpeed	src/Dodge/Data/Creature/Misc.hs	37;"	f
-_mvToPoint	src/Dodge/Data/Creature.hs	67;"	f
+_mvToPoint	src/Dodge/Data/Creature.hs	66;"	f
-_mvTurnJit	src/Dodge/Data/Creature/Misc.hs	44;"	f
+_mvTurnJit	src/Dodge/Data/Creature/Misc.hs	41;"	f
-_mvTurnRad	src/Dodge/Data/Creature/Misc.hs	43;"	f
+_mvTurnRad	src/Dodge/Data/Creature/Misc.hs	40;"	f
 _mzAmmoPerShot	src/Dodge/Data/Muzzle.hs	16;"	f
 _mzAmmoSlot	src/Dodge/Data/Muzzle.hs	13;"	f
 _mzEffect	src/Dodge/Data/Muzzle.hs	15;"	f
@@ -2924,8 +2923,8 @@ _psRoomEff	src/Dodge/Data/GenWorld.hs	66;"	f
 _psRoomRandPointNum	src/Dodge/Data/GenWorld.hs	70;"	f
 _psRot	src/Dodge/Data/GenWorld.hs	62;"	f
 _psSelect	src/Dodge/Data/GenWorld.hs	65;"	f
-_pulseProgress	src/Dodge/Data/Creature/Misc.hs	66;"	f
+_pulseProgress	src/Dodge/Data/Creature/Misc.hs	63;"	f
-_pulseRate	src/Dodge/Data/Creature/Misc.hs	65;"	f
+_pulseRate	src/Dodge/Data/Creature/Misc.hs	62;"	f
 _putBlock	src/Dodge/Data/GenWorld.hs	39;"	f
 _putButton	src/Dodge/Data/GenWorld.hs	34;"	f
 _putEndPoint	src/Dodge/Data/GenWorld.hs	47;"	f
@@ -3077,9 +3076,9 @@ _skOldPos	src/Dodge/Data/Spark.hs	19;"	f
 _skPos	src/Dodge/Data/Spark.hs	18;"	f
 _skVel	src/Dodge/Data/Spark.hs	16;"	f
 _skWidth	src/Dodge/Data/Spark.hs	20;"	f
-_skinHead	src/Dodge/Data/Creature/Misc.hs	81;"	f
+_skinHead	src/Dodge/Data/Creature/Misc.hs	84;"	f
-_skinLower	src/Dodge/Data/Creature/Misc.hs	83;"	f
+_skinLower	src/Dodge/Data/Creature/Misc.hs	86;"	f
-_skinUpper	src/Dodge/Data/Creature/Misc.hs	82;"	f
+_skinUpper	src/Dodge/Data/Creature/Misc.hs	85;"	f
 _smoothScrollAmount	src/Dodge/Data/Input.hs	52;"	f
 _soundAngDist	src/Sound/Data.hs	49;"	f
 _soundChannel	src/Sound/Data.hs	48;"	f
@@ -3101,7 +3100,6 @@ _ssItems	src/Dodge/Data/SelectionList.hs	30;"	f
 _ssOffset	src/Dodge/Data/SelectionList.hs	31;"	f
 _ssShownItems	src/Dodge/Data/SelectionList.hs	32;"	f
 _ssShownLength	src/Dodge/Data/SelectionList.hs	33;"	f
-_strength	src/Dodge/Data/Creature/Misc.hs	22;"	f
 _strideAmount	src/Dodge/Data/Creature/Stance.hs	22;"	f
 _strideLength	src/Dodge/Data/Creature/Stance.hs	16;"	f
 _stuckCrID	src/Dodge/Data/Projectile.hs	59;"	f
@@ -3122,7 +3120,7 @@ _swarm	src/Dodge/Data/Creature/State.hs	48;"	f
 _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	66;"	f
+_targetCr	src/Dodge/Data/Creature.hs	65;"	f
 _targetID	src/Dodge/Data/ActionPlan.hs	85;"	f
 _targetSeenAt	src/Dodge/Data/ActionPlan.hs	86;"	f
 _tbPos	src/Dodge/Data/TractorBeam.hs	14;"	f
@@ -3247,12 +3245,12 @@ _vboPtr	src/Shader/Data.hs	83;"	f
 _vboShapes	src/Data/Preload/Render.hs	42;"	f
 _vboVertexBytes	src/Shader/Data.hs	84;"	f
 _vboWindows	src/Data/Preload/Render.hs	41;"	f
-_vcCoolDown	src/Dodge/Data/Creature/Misc.hs	34;"	f
+_vcCoolDown	src/Dodge/Data/Creature/Misc.hs	31;"	f
-_vcMaxCoolDown	src/Dodge/Data/Creature/Misc.hs	33;"	f
+_vcMaxCoolDown	src/Dodge/Data/Creature/Misc.hs	30;"	f
 _vertices	src/Polyhedra/Data.hs	22;"	f
 _viDist	src/Dodge/Data/Creature/Perception.hs	43;"	f
 _viFOV	src/Dodge/Data/Creature/Perception.hs	42;"	f
-_viewPoint	src/Dodge/Data/Creature.hs	68;"	f
+_viewPoint	src/Dodge/Data/Creature.hs	67;"	f
 _volume_master	src/Dodge/Data/Config.hs	39;"	f
 _volume_music	src/Dodge/Data/Config.hs	41;"	f
 _volume_sound	src/Dodge/Data/Config.hs	40;"	f
@@ -3450,7 +3448,7 @@ attachList'	src/Dodge/Tree/Compose.hs	80;"	f
 attachOnward	src/Dodge/Tree/Compose.hs	95;"	f
 attachOnward'	src/Dodge/Tree/Compose.hs	98;"	f
 attachTree	src/Dodge/Tree/Compose.hs	38;"	f
-attentionViewPoint	src/Dodge/Creature/ReaderUpdate.hs	67;"	f
+attentionViewPoint	src/Dodge/Creature/ReaderUpdate.hs	68;"	f
 attribSize	src/Shader/Compile.hs	306;"	f
 autoAmr	src/Dodge/Item/Held/Rod.hs	39;"	f
 autoBS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	374;"	f
@@ -3507,7 +3505,7 @@ batteryPack	src/Dodge/Item/Equipment.hs	46;"	f
 belowNumX	src/Dodge/Combine/Graph.hs	85;"	f
 beltMag	src/Dodge/Item/Ammo.hs	38;"	f
 bfsNodePoints	src/Dodge/Path.hs	58;"	f
-bfsThenReturn	src/Dodge/Creature/ReaderUpdate.hs	217;"	f
+bfsThenReturn	src/Dodge/Creature/ReaderUpdate.hs	218;"	f
 bgateCalc	src/Dodge/Inventory/SelectionList.hs	114;"	f
 bgunSound	src/Dodge/HeldUse.hs	510;"	f
 bindFBO	src/Render.hs	244;"	f
@@ -3596,11 +3594,11 @@ changeSwapWith	src/Dodge/Inventory.hs	178;"	f
 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	30;"	f
+chaseCrit	src/Dodge/Creature/ChaseCrit.hs	27;"	f
 chaseCritAwarenessUpdate	src/Dodge/Creature/Perception.hs	70;"	f
-chaseCritMv	src/Dodge/Creature/ReaderUpdate.hs	113;"	f
+chaseCritMv	src/Dodge/Creature/ReaderUpdate.hs	114;"	f
 chaseCritPerceptionUpdate	src/Dodge/Creature/Perception.hs	31;"	f
-chaseCritVocalization	src/Dodge/Creature/ChaseCrit.hs	42;"	f
+chaseCritVocalization	src/Dodge/Creature/ChaseCrit.hs	37;"	f
 checkCombineSelectionExists	src/Dodge/DisplayInventory.hs	100;"	f
 checkConnection	src/Dodge/Inventory/Swap.hs	64;"	f
 checkDeath	src/Dodge/Creature/State.hs	79;"	f
@@ -3735,7 +3733,8 @@ crBlips	src/Dodge/RadarSweep.hs	87;"	f
 crCamouflage	src/Dodge/Creature/Picture.hs	33;"	f
 crCanSeeCr	src/Dodge/Creature/Test.hs	50;"	f
 crCrSpring	src/Dodge/Update.hs	782;"	f
-crCurrentEquipment	src/Dodge/Creature/Statistics.hs	27;"	f
+crCurrentEquipment	src/Dodge/Creature/Statistics.hs	57;"	f
+crDexterity	src/Dodge/Creature/Statistics.hs	14;"	f
 crDisplayAwareness	src/Dodge/Creature/Picture/Awareness.hs	38;"	f
 crDisplayVigilance	src/Dodge/Creature/Picture/Awareness.hs	52;"	f
 crHasTarget	src/Dodge/Creature/Test.hs	63;"	f
@@ -3744,6 +3743,7 @@ crHit	src/Dodge/WorldEvent/ThingsHit.hs	68;"	f
 crIXsNearCirc	src/Dodge/Zoning/Creature.hs	32;"	f
 crIXsNearPoint	src/Dodge/Zoning/Creature.hs	14;"	f
 crInAimStance	src/Dodge/Creature/Test.hs	92;"	f
+crIntelligence	src/Dodge/Creature/Statistics.hs	34;"	f
 crIsAiming	src/Dodge/Creature/Test.hs	58;"	f
 crIsArmouredFrom	src/Dodge/Creature/Test.hs	113;"	f
 crMass	src/Dodge/Creature/Mass.hs	5;"	f
@@ -3752,6 +3752,7 @@ crMaxHP	src/Dodge/Creature/MaxHP.hs	6;"	f
 crMvAbsolute	src/Dodge/Creature/Impulse/Movement.hs	27;"	f
 crMvBy	src/Dodge/Creature/Impulse/Movement.hs	20;"	f
 crMvForward	src/Dodge/Creature/Impulse/Movement.hs	41;"	f
+crMvType	src/Dodge/Creature/MoveType.hs	5;"	f
 crNearPoint	src/Dodge/Creature/Test.hs	139;"	f
 crNumFreeSlots	src/Dodge/Inventory/CheckSlots.hs	23;"	f
 crOnWall	src/Dodge/WallCreatureCollisions.hs	86;"	f
@@ -3761,11 +3762,12 @@ crSetRoots	src/Dodge/Inventory/Location.hs	48;"	f
 crShape	src/Dodge/Creature/Shape.hs	8;"	f
 crSpring	src/Dodge/Update.hs	777;"	f
 crStratConMatches	src/Dodge/Creature/Test.hs	76;"	f
+crStrength	src/Dodge/Creature/Statistics.hs	24;"	f
 crUpdate	src/Dodge/Creature/State.hs	63;"	f
 crUpdateInvidLocations	src/Dodge/Inventory/Location.hs	61;"	f
 crUpdateItemLocations	src/Dodge/Inventory/Location.hs	42;"	f
-crVocalizationSound	src/Dodge/Creature/Vocalization.hs	9;"	f
+crVocalizationSound	src/Dodge/Creature/Vocalization.hs	13;"	f
-crWarningSounds	src/Dodge/Creature/Vocalization.hs	19;"	f
+crWarningSounds	src/Dodge/Creature/Vocalization.hs	23;"	f
 crZoneSize	src/Dodge/Zoning/Creature.hs	41;"	f
 craftInfo	src/Dodge/Item/Info.hs	168;"	f
 craftItemSPic	src/Dodge/Item/Draw/SPic.hs	57;"	f
@@ -3891,8 +3893,8 @@ dedumS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	340;"	f
 defDamageMaterial	src/Dodge/Material/Damage.hs	17;"	f
 defLSPic	src/Dodge/LightSource/Draw.hs	10;"	f
 defSPic	src/Dodge/Item/Draw/SPic.hs	299;"	f
-defaultAimMvType	src/Dodge/Default/Creature.hs	113;"	f
+defaultAimMvType	src/Dodge/Creature/MoveType.hs	15;"	f
-defaultAimingCrit	src/Dodge/Default/Creature.hs	122;"	f
+defaultAimingCrit	src/Dodge/Default/Creature.hs	105;"	f
 defaultApplyDamage	src/Dodge/Creature/Damage.hs	22;"	f
 defaultArcStep	src/Dodge/Tesla/Arc.hs	140;"	f
 defaultArcStep	src/Dodge/Tesla/Arc/Default.hs	15;"	f
@@ -3905,7 +3907,7 @@ defaultButton	src/Dodge/Default.hs	49;"	f
 defaultCWCam	src/Dodge/Default/World.hs	68;"	f
 defaultCWGen	src/Dodge/Default/World.hs	58;"	f
 defaultCWorld	src/Dodge/Default/World.hs	83;"	f
-defaultChaseMvType	src/Dodge/Default/Creature.hs	104;"	f
+defaultChaseMvType	src/Dodge/Creature/MoveType.hs	24;"	f
 defaultClusterStatus	src/Dodge/Default/Room.hs	38;"	f
 defaultConfig	src/Dodge/Data/Config.hs	127;"	f
 defaultCorpse	src/Dodge/Corpse/Make.hs	35;"	f
@@ -3944,7 +3946,7 @@ defaultProp	src/Dodge/Default/Prop.hs	6;"	f
 defaultProximitySensor	src/Dodge/Default.hs	75;"	f
 defaultRoom	src/Dodge/Default/Room.hs	9;"	f
 defaultSensorWall	src/Dodge/Default/Wall.hs	58;"	f
-defaultState	src/Dodge/Default/Creature.hs	131;"	f
+defaultState	src/Dodge/Default/Creature.hs	114;"	f
 defaultSwitchWall	src/Dodge/Default/Door.hs	22;"	f
 defaultTerminal	src/Dodge/Default/Terminal.hs	9;"	f
 defaultTerminalInput	src/Dodge/Default/Terminal.hs	32;"	f
@@ -4075,7 +4077,7 @@ doScopeZoom	src/Dodge/Update/Scroll.hs	85;"	f
 doSectionSize	src/Dodge/DisplayInventory.hs	217;"	f
 doSideEffects	appDodge/Main.hs	120;"	f
 doStep	src/Dodge/ArcStep.hs	9;"	f
-doStrategyActions	src/Dodge/Creature/ReaderUpdate.hs	165;"	f
+doStrategyActions	src/Dodge/Creature/ReaderUpdate.hs	166;"	f
 doTerminalBootProgram	src/Dodge/WorldEffect.hs	101;"	f
 doTerminalCommandEffect	src/Dodge/Terminal.hs	135;"	f
 doTestDrawing	src/Dodge/Render.hs	42;"	f
@@ -4279,7 +4281,7 @@ equipItemSPic	src/Dodge/Item/Draw/SPic.hs	149;"	f
 equipPosition	src/Dodge/Item/Draw.hs	38;"	f
 equipSiteInfo	src/Dodge/Item/Info.hs	253;"	f
 equipType	src/Dodge/Data/EquipType.hs	10;"	f
-equipmentStrValue	src/Dodge/Creature/Statistics.hs	21;"	f
+equipmentStrValue	src/Dodge/Creature/Statistics.hs	51;"	f
 errorAngleVV	src/Geometry.hs	59;"	f
 errorClosestPointOnLine	src/Geometry.hs	71;"	f
 errorClosestPointOnLineParam	src/Geometry.hs	77;"	f
@@ -4355,7 +4357,7 @@ flickerMod	src/Dodge/Placement/Instance/LightSource/Flicker.hs	10;"	f
 flickerUpdate	src/Dodge/Placement/Instance/LightSource/Flicker.hs	24;"	f
 flipSwitch	src/Dodge/Button/Event.hs	21;"	f
 floatSize	src/Shader/Parameters.hs	17;"	f
-flockACC	src/Dodge/Creature/ReaderUpdate.hs	88;"	f
+flockACC	src/Dodge/Creature/ReaderUpdate.hs	89;"	f
 flockArmourChaseCrit	src/Dodge/Creature/ArmourChase.hs	15;"	f
 flockCenterFunc	src/Dodge/Creature/Boid.hs	254;"	f
 flockChaseTarget	src/Dodge/Creature/Boid.hs	185;"	f
@@ -4435,8 +4437,7 @@ getBulletType	src/Dodge/HeldUse.hs	880;"	f
 getCloseObj	src/Dodge/Update/Input/InGame.hs	515;"	f
 getCommands	src/Dodge/Terminal.hs	117;"	f
 getCommandsHelp	src/Dodge/Terminal.hs	75;"	f
-getCrDexterity	src/Dodge/Creature/Statistics.hs	12;"	f
+getCrMoveSpeed	src/Dodge/Creature/Statistics.hs	45;"	f
-getCrMoveSpeed	src/Dodge/Creature/Statistics.hs	15;"	f
 getDamageCoding	src/Dodge/Terminal.hs	177;"	f
 getDistortions	src/Dodge/Render.hs	383;"	f
 getEquipmentAllocation	src/Dodge/Inventory/RBList.hs	47;"	f
@@ -4481,7 +4482,7 @@ glassWallDamage	src/Dodge/Wall/DamageEffect.hs	48;"	f
 glauncherPic	src/Dodge/Item/Draw/SPic.hs	393;"	f
 glushortSize	src/Shader/Parameters.hs	25;"	f
 goToPostStrat	src/Dodge/Creature/Strategy.hs	10;"	f
-goToTarget	src/Dodge/Creature/ReaderUpdate.hs	137;"	f
+goToTarget	src/Dodge/Creature/ReaderUpdate.hs	138;"	f
 grahamEliminate	src/Geometry/Polygon.hs	125;"	f
 grahamScan	src/Geometry/Polygon.hs	116;"	f
 grapeCannon	src/Dodge/Item/Held/Cone.hs	17;"	f
@@ -4554,7 +4555,7 @@ heldItemOrient2D	src/Dodge/Item/HeldOffset.hs	29;"	f
 heldItemRelativeOrient	src/Dodge/Item/HeldOffset.hs	34;"	f
 heldItemRifling	src/Dodge/HeldUse.hs	1069;"	f
 heldItemSPic	src/Dodge/Item/Draw/SPic.hs	225;"	f
-heldItemWeight	src/Dodge/Creature/Statistics.hs	41;"	f
+heldItemWeight	src/Dodge/Creature/Statistics.hs	71;"	f
 heldPositionInfo	src/Dodge/Item/Info.hs	240;"	f
 heldTorqueAmount	src/Dodge/HeldUse.hs	583;"	f
 heldTriggerType	src/Dodge/BaseTriggerType.hs	17;"	f
@@ -4672,7 +4673,7 @@ invertEncircleDistP	src/Dodge/Creature/Boid.hs	14;"	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	23;"	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	142;"	f
@@ -4740,7 +4741,7 @@ itemString	src/Dodge/Item/Display.hs	55;"	f
 itemToBreakLists	src/Dodge/Item/Grammar.hs	68;"	f
 itemToFunction	src/Dodge/Item/Grammar.hs	148;"	f
 itemTreeSPic	src/Dodge/Item/Draw/SPic.hs	23;"	f
-itemWeight	src/Dodge/Creature/Statistics.hs	36;"	f
+itemWeight	src/Dodge/Creature/Statistics.hs	66;"	f
 iterateUntil	src/MonadHelp.hs	23;"	f
 iterateWhile	src/MonadHelp.hs	30;"	f
 itmBaseInfo	src/Dodge/Item/Info.hs	30;"	f
@@ -4825,7 +4826,7 @@ linksOnPath	src/Dodge/Room/CheckConsistency.hs	7;"	f
 listConfig	src/Dodge/Menu.hs	216;"	f
 listControls	src/Dodge/Menu.hs	228;"	f
 listCursorChooseBorderScale	src/Dodge/Render/List.hs	135;"	f
-listGuard	src/Dodge/Creature/ReaderUpdate.hs	189;"	f
+listGuard	src/Dodge/Creature/ReaderUpdate.hs	190;"	f
 listSelectionColorPicture	src/Dodge/DisplayInventory.hs	308;"	f
 litCorridor90	src/Dodge/Room/RoadBlock.hs	26;"	f
 llleft	src/Dodge/Item/Grammar.hs	205;"	f
@@ -5172,8 +5173,8 @@ overlapCircWalls	src/Dodge/Base/Collide.hs	138;"	f
 overlapCircWallsClosest	src/Dodge/Base/Collide.hs	177;"	f
 overlapSegCrs	src/Dodge/Base/Collide.hs	60;"	f
 overlapSegWalls	src/Dodge/Base/Collide.hs	120;"	f
-overrideInternal	src/Dodge/Creature/ReaderUpdate.hs	173;"	f
+overrideInternal	src/Dodge/Creature/ReaderUpdate.hs	174;"	f
-overrideMeleeCloseTarget	src/Dodge/Creature/ReaderUpdate.hs	34;"	f
+overrideMeleeCloseTarget	src/Dodge/Creature/ReaderUpdate.hs	35;"	f
 overwriteLabel	src/Dodge/Tree/Compose.hs	31;"	f
 p	src/ShortShow.hs	33;"	f
 pContID	src/Dodge/LevelGen/PlacementHelper.hs	15;"	f
@@ -5505,9 +5506,9 @@ renderLayer	src/Render.hs	233;"	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	161;"	f
+replaceNullWith	src/Dodge/Creature/ReaderUpdate.hs	162;"	f
 replacePutID	src/Dodge/Placement/Instance/Wall.hs	102;"	f
-resetCrVocCoolDown	src/Dodge/Creature/Vocalization.hs	44;"	f
+resetCrVocCoolDown	src/Dodge/Creature/Vocalization.hs	47;"	f
 resetPLUse	src/Dodge/PlacementSpot.hs	96;"	f
 resizeFBOTO	src/Framebuffer/Update.hs	203;"	f
 resizeFBOTO3	src/Framebuffer/Update.hs	175;"	f
@@ -5653,7 +5654,7 @@ seagullCry2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	436;"	f
 seagullCryS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	444;"	f
 seagullWhistle1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	384;"	f
 seagullWhistleS	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	550;"	f
-searchIfDamaged	src/Dodge/Creature/ReaderUpdate.hs	204;"	f
+searchIfDamaged	src/Dodge/Creature/ReaderUpdate.hs	205;"	f
 secondColumnParams	src/Dodge/ListDisplayParams.hs	43;"	f
 sectionsDesiredLines	src/Dodge/DisplayInventory.hs	204;"	f
 sectionsSizes	src/Dodge/DisplayInventory.hs	207;"	f
@@ -5697,7 +5698,7 @@ setLayer	src/Picture/Base.hs	139;"	f
 setLinkType	src/Dodge/RoomLink.hs	60;"	f
 setLinkTypePD	src/Dodge/RoomLink.hs	67;"	f
 setMusicVolume	src/Sound.hs	162;"	f
-setMvPos	src/Dodge/Creature/ReaderUpdate.hs	52;"	f
+setMvPos	src/Dodge/Creature/ReaderUpdate.hs	53;"	f
 setOldPos	src/Dodge/Update.hs	467;"	f
 setOutLinks	src/Dodge/RoomLink.hs	48;"	f
 setOutLinksByType	src/Dodge/RoomLink.hs	57;"	f
@@ -5708,12 +5709,12 @@ 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	75;"	f
+setTargetMv	src/Dodge/Creature/ReaderUpdate.hs	76;"	f
 setTile	src/Dodge/Layout.hs	68;"	f
 setTiles	src/Dodge/Layout.hs	65;"	f
 setToggle	src/Dodge/Prop/Update.hs	46;"	f
 setViewDistance	src/Dodge/Update/Camera.hs	228;"	f
-setViewPos	src/Dodge/Creature/ReaderUpdate.hs	62;"	f
+setViewPos	src/Dodge/Creature/ReaderUpdate.hs	63;"	f
 setViewport	src/Dodge/Render.hs	388;"	f
 setVol	src/Dodge/Config/Update.hs	30;"	f
 setWristShieldPos	src/Dodge/Equipment.hs	49;"	f
@@ -5826,7 +5827,7 @@ slowDoorRoom	src/Dodge/Room/LongDoor.hs	152;"	f
 slowDoorRoomRunPast	src/Dodge/Room/LongDoor.hs	169;"	f
 smallBattery	src/Dodge/Item/Ammo.hs	59;"	f
 smallBranch	src/Dodge/Tree/GenerateStructure.hs	32;"	f
-smallChaseCrit	src/Dodge/Creature/ChaseCrit.hs	15;"	f
+smallChaseCrit	src/Dodge/Creature/ChaseCrit.hs	14;"	f
 smallDrawTree	src/Dodge/LevelGen.hs	88;"	f
 smallGlass1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	362;"	f
 smallGlass2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	492;"	f
@@ -5921,7 +5922,7 @@ startNewGameInSlot	src/Dodge/StartNewGame.hs	15;"	f
 startRoom	src/Dodge/Room/Start.hs	52;"	f
 startSeedGame	src/Dodge/StartNewGame.hs	20;"	f
 startSeedGameConc	src/Dodge/StartNewGame.hs	27;"	f
-statsModifier	src/Dodge/Creature/Info.hs	15;"	f
+statsModifier	src/Dodge/Creature/Info.hs	16;"	f
 stickyMod	src/Dodge/Item/Scope.hs	51;"	f
 stone1S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	410;"	f
 stone2S	src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs	506;"	f
@@ -5934,8 +5935,8 @@ stopAllSounds	src/Sound.hs	125;"	f
 stopBulletAt	src/Dodge/Bullet.hs	190;"	f
 stopPushing	src/Dodge/Block.hs	107;"	f
 stopSoundFrom	src/Dodge/SoundLogic.hs	220;"	f
-strFromEquipment	src/Dodge/Creature/Statistics.hs	18;"	f
+strFromEquipment	src/Dodge/Creature/Statistics.hs	48;"	f
-strFromHeldItem	src/Dodge/Creature/Statistics.hs	30;"	f
+strFromHeldItem	src/Dodge/Creature/Statistics.hs	60;"	f
 strengthFactor	src/Dodge/Creature/Impulse/Movement.hs	35;"	f
 strictify	src/MaybeHelp.hs	37;"	f
 strideRot	src/Dodge/Item/HeldOffset.hs	78;"	f
@@ -5981,7 +5982,7 @@ targCorner	src/Dodge/Targeting/Draw.hs	35;"	f
 targetCursorPic	src/Dodge/Targeting/Draw.hs	41;"	f
 targetYouCognizant	src/Dodge/Creature/ChooseTarget.hs	13;"	f
 targetYouLOS	src/Dodge/Creature/ChooseTarget.hs	7;"	f
-targetYouWhenCognizant	src/Dodge/Creature/ReaderUpdate.hs	195;"	f
+targetYouWhenCognizant	src/Dodge/Creature/ReaderUpdate.hs	196;"	f
 targetYouWhenCognizant	src/Dodge/Creature/SetTarget.hs	9;"	f
 targetingScope	src/Dodge/Item/Scope.hs	38;"	f
 telRoomLev	src/Dodge/Room/Teleport.hs	14;"	f
@@ -6139,7 +6140,7 @@ tryDropSelected	src/Dodge/Update/Input/InGame.hs	125;"	f
 tryGetChannel	src/Sound.hs	97;"	f
 tryGetRootAttachedFromInvID	src/Dodge/Inventory/Location.hs	20;"	f
 tryGetRootItemInvID	src/Dodge/Inventory/Location.hs	29;"	f
-tryMeleeAttack	src/Dodge/Creature/ReaderUpdate.hs	37;"	f
+tryMeleeAttack	src/Dodge/Creature/ReaderUpdate.hs	38;"	f
 tryPickupSelected	src/Dodge/Update/Input/InGame.hs	132;"	f
 tryPlay	src/Sound.hs	84;"	f
 tryPutFloorItemIDInInv	src/Dodge/Inventory/Add.hs	26;"	f
@@ -6171,7 +6172,7 @@ underBarrelSlot	src/Dodge/Item/Scope.hs	159;"	f
 unfoldrMID	src/MonadHelp.hs	33;"	f
 unigate	src/Dodge/Item/Scope.hs	102;"	f
 unitVectorAtAngle	src/Geometry/Vector.hs	100;"	f
-unlockInv	src/Dodge/Inventory/Lock.hs	14;"	f
+unlockInv	src/Dodge/Inventory/Lock.hs	12;"	f
 unpause	src/Dodge/Menu.hs	195;"	f
 unsafeBlinkAction	src/Dodge/Creature/Action/Blink.hs	56;"	f
 unsafeBlinker	src/Dodge/Item/Held/Utility.hs	33;"	f
@@ -6367,11 +6368,11 @@ vgunMuzzles	src/Dodge/HeldUse.hs	301;"	f
 viewBoundaries	src/Dodge/Debug/Picture.hs	304;"	f
 viewClipBounds	src/Dodge/Debug/Picture.hs	313;"	f
 viewDistanceFromItems	src/Dodge/Update/Camera.hs	186;"	f
-viewTarget	src/Dodge/Creature/ReaderUpdate.hs	145;"	f
+viewTarget	src/Dodge/Creature/ReaderUpdate.hs	146;"	f
 violet	src/Color.hs	21;"	f
 visibleWalls	src/Dodge/Base/Collide.hs	124;"	f
 visionCheck	src/Dodge/Creature/Perception.hs	153;"	f
-vocalizationTest	src/Dodge/Creature/Vocalization.hs	39;"	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	347;"	f
 waistSP	src/Dodge/Creature/HandPos.hs	173;"	f
@@ -6390,7 +6391,7 @@ wasdM	src/Dodge/WASD.hs	9;"	f
 wasdMovement	src/Dodge/Creature/YourControl.hs	152;"	f
 wasdWithAiming	src/Dodge/Creature/YourControl.hs	118;"	f
 watchCombinations	src/Dodge/Combine/Combinations.hs	15;"	f
-watchUpdateStrat	src/Dodge/Creature/ReaderUpdate.hs	178;"	f
+watchUpdateStrat	src/Dodge/Creature/ReaderUpdate.hs	179;"	f
 weakenMatS	src/Dodge/Material/Sound.hs	18;"	f
 weaponBehindPillar	src/Dodge/Room/Room.hs	175;"	f
 weaponBetweenPillars	src/Dodge/Room/Room.hs	191;"	f
@@ -6451,13 +6452,13 @@ you	src/Dodge/Base/You.hs	12;"	f
 youDropItem	src/Dodge/Creature/Action.hs	189;"	f
 yourAugmentedItem	src/Dodge/Render/HUD.hs	236;"	f
 yourControl	src/Dodge/Creature/YourControl.hs	27;"	f
-yourDefaultSpeed	src/Dodge/Default/Creature.hs	125;"	f
+yourDefaultSpeed	src/Dodge/Default/Creature.hs	108;"	f
-yourDefaultStrideLength	src/Dodge/Default/Creature.hs	128;"	f
+yourDefaultStrideLength	src/Dodge/Default/Creature.hs	111;"	f
-yourInfo	src/Dodge/Creature/Info.hs	9;"	f
+yourInfo	src/Dodge/Creature/Info.hs	10;"	f
 yourInv	src/Dodge/Base/You.hs	25;"	f
 yourRootItem	src/Dodge/Base/You.hs	20;"	f
 yourSelectedItem	src/Dodge/Base/You.hs	15;"	f
-yourStatsInfo	src/Dodge/Creature/Info.hs	26;"	f
+yourStatsInfo	src/Dodge/Creature/Info.hs	27;"	f
 zConnect	src/Dodge/Render/Connectors.hs	17;"	f
 zConnectCol	src/Dodge/Render/Connectors.hs	28;"	f
 zConnectColMidX	src/Dodge/Render/Connectors.hs	31;"	f