Move around ammo source checks

src/Dodge/Item/Held/BatteryGuns.hs

@@ -36,9 +36,7 @@ teslaGun =
 lasGun :: Item
 lasGun =
     defaultAutoBatteryGun
-        & itUse . heldConsumption
-            .~ ( defaultLoadable
-               )
+        & itUse . heldConsumption .~ [ElectricalAmmo]
         & itParams
             .~ Refracting
                 { _phaseV = 1
@@ -75,9 +73,6 @@ lasGunTweak =
 tractorGun :: Item
 tractorGun =
     lasGun
-        & itUse . heldConsumption
-            .~ ( defaultLoadable
-               )
         & itParams .~ Attracting{_attractionPower = 1}
         & itTweaks
             .~ Tweakable

src/Dodge/Item/Held/Launcher.hs

@@ -32,8 +32,7 @@ launcher =
         -- & itUse . heldAim . aimHandlePos .~ V2 3 0
         -- & itUse . heldAim . aimMuzPos .~ 20
         & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 20 0) 0 0]
-        & itUse . heldConsumption . laAmmoType
-            .~ ProjectileAmmo
+        & itUse . heldConsumption .~ [BulletAmmo]
         & itType . iyBase .~ HELD LAUNCHER
         & itType . iyModules . at ModLauncherHoming ?~ EMPTYMODULE
 

src/Dodge/Item/Held/SprayGuns.hs

@@ -17,10 +17,8 @@ poisonSprayer :: Item
 poisonSprayer =
     flameThrower
         & itType . iyBase .~ HELD POISONSPRAYER
-        & itUse . heldConsumption . laAmmoType
-            .~ GasAmmo
-                { _amCreateGas = CreatePoisonGas --aGasCloud
-                }
+        & itUse . heldConsumption .~ [GasAmmo]
+        & itUse . heldParams .~ GasSprayParams CreatePoisonGas --aGasCloud
         & itUse . heldMods .~ PoisonSprayerMod
 
 flameSpitter :: Item
@@ -91,11 +89,6 @@ flameThrower =
         & itUse . heldAim . aimStance .~ TwoHandUnder
         -- & itUse . heldAim . aimHandlePos .~ 0
         & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 18 0) 0 0]
-        & itUse . heldConsumption
-            .~ ( defaultLoadable
-                    & laAmmoType
-                        .~ GasAmmo
-                            { _amCreateGas = CreateFlame --aFlame
-                            }
-               )
+        & itUse . heldConsumption .~ [GasAmmo]
         & itType . iyBase .~ HELD FLAMETHROWER
+        & itUse . heldParams .~ GasSprayParams CreateFlame --aGasCloud

src/Dodge/Item/Held/Stick.hs

@@ -38,9 +38,7 @@ baseStickSpread = 0.2
 pistol :: Item
 pistol =
     bangStick 1
-        & itUse . heldConsumption
-            .~ ( defaultBulletLoadable
-               )
+        & itUse . heldConsumption .~ [BulletAmmo]
         & itUse . heldDelay . rateMax .~ 6
         & itUse . heldMods .~ PistolMod
         & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 10 0) 0 0.05]

src/Dodge/Item/Held/Utility.hs

@@ -43,7 +43,7 @@ forceFieldGun =
         -- than the list below
         --[ hammerCheckI , ammoCheckI , useAmmoAmount 1]
         & itType . iyBase .~ HELD FORCEFIELDGUN
-        & itUse . heldConsumption .~ (defaultLoadable & laAmmoType .~ ForceFieldAmmo DefaultForceField)
+        & itUse . heldConsumption .~ [ElectricalAmmo]
 
 {- |
 Sends out pulses that display walls.