Delete cruft, add Reader monad to some internal ai

src/Dodge/Creature/State/Data.hs

@@ -4,31 +4,25 @@ module Dodge.Creature.State.Data
   where
 import Geometry
 import Dodge.Data.DamageType
-import Dodge.Creature.Impulse.Data
 import Dodge.Creature.Stance.Data
 import Picture.Data
 
 import Control.Lens
 import qualified Data.IntSet as IS
-
 data CreatureState = CrSt 
-    { _goals    :: [[Impulse]]
-    , _crDamage  :: [DamageType]
+    { _crDamage  :: [DamageType]
     , _crPastDamage :: [[DamageType]]
     , _crSpState :: CrSpState
     , _crDropsOnDeath :: CreatureDropType
     }
-
 data CreatureDropType
     = DropAll
     | DropAmount Int
     | DropSpecific [Int]
-
 data CrSpState 
     = Barrel { _piercedPoints :: [Point2]}
     | GenCr
   deriving (Eq,Show,Ord)
-
 data Faction 
     = GenericFaction Int
     | ZombieFaction
@@ -39,11 +33,12 @@ data Faction
     | ColorFaction Color
     | PlayerFaction
   deriving (Eq,Show)
-
 data CrGroup
     = LoneWolf
-    | Swarm { _swarm :: IS.IntSet }
-
+    | Swarm 
+        { _swarm :: IS.IntSet 
+        , _crGroupID :: Int
+        }
+    | CrGroupID { _crGroupID :: Int }
 makeLenses ''CreatureState
 makeLenses ''CrSpState
-makeLenses ''Impulse