Move bullet modifications from weapons to magazines

src/Dodge/Item/Held/Cone.hs

@@ -10,9 +10,6 @@ import Linear
 bangCone :: Item
 bangCone =
     defaultBulletWeapon
-        { _itParams =
-            BulletShooter
-        }
         & itDimension . dimRad .~ 8
         & itDimension . dimCenter .~ V3 5 0 0
         & itUse . heldDelay . rateMax .~ 20

src/Dodge/Item/Held/Launcher.hs

@@ -35,7 +35,6 @@ launcher =
         & itUse . heldConsumption . laAmmoType
             .~ ProjectileAmmo
                 { _amPayload = ExplosionPayload
-                , _amString = "EXPLOSIVE SHELL"
                 , _amPjDraw = DrawShell
                 , _amPjCreation = CreateShell
                 }

src/Dodge/Item/Held/Rod.hs

@@ -9,7 +9,7 @@ module Dodge.Item.Held.Rod (
 
 import Dodge.Data.Item
 import Dodge.Default
-import Dodge.Item.Weapon.Bullet
+--import Dodge.Item.Weapon.Bullet
 --import Dodge.Reloading.Action
 import Geometry
 import LensHelp
@@ -36,7 +36,7 @@ bangRod =
         & itUse . heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
         -- & itUse . heldAim . aimHandlePos .~ 5
         & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 30 0) 0 0.1]
-        & itUse . heldConsumption . laAmmoType .~ hvBulletAmmo
+--        & itUse . heldConsumption . laAmmoType .~ hvBulletAmmo
 
 elephantGun :: Item
 elephantGun =

src/Dodge/Item/Held/SprayGuns.hs

@@ -19,8 +19,7 @@ poisonSprayer =
         & itType . iyBase .~ HELD POISONSPRAYER
         & itUse . heldConsumption . laAmmoType
             .~ GasAmmo
-                { _amString = "POISONGAS"
-                , _amCreateGas = CreatePoisonGas --aGasCloud
+                { _amCreateGas = CreatePoisonGas --aGasCloud
                 }
         & itUse . heldMods .~ PoisonSprayerMod
 
@@ -96,8 +95,7 @@ flameThrower =
             .~ ( defaultLoadable
                     & laAmmoType
                         .~ GasAmmo
-                            { _amString = "FLAME"
-                            , _amCreateGas = CreateFlame --aFlame
+                            { _amCreateGas = CreateFlame --aFlame
                             }
                )
         & itType . iyBase .~ HELD FLAMETHROWER