Cleanup

src/Dodge/Data/Creature.hs

@@ -46,7 +46,7 @@ data Creature = Creature
     , _crInv :: IM.IntMap Item
     , _crManipulation :: Manipulation
     , _crEquipment :: M.Map EquipSite Int
-    , _crState :: CreatureState
+    , _crDamage :: [Damage]
     , _crPastDamage :: Int
     , _crStance :: Stance
     , _crActionPlan :: ActionPlan

src/Dodge/Data/Creature/State.hs

@@ -10,18 +10,6 @@ import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import qualified Data.IntSet as IS
-import Dodge.Data.Damage
-
-data CreatureState = CrSt
-    { _csDamage :: [Damage]
---    , _csSpState :: CrSpState
-    }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
---data CrSpState
---    = Barrel -- {_piercedPoints :: [Point2]}
---    | GenCr
---    deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Faction
     = GenericFaction Int
@@ -44,10 +32,6 @@ data CrGroup
     | ShieldGroup
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-makeLenses ''CreatureState
---makeLenses ''CrSpState
 makeLenses ''CrGroup
---deriveJSON defaultOptions ''CrSpState
 deriveJSON defaultOptions ''Faction
 deriveJSON defaultOptions ''CrGroup
-deriveJSON defaultOptions ''CreatureState