OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Additional face reactions.

Browse source
This commit is contained in:
Mari the Deer 2022-07-06 13:10:46 +02:00
commit 9d0287ef50
8 changed files with 86 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
zscript/handler/swwm_handler_damage.zsc
View file

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

2
zscript/handler/swwm_handler_oneliners.zsc
View file

@ -108,6 +108,8 @@ extend Class SWWMHandler
if ( loudlv > 3 ) players[consoleplayer].mo.A_StartSound(onelinersnd,CHAN_DEMOVOICEAUX3,CHANF_DEFAULT,1.,ATTN_NONE);
}
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;
}
onelinertic = 0;
onelinerspan = 0;