From 817d662da7c6850635fe78d1c0f2a8aa665fd24a Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Wed, 22 Jun 2022 01:52:42 +0200
Subject: [PATCH] Fix ammo discrepancies with devel.

---
 language.version                    |  4 ++--
 zscript/dlc1/swwm_ammoitems_dlc.zsc | 12 ++++++------
 zscript/items/swwm_ammoitems.zsc    |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/language.version b/language.version
index 1ccc7f382..978ff3a2f 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.28 \cu(Wed 22 Jun 01:50:28 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.2.28 \cu(2022-06-22 01:50:28)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.29 \cu(Wed 22 Jun 01:52:57 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.2.29 \cu(2022-06-22 01:52:57)\c-";
diff --git a/zscript/dlc1/swwm_ammoitems_dlc.zsc b/zscript/dlc1/swwm_ammoitems_dlc.zsc
index 0702e81b8..7533e5aca 100644
--- a/zscript/dlc1/swwm_ammoitems_dlc.zsc
+++ b/zscript/dlc1/swwm_ammoitems_dlc.zsc
@@ -88,7 +88,7 @@ Class SheenAmmo : SWWMAmmo
 		Inventory.Amount 1;
 		Inventory.MaxAmount 300;
 		Ammo.BackpackAmount 60;
-		Ammo.BackpackMaxAmount 1200;
+		Ammo.BackpackMaxAmount 900;
 		Ammo.DropAmount 3;
 		+FLOATBOB;
 		FloatBobStrength 0.25;
@@ -324,7 +324,7 @@ Class RayBolt : MagAmmo
 		Inventory.Icon "graphics/HUD/Icons/A_RayBolt.png";
 		MagAmmo.ParentAmmo "RayAmmo";
 		MagAmmo.ClipSize 10;
-		Inventory.MaxAmount 15;
+		Inventory.MaxAmount 10;
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 	}
@@ -401,8 +401,8 @@ Class MisterRound : MagAmmo
 		Stamina -14000;
 		Inventory.Icon "graphics/HUD/Icons/A_MRRound.png";
 		MagAmmo.ParentAmmo "MisterAmmo";
-		MagAmmo.ClipSize 30;
-		Inventory.MaxAmount 40;
+		MagAmmo.ClipSize 20;
+		Inventory.MaxAmount 20;
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 	}
@@ -473,7 +473,7 @@ Class MisterAmmo : SWWMAmmo
 		Inventory.Amount 1;
 		Inventory.MaxAmount 2;
 		Ammo.BackpackAmount 0;
-		Ammo.BackpackMaxAmount 6;
+		Ammo.BackpackMaxAmount 4;
 		Ammo.DropAmount 1;
 		SWWMAmmo.MagAmmoType "MisterRound";
 		+FLOATBOB;
@@ -554,7 +554,7 @@ Class UltimatePod : MagAmmo
 		Inventory.Icon "graphics/HUD/Icons/A_UltimatePod.png";
 		MagAmmo.ParentAmmo "UltimateAmmo";
 		MagAmmo.ClipSize 4;
-		Inventory.MaxAmount 6;
+		Inventory.MaxAmount 4;
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 	}
diff --git a/zscript/items/swwm_ammoitems.zsc b/zscript/items/swwm_ammoitems.zsc
index 96a26c507..bd42a88a7 100644
--- a/zscript/items/swwm_ammoitems.zsc
+++ b/zscript/items/swwm_ammoitems.zsc
@@ -811,7 +811,7 @@ Class SilverBullets : MagAmmo
 		Inventory.Icon "graphics/HUD/Icons/A_SilverBulletBullet.png";
 		MagAmmo.ParentAmmo "SilverBulletAmmo";
 		MagAmmo.ClipSize 5;
-		Inventory.MaxAmount 8;
+		Inventory.MaxAmount 5;
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 		Radius 4;
@@ -864,7 +864,7 @@ Class SilverBullets2 : MagAmmo
 		Inventory.Icon "graphics/HUD/Icons/A_SilverBulletBullet2.png";
 		MagAmmo.ParentAmmo "SilverBulletAmmo2";
 		MagAmmo.ClipSize 5;
-		Inventory.MaxAmount 8;
+		Inventory.MaxAmount 5;
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 		Radius 4;
@@ -954,7 +954,7 @@ Class CandyGunBullets : MagAmmo
 		Inventory.Icon "graphics/HUD/Icons/A_CandyBullet.png";
 		MagAmmo.ParentAmmo "CandyGunAmmo";
 		MagAmmo.ClipSize 7;
-		Inventory.MaxAmount 10;
+		Inventory.MaxAmount 7;
 		+FLOATBOB;
 		FloatBobStrength 0.25;
 		Radius 2;