From 66fda3fb936a60c4c8294ad6e107c1d673b405fd Mon Sep 17 00:00:00 2001 From: justin Date: Sat, 18 Jun 2022 01:26:17 +0100 Subject: [PATCH] Move towards debris slowing movement --- src/Dodge/Creature/Statistics.hs | 5 ++++- src/Dodge/Data.hs | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Dodge/Creature/Statistics.hs b/src/Dodge/Creature/Statistics.hs index 8271aa473..7339d4bfd 100644 --- a/src/Dodge/Creature/Statistics.hs +++ b/src/Dodge/Creature/Statistics.hs @@ -8,8 +8,11 @@ import LensHelp import Data.Maybe import Data.IntMap.Merge.Strict +getCrDexterity :: Creature -> Int +getCrDexterity cr = _dexterity (_crStatistics cr) + getCrStrength :: Creature -> Int -getCrStrength cr = strFromHeldItem cr + strFromEquipment cr + _crStrength (_crStatistics cr) +getCrStrength cr = strFromHeldItem cr + strFromEquipment cr + _strength (_crStatistics cr) strFromEquipment :: Creature -> Int strFromEquipment = sum . fmap equipmentStrValue . crCurrentEquipment diff --git a/src/Dodge/Data.hs b/src/Dodge/Data.hs index 2c5e51c71..cd9845ea5 100644 --- a/src/Dodge/Data.hs +++ b/src/Dodge/Data.hs @@ -378,9 +378,9 @@ data CamouflageStatus | Invisible deriving (Eq,Ord,Enum) data CreatureStatistics = CreatureStatistics - { _crStrength :: Int - , _crDexterity :: Int - , _crIntelligence :: Int + { _strength :: Int + , _dexterity :: Int + , _intelligence :: Int } data Vocalization = Mute