Move toward adding multiple equipable items that are not directly usable

2021-12-08 17:09:24 +00:00
parent 9f6e5af991
commit a9139db0a8
22 changed files with 260 additions and 137 deletions
@@ -181,9 +181,14 @@ scalp cr
    fhead = colorSH (greyN 0.9) . upperPrismPolyHalf 5 $ polyCirc 4 5

 crInStance :: AimStance -> Creature -> Bool
-crInStance as cr = crIsAiming' cr 
+crInStance as cr = crIsAiming' cr -- || (_posture (_crStance cr) == Reloading && hasAmmo cr)
    && cr ^? crInv . ix (_crInvSel cr) . itUse . useAim . aimStance == Just as

+--hasAmmo :: Creature -> Bool
+--hasAmmo cr = case cr ^? crInv . ix (_crInvSel cr) . itConsumption . ammoLoaded of
+--    Just x -> x > 0
+--    _ -> False
+
 oneH :: Creature -> Bool
 oneH = crInStance OneHand