OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

More stuff from master

Browse source
This commit is contained in:
Mari the Deer 2021-10-06 00:33:24 +02:00
commit 5957f05d71
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -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-";

2
zscript/handler/swwm_handler_worldthings.zsc
View file

@ -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();

2
zscript/swwm_player.zsc
View file

@ -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;