OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix for some weapon pickups "twitching".

Browse source
This commit is contained in:
Mari the Deer 2023-07-01 14:28:00 +02:00
commit 098191dcc6
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r819 \cu(Sat 1 Jul 14:18:38 CEST 2023)\c-";
SWWM_SHORTVER="\cw1.3pre r819 \cu(2023-07-01 14:18:38)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r820 \cu(Sat 1 Jul 14:28:00 CEST 2023)\c-";
SWWM_SHORTVER="\cw1.3pre r820 \cu(2023-07-01 14:28:00)\c-";

8
zscript/weapons/swwm_sparkyboi.zsc
View file

@ -149,6 +149,11 @@ Class Sparkster : SWWMWeapon
A_StartSound("biospark/fail",CHAN_WEAPON,CHANF_OVERLAP);
}
action void A_UpdatePickup()
{
frame = invoker.doublestacc;
}
override void MarkPrecacheSounds()
{
Super.MarkPrecacheSounds();
@ -224,8 +229,7 @@ Class Sparkster : SWWMWeapon
States
{
Spawn:
XZW1 A -1 NoDelay A_JumpIf(invoker.doublestacc,1);
XZW1 B -1;
XZW1 A -1 NoDelay A_UpdatePickup();
Stop;
Select:
XZW2 G 2

6
zscript/weapons/swwm_tastytreat.zsc
View file

@ -325,7 +325,7 @@ Class CandyGun : SWWMWeapon
CandyGun(spare).AmmoGive1 = 0;
CandyGun(spare).clipcount = 0;
CandyGun(spare).chambered = false;
spare.SetState(spare.SpawnState+1);
spare.frame = 1;
spare.DropTime = 30;
spare.bSpecial = spare.bSolid = false;
Ammo2.Amount--;
@ -334,7 +334,7 @@ Class CandyGun : SWWMWeapon
swapdrop = false;
let drop = Super.CreateTossable(amt);
if ( (drop == self) && (clipcount <= 0) && !chambered )
SetState(SpawnState+2);
frame = 2;
return drop;
}
@ -378,7 +378,7 @@ Class CandyGun : SWWMWeapon
States
{
Spawn:
XZW1 ABC -1;
XZW1 A -1;
Stop;
Select:
XZW2 B 2