From 3e89782c06a16d327f22cb1eab69fc606eebdb42 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Wed, 3 Jun 2020 12:43:16 +0200 Subject: [PATCH] Forgot to call A_AlertMonsters on Wallbuster. --- language.version | 2 +- zscript/swwm_cbt.zsc | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/language.version b/language.version index 40dfc87c4..687dc5c0a 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\cxSWWM GZ\c- r293 (Wed 3 Jun 12:16:59 CEST 2020)"; +SWWM_MODVER="\cxSWWM GZ\c- r294 (Wed 3 Jun 12:43:17 CEST 2020)"; diff --git a/zscript/swwm_cbt.zsc b/zscript/swwm_cbt.zsc index 2646bf33a..314761734 100644 --- a/zscript/swwm_cbt.zsc +++ b/zscript/swwm_cbt.zsc @@ -620,6 +620,7 @@ Class Wallbuster : SWWMWeapon static const statelabel flashes[] = {"FlashRed","FlashGreen","FlashBlue","FlashPurple"}; static const String sounds[] = {"spreadgun/redfire","spreadgun/greenfire","spreadgun/bluefire","spreadgun/purplefire"}; static const Color cols[] = {Color(40,255,192,64),Color(36,255,192,80),Color(48,32,176,255),Color(24,255,224,96)}; + static const int louds[] = {800,1000,1100,1200,1400,600,2500}; int redflashstr = 0; int blueflashstr = 0; // speen @@ -655,6 +656,7 @@ Class Wallbuster : SWWMWeapon [x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll); [x2, y2, z2] = swwm_CoordUtil.GetAxes(BulletSlope(),angle,roll); if ( !invoker.cbtmuffler ) invoker.cbtmuffler = CVar.GetCVar('swwm_earbuster',players[consoleplayer]); + int alertness = 0; // second pass, play the fire effects for ( int i=0; i louds[which] ) += louds[which]/4; + else alertness += louds[which]; } if ( howmany < 3 ) player.SetPsprite(PSP_WEAPON,ResolveState("FireOne")); else if ( howmany < 15 ) player.SetPsprite(PSP_WEAPON,ResolveState("FireFive")); @@ -693,6 +697,7 @@ Class Wallbuster : SWWMWeapon A_QuakeEx(qk,qk,qk,ql,0,8,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:qk*.15); A_ZoomFactor(1.+qk*.04,ZOOM_INSTANT); A_ZoomFactor(1.); + A_AlertMonsters(alertness); if ( redflashstr > 0 ) { let l = Spawn("SWWMWeaponLight",pos);