Make creature update an external function

src/Dodge/Creature/LtAutoCrit.hs

@@ -3,17 +3,8 @@ module Dodge.Creature.LtAutoCrit
     ) where
 import Dodge.Data
 import Dodge.Default
-import Dodge.Creature.Update
-import Dodge.Creature.Action
-import Dodge.Creature.Test
-import Dodge.Creature.Volition
-import Dodge.Creature.Strategy
---import Dodge.Creature.ChooseTarget
-import Dodge.Creature.ReaderUpdate
-import Dodge.Creature.Perception
 import Dodge.Item.Weapon.BulletGuns
 import Dodge.Item.Consumable
-import Geometry
 import Picture
 
 import qualified Data.IntMap.Strict as IM
@@ -21,43 +12,10 @@ import Control.Lens
 
 ltAutoCrit :: Creature
 ltAutoCrit = defaultCreature
-    { _crUpdate = defaultImpulsive
-        [ performActions
-        , watchUpdateStrat
-            [ (crHasTargetLOS, \_ _ -> StrategyActions (ShootAt 0) 
-                [DoActionIf (const $ not . crIsAiming) drawWeapon
-                ,DoActionThen 
-                    (DoActionWhile crHasTargetLOS $ ArbitraryAction chooseMovement)
-                    (DoImpulses [ChangeStrategy WatchAndWait])
-                ]
-              )
-            , (const crAwayFromPost, const goToPostStrat)
-            ]
-        , perceptionUpdate [0]
-        , const doStrategyActions
-        , const reloadOverride
-        , targetYouWhenCognizant
-        , const $ overrideInternal
-            (\cr -> crHasTarget cr && crStratConMatches (GetTo (V2 0 0)) cr)
-            (crActionPlan . apStrategy .~ WatchAndWait)
-        ]
-    , _crInv = IM.fromList [(0,autoPistol),(1,medkit 100)]
+    {  _crInv = IM.fromList [(0,autoPistol),(1,medkit 100)]
     , _crRad = 10
     , _crHP = 500
     }
+    & crType . humanoidAI .~ LtAutoAI
     & crType . skinUpper .~ light4 red
 
-chooseMovement :: Creature -> World -> Action
-chooseMovement cr w 
-    | dist cpos p > 200 = DoImpulses [UseItem,TurnToward p 0.05 , MoveForward 3]
-    | dist cpos p < 80 = DoImpulses [UseItem,TurnToward p 0.05, MoveForward (-3) ]
-    | errorAngleVV 22 (p' -.- cpos) (unitVectorAtAngle (_crDir cr)) < 0.4
-          = DoImpulses [UseItem,TurnToward p' 0.01, Move (V2 0 3)]
-    | otherwise
-          = DoImpulses [UseItem,TurnToward p' 0.05, Move (V2 0 3)]
-  where
-    cpos = _crPos cr
-    tcr = _creatures w IM.! 0
-    p = _crPos tcr
-    v = vNormal $ p -.- cpos
-    p' = p +.+ 0.5 *.* (v -.- 20 *.* normalizeV v)