Refactor creature ai

src/Dodge/Creature.hs

@@ -7,12 +7,12 @@ module Dodge.Creature
     , spreadGunCrit
     , autoCrit
     , chaseCrit
+    , armourChaseCrit
     , smallChaseCrit
     )
   where
 --import Dodge.Creature.Stance.Data
 import Dodge.Creature.State.Data
-import Dodge.Creature.ImpulseRat
 --import Dodge.Creature.ReaderUpdate
 --import Dodge.Creature.AlertLevel
 --import Dodge.Creature.SetTarget
@@ -25,6 +25,7 @@ import Dodge.Creature.LtAutoCrit
 import Dodge.Creature.SpreadGunCrit
 import Dodge.Creature.AutoCrit
 import Dodge.Creature.ChaseCrit
+import Dodge.Creature.ArmourChase
 import Dodge.Data
 import Dodge.Default
 import Dodge.Base
@@ -37,7 +38,7 @@ import Dodge.Creature.Inanimate
 import Dodge.Creature.State
 import Dodge.Creature.Picture
 import Dodge.Creature.Rationality
-import Dodge.Creature.ChooseTarget
+--import Dodge.Creature.ChooseTarget
 --import Dodge.Item
 import Dodge.Picture.Layer
 import Picture
@@ -61,16 +62,6 @@ spawnerCrit = defaultCreature
     , _crPict = basicCrPict blue
     , _crInv = IM.empty -- IM.fromList [(0,frontArmour)]
     }
-armourChaseCrit :: Creature
-armourChaseCrit = defaultCreature
-    { _crUpdate = stateUpdate $ meleeCooldown $ impulsiveAI $ chaseTarget targetYouLOS
-    , _crHP = 300
-    , _crPict = basicCrPict green
-    , _crInv = IM.fromList 
-        [(0,frontArmour)
-        ,(1,medkit 200)
-        ]
-    }
 miniGunCrit :: Creature
 miniGunCrit = defaultCreature
     { _crPict = basicCrPict red
@@ -174,7 +165,7 @@ startInventory = IM.fromList (zip [0..20]
     ,lasGun
     ,autoGun
     ,flamer
-    --,poisonSprayer
+    ,poisonSprayer
     ,launcher
     --,lasGun
     --,grenade