OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Tag colors and animated face using A_ChangeModel.

Browse source
This commit is contained in:
Mari the Deer 2022-07-26 18:36:38 +02:00
commit 2d2dcf7ad5
28 changed files with 350 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

4
zscript/handler/swwm_handler_damage.zsc
View file

@ -142,7 +142,7 @@ extend Class SWWMHandler
if ( !lastcombat || (gametic > lastcombat+20) )
{
lastcombat = AddOneliner("hitfriend",1,10);
if ( Demolitionist(e.DamageSource) ) Demolitionist(e.DamageSource).lastsad = gametic;
if ( Demolitionist(e.DamageSource) ) Demolitionist(e.DamageSource).facesad = true;
}
highesttic = gametic;
}
@ -173,7 +173,7 @@ extend Class SWWMHandler
if ( e.Thing.IsFriend(src) )
{
lastcombat = AddOneliner("friendkill",1,5);
if ( Demolitionist(e.DamageSource) ) Demolitionist(e.DamageSource).lastsad = gametic;
if ( Demolitionist(e.DamageSource) ) Demolitionist(e.DamageSource).facesad = true;
}
else if ( (!lastcombat || (gametic > lastcombat+50)) && !SWWMHDoomHandler.IsCuteGirl(e.Thing) ) // [HDoom] don't shout at the girls
{

2
zscript/handler/swwm_handler_oneliners.zsc
View file

@ -109,7 +109,7 @@ extend Class SWWMHandler
}
SendNetworkEvent("swwmremoteliner."..onelinersnd,consoleplayer,onelinerlevel);
// hack due to the fact this one can be cancelled early
if ( onelinertype == "falling" ) Demolitionist(players[consoleplayer].mo).lastgrin = gametic;
if ( onelinertype == "falling" ) Demolitionist(players[consoleplayer].mo).facegrin = true;
}
onelinertic = 0;
onelinerspan = 0;