From 5957f05d71f3a0eb37ca34074af080e691a6d861 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Wed, 6 Oct 2021 00:33:24 +0200 Subject: [PATCH] More stuff from master --- language.version | 4 ++-- zscript/handler/swwm_handler_worldthings.zsc | 2 +- zscript/swwm_player.zsc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/language.version b/language.version index a5ccfd308..0b6717dce 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r10 \cu(Tue 5 Oct 19:40:58 CEST 2021)\c-"; -SWWM_SHORTVER="\cw1.2pre r10 \cu(2021-10-05 19:40:58)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r12 \cu(Wed 6 Oct 00:33:37 CEST 2021)\c-"; +SWWM_SHORTVER="\cw1.2pre r12 \cu(2021-10-06 00:33:37)\c-"; diff --git a/zscript/handler/swwm_handler_worldthings.zsc b/zscript/handler/swwm_handler_worldthings.zsc index 4b4973b7d..b1b4ce629 100644 --- a/zscript/handler/swwm_handler_worldthings.zsc +++ b/zscript/handler/swwm_handler_worldthings.zsc @@ -205,7 +205,7 @@ extend Class SWWMHandler if ( !G_SkillPropertyInt(SKILLP_SpawnMulti) || multiplayer || sv_alwaysspawnmulti ) return false; // is it coop inventory? suppress it - if ( (e.Thing.spawnflags&(MTF_COOPERATIVE|MTF_DEATHMATCH)) && !(e.Thing.spawnflags&MTF_SINGLE) && (e.Thing is 'Inventory') ) + if ( (e.Thing.spawnflags&(MTF_COOPERATIVE|MTF_DEATHMATCH)) && !(e.Thing.spawnflags&MTF_SINGLE) && ((e.Thing is 'Inventory') || (e.Thing is 'MaceSpawner')) ) { e.Thing.ClearCounters(); e.Thing.Destroy(); diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index fe0735373..e6e0766de 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -1125,7 +1125,7 @@ Class Demolitionist : PlayerPawn if ( !TestMobjLocation() ) SetOrigin(oldp,true); } encroachtics++; - if ( !(encroachtics%GameTicRate) && !IsFriend(encroached) ) + if ( !(encroachtics%GameTicRate) && (encroached.bISMONSTER || encroached.player || (encroached is 'ScriptedMarine')) && !IsFriend(encroached) ) SWWMUtility.AchievementProgress("step",encroachtics/GameTicRate,player); } else encroachtics = 0;