Allow for different item drops on creature death

src/Dodge/Data.hs

@@ -5,11 +5,15 @@ module Dodge.Data
     ( module Dodge.Data
     , module Dodge.Data.Menu
     , module Dodge.Data.SoundOrigin
+    , module Dodge.Creature.Data
+    , module Dodge.Creature.State.Data
     , Point2 (..)
     , Sound (..)
     , soundTime
     )
   where
+import Dodge.Creature.Data
+import Dodge.Creature.State.Data
 import Dodge.Data.Menu
 import Dodge.Data.SoundOrigin
 import Dodge.Config.Data
@@ -161,93 +165,6 @@ data Creature = Creature
     , _crIsAnimate  :: Bool
     }
 
-data CreatureState = CrSt 
-    { _goals    :: [[Goal]]
-    , _stance  :: Stance
-    , _faction :: Faction
-    , _crDamage  :: [DamageType]
-    , _crPastDamage :: Int
-    , _crSpState :: CrSpState
-    , _crApplyDamage :: [DamageType] -> Creature -> (World -> World,Creature)
-    }
-
-data CrSpState 
-    = Barrel { _piercedPoints :: [Point2]}
-    | GenCr
-  deriving (Eq,Show,Ord)
-data Goal 
-    = MoveTo Point2
-    | MoveToFor Point2 Int
-    | MoveFire Point2 Point2
-    | PathTo Point2
-    | PathAlong [Point2]
-    | SubPathTo Point2 Int Point2
-    | Wait
-    | WaitFor Int
-    | WaitForID Int Int
-    | FireAt Point2
-    | FireAtID Int Point2
-    | Fire
-    | Reload
-    | IncreaseAlert Int
-    | Guard Point2 Point2
-    | Search Int
-    | SearchNear Point2
-    | AimAt Point2 Int
-    | InitGuard
-    | Init
-    | MeleeAttack Int
-    | InitTrackYou
-    | TrackYou
-    | Track Int
-    | TrackFor Int Int
-    | TurnByFor Float Int
-    | TurnTo Point2
-    | TurnToward Point2
-    | TurnTowardAngle Float
-    | StrafeLeftAround Int Point2
-    | StrafeRightAround Int Point2
-    | StrafeLeftFor Int
-    | StrafeRightFor Int
-    | StrafeLeftForSpeed Int Float
-    | StrafeRightForSpeed Int Float
-    | StrafeLeftFire
-    | StrafeRightFire
-    | MoveForwardFor Int
-    | MoveForwardFire
-    | MoveBackwardFor Int
-    | MoveByFor Point2 Int
-    | MoveBackwardFire
-    | GoalID Int Goal
-    | AtRange Float
-    | AtRanges Float Float
-    | RepeatAction Int Goal
-    | MakeJudgement
-    | SetPosture Posture
-  deriving (Eq,Show)
-data Stance = Stance 
-    {_carriage :: Carriage
-    ,_posture  :: Posture
-    }
-  deriving (Eq,Show)
-data Carriage 
-    = Walking { _stepCycle :: Int, _stepToAdd :: Int }
-    | Standing
-    | Floating
-    | Boosting Point2
-  deriving (Eq,Show)
-data Posture = Aiming | AtEase
-  deriving (Eq,Show)
-data Mind = ZombieMind | HumanMind
-    deriving (Eq,Show)
-data Faction 
-    = GenericFaction Int
-    | ZombieFaction
-    | EncircleFlock
-    | ChaseCritters
-    | SpawnedBy Int
-    | NoFaction
-  deriving (Eq,Show)
 
 data WorldState 
     = DoorNumOpen Int 
@@ -583,18 +500,24 @@ data ForceField = FF
     }
 data FFState = FFDestroyable { _ffsHP :: Int }
 
+data CreatureState = CrSt 
+    { _goals    :: [[Goal]]
+    , _stance  :: Stance
+    , _faction :: Faction
+    , _crDamage  :: [DamageType]
+    , _crPastDamage :: Int
+    , _crSpState :: CrSpState
+    , _crApplyDamage :: [DamageType] -> Creature -> (World -> World,Creature)
+    , _crDropsOnDeath :: ItemDropType
+    }
 
 makeLenses ''World
 makeLenses ''Cloud
 makeLenses ''Creature
 makeLenses ''CreatureState
-makeLenses ''CrSpState
-makeLenses ''Goal
 makeLenses ''LightSource
 makeLenses ''TempLightSource
 makeLenses ''Stance
-makeLenses ''Carriage
-makeLenses ''Posture
 makeLenses ''Item
 makeLenses ''ItemPos
 makeLenses ''ItEffect