Move bullet modifications from weapons to magazines

src/Dodge/Item/Weapon/Bullet.hs

@@ -9,11 +9,8 @@ import Control.Lens
 import Geometry.Data
 
 basicBulletAmmo :: AmmoType
-basicBulletAmmo =
-    BulletAmmo
-        { _amString = "BASIC"
-        , _amBullet = defaultBullet
-        }
+basicBulletAmmo = SmallBulletAmmo
+--        , _amBullet = defaultBullet
 
 defaultBullet :: Bullet
 defaultBullet =
@@ -36,16 +33,11 @@ basicBulDams =
     [ Damage PIERCING 100 0 0 0 $ PushBackDamage 2
     ]
 
-hvBulletAmmo :: AmmoType
-hvBulletAmmo =
-    BulletAmmo
-        { _amString = "HVBULLET"
-        , _amBullet =
-            defaultBullet
+hvBulletAmmo :: Bullet
+hvBulletAmmo = defaultBullet
                 & buWidth .~ 6
                 & buVel .~ V2 80 0
                 & buDamages .~ heavyBulDams
-        }
 
 heavyBulDams :: [Damage]
 heavyBulDams =

src/Dodge/Item/Weapon/Drone.hs

@@ -16,7 +16,7 @@ droneLauncher =
         & itUse . heldAim . aimWeight .~ 8
         & itUse . heldAim . aimRange .~ 0.5
         & itUse . heldAim . aimStance .~ TwoHandOver
-        & itUse . heldConsumption . laAmmoType .~ DroneAmmo{_amString = "LASDRONE"}
+        & itUse . heldConsumption . laAmmoType .~ DroneAmmo
         & itType . iyBase .~ HELD DRONELAUNCHER
 
 lasDronesPic :: Item -> SPic