Delete cruft, add Reader monad to some internal ai

src/Dodge/Data.hs

@@ -16,10 +16,8 @@ module Dodge.Data
     , soundTime
     ) where
 import Dodge.Picture.Layer.Data
-import Dodge.Creature.Data
 import Dodge.Creature.State.Data
 import Dodge.Creature.Stance.Data
-import Dodge.Creature.Rationality.Data
 import Dodge.Creature.AlertLevel.Data
 import Dodge.Data.Menu
 import Dodge.Data.SoundOrigin
@@ -42,6 +40,7 @@ import Data.Data
 import Data.Graph.Inductive
 import Data.Int (Int16)
 import qualified Data.Set as S
+import qualified Data.IntSet as IS
 import qualified Data.IntMap.Strict as IM
 import qualified Data.Map as M
 import qualified Data.DList as DL
@@ -58,6 +57,7 @@ data World = World
     , _cameraViewFrom       :: !Point2
     , _creatures            :: IM.IntMap Creature
     , _creaturesZone        :: IM.IntMap (IM.IntMap (IM.IntMap Creature))
+    , _creatureGroups       :: IM.IntMap CrGroupParams
     , _itemPositions        :: IM.IntMap ItemPos
     , _clouds               :: IM.IntMap Cloud
     , _cloudsZone           :: IM.IntMap (IM.IntMap (IM.IntMap Cloud))
@@ -65,7 +65,7 @@ data World = World
     , _particles            :: ![Particle]
     , _staticWalls          :: [Wall]
     , _walls                :: !(IM.IntMap Wall)
-    , _wallsZone            :: (IM.IntMap (IM.IntMap (IM.IntMap Wall)))
+    , _wallsZone            :: IM.IntMap (IM.IntMap (IM.IntMap Wall))
     , _forceFields          :: IM.IntMap ForceField
     , _floorItems           :: IM.IntMap FloorItem
     , _randGen              :: StdGen
@@ -104,7 +104,13 @@ data World = World
     , _config               :: Configuration
     , _sideEffects          :: [PreloadData SoundOrigin -> IO (PreloadData SoundOrigin)]
     , _doneSideEffects      :: [PreloadData SoundOrigin -> IO (PreloadData SoundOrigin)]
-    } 
+    }
+data CrGroupParams = CrGroupParams
+    { _crGroupParamID   :: Int
+    , _crGroupIDs       :: IS.IntSet
+    , _crGroupCenter    :: Point2
+    , _crGroupUpdate    :: World -> CrGroupParams -> Maybe CrGroupParams
+    }
 data Corpse = Corpse
     { _cpPos :: Point2
     , _cpPict :: Picture
@@ -380,8 +386,7 @@ data Particle
         , _btMaxTime'   :: Int
         , _btTimer'     :: Int
         }
-type HitEffect = Particle -> [(Point2, (Either3 Creature Wall ForceField))] -> World 
-                    -> (World,Maybe Particle)
+type HitEffect = Particle -> [(Point2, Either3 Creature Wall ForceField)] -> World -> (World,Maybe Particle)
 data Projectile 
     = Projectile    
         { _pjPos :: Point2
@@ -540,26 +545,26 @@ data Action
         ,_waitThenAction :: Action
         }
     | DoActionWhile 
-        {_doActionWhileCondition :: ( (World, Creature) -> Bool)
+        {_doActionWhileCondition :: (World, Creature) -> Bool
         ,_doActionWhileAction :: Action 
         }
     | DoActionWhilePartial
         {_doActionWhilePartial :: Action
-        ,_doActionWhileCondition :: ( (World, Creature) -> Bool)
+        ,_doActionWhileCondition :: (World, Creature) -> Bool
         ,_doActionWhileAction :: Action 
         }
     | DoActionIf
-        {_doActionIfCondition :: ( (World, Creature) -> Bool) 
+        {_doActionIfCondition :: (World, Creature) -> Bool
         ,_doActionIfAction :: Action
         }
     | DoActionIfElse 
         {_doActionIfElseIfAction :: Action 
-        ,_doActionIfElseCondition :: ( (World, Creature) -> Bool) 
+        ,_doActionIfElseCondition ::  (World, Creature) -> Bool
         ,_doActionIfElseElseAction :: Action
         }
     | DoActionWhileThen 
         {_doActionWhileThenDo :: Action 
-        ,_doActionWhileThenCondition :: ( (World, Creature) -> Bool) 
+        ,_doActionWhileThenCondition :: (World, Creature) -> Bool
         ,_doActionWhileThenThen :: Action
         }
     | DoActions 
@@ -619,6 +624,7 @@ data Strategy
     | GetTo Point2
     | Reload
     | Flee
+    | MeleeStrike
   deriving (Generic)
 --  deriving (Eq,Ord,Show)
 data Goal
@@ -646,6 +652,7 @@ makeLenses ''Button
 makeLenses ''ActionPlan
 makeLenses ''Impulse
 makeLenses ''Action
+makeLenses ''CrGroupParams
 
 numColor :: Int -> Color
 numColor 0  = (1,0,0,1)