Cleanup creatures somewhat, fix LOS to LOSIndirect

2022-07-03 15:07:55 +01:00
parent b43ec42a2e
commit ffdfaa41c0
24 changed files with 81 additions and 116 deletions
@@ -64,10 +64,10 @@ crSafeDistFromTarg d cr = case cr ^? crIntention . targetCr . _Just of
    Nothing -> True

 crStratConMatches :: Strategy -> Creature -> Bool
-crStratConMatches strat cr = eqConstr strat (_crStrategy $ _crActionPlan cr)
+crStratConMatches strat cr = eqConstr strat (_apStrategy $ _crActionPlan cr)

 crAwayFromPost :: Creature -> Bool
-crAwayFromPost cr = case find sentinelGoal . _crGoal $ _crActionPlan cr of
+crAwayFromPost cr = case find sentinelGoal . _apGoal $ _crActionPlan cr of
    Just (SentinelAt p _) -> dist p (_crPos cr) > 15
    _ -> False
  where