OrdinaryMagician/stinger_m
OrdinaryMagician/stinger_m
1
Fork 0
Code Activity

Adjustments and bugfixes.

Browse source
This commit is contained in:
Marisa the Magician 2019-09-20 13:37:05 +02:00
commit e4c93e892b
7 changed files with 39 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
zscript/unrealcommon.zsc
View file

@ -197,7 +197,7 @@ Class UPlayer : UTPlayer
if ( dsp )
{
dsp.Ammo1.MaxAmount = 90;
if ( player.ReadyWeapon == dsp )
if ( (player.ReadyWeapon == dsp) && (player.PendingWeapon == WP_NOCHANGE) )
dsp.pendingupgrade = 4;
else
{
@ -261,8 +261,7 @@ Class UPlayer : UTPlayer
if ( ((player.ReadyWeapon is 'URifle') && !sting_rifle && (player.buttons&BT_ALTATTACK)) || ((player.ReadyWeapon is 'Peacemaker') && player.buttons&BT_ALTATTACK) )
return;
let psp = player.FindPSprite(PSP_WEAPON);
if ( ((player.ReadyWeapon is 'UBioRifle') && (player.buttons&BT_ALTATTACK))
|| (player.ReadyWeapon is 'Eightball')
if ( (player.ReadyWeapon is 'Eightball')
|| ((player.ReadyWeapon is 'DispersionPistol') && DispersionPistol(player.ReadyWeapon).bCharging)
|| ((player.ReadyWeapon is 'UBioRifle') && UBioRifle(player.ReadyWeapon).bCharging)
|| (player.ReadyWeapon is 'Razorjack') )
@ -274,7 +273,7 @@ Class UPlayer : UTPlayer
&& psp.CurState.InStateSequence(player.ReadyWeapon.FindState("Hold")))
|| (player.ReadyWeapon is 'UFlamethrower') || (player.ReadyWeapon is 'UMinigun')
|| ((player.ReadyWeapon is 'Bonesaw') && player.buttons&BT_ATTACK)
|| ((player.ReadyWeapon is 'Impaler') && psp.CurState.InStateSequence(player.ReadyWeapon.FindState("AltHold"))) )
|| ((player.ReadyWeapon is 'Impaler') && player.buttons&BT_ALTATTACK) )
{
if ( !InStateSequence(CurState,FindState("MissileRep")) )
SetStateLabel("MissileRep");