Move shells to external magazines

src/Dodge/Item/Ammo.hs

@@ -14,6 +14,7 @@ tinMag =
         & itUse
             .~ AmmoMagUse
                 { _amagParams = BulletParams defaultBullet
+                , _amagType = SmallBulletAmmo
                 , _amagLoadStatus =
                     ReloadStatus
                         { _iaMax = 15
@@ -47,9 +48,33 @@ beltMag =
 shellMag :: Item
 shellMag =
     defaultHeldItem & itType . iyBase .~ AMMOMAG SHELLMAG
+        & itUse
+            .~ AmmoMagUse
+                { _amagParams = ProjectileParams
+                    { _ampPayload = ExplosionPayload
+                    , _ampPjDraw = DrawShell
+                    , _ampPjCreation = CreateShell
+                    }
+                , _amagLoadStatus =
+                    ReloadStatus
+                        { _iaMax = 15
+                        , _iaLoaded = 15
+                        , _iaPrimed = True
+                        , _iaCycle = [loadEject 10, loadInsert 10, loadPrime 10]
+                        , _iaProgress = Nothing
+                        }
+                , _amagType = ProjectileAmmo
+                }
+
+smallBattery :: Item
+smallBattery =
+    defaultHeldItem & itType . iyBase .~ AMMOMAG TINMAG
+        & itType . iyModules . at ModBulletPayload ?~ EMPTYMODULE
+        & itType . iyModules . at ModBulletTrajectory ?~ EMPTYMODULE
         & itUse
             .~ AmmoMagUse
                 { _amagParams = BulletParams defaultBullet
+                , _amagType = SmallBulletAmmo
                 , _amagLoadStatus =
                     ReloadStatus
                         { _iaMax = 15

src/Dodge/Item/Held/Launcher.hs

@@ -34,10 +34,6 @@ launcher =
         & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 20 0) 0 0]
         & itUse . heldConsumption . laAmmoType
             .~ ProjectileAmmo
-                { _amPayload = ExplosionPayload
-                , _amPjDraw = DrawShell
-                , _amPjCreation = CreateShell
-                }
         & itType . iyBase .~ HELD LAUNCHER
         & itType . iyModules . at ModLauncherHoming ?~ EMPTYMODULE
 
@@ -54,7 +50,7 @@ remoteLauncher =
         & itType . iyBase .~ HELD REMOTELAUNCHER
         & itUse . heldUse .~ HeldFireRemoteShell --fireRemoteShell
         & itScope .~ RemoteScope (V2 0 0) 1
-        & itUse . heldConsumption . laAmmoType . amPjDraw .~ DrawRemoteShell
+--        & itUse . heldConsumption . laAmmoType . amPjDraw .~ DrawRemoteShell
 
 basicAmPjMoves :: IM.IntMap TweakParam
 basicAmPjMoves =