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

13
zscript/items/swwm_collectibles_gesture.zsc
View file

@ -81,6 +81,10 @@ Class FrispyCornGesture : SWWMItemGesture
}
Class SayaBeanGesture : SWWMItemGesture
{
action void A_PreSquish()
{
if ( Demolitionist(self) ) Demolitionist(self).lastgrin = gametic;
}
action void A_Squish1()
{
A_StartSound("squeak",CHAN_ITEMEXTRA,CHANF_OVERLAP);
@ -133,7 +137,8 @@ Class SayaBeanGesture : SWWMItemGesture
XZW1 A 3 A_UsePlush();
XZW1 B 3 A_StartSound("demolitionist/handsup",CHAN_WEAPON,CHANF_OVERLAP);
XZW1 CDEFGH 3;
XZW1 IJ 4;
XZW1 I 4 A_PreSquish();
XZW1 J 4;
XZW1 KL 3;
XZW1 M 2 A_Squish1();
XZW1 N 2 A_Squish2();
@ -252,6 +257,10 @@ Class KirinPlushGesture : SWWMItemGesture
s.plushuses++;
SWWMUtility.AchievementProgress("plush",s.plushuses,player);
}
action void A_PreKiss()
{
if ( Demolitionist(self) ) Demolitionist(self).lastblink = gametic;
}
action void A_PetPlush()
{
A_StartSound("demolitionist/petting",CHAN_WEAPON,CHANF_OVERLAP);
@ -304,7 +313,7 @@ Class KirinPlushGesture : SWWMItemGesture
XZW1 CDEFGH 3;
XZW1 IJKL 5;
XZW1 M 5 A_StartSound("demolitionist/handsdown",CHAN_WEAPON,CHANF_OVERLAP);
XZW1 N 4;
XZW1 N 4 A_PreKiss();
XZW1 O 2;
XZW1 P 2 A_PetPlush();
XZW1 Q 3 A_KissPlush();

3
zscript/items/swwm_powerups.zsc
View file

@ -88,7 +88,10 @@ Class GrilledCheeseSandwich : Inventory
if ( Owner.Health > 500 ) return false;
if ( pickup && ((Owner.player == players[consoleplayer]) || bBigPowerup) ) Owner.A_StartSound(UseSound,CHAN_ITEMEXTRA,CHANF_OVERLAP);
if ( (Owner.player == players[consoleplayer]) && (swwm_mutevoice < 2) )
{
SWWMHandler.AddOneliner("eat",2);
if ( Owner is 'Demolitionist' ) Demolitionist(Owner).lastgrin = gametic;
}
DoTheThing();
return true;
}