Cleanup
This commit is contained in:
@@ -5,17 +5,6 @@ Note that the creature NEED NOT be the same as the creature with that id in the
|
||||
in fact in some cases a creature with that id may not even exist.
|
||||
-}
|
||||
module Dodge.Creature.Test
|
||||
-- ( crCanShoot
|
||||
-- , crIsAiming'
|
||||
-- , crIsReloading
|
||||
-- , crIsAiming
|
||||
-- , crHasTargetLOS
|
||||
-- , crAwayFromPost
|
||||
-- , crHasTargetR
|
||||
-- , crStratConMatchesR
|
||||
-- , crHasAmmo
|
||||
-- , crSafeDistFromTarg
|
||||
-- )
|
||||
where
|
||||
import Dodge.Data
|
||||
import Dodge.Base.Collide
|
||||
@@ -59,9 +48,6 @@ crCanSeeCIDR cid cr = reader $ \w -> hasLOS (_crPos cr) (_crPos $ _creatures w I
|
||||
crIsAiming :: Creature -> Bool
|
||||
crIsAiming cr = _posture (_crStance cr) == Aiming
|
||||
|
||||
crIsAiming' :: Creature -> Bool
|
||||
crIsAiming' cr = _posture (_crStance cr) == Aiming
|
||||
|
||||
crHasTarget' :: Creature -> Bool
|
||||
crHasTarget' cr = isJust $ cr ^? crIntention . targetCr . _Just
|
||||
|
||||
@@ -119,11 +105,5 @@ crAwayFromPostR cr = return $ case find sentinelGoal $ _crGoal $ _crActionPlan c
|
||||
crHasAmmo :: Creature -> Bool
|
||||
crHasAmmo cr = maybe False (> 0) $ cr ^? crInv . ix (_crInvSel cr) . itConsumption . ammoLoaded
|
||||
|
||||
crHasAmmo' :: Creature -> Bool
|
||||
crHasAmmo' cr = maybe False (> 0) $ cr ^? crInv . ix (_crInvSel cr) . itConsumption . ammoLoaded
|
||||
|
||||
crCanShoot :: Creature -> Bool
|
||||
crCanShoot p = crIsAiming p && crHasAmmo p
|
||||
|
||||
crCanShoot' :: Creature -> Bool
|
||||
crCanShoot' p = crIsAiming' p && crHasAmmo' p
|
||||
|
||||
Reference in New Issue
Block a user