From 655e8748d7822f1d9652035d0474cac09756234d Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Sat, 8 Oct 2022 02:07:53 +0200
Subject: [PATCH] Give cheat small fix.

---
 language.version        | 4 ++--
 zscript/swwm_player.zsc | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/language.version b/language.version
index eb3040230..b5ae3f6db 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r550 \cu(Sat  8 Oct 02:05:20 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r550 \cu(2022-10-08 02:05:20)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r551 \cu(Sat  8 Oct 02:07:53 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r551 \cu(2022-10-08 02:07:53)\c-";
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index af0b70a94..83a3ea615 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -353,8 +353,11 @@ Class Demolitionist : PlayerPawn
 			{
 				// Add it first if not found
 				ammoitem = Ammo(Spawn(type));
+				ammoitem.Amount = 0;
 				ammoitem.AttachToOwner(self);
 			}
+			// Don't give spares unless we own a Candy Gun, for consistency
+			if ( (type is 'CandyGunSpares') && !FindInventory('CandyGun') ) continue;
 			// Top up
 			ammoitem.Amount = ammoitem.MaxAmount;
 			// Does it have mag ammo?
@@ -493,10 +496,10 @@ Class Demolitionist : PlayerPawn
 		{
 			CheatGive_Health();
 			CheatGive_Backpack();
-			CheatGive_Ammo();
 			CheatGive_Armor();
 			CheatGive_Keys();
 			CheatGive_Weapons();
+			CheatGive_Ammo();
 			CheatGive_Artifacts();
 			CheatGive_PuzzlePieces();
 			if ( giveall == ALL_YESYES )