Cleanup

src/Dodge/Item/Weapon/Utility.hs

@@ -68,10 +68,6 @@ shrinkGun = defaultGun
     { _itName = "SHRINKER"
     , _itType = SHRINKER
     , _itConsumption = defaultAmmo
-        { _ammoBaseMax = 100
-        , _ammoLoaded = 100
-        , _reloadTime = 20
-        }
     , _itUse = defaultlUse {_lUse = hammerCheckL useShrinkGun}
             & useHammer .~ upHammer
 --    , _itFloorPict = shrinkGunPic
@@ -100,10 +96,6 @@ blinkGun = defaultGun
     , _itType = BLINKER
     , _itInvColor = cyan
     , _itConsumption = defaultAmmo
-        { _ammoBaseMax = 100
-        , _ammoLoaded = 100
-        , _reloadTime = 20
-        }
     , _itUse = defaultlUse 
         & lUse .~ hammerCheckL (shootL $ const blinkAction)
         & useHammer .~ upHammer
@@ -139,13 +131,7 @@ forceFieldGun :: Item
 forceFieldGun = defaultGun 
     { _itName = "FORCEFIELDGUN"
     , _itType = FORCEFIELDGUN
-    , _itConsumption = defaultAmmo
-        { _ammoBaseMax = 100
-        , _ammoLoaded = 100
-        , _reloadTime = 40
-        , _reloadState = Nothing'
-        , _aoType = ForceFieldAmmo forceField
-        }
+    , _itConsumption = defaultAmmo & laType .~ ForceFieldAmmo forceField
     , _itUse = ruseInstant useForceFieldGun (HasHammer HammerUp)
         [ hammerCheckI , ammoCheckI , useAmmoAmount 1]
 --    , _itFloorPict = \_ -> (,) emptySH $ onLayer FlItLayer $ polygon $ map toV2 [(-4,-4),(-4,4),(4,4),(4,0),(0,0),(0,-4)]