From afccfcb5ff599316e7e7599c943925ace61be32b Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Sun, 7 Aug 2022 20:19:27 +0200
Subject: [PATCH] Tweak ammo spawns again.

---
 language.version                 |  4 ++--
 zscript/items/swwm_ammospawn.zsc | 17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/language.version b/language.version
index 5b498a771..a70a6a5bf 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r270 \cu(Sun  7 Aug 15:16:28 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r270 \cu(2022-08-07 15:16:28)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r271 \cu(Sun  7 Aug 20:19:27 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r271 \cu(2022-08-07 20:19:27)\c-";
diff --git a/zscript/items/swwm_ammospawn.zsc b/zscript/items/swwm_ammospawn.zsc
index ee8ca2b12..654148ab3 100644
--- a/zscript/items/swwm_ammospawn.zsc
+++ b/zscript/items/swwm_ammospawn.zsc
@@ -129,14 +129,13 @@ Class SWWMClipAmmoSmall : SWWMAmmoSpawner
 {
 	override Class<Actor> PickAmmo( bool enemydrop )
 	{
-		if ( !Random[Replacements](0,4) )
+		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,2)?'SheenAmmo3':'SheenSmallAmmo';
-			if ( aex )
-				return 'EvisceratorShell';
+				return Random[Replacements](0,2)?'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));
@@ -153,8 +152,8 @@ Class SWWMClipAmmoMed : SWWMAmmoSpawner
 		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)?'SheenAmmo3':'SheenSmallAmmo';
-		return Random[Replacements](0,1)?'EvisceratorShell':'EvisceratorShell2';
+			return Random[Replacements](0,2)?'SheenSmallAmmo':'SheenAmmo3';
+		return Random[Replacements](0,2)?'EvisceratorShell2':'EvisceratorShell';
 	}
 }
 Class SWWMClipAmmoBig : SWWMAmmoSpawner
@@ -165,7 +164,7 @@ Class SWWMClipAmmoBig : SWWMAmmoSpawner
 			bex = SWWMUtility.ItemExists('HeavyMahSheenGun',ownedonly:enemydrop);
 		if ( (!aex && bex) || (Random[Replacements](0,1) && bex) )
 			return Random[Replacements](0,2)?'SheenSmallAmmo':'SheenBigAmmo';
-		return Random[Replacements](0,5)?'EvisceratorShell':Random[Replacements](0,2)?'EvisceratorShell2':'EvisceratorShell3';
+		return Random[Replacements](0,2)?'EvisceratorShell2':'EvisceratorShell3';
 	}
 }
 Class SWWMBlastAmmoSmall : SWWMAmmoSpawner
@@ -186,8 +185,8 @@ Class SWWMBlastAmmoBig : SWWMAmmoSpawner
 		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,2)?'SheenSmallAmmo':'SheenBigAmmo';
-		return Random[Replacements](0,2)?'EvisceratorShell':Random[Replacements](0,1)?'EvisceratorShell2':'EvisceratorShell3';
+			return Random[Replacements](0,2)?'SheenBigAmmo':'SheenSmallAmmo';
+		return Random[Replacements](0,2)?'EvisceratorShell3':'EvisceratorShell2';
 	}
 }
 Class SWWMRocketAmmoSmall : SWWMAmmoSpawner