From b12303d4f64634dcc0ef87e0554e7463fd74e662 Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Tue, 9 Aug 2022 18:00:51 +0200
Subject: [PATCH] Ammo spawns and pricing tweaks.

---
 language.version                    |  4 ++--
 zscript/dlc1/swwm_ammoitems_dlc.zsc |  4 ++--
 zscript/items/swwm_ammospawn.zsc    | 17 +++++++----------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/language.version b/language.version
index 6be0d1fdf..75604080b 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r284 \cu(Tue  9 Aug 14:09:22 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r284 \cu(2022-08-09 14:09:22)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r285 \cu(Tue  9 Aug 18:00:51 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r285 \cu(2022-08-09 18:00:51)\c-";
diff --git a/zscript/dlc1/swwm_ammoitems_dlc.zsc b/zscript/dlc1/swwm_ammoitems_dlc.zsc
index cd455b361..c24d58619 100644
--- a/zscript/dlc1/swwm_ammoitems_dlc.zsc
+++ b/zscript/dlc1/swwm_ammoitems_dlc.zsc
@@ -6,7 +6,7 @@ Class SMW05Ammo : SWWMAmmo
 	{
 		Tag "$T_SMW05BULLET";
 		SWWMAmmo.PickupTag "SMW05BULLET";
-		Stamina 300;
+		Stamina 600;
 		Inventory.Amount 1;
 		Inventory.MaxAmount 80;
 		Ammo.BackpackAmount 20;
@@ -58,7 +58,7 @@ Class SheenAmmo : SWWMAmmo
 	{
 		Tag "$T_SHEENBULLET";
 		SWWMAmmo.PickupTag "SHEENBULLET";
-		Stamina 600;
+		Stamina 1500;
 		Inventory.Amount 1;
 		Inventory.MaxAmount 400;
 		Ammo.BackpackAmount 50;
diff --git a/zscript/items/swwm_ammospawn.zsc b/zscript/items/swwm_ammospawn.zsc
index 7fe68dc14..55d18cfaf 100644
--- a/zscript/items/swwm_ammospawn.zsc
+++ b/zscript/items/swwm_ammospawn.zsc
@@ -129,16 +129,13 @@ Class SWWMClipAmmoSmall : SWWMAmmoSpawner
 {
 	override Class<Actor> PickAmmo( bool enemydrop )
 	{
-		if ( !Random[Replacements](0,2) )
-		{
-			bool aex = SWWMUtility.ItemExists('Eviscerator',ownedonly:enemydrop),
-				bex = SWWMUtility.ItemExists('HeavyMahSheenGun',ownedonly:enemydrop);
-			if ( (!aex && bex) || (Random[Replacements](0,1) && bex) )
-				return Random[Replacements](0,1)?'SheenAmmo2':'SheenAmmo3';
-			if ( aex ) return 'EvisceratorShell';
-		}
-		bool aex = (SWWMUtility.ItemExists('Spreadgun',ownedonly:enemydrop)||SWWMUtility.ItemExists('Wallbuster',ownedonly:enemydrop)),
-			bex = (SWWMUtility.ItemExists('PuntzerBeta',ownedonly:enemydrop)||SWWMUtility.ItemExists('PuntzerGamma',ownedonly:enemydrop));
+		bool aex = SWWMUtility.ItemExists('Eviscerator',ownedonly:enemydrop),
+			bex = SWWMUtility.ItemExists('HeavyMahSheenGun',ownedonly:enemydrop);
+		if ( (!aex && bex) || (Random[Replacements](0,1) && bex) )
+			return Random[Replacements](0,1)?'SheenAmmo2':'SheenAmmo3';
+		if ( aex ) return 'EvisceratorShell';
+		aex = (SWWMUtility.ItemExists('Spreadgun',ownedonly:enemydrop)||SWWMUtility.ItemExists('Wallbuster',ownedonly:enemydrop));
+		bex = (SWWMUtility.ItemExists('PuntzerBeta',ownedonly:enemydrop)||SWWMUtility.ItemExists('PuntzerGamma',ownedonly:enemydrop));
 		if ( (!aex && bex) || (Random[Replacements](0,1) && bex) )
 			return Random[Replacements](0,2)?'SMW05Ammo':'SMW05Ammo2';
 		return Random[Replacements](0,1)?'RedShell':'GreenShell';