OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Voodoo dolls are annoying.

Browse source
This commit is contained in:
Mari the Deer 2022-09-24 01:21:03 +02:00
commit 8833db9591
7 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
zscript/handler/swwm_handler_damage.zsc
View file

@ -117,6 +117,7 @@ extend Class SWWMHandler
// combat hit chatter
private void DoCombatHit( WorldEvent e )
{
if ( (e.DamageSource is 'SWWMVoodooDoll') || (e.Thing is 'SWWMVoodooDoll') ) return;
if ( (e.DamageSource.bISMONSTER || e.DamageSource.player || (e.DamageSource is 'ScriptedMarine')) && (e.Thing == players[consoleplayer].mo) && (e.Thing.Health > 0) )
{
if ( !lastcombat || (gametic > lastcombat+20) )
@ -160,7 +161,7 @@ extend Class SWWMHandler
s.kills++;
s.AddWeaponKill(inflictor,e.Thing,e.DamageType);
}
if ( src == players[consoleplayer].mo )
if ( (src == players[consoleplayer].mo) && !(e.Thing is 'SWWMVoodooDoll') )
{
highesttic = gametic;
if ( !lastcombat || (gametic > lastcombat+20) )