Fold some ammo data into its own type

2021-11-27 13:40:56 +00:00
parent bfdac2fad5
commit 92a8dd59b8
21 changed files with 175 additions and 115 deletions
@@ -122,7 +122,7 @@ reloadOverrideR
    :: Creature 
    -> Reader World Creature
 reloadOverrideR cr
-    | cr ^? crInv . ix (_crInvSel cr) . wpLoadedAmmo == Just 0 
+    | cr ^? crInv . ix (_crInvSel cr) . wpAmmo . wpLoadedAmmo == Just 0 
            && cr ^. crStance . posture == Aiming
        = return $ cr & crActionPlan . crStrategy .~ StrategyActions Reload reloadActions
    | otherwise = return cr