From 749ccd80b6dc2cb2f3b18951fac1be0d51260ee0 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Sun, 24 Sep 2023 22:21:57 +0200 Subject: [PATCH] Small refactoring/cleanup. --- language.version | 4 +- zscript/handler/swwm_handler_flash.zsc | 4 +- zscript/handler/swwm_handler_iwantdie.zsc | 100 ++++++++++----------- zscript/handler/swwm_handler_worldtick.zsc | 2 + zscript/handler/swwm_statichandler.zsc | 15 +--- zscript/hud/swwm_hud.zsc | 1 + zscript/hud/swwm_hud_topstuff.zsc | 1 - 7 files changed, 55 insertions(+), 72 deletions(-) diff --git a/language.version b/language.version index b30b935e6..8a0e261b2 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r959 \cu(Sun 24 Sep 18:44:16 CEST 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r959 \cu(2023-09-24 18:44:16)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r960 \cu(Sun 24 Sep 22:21:57 CEST 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r960 \cu(2023-09-24 22:21:57)\c-"; diff --git a/zscript/handler/swwm_handler_flash.zsc b/zscript/handler/swwm_handler_flash.zsc index 70f726427..46d97e43c 100644 --- a/zscript/handler/swwm_handler_flash.zsc +++ b/zscript/handler/swwm_handler_flash.zsc @@ -59,12 +59,12 @@ extend Class SWWMHandler if ( gametic < hflash[camplayer] ) { double fstr = (hflash[camplayer]-(gametic+e.FracTic))/5.; - Screen.Dim(Color(64,128,255),.1875*fstr*pickup_fade_scalar,0,0,Screen.GetWidth(),Screen.GetHeight()); + Screen.Dim(Color(64,128,255),.1875*fstr*pickup_fade_scalar,0,0,Screen.GetWidth(),Screen.GetHeight(),STYLE_Add); } if ( gametic < aflash[camplayer] ) { double fstr = (aflash[camplayer]-(gametic+e.FracTic))/5.; - Screen.Dim(Color(96,255,64),.1875*fstr*pickup_fade_scalar,0,0,Screen.GetWidth(),Screen.GetHeight()); + Screen.Dim(Color(96,255,64),.1875*fstr*pickup_fade_scalar,0,0,Screen.GetWidth(),Screen.GetHeight(),STYLE_Add); } } } diff --git a/zscript/handler/swwm_handler_iwantdie.zsc b/zscript/handler/swwm_handler_iwantdie.zsc index d603e69e2..51fae4a45 100644 --- a/zscript/handler/swwm_handler_iwantdie.zsc +++ b/zscript/handler/swwm_handler_iwantdie.zsc @@ -19,64 +19,58 @@ extend Class SWWMHandler private void IWantDieSpawn( WorldEvent e ) { if ( iwantdie == -1 ) iwantdie = (G_SkillName() == StringTable.Localize("$SWWM_SKLUNATIC")); - if ( iwantdie ) + if ( iwantdie <= 0 ) return; + if ( SWWMUtility.ValidProjectile(e.Thing) && !e.Thing.FindInventory("DontDuplicate") && (e.Thing.target && e.Thing.target.bISMONSTER && !e.Thing.target.player) ) { - if ( SWWMUtility.ValidProjectile(e.Thing) && !e.Thing.FindInventory("DontDuplicate") && (e.Thing.target && e.Thing.target.bISMONSTER && !e.Thing.target.player) ) + e.Thing.speed *= 2; + e.Thing.vel *= 2; + double ang = e.Thing.target.target?e.Thing.AngleTo(e.Thing.target.target):e.Thing.angle; + double pt = e.Thing.target.target?e.Thing.PitchTo(e.Thing.target.target,e.Thing.target.missileheight,e.Thing.target.target.Height/2.):e.Thing.pitch; + let [x, y, z] = SWWMUtility.GetAxes(ang,pt,e.Thing.roll); + int numpt = Random[ExtraMissiles](1,2); + for ( int i=0; i x.ceilingz ) x.SetZ(x.ceilingz-x.height); + if ( x.pos.z < x.floorz ) x.SetZ(x.floorz); + if ( !x.TestMobjLocation() || !x.TestMobjZ() || !level.IsPointInLevel(x.pos) ) { - int numpt = Random[ExtraMissiles](1,2); - for ( int i=0; i x.ceilingz ) x.SetZ(x.ceilingz-x.height); - if ( x.pos.z < x.floorz ) x.SetZ(x.floorz); - if ( !x.TestMobjLocation() || !x.TestMobjZ() || !level.IsPointInLevel(x.pos) ) - { - x.ClearCounters(); - x.Destroy(); - } - else - { - x.angle = e.Thing.angle; - x.bAMBUSH = e.Thing.bAMBUSH; - x.GiveInventory("DontDuplicate",1); - break; - } - } - } + x.ClearCounters(); + x.Destroy(); + } + else + { + x.angle = e.Thing.angle; + x.bAMBUSH = e.Thing.bAMBUSH; + x.GiveInventory("DontDuplicate",1); + break; } } } diff --git a/zscript/handler/swwm_handler_worldtick.zsc b/zscript/handler/swwm_handler_worldtick.zsc index 8a18440bd..11bf448b3 100644 --- a/zscript/handler/swwm_handler_worldtick.zsc +++ b/zscript/handler/swwm_handler_worldtick.zsc @@ -310,6 +310,8 @@ extend Class SWWMHandler continue; if ( (a is 'Inventory') && (!a.bSPECIAL || Inventory(a).Owner || (a.GetClassName() == 'aas_token')) ) // autoautosave hotfix continue; + if ( isproj && SWWMUtility.ValidProjectile(a) ) + continue; if ( (a is 'Chancebox') && (a.CurState != a.SpawnState) ) continue; if ( isproj && !level.allmap && !(a.target && a.target.IsFriend(players[consoleplayer].mo)) && !a.CheckSight(players[consoleplayer].Camera,SF_IGNOREVISIBILITY|SF_IGNOREWATERBOUNDARY) ) diff --git a/zscript/handler/swwm_statichandler.zsc b/zscript/handler/swwm_statichandler.zsc index e9f79437a..34fef218e 100644 --- a/zscript/handler/swwm_statichandler.zsc +++ b/zscript/handler/swwm_statichandler.zsc @@ -232,20 +232,7 @@ Class SWWMStaticHandler : StaticEventHandler override void ConsoleProcess( ConsoleEvent e ) { - if ( e.Name ~== "swwmresetmmcolors" ) - { - Array cvarlist; - SWWMUtility.GetCVars(cvarlist); - foreach ( cv:cvarlist ) - { - if ( (cv.Left(8) != "swwm_mm_") - || (cv.IndexOf("color") == -1) - || (cv == "swwm_mm_colorset") ) - continue; - CVar.FindCVar(cv).ResetToDefault(); - } - } - else if ( e.Name ~== "swwmresetcvars" ) + if ( e.Name ~== "swwmresetcvars" ) { Array cvarlist; SWWMUtility.GetCVars(cvarlist); diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc index ab33eeaa7..2e183c704 100644 --- a/zscript/hud/swwm_hud.zsc +++ b/zscript/hud/swwm_hud.zsc @@ -355,6 +355,7 @@ Class SWWMStatusBar : BaseStatusBar mhudfontcol[MCR_FLASH] = Font.FindFontColor("MiniFlash"); mhudfontcol[MCR_REDFLASH] = Font.FindFontColor("MiniRedFlash"); mhudfontcol[MCR_WHITEFLASH] = Font.FindFontColor("MiniWhiteFlash"); + GetMinimapColors(); tclabel = mhudfontcol[MCR_CYANBLU]; tcvalue = mhudfontcol[MCR_WHITE]; tcextra = mhudfontcol[MCR_IBUKIHUD]; diff --git a/zscript/hud/swwm_hud_topstuff.zsc b/zscript/hud/swwm_hud_topstuff.zsc index f3dd509b8..e0a50297f 100644 --- a/zscript/hud/swwm_hud_topstuff.zsc +++ b/zscript/hud/swwm_hud_topstuff.zsc @@ -748,7 +748,6 @@ extend Class SWWMStatusBar // obviously, don't draw the minimap if the automap is open if ( !automapactive && swwm_mm_enable ) { - GetMinimapColors(); xx = int(ss.x-(margin+(HALFMAPSIZE+2)*2)); Screen.DrawTexture(MiniBox,false,xx,yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); DrawMinimap(xx,yy);