From 8b94320ca827de4f85b2e95771c9f72b44dce44f Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sat, 23 Jan 2021 18:21:57 +0100
Subject: [PATCH] Ynykron unload/load animation fixes.

---
 language.version                    |  2 +-
 zscript/swwm_deathlydeathcannon.zsc | 34 +++++++++++++++++++----------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/language.version b/language.version
index 4f47f2473..1c9cd19a6 100644
--- a/language.version
+++ b/language.version
@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r788 \cu(Sat 23 Jan 18:21:49 CET 2021)";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r789 \cu(Sat 23 Jan 18:21:57 CET 2021)";
diff --git a/zscript/swwm_deathlydeathcannon.zsc b/zscript/swwm_deathlydeathcannon.zsc
index c8b49b967..d9734b603 100644
--- a/zscript/swwm_deathlydeathcannon.zsc
+++ b/zscript/swwm_deathlydeathcannon.zsc
@@ -3057,6 +3057,7 @@ Class Ynykron : SWWMWeapon
 			return A_JumpIf(invoker.inverted,"TakeInverted");
 		}
 	TakeNormal:
+		XZW2 A 2;
 		XZW3 STU 2;
 		XZW3 V 2
 		{
@@ -3064,20 +3065,24 @@ Class Ynykron : SWWMWeapon
 			A_PlayerReload();
 		}
 		XZW3 WXYZ 2;
-		XZW4 ABCDEFGHIJKLMNO 2;
+		XZW4 A 2;
+		XZW4 B 2 A_StopSound(CHAN_WEAPONEXTRA);
+		XZW4 CDEFGHIJKLMNO 2;
 		XZW4 P 0
 		{
 			invoker.inverted = true;
 		}
 		Goto PutInverted;
 	TakeInverted:
-		XZW5 PQRS 2;
+		XZW5 P 2;
+		XZW5 QRS 2;
 		XZW5 T 2
 		{
 			A_StartSound("ynykron/magout",CHAN_WEAPON,CHANF_OVERLAP);
 			A_PlayerReload();
 		}
-		XZW5 UVWXYZ 2;
+		XZW5 UVWXY 2;
+		XZW5 Z 2 A_StopSound(CHAN_WEAPONEXTRA);
 		XZW6 ABCDEFGHIJKLM 2;
 		XZW6 N 0
 		{
@@ -3089,16 +3094,18 @@ Class Ynykron : SWWMWeapon
 		XZW4 T 2 A_StartSound("ynykron/magin",CHAN_WEAPON,CHANF_OVERLAP);
 		XZW4 UVWXYZ 2;
 		XZW5 A 2 A_StartSound("ynykron/meleeend",CHAN_WEAPON,CHANF_OVERLAP);
-		XZW5 BCDEFGHIJK 2;
+		XZW5 B 2 A_StartSound("ynykron/idle",CHAN_WEAPONEXTRA,CHANF_LOOP,.3,4.);
+		XZW5 CDEFGHIJK 2;
 		XZW5 L 4;
 		Goto Ready;
 	PutInverted:
 		XZW6 NOPQ 2;
 		XZW6 R 2 A_StartSound("ynykron/magin",CHAN_WEAPON,CHANF_OVERLAP);
-		XZW6 STUVWXY 2;
-		XZW6 Z 2 A_StartSound("ynykron/meleeend",CHAN_WEAPON,CHANF_OVERLAP);
-		XZW7 ABCDEFGHIJ 2;
-		XZW7 K 4;
+		XZW6 STUVWX 2;
+		XZW6 Y 2 A_StartSound("ynykron/meleeend",CHAN_WEAPON,CHANF_OVERLAP);
+		XZW6 Z 2 A_StartSound("ynykron/idle",CHAN_WEAPONEXTRA,CHANF_LOOP,.3,4.);
+		XZW7 ABCDEFGHI 2;
+		XZW7 J 4;
 		XZW5 P 0;
 		Goto Ready;
 	Discharge:
@@ -3182,10 +3189,13 @@ Class Ynykron : SWWMWeapon
 			return ResolveState(null);
 		}
 	UnloadNormal:
+		XZW2 A 2;
 		XZW3 STU 2;
 		XZW3 V 2 A_StartSound("ynykron/magout",CHAN_WEAPON,CHANF_OVERLAP);
 		XZW3 WXYZ 2;
-		XZW4 ABCDEFGHIJKLMNO 2;
+		XZW4 A 2;
+		XZW4 B 2 A_StopSound(CHAN_WEAPONEXTRA);
+		XZW4 CDEFGHIJKLMNO 2;
 		XZW4 P 0
 		{
 			if ( !sv_infiniteammo && !FindInventory('PowerInfiniteAmmo',true) )
@@ -3203,9 +3213,11 @@ Class Ynykron : SWWMWeapon
 		}
 		Goto PutNormal;
 	UnloadInverted:
-		XZW5 PQRS 2;
+		XZW5 P 2;
+		XZW5 QRS 2;
 		XZW5 T 2 A_StartSound("ynykron/magout",CHAN_WEAPON,CHANF_OVERLAP);
-		XZW5 UVWXYZ 2;
+		XZW5 UVWXY 2;
+		XZW5 Z 2 A_StopSound(CHAN_WEAPONEXTRA);
 		XZW6 ABCDEFGHIJKLM 2;
 		XZW6 N 0
 		{