OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Allow headpats to be held.

Browse source
This commit is contained in:
Mari the Deer 2021-06-06 20:44:46 +02:00
commit ff1032fa19
3 changed files with 51 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

47
zscript/swwm_gesture.zsc
View file

@ -442,13 +442,32 @@ Class SWWMGesture : SWWMWeapon
XZW4 C 2;
XZW4 D 2 A_Headpat();
XZW4 EF 2;
XZW4 GHI 1;
XZW4 GH 1;
HeadpatLoop:
XZW4 I 1;
XZW3 YZ 1;
XZW4 AB 1;
XZW4 C 2;
XZW4 D 2 A_Headpat();
XZW4 EF 2;
XZW4 GHI 1;
XZW4 GH 1;
XZW4 I 1
{
if ( player.cmd.buttons&BT_USE )
{
if ( FindInventory("RagekitPower") )
{
A_CallPlayerGesture("RagepatLoop","RagepatLoop");
return ResolveState("RagepatLoop");
}
else
{
A_CallPlayerGesture("HeadpatLoop","HeadpatLoop");
return ResolveState("HeadpatLoop");
}
}
return ResolveState(null);
}
XZW4 JK 2;
XZW4 L 2 A_StartSound("demolitionist/handsdown",CHAN_WEAPON,CHANF_OVERLAP);
XZW4 MNOP 3;
@ -474,12 +493,32 @@ Class SWWMGesture : SWWMWeapon
XZW4 AC 1;
XZW4 D 1 A_Headpat();
XZW4 EF 1;
XZW4 GI 1;
XZW4 G 1;
RagepatLoop:
XZW4 I 1;
XZW3 Y 1;
XZW4 AC 1;
XZW4 D 1 A_Headpat();
XZW4 EF 1;
XZW4 GIJK 1;
XZW4 G 1;
XZW4 I 1
{
if ( player.cmd.buttons&BT_USE )
{
if ( FindInventory("RagekitPower") )
{
A_CallPlayerGesture("RagepatLoop","RagepatLoop");
return ResolveState("RagepatLoop");
}
else
{
A_CallPlayerGesture("HeadpatLoop","HeadpatLoop");
return ResolveState("HeadpatLoop");
}
}
return ResolveState(null);
}
XZW4 JK 1;
XZW4 L 1 A_StartSound("demolitionist/handsup",CHAN_WEAPON,CHANF_OVERLAP);
XZW4 MNOP 2;
XZW1 A 0 A_HeadpatEnd();

8
zscript/swwm_player.zsc
View file

@ -2989,7 +2989,9 @@ Class Demolitionist : PlayerPawn
XZWH XYZ 1;
XZWI A 1;
XZWI BCDE 2;
XZWI FGH 1;
XZWI FG 1;
HeadpatLoop:
XZWI H 1;
XZWH XYZ 1;
XZWI A 1;
XZWI BCDE 2;
@ -3009,7 +3011,9 @@ Class Demolitionist : PlayerPawn
XZWI FH 1;
XZWH XZ 1;
XZWI BCDE 1;
XZWI FH 1;
XZWI F 1;
RagepatLoop:
XZWI H 1;
XZWH XZ 1;
XZWI BCDE 1;
XZWI FH 1;