Refactor bullet particles

2021-05-19 13:46:19 +02:00
parent 44f239c673
commit 4463dc7716
29 changed files with 637 additions and 535 deletions
@@ -1,162 +1,19 @@
 module Dodge.Creature.ActionRat
-    ( shootTargetWithStrat
-    , aimThenShootStrat 
-    , suppressShootTarget
-    , suppress
-    , shootAdvance
-    , shootFirstMiss
-    , doStrategyActions
-    , doStrategyActionsR
-    , reloadOverride
-    , reloadOverrideR
-    , reloadOverrideNoHolster
-    , shootAdvanceStrat
-    , shootMoveStrat
-    , watchUpdateStrat
-    , watchUpdateStratR
-    , goToPostStrat
-    , overrideInternal
-    , overrideInternalR
-    , fleeTime
+    ( goToPostStrat
    )
    where
 import Dodge.Data
-import Dodge.Base
+--import Dodge.Base
 --import Dodge.Base.Collide
 --import Dodge.Creature.ChooseTarget
-import Dodge.Creature.Stance.Data
+--import Dodge.Creature.Stance.Data
 import Dodge.Creature.Test
+import Dodge.Creature.Volition
 --import Geometry

 import Data.List
 --import qualified Data.IntMap.Strict as IM
-import Control.Lens
-import Control.Monad.Reader
-
-shootTargetWithStrat
-    :: (Creature -> World -> Maybe Creature)    -- ^ Function for determining target
-    -> (World -> Creature -> Creature -> [Action] -> [Action])
-            -- ^ Function for determining shooting strategy given target
-    -> World 
-    -> Creature 
-    -> Creature 
-shootTargetWithStrat targFunc strat w cr = case targFunc cr w of
-    Nothing -> cr
-    Just crTarg -> cr & crActionPlan . crAction %~ strat w cr crTarg
-
-{- | Action update for a simple shooting creature -}
-suppressShootTarget
-    :: (Creature -> World -> Maybe Creature)    -- ^ Function for determining target
-    -> World 
-    -> Creature 
-    -> Creature 
-suppressShootTarget targFunc w cr = case targFunc cr w of
-    Nothing -> cr
-    Just crTarg -> cr & crActionPlan . crAction %~ suppress w cr crTarg
-
-suppress :: World -> Creature -> Creature -> [Action] -> [Action]
-suppress w cr tcr as
-    | canSee (_crID cr) (_crID tcr) w && cr ^. crStance . posture /= Aiming 
-        && cr ^? crInv . ix (_crInvSel cr) . wpReloadState == Just 0 = 
-        [ DrawWeapon
-        , WaitThen 50 ShootTillEmpty
-        , AimAtCloseSlow 
-            { _targetID = _crID tcr
-            , _targetSeenAt = _crPos cr
-            , _aimSpeed = 0.2
-            , _slowAimSpeed = 0.01
-            , _slowAimAngle = pi/4
-            }
-        ]
-    | otherwise = as
-
-- This should be decomposed properly
-shootFirstMiss :: Int -> World -> Creature -> Strategy
-shootFirstMiss tcid _ _ = StrategyActions (ShootAt tcid) acs 
-  where
-    acs = 
-        [ DoActionIfElse NoAction crIsAiming (DoActionThen DrawWeapon (WaitThen 50 NoAction))
-          `DoActionThen`
-          LeadTarget (30,50)
-          `DoActionThen`
-          advanceShoot
-          `DoActionThen`
-          LeadTarget (0,0)
-          `DoActionThen`
-          lostest `DoActionWhile` 
-            advanceShoot `DoActionThen`
-            75 `DoReplicate` 
-            advanceShoot `DoActionThen`
-          DoImpulses [ChangeStrategy WatchAndWait]
-          
-        ]
-    lostest (w,cr') = canSee (_crID cr') tcid w 
-    advanceShoot = ImpulsesList [[UseItem, MoveForward 3]]
-    
-fleeTime :: Int -> World -> Creature -> Strategy
-fleeTime t _ _ = StrategyActions Flee
-    [ t `DoReplicate`
-        UseTargetCID FleeFrom 
-          `DoActionThen`
-        DoImpulses [ChangeStrategy WatchAndWait]
-    ]
-
-aimThenShootStrat :: Int -> World -> Creature -> Strategy
-aimThenShootStrat tcid _ _ = StrategyActions (ShootAt tcid)
-    [ DoActionIfElse NoAction crIsAiming (DoActionThen DrawWeapon (WaitThen 50 NoAction))
-      `DoActionThen`
-        50
-       `WaitThen` 
-        DoImpulses [UseItem, ChangeStrategy WatchAndWait]
-    , AimAtCloseSlow 
-        { _targetID = tcid
-        , _targetSeenAt = (0,0) -- hack
-        , _aimSpeed = 0.2
-        , _slowAimSpeed = 0.01
-        , _slowAimAngle = pi/8
-        }
-    ]
-
-shootMoveStrat :: Point2 -> Int -> World -> Creature -> Strategy
-shootMoveStrat moveV tcid _ _ = StrategyActions (ShootAt tcid)
-    [ DoActionIfElse NoAction crIsAiming (DoActionThen DrawWeapon (WaitThen 50 NoAction))
-      `DoActionThen`
-        lostest `DoActionWhile`
-        75 `DoReplicate` 
-        advanceShoot `DoActionThen`
-      DoImpulses [ChangeStrategy WatchAndWait]
-    , AimAtCloseSlow 
-        { _targetID = tcid
-        , _targetSeenAt = (0,0) -- hack
-        , _aimSpeed = 0.2
-        , _slowAimSpeed = 0.01
-        , _slowAimAngle = pi/8
-        }
-    ]
-  where
-    lostest (w,cr') = canSee (_crID cr') tcid w 
-    advanceShoot = ImpulsesList [[UseItem, Move moveV]]
-
-shootAdvanceStrat :: Int -> World -> Creature -> Strategy
-shootAdvanceStrat tcid _ _ = StrategyActions (ShootAt tcid)
-    [ DoActionIfElse NoAction crIsAiming (DoActionThen DrawWeapon (WaitThen 50 NoAction))
-      `DoActionThen`
-        lostest `DoActionWhile`
-        advanceShoot `DoActionThen`
-        75 `DoReplicate` 
-        advanceShoot `DoActionThen`
-        DoImpulses [ChangeStrategy WatchAndWait]
-    , AimAtCloseSlow 
-        { _targetID = tcid
-        , _targetSeenAt = (0,0) -- hack
-        , _aimSpeed = 0.2
-        , _slowAimSpeed = 0.01
-        , _slowAimAngle = pi/8
-        }
-    ]
-  where
-    lostest (w,cr') = canSee (_crID cr') tcid w 
-    advanceShoot = ImpulsesList [[UseItem, MoveForward 3]]
+--import Control.Lens

 goToPostStrat :: World -> Creature -> Strategy
 goToPostStrat w cr = case find sentinelGoal $ _crGoal $ _crActionPlan cr of
@@ -171,137 +28,6 @@ goToPostStrat w cr = case find sentinelGoal $ _crGoal $ _crActionPlan cr of
    sentinelGoal (SentinelAt _ _) = True
    sentinelGoal _ = False
    holsterIfAiming 
-        | crIsAiming (w,cr) = HolsterWeapon
+        | crIsAiming (w,cr) = holsterWeapon
        | otherwise     = NoAction

-overrideInternal 
-    :: ((World , Creature) -> Bool)
-    -> (World -> Creature -> Creature)
-    -> World
-    -> Creature
-    -> Creature
-overrideInternal test update w cr
-    | test (w,cr) = update w cr
-    | otherwise = cr
-
-overrideInternalR
-    :: ((World , Creature) -> Bool)
-    -> (World -> Creature -> Creature)
-    -> Creature
-    -> Reader World Creature
-overrideInternalR test update cr = reader $ \w -> 
-    if test (w,cr) 
-    then update w cr
-    else cr
-
-shootAdvance :: World -> Creature -> Creature -> [Action] -> [Action]
-shootAdvance w cr tcr as
-    | lostest (w,cr) && cr ^. crStance . posture /= Aiming 
-        && cr ^? crInv . ix (_crInvSel cr) . wpReloadState == Just 0 = 
-        [ DrawWeapon
-        , DoImpulses [ChangeStrategy $ ShootAt $ _crID tcr]
-        , 50 `WaitThen` 
-            lostest `DoActionWhile` 
-            advanceShoot `DoActionThen`
-            50 `DoReplicate`
-            advanceShoot `DoActionThen`
-            DoImpulses [ChangeStrategy WatchAndWait]
-        , AimAtCloseSlow 
-            { _targetID = _crID tcr
-            , _targetSeenAt = _crPos cr
-            , _aimSpeed = 0.2
-            , _slowAimSpeed = 0.01
-            , _slowAimAngle = pi/8
-            }
-        ]
-    | cr ^. crStance . posture == Aiming && cr ^? crInv . ix (_crInvSel cr) . wpReloadState /= Just 0 
-        = [ HolsterWeapon ]
-    | otherwise = as
-  where
-    lostest (w',cr') = canSee (_crID cr') (_crID tcr) w' 
-    advanceShoot = ImpulsesList [[UseItem, MoveForward 3]]
-
-doStrategyActions
-    :: World
-    -> Creature
-    -> Creature
-doStrategyActions _ cr = case cr ^? crActionPlan . crStrategy of
-    Just (StrategyActions strat acs) -> cr & crActionPlan . crAction .~ acs
-        & crActionPlan . crStrategy .~ strat
-    _ -> cr
-
-doStrategyActionsR
-    :: Creature
-    -> Reader World Creature
-doStrategyActionsR cr = return $ case cr ^? crActionPlan . crStrategy of
-    Just (StrategyActions strat acs) -> cr & crActionPlan . crAction .~ acs
-        & crActionPlan . crStrategy .~ strat
-    _ -> cr
-
-reloadOverride
-    :: World
-    -> Creature
-    -> Creature
-reloadOverride _ cr
-    | cr ^? crInv . ix (_crInvSel cr) . wpLoadedAmmo == Just 0 
-            && cr ^. crStance . posture == Aiming
-        = cr & crActionPlan . crStrategy .~ StrategyActions Reload reloadActions
-    | otherwise = cr
-  where
-    reloadActions = 
-        [ HolsterWeapon
-        , WaitThen 1 $ DoActionWhileInterrupt NoAction crIsReloading (DoImpulses [ChangeStrategy WatchAndWait])
-        ]
-
-reloadOverrideR
-    :: Creature 
-    -> Reader World Creature
-reloadOverrideR cr
-    | cr ^? crInv . ix (_crInvSel cr) . wpLoadedAmmo == Just 0 
-            && cr ^. crStance . posture == Aiming
-        = return $ cr & crActionPlan . crStrategy .~ StrategyActions Reload reloadActions
-    | otherwise = return $ cr
-  where
-    reloadActions = 
-        [ HolsterWeapon
-        , WaitThen 1 $ DoActionWhileInterrupt NoAction crIsReloading (DoImpulses [ChangeStrategy WatchAndWait])
-        ]
-
-reloadOverrideNoHolster
-    :: World
-    -> Creature
-    -> Creature
-reloadOverrideNoHolster _ cr
-    | cr ^? crInv . ix (_crInvSel cr) . wpLoadedAmmo == Just 0 
-            && cr ^. crStance . posture == Aiming
-        = cr & crActionPlan . crStrategy .~ StrategyActions Reload reloadActions
-    | otherwise = cr
-  where
-    reloadActions = 
-        [ DoActionWhileInterrupt NoAction crIsReloading (DoImpulses [ChangeStrategy WatchAndWait])
-        ]
-
-watchUpdateStrat 
-    :: [ ((World, Creature) -> Bool, World -> Creature -> Strategy) ]
-    -> World
-    -> Creature
-    -> Creature
-watchUpdateStrat fs w cr = case cr ^? crActionPlan . crStrategy of
-    Just WatchAndWait -> cr 
-        & crActionPlan . crStrategy .~ listGuard (fs, \_ _ -> WatchAndWait) (w, cr) w cr
-    _ -> cr
-
-watchUpdateStratR
-    :: [ ((World, Creature) -> Bool, World -> Creature -> Strategy) ]
-    -> Creature
-    -> Reader World Creature
-watchUpdateStratR fs cr = reader $ \w -> case cr ^? crActionPlan . crStrategy of
-    Just WatchAndWait -> cr 
-        & crActionPlan . crStrategy .~ listGuard (fs, \_ _ -> WatchAndWait) (w, cr) w cr
-    _ -> cr
-
-listGuard :: ([(a -> Bool, b)] , b) -> a -> b
-listGuard ( (test,y):ps, z ) x
-    | test x = y
-    | otherwise = listGuard (ps, z) x
-listGuard (_,z) _ = z