Refector

src/Dodge/Creature/State/Data.hs

@@ -4,11 +4,13 @@ module Dodge.Creature.State.Data
   where
 import Geometry
 import Dodge.Data.DamageType
+import Dodge.Creature.Impulse.Data
+import Dodge.Creature.Stance.Data
 
 import Control.Lens
 
 data CreatureState = CrSt 
-    { _goals    :: [[Goal]]
+    { _goals    :: [[Impulse]]
     , _stance  :: Stance
     , _faction :: Faction
     , _crDamage  :: [DamageType]
@@ -27,72 +29,7 @@ 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
-    | Flying
-    | Boosting Point2
-  deriving (Eq,Show)
-data Posture = Aiming | AtEase
-  deriving (Eq,Show)
-data Mind = ZombieMind | HumanMind
-    deriving (Eq,Show)
+
 data Faction 
     = GenericFaction Int
     | ZombieFaction
@@ -104,6 +41,4 @@ data Faction
 
 makeLenses ''CreatureState
 makeLenses ''CrSpState
-makeLenses ''Goal
-makeLenses ''Carriage
-makeLenses ''Posture
+makeLenses ''Impulse