From f4b345bcde8af01d2c6defd84334f8ff076ad5f2 Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Tue, 19 Dec 2023 19:23:52 +0100
Subject: [PATCH] Speed up reloading of Slot 6 weapons.

---
 language.version                  |  4 ++--
 zscript/dlc1/swwm_notashotgun.zsc | 15 +++++++++------
 zscript/weapons/swwm_blazeit.zsc  | 16 +++++++++-------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/language.version b/language.version
index 6564f8ed5..97fec2ef8 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1059 \cu(Tue 19 Dec 16:39:35 CET 2023)\c-";
-SWWM_SHORTVER="\cw1.3pre r1059 \cu(2023-12-19 16:39:35)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1060 \cu(Tue 19 Dec 19:23:52 CET 2023)\c-";
+SWWM_SHORTVER="\cw1.3pre r1060 \cu(2023-12-19 19:23:52)\c-";
diff --git a/zscript/dlc1/swwm_notashotgun.zsc b/zscript/dlc1/swwm_notashotgun.zsc
index 6f8aa327f..c544efe20 100644
--- a/zscript/dlc1/swwm_notashotgun.zsc
+++ b/zscript/dlc1/swwm_notashotgun.zsc
@@ -536,11 +536,13 @@ Class Quadravol : SWWMWeapon
 		Goto ReloadHold;
 	ReloadHold:
 		XZW5 P 2 A_LoadOverlay();
-		XZW5 QRS 2;
-		XZW5 T 2 A_StartSound("quadshot/load",CHAN_WEAPON,CHANF_OVERLAP);
-		XZW5 UV 2;
-		XZW5 W 2 A_Load();
-		XZW5 XYZ 2;
+		XZW5 QR 2;
+		XZW5 S 1;
+		XZW5 T 1 A_StartSound("quadshot/load",CHAN_WEAPON,CHANF_OVERLAP);
+		XZW5 UV 1;
+		XZW5 W 1 A_Load();
+		XZW5 X 1;
+		XZW5 YZ 2;
 		XZW6 A 2;
 		XZW5 P 2
 		{
@@ -557,7 +559,8 @@ Class Quadravol : SWWMWeapon
 		XZW6 GHIJK 3;
 		Goto Ready;
 	LoadOverlay:
-		XZWZ HIJKLMN 2;
+		XZWZ HIJ 2;
+		XZWZ KLMN 1;
 		XZWZ O 0;
 		Stop;
 	Idle:
diff --git a/zscript/weapons/swwm_blazeit.zsc b/zscript/weapons/swwm_blazeit.zsc
index dff52ae30..4e7c34b00 100644
--- a/zscript/weapons/swwm_blazeit.zsc
+++ b/zscript/weapons/swwm_blazeit.zsc
@@ -595,7 +595,7 @@ Class Hellblazer : SWWMWeapon
 	Unload:
 		XZW2 A 2;
 		XZW3 JKLMNOPQRSTUVWXYZ 2;
-		XZW4 ABCDEFGHIJ 2;
+		XZW4 ABCDEFGHIJ 1;
 		XZW6 VWXYZ 3;
 		XZW4 J 0 A_SwapAmmo();
 		Goto Load;
@@ -611,24 +611,26 @@ Class Hellblazer : SWWMWeapon
 			A_BumpView(-1.);
 			A_StartSound("hellblazer/magout",CHAN_WEAPON,CHANF_OVERLAP);
 		}
-		XZW9 ABCDEFGHIJ 2;
+		XZW9 ABCDEFGHIJ 1;
 		XZWB VW 3 A_BumpView(.3,tics:3);
 		XZWB X 3;
 		XZWB YZ 3 A_BumpView(-.3,tics:3);
 		Goto Load_G;
 	Load:
-		XZW4 JKLMNOPQRSTUVWXYZ 2;
+		XZW4 JKLMNOPQRS 1;
+		XZW4 TUVWXYZ 2;
 		XZW5 ABCDEFGHIJ 2;
 		Goto Ready;
 	Load_G:
-		XZW9 J 2 A_PlayerReload();
-		XZW9 KLMNOP 2;
-		XZW9 Q 2
+		XZW9 J 1 A_PlayerReload();
+		XZW9 KLMNOP 1;
+		XZW9 Q 1
 		{
 			A_BumpView(1.);
 			A_StartSound("hellblazer/magin",CHAN_WEAPON,CHANF_OVERLAP);
 		}
-		XZW9 RSTUVWX 2;
+		XZW9 RS 1;
+		XZW9 TUVWX 2;
 		XZW9 Y 2 A_StartSound("hellblazer/close",CHAN_WEAPON,CHANF_OVERLAP);
 		XZW9 Z 2;
 		XZWA A 2 A_QuakeEx(1.2,1.2,1.2,8,0,15,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.3);