Cleanup warnings

src/Dodge/Creature.hs

@@ -5,9 +5,10 @@ module Dodge.Creature
     , pistolCrit
     , ltAutoCrit
     , spreadGunCrit
+    , autoCrit
     )
   where
-import Dodge.Creature.Stance.Data
+--import Dodge.Creature.Stance.Data
 import Dodge.Creature.State.Data
 import Dodge.Creature.ImpulseRat
 import Dodge.Creature.ActionRat
@@ -18,10 +19,12 @@ import Dodge.Creature.LauncherCrit
 import Dodge.Creature.PistolCrit
 import Dodge.Creature.LtAutoCrit
 import Dodge.Creature.SpreadGunCrit
+import Dodge.Creature.AutoCrit
 import Dodge.Data
 import Dodge.Default
 import Dodge.Base
 import Dodge.Item.Weapon
+import Dodge.Item.Equipment
 import Dodge.Item.Consumable
 import Dodge.WorldEvent.Cloud
 import Dodge.Creature.YourControl
@@ -30,29 +33,21 @@ import Dodge.Creature.State
 import Dodge.Creature.Picture
 import Dodge.Creature.Rationality
 import Dodge.Creature.ChooseTarget
-import Dodge.Item
+--import Dodge.Item
 import Dodge.Picture.Layer
 import Picture
-import Geometry
+--import Geometry
 
-import Data.List
-import Data.Char
-import Data.Maybe
-import Data.Function
-import Data.Graph.Inductive.Graph
-import Data.Graph.Inductive.PatriciaTree
-import Codec.BMP
-import qualified Data.ByteString as B
+--import Data.List
+--import Data.Char
+--import Data.Maybe
+--import Data.Function
 import Control.Lens
-import Control.Applicative
 import Control.Monad.State
-import Control.Monad
-import System.Random
-import qualified Data.Set as S
+--import System.Random
+--import qualified Data.Set as S
 import qualified Data.IntMap.Strict as IM
-import qualified Data.Map as M
-import Foreign.ForeignPtr
-import Control.Concurrent
+--import qualified Data.Map as M
 
 spawnerCrit :: Creature
 spawnerCrit = defaultCreature
@@ -74,9 +69,12 @@ smallChaseCrit = defaultCreature
 chaseCrit :: Creature
 chaseCrit = defaultCreature
     { _crUpdate = stateUpdate $ impulsiveAIR $ 
-        chaseTargetR targetYouLOS <=<
-        overrideMeleeCloseTargetR <=<
-        basicPerceptionUpdateR [0] <=<
+        doStrategyActionsR >=>
+        performActionsR >=>
+        overrideMeleeCloseTargetR >=>
+        chaseTargetR targetYouLOS >=>
+        basicPerceptionUpdateR [0] >=>
+        targetYouWhenCognizantR >=>
         return . (crMeleeCooldown . _Just %~ (max 0 . subtract 1))
     , _crHP = 300
     , _crPict = basicCrPict green
@@ -165,33 +163,6 @@ multGunCrit = defaultCreature
         , _crGoal       = []
         }
     }
-autoCrit :: Creature
-autoCrit = defaultCreature
-    { _crPict = basicCrPict red
-    , _crUpdate = stateUpdate $ impulsiveAI $ composeInternalAIs
-        [ performActions
-        , watchUpdateStrat
-            [ (crHasTargetLOS, shootAdvanceStrat 0)
-            , (crAwayFromPost, goToPostStrat)
-            ]
-        , basicPerceptionUpdate [0]
-        , doStrategyActions
-        , reloadOverride
-        , targetYouWhenCognizant
-        , overrideInternal (onBoth (&&) crHasTarget (crStratConMatches (GetTo (0,0))))
-            $ \ _ -> crActionPlan . crStrategy .~ WatchAndWait
-        ]
-    , _crActionPlan = ActionPlan
-        { _crImpulse    = []
-        , _crAction     = []
-        , _crStrategy   = StrategyActions WatchAndWait [StartSentinelPost]
-        , _crGoal       = []
-        }
-    , _crInv = IM.fromList [(0,autoGun),(1,medkit 100)]
-    , _crInvSel = 0
-    , _crRad = 10
-    , _crHP = 300
-    }
 addArmour :: Creature -> Creature
 addArmour = over crInv insarmour
   where 
@@ -215,6 +186,7 @@ startCr = defaultCreature
     , _crFaction = PlayerFaction
     }
 {- | Items you start with.  -}
+startInventory :: IM.IntMap Item
 startInventory = IM.fromList (zip [0..20] 
     (
     [bezierGun
@@ -241,6 +213,6 @@ startInventory = IM.fromList (zip [0..20]
     ] 
       ++ 
     repeat NoItem))
-
+smokeGenGun :: Item
 smokeGenGun = effectGun "smoke" $ const spawnSmokeAtCursor