Remove internal ammo

src/Dodge/Item/Weapon/Drone.hs

@@ -17,7 +17,6 @@ droneLauncher =
         & itUse . heldAim . aimRange .~ 0.5
         & itUse . heldAim . aimStance .~ TwoHandOver
         & itUse . heldConsumption . laAmmoType .~ DroneAmmo{_amString = "LASDRONE"}
-        & itUse . heldConsumption . laSource . _InternalSource . iaMax .~ 2
         & itType . iyBase .~ HELD DRONELAUNCHER
 
 lasDronesPic :: Item -> SPic

src/Dodge/Item/Weapon/FractionLoaded.hs

@@ -1,26 +1,26 @@
 module Dodge.Item.Weapon.FractionLoaded (
-    fractionLoadedAmmo,
-    fractionLoadedAmmo2,
+--    fractionLoadedAmmo,
+--    fractionLoadedAmmo2,
 ) where
 
 import Control.Lens
 import Data.Maybe
 import Dodge.Data.Item
 
----- this shouldn't really be used
-loadedAmmo :: Item -> Int
-loadedAmmo itm = fromMaybe 0 $ itm ^? itUse . heldConsumption . laSource . _InternalSource . iaLoaded
-
---    | _laTransfer (_itConsumption it) == NoTransfer = _laLoaded (_itConsumption it)
---    | otherwise = 0
-
-fractionLoadedAmmo :: Item -> Float
-fractionLoadedAmmo it = fromIntegral (loadedAmmo it) / fromIntegral itmaxammo
-  where
-    itmaxammo = fromMaybe 1 $ it ^? itUse . heldConsumption . laSource . _InternalSource . iaMax
-
-fractionLoadedAmmo2 :: Item -> Float
-fractionLoadedAmmo2 it =
-    1 - (1 - fromIntegral (loadedAmmo it) / fromIntegral itmaxammo) ** 2
-  where
-    itmaxammo = fromMaybe 1 $ it ^? itUse . heldConsumption . laSource . _InternalSource . iaMax
+-- ---- this shouldn't really be used
+-- loadedAmmo :: Item -> Int
+-- loadedAmmo itm = fromMaybe 0 $ itm ^? itUse . heldConsumption . laSource . _InternalSource . iaLoaded
+-- 
+-- --    | _laTransfer (_itConsumption it) == NoTransfer = _laLoaded (_itConsumption it)
+-- --    | otherwise = 0
+-- 
+-- fractionLoadedAmmo :: Item -> Float
+-- fractionLoadedAmmo it = fromIntegral (loadedAmmo it) / fromIntegral itmaxammo
+--   where
+--     itmaxammo = fromMaybe 1 $ it ^? itUse . heldConsumption . laSource . _InternalSource . iaMax
+-- 
+-- fractionLoadedAmmo2 :: Item -> Float
+-- fractionLoadedAmmo2 it =
+--     1 - (1 - fromIntegral (loadedAmmo it) / fromIntegral itmaxammo) ** 2
+--   where
+--     itmaxammo = fromMaybe 1 $ it ^? itUse . heldConsumption . laSource . _InternalSource . iaMax

src/Dodge/Item/Weapon/TriggerType.hs

@@ -140,23 +140,11 @@ withThickSmokeI eff item cr w =
 -- TODO  create a trigger that does different things on first and continued
 -- fire.
 ammoCheckI :: ChainEffect
-ammoCheckI eff itm cr w = case itm ^? itUse . heldConsumption . laSource of
-    Just (InternalSource ia)
-        | _iaLoaded ia <= 0 || not (_iaPrimed ia) ->
-            failsound w
-    Just AboveSource
-        | fromMaybe True $ do
-            invid <- itm ^? itLocation . ipInvID
-            x <- cr ^? crInv . ix (invid - 1) . itUse . equipEffect . eeUse . euseAmmoAmount
-            return $ x <= 0 ->
-            failsound w
-    Just BelowSource
-        | fromMaybe True $ do
-            invid <- itm ^? itLocation . ipInvID
-            x <- cr ^? crInv . ix (invid + 1) . itUse . attachParams . ammoAttachParams . iaLoaded
-            return $ x <= 0 ->
-            failsound w
-    _ -> eff itm cr $ w & cWorld . lWorld . creatures . ix (_crID cr) %~ crCancelReloading
+ammoCheckI eff itm cr w = fromMaybe (failsound w) $ do
+    invid <- itm ^? itLocation . ipInvID
+    x <- cr ^? crInv . ix (invid + 1) . itUse . attachParams . ammoAttachParams . iaLoaded
+    guard $ x > 0
+    return $ eff itm cr $ w & cWorld . lWorld . creatures . ix (_crID cr) %~ crCancelReloading
   where
     failsound = case w ^? input . mouseButtons . ix SDL.ButtonLeft of
         Just 0 -> soundStart (CrReloadSound (_crID cr)) (_crPos cr) click1S Nothing
@@ -165,8 +153,8 @@ ammoCheckI eff itm cr w = case itm ^? itUse . heldConsumption . laSource of
 itUseCharge :: Int -> Item -> Item
 itUseCharge x = itUse . leftConsumption . arLoaded %~ (max 0 . subtract x)
 
-itUseAmmo :: Int -> Item -> Item
-itUseAmmo x = itUse . heldConsumption . laSource . _InternalSource . iaLoaded %~ (max 0 . subtract x)
+--itUseAmmo :: Int -> Item -> Item
+--itUseAmmo x = itUse . heldConsumption . laSource . _InternalSource . iaLoaded %~ (max 0 . subtract x)
 
 {- | Fires at an increasing rate.
 Has different effect after first fire.
@@ -183,7 +171,7 @@ rateIncAB exeffFirst exeffCont eff item cr w
         w
             & pointItem
                 %~ ( (itUse . heldDelay . rateMax .~ max fastRate (currentRate - 1))
-                        . itUseAmmo 1
+--                        . itUseAmmo 1
                         . (itUse . heldDelay . rateTime .~ currentRate)
                    )
             & exeffCont eff item cr
@@ -191,7 +179,7 @@ rateIncAB exeffFirst exeffCont eff item cr w
         w
             & pointItem
                 %~ ( (itUse . heldDelay . rateMax .~ startRate - 1)
-                        . itUseAmmo 1
+--                        . itUseAmmo 1
                         . (itUse . heldDelay . rateTime .~ startRate)
                    )
             & exeffFirst eff item cr
@@ -352,7 +340,7 @@ useAllAmmo eff item cr = fromMaybe id $ do
     invid <- item ^? itLocation . ipInvID
     return $ eff item cr
         . (cWorld . lWorld . creatures . ix (_crID cr) . crInv . ix (invid + 1) 
-           . itUse . heldConsumption . laSource . _InternalSource . iaLoaded .~ 0)
+           . itUse . attachParams . ammoAttachParams . iaLoaded .~ 0)
 
 useAmmoUpTo :: Int -> ChainEffect
 useAmmoUpTo amAmount eff itm cr = fromMaybe id $ do
@@ -370,18 +358,7 @@ useAmmoAmount amAmount eff item cr =
     itref = cr ^?! crManipulation . manObject . inInventory . ispItem -- unsafe!! TODO change
 
 useAmmoAmount' :: Int -> Int -> IM.IntMap Item -> IM.IntMap Item
-useAmmoAmount' itref x inv = case inv ^? ix itref . itUse . heldConsumption . laSource of
-    Just InternalSource{} ->
-        inv & ix itref . itUse . heldConsumption . laSource . _InternalSource . iaLoaded -~ x
-    Just AboveSource ->
-        inv & ix (itref - 1) . itUse . equipEffect . eeUse . euseAmmoAmount -~ x
-    Just BelowSource ->
-        inv & ix (itref + 1) . itUse . equipEffect . eeUse . euseAmmoAmount -~ x
-    Just EitherSource -> case inv ^? ix (itref - 1) . itUse . equipEffect . eeUse . euseAmmoAmount of
-        Just amamount | amamount > 0 -> 
-            inv & ix (itref - 1) . itUse . equipEffect . eeUse . euseAmmoAmount -~ x
-        _ -> inv & ix (itref + 1) . itUse . equipEffect . eeUse . euseAmmoAmount -~ x
-    _ -> inv
+useAmmoAmount' itref x inv = inv & ix (itref + 1) . itUse . attachParams . ammoAttachParams . iaLoaded -~ x
 
 -- . crInv . ix itRef . itUse . heldConsumption . laSource
 
@@ -677,10 +654,12 @@ repeatOnFrames is hm f it cr w =
 --        return $ f it cr' w'
 
 duplicateLoaded :: ChainEffect
-duplicateLoaded eff it cr w = foldr f w [1 .. numBul]
+duplicateLoaded eff it cr w = foldr f w (take numbul [1 .. ])
   where
     f _ = eff it cr
-    numBul = it ^?! itUse . heldConsumption . laSource . _InternalSource . iaLoaded
+    numbul = fromMaybe 0 $ do
+        i <- cr ^? crManipulation . manObject . inInventory . ispItem
+        cr ^? crInv . ix (i+1) . itUse . attachParams . ammoAttachParams . iaLoaded
 
 duplicateNumBarrels :: Int -> ChainEffect
 duplicateNumBarrels n eff itm cr w = foldr f w (take n $ itm ^?! itUse . heldAim . aimMuzzles)
@@ -697,9 +676,12 @@ duplicateNumBarrels n eff itm cr w = foldr f w (take n $ itm ^?! itUse . heldAim
             (a,g) = randomR (-inacc,inacc) $ _randGen w'
 
 duplicateLoadedBarrels :: ChainEffect
-duplicateLoadedBarrels eff itm = duplicateNumBarrels numbul eff itm
+duplicateLoadedBarrels eff itm cr = duplicateNumBarrels numbul eff itm cr
   where
-    numbul = itm ^?! itUse . heldConsumption . laSource . _InternalSource . iaLoaded
+    numbul :: Int
+    numbul = fromMaybe 0 $ do
+        i <- cr ^? crManipulation . manObject . inInventory . ispItem
+        cr ^? crInv . ix (i+1) . itUse . attachParams . ammoAttachParams . iaLoaded
 
 duplicateOffsetsFocus :: [Float] -> ChainEffect
 duplicateOffsetsFocus xs eff item cr w = foldr f w poss