Commit before extending selection sections: overlapping elements

2023-05-19 13:38:21 +01:00
parent 2f0bb5115b
commit ac87621640
13 changed files with 131 additions and 115 deletions
@@ -43,9 +43,8 @@ crWeaponReady cr = fromMaybe False $ do
    asource <- cr ^? crInv . ix i . itUse . heldConsumption . laSource
    case asource of
        InternalSource ia -> return (_iaLoaded ia > 0 && _iaPrimed ia)
-        ExternalSource ea -> do
-            srcid <- ea ^? _Just
-            x <- cr ^? crInv . ix srcid . itUse . equipEffect . eeUse . euseAmmoAmount
+        AboveSource -> do
+            x <- cr ^? crInv . ix (i - 1) . itUse . equipEffect . eeUse . euseAmmoAmount
            return (x > 0)

 crCanSeeCr :: Creature -> (World, Creature) -> Bool