Allow for partial reloading

src/Dodge/Item/Weapon/Utility.hs

@@ -57,9 +57,9 @@ shrinkGun = defaultGun
     { _itName = "SHRINKER"
     , _itIdentity = Generic
     , _itConsumption = defaultAmmo
-        { _wpMaxAmmo = 100
-        , _wpLoadedAmmo = 100
-        , _wpReloadTime = 20
+        { _ammoMax = 100
+        , _ammoLoaded = 100
+        , _reloadTime = 20
         }
     , _itUse = defaultlUse {_lUse = hammerCheckL useShrinkGun}
             & useHammer .~ upHammer
@@ -87,9 +87,9 @@ blinkGun = defaultGun
     { _itName = "BLINKER"
     , _itIdentity = Blinker
     , _itConsumption = defaultAmmo
-        { _wpMaxAmmo = 100
-        , _wpLoadedAmmo = 100
-        , _wpReloadTime = 20
+        { _ammoMax = 100
+        , _ammoLoaded = 100
+        , _reloadTime = 20
         }
     , _itUse = defaultlUse 
         {_lUse = hammerCheckL $ shootL aSelfL
@@ -119,10 +119,10 @@ forceFieldGun = defaultGun
     { _itName = "FORCEFIELD"
     , _itIdentity = ForceFieldGun
     , _itConsumption = defaultAmmo
-        { _wpMaxAmmo = 100
-        , _wpLoadedAmmo = 100
-        , _wpReloadTime = 40
-        , _wpReloadState = 0
+        { _ammoMax = 100
+        , _ammoLoaded = 100
+        , _reloadTime = 40
+        , _reloadState = Nothing'
         }
     , _itUse = undefined
     , _itFloorPict = \_ -> (,) emptySH $ onLayer FlItLayer $ polygon $ map toV2 [(-4,-4),(-4,4),(4,4),(4,0),(0,0),(0,-4)]