Rethink item ammo to item consumables, start item type datatype

src/Dodge/Creature/Action.hs

@@ -144,29 +144,28 @@ performAction cr w ac = case ac of
         (imps , _)        -> (imps, Just $ DoReplicatePartial sac (t-1) sac)
     NoAction -> ([],Nothing)
 
-startReloadingWeapon 
-    :: Creature      
-    -> World 
-    -> Maybe World
+startReloadingWeapon :: Creature -> World -> Maybe World
 startReloadingWeapon cr w = 
     let cid = _crID cr
         it = _crInv cr IM.! _crInvSel cr
         itRef = creatures . ix cid . crInv . ix (_crInvSel cr)
     in case it of 
-        Weapon {_wpAmmo = LoadableAmmo {_wpMaxAmmo=maxA,_wpLoadedAmmo=lA ,_wpReloadState=rS,_wpReloadTime=rT}}
-            | lA < maxA && rS == 0 -> Just $ set ( itRef . wpAmmo . wpLoadedAmmo) maxA
-                                            $ set ( itRef . wpAmmo . wpReloadState) rT w
+        Weapon {_itConsumption = LoadableAmmo {_wpMaxAmmo=maxA,_wpLoadedAmmo=lA ,_wpReloadState=rS,_wpReloadTime=rT}}
+            | lA < maxA && rS == 0 -> Just $ set ( itRef . itConsumption . wpLoadedAmmo) maxA
+                                            $ set ( itRef . itConsumption . wpReloadState) rT w
         _                          -> Nothing
 {- | Start reloading if clip is empty. -}
 crAutoReload :: Creature -> Creature
-crAutoReload cr = case cr ^? crInv . ix (_crInvSel cr) . wpAmmo . wpLoadedAmmo of
+crAutoReload cr = case cr ^? ptrItConsumption' . wpLoadedAmmo of
     Just 0 | _posture (_crStance cr) /= Aiming
-            -> cr & crInv . ix (_crInvSel cr) . wpAmmo . wpReloadState %~ (`fromMaybe` reloadT)
-        & crInv . ix (_crInvSel cr) . wpAmmo . wpLoadedAmmo  %~ (`fromMaybe` maxA)
+            -> cr & ptrItConsumption . wpReloadState %~ (`fromMaybe` reloadT)
+                  & ptrItConsumption . wpLoadedAmmo  %~ (`fromMaybe` maxA)
     _      -> cr
   where 
-    reloadT = cr ^? crInv . ix (_crInvSel cr) . wpAmmo . wpReloadTime
-    maxA    = cr ^? crInv . ix (_crInvSel cr) . wpAmmo . wpMaxAmmo
+    ptrItConsumption = crInv . ix (_crInvSel cr) . itConsumption
+    ptrItConsumption' = crInv . ix (_crInvSel cr) . itConsumption
+    reloadT = cr ^? ptrItConsumption' . wpReloadTime
+    maxA    = cr ^? ptrItConsumption' . wpMaxAmmo
 {- | Teleport a creature to the mouse position -}
 blinkAction 
     :: Creature

src/Dodge/Creature/ReaderUpdate.hs

@@ -122,7 +122,7 @@ reloadOverrideR
     :: Creature 
     -> Reader World Creature
 reloadOverrideR cr
-    | cr ^? crInv . ix (_crInvSel cr) . wpAmmo . wpLoadedAmmo == Just 0 
+    | cr ^? crInv . ix (_crInvSel cr) . itConsumption . wpLoadedAmmo == Just 0 
             && cr ^. crStance . posture == Aiming
         = return $ cr & crActionPlan . crStrategy .~ StrategyActions Reload reloadActions
     | otherwise = return cr

src/Dodge/Creature/State.hs

@@ -144,7 +144,7 @@ invSideEff cr w = weaponReloadSounds cr $ IM.foldrWithKey f w (_crInv cr)
         itpointer = creatures . ix (_crID cr) . crInv . ix i
 
 weaponReloadSounds :: Creature -> World -> World
-weaponReloadSounds cr w = case cr ^? crInv . ix (_crInvSel cr) . wpAmmo of
+weaponReloadSounds cr w = case cr ^? crInv . ix (_crInvSel cr) . itConsumption of
     Just am@LoadableAmmo{} -> case _wpReloadType am of
         PassiveReload stype |_wpReloadTime am ==_wpReloadState am 
                                         -> soundContinue (CrReloadSound 0) (_crPos cr) stype Nothing w
@@ -153,6 +153,7 @@ weaponReloadSounds cr w = case cr ^? crInv . ix (_crInvSel cr) . wpAmmo of
         ActiveReload | _wpReloadState am == 0 -> w
         ActiveReload -> soundContinue (CrReloadSound cid) (_crPos cr) reloadS (Just 1) w
     Just ChargeableAmmo {} -> w
+    Just ItemItselfConsumable {} -> w
     Nothing -> w
   where 
     cid = _crID cr
@@ -185,7 +186,7 @@ isFrictionless cr = case cr ^? crStance . carriage of
     _                 -> False
 
 stepReloading :: Creature -> Creature
-stepReloading cr = over (crInv . ix iSel . wpAmmo . wpReloadState) decreaseToZero cr
+stepReloading cr = over (crInv . ix iSel . itConsumption . wpReloadState) decreaseToZero cr
   where 
     iSel = _crInvSel cr 
 

src/Dodge/Creature/Test.hs

@@ -35,12 +35,12 @@ onBoth :: (a -> b -> c) -> (d -> a) -> (d -> b) -> d -> c
 onBoth f g h x = f (g x) (h x)
 
 crIsReloading :: (World, Creature) -> Bool
-crIsReloading (_,cr) = case cr ^? crInv . ix (_crInvSel cr) . wpAmmo . wpReloadState of
+crIsReloading (_,cr) = case cr ^? crInv . ix (_crInvSel cr) . itConsumption . wpReloadState of
     Just t -> t > 0
     _ -> False
 
 crIsReloadingR :: Creature -> Reader World Bool
-crIsReloadingR cr = return $ case cr ^? crInv . ix (_crInvSel cr) . wpAmmo . wpReloadState of
+crIsReloadingR cr = return $ case cr ^? crInv . ix (_crInvSel cr) . itConsumption . wpReloadState of
     Just t -> t > 0
     _ -> False
 
@@ -114,7 +114,7 @@ crAwayFromPostR cr = return $ case find sentinelGoal $ _crGoal $ _crActionPlan c
     sentinelGoal _ = False
 
 crHasAmmo :: (World,Creature) -> Bool
-crHasAmmo (_,cr) = maybe False (> 0) $ cr ^? crInv . ix (_crInvSel cr) . wpAmmo . wpLoadedAmmo
+crHasAmmo (_,cr) = maybe False (> 0) $ cr ^? crInv . ix (_crInvSel cr) . itConsumption . wpLoadedAmmo
 
 crCanShoot :: (World,Creature) -> Bool
 crCanShoot p = crIsAiming p && crHasAmmo p