From d100d09378a67a7be00613065ac70ab69cd36813 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Thu, 4 Jun 2020 17:42:28 +0200 Subject: [PATCH] Third person animation fixup for explosive reload. --- language.version | 2 +- zscript/swwm_splode.zsc | 4 +++- zscript/swwm_tastytreat.zsc | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/language.version b/language.version index bfd67e6c7..41ae698ed 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\cxSWWM GZ\c- r301 (Thu 4 Jun 16:55:29 CEST 2020)"; +SWWM_MODVER="\cxSWWM GZ\c- r302 (Thu 4 Jun 17:42:28 CEST 2020)"; diff --git a/zscript/swwm_splode.zsc b/zscript/swwm_splode.zsc index ebc087423..0c270e5b4 100644 --- a/zscript/swwm_splode.zsc +++ b/zscript/swwm_splode.zsc @@ -477,7 +477,9 @@ Class ExplodiumGun : SWWMWeapon } XZW6 EFGHIJKLMNOPRS 1; XZW6 T 1 A_ThrowMag(); - XZW6 UVWXY 2; + XZW6 UV 2; + XZW6 W 2 A_PlayerReload(); + XZW6 XY 2; XZW6 Z 4; Goto ReloadEnd; Reload: diff --git a/zscript/swwm_tastytreat.zsc b/zscript/swwm_tastytreat.zsc index 3e2386e42..a922cc49e 100644 --- a/zscript/swwm_tastytreat.zsc +++ b/zscript/swwm_tastytreat.zsc @@ -319,7 +319,8 @@ Class TinyCandyPop : CandyPop s.special1 = Random[ExploS](1,3); s.scale *= 1.8; s.alpha *= .4; - } } + } + } Stop; } } @@ -1125,7 +1126,9 @@ Class CandyGun : SWWMWeapon } XZW6 EFGHIJKLMNOPRS 1; XZW6 T 1 A_ThrowMag(); - XZW6 UVWXY 2; + XZW6 UV 2; + XZW6 W 2 A_PlayerReload(); + XZW6 XY 2; XZW6 Z 4; Goto ReloadEnd; SpecialFire: