OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

1.0.3 release:

Browse source 
- Fix Biorifle and Impact Hammer still being able to fire if player died while charging.
 - Fix Minigun not shooting bullets immediately on refire.
 - Fix Minigun playing unwind animation on death.
This commit is contained in:
Marisa the Magician 2019-10-29 13:28:17 +01:00
commit 1f5778177a
4 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
zscript/biorifle.zsc
View file

@ -802,6 +802,11 @@ Class BioRifle : UTWeapon
AltCheck:
TNT1 A 1
{
if ( Health <= 0 )
{
invoker.bCharging = false;
return ResolveState("Null");
}
if ( player.cmd.buttons&BT_ALTATTACK )
return ResolveState(null);
player.SetPSprite(PSP_WEAPON,ResolveState("AltRelease"));

7
zscript/impacthammer.zsc
View file

@ -52,6 +52,11 @@ Class ImpactHammer : UTWeapon
}
action void A_ChargeUp()
{
if ( Health <= 0 )
{
player.SetPSprite(-9999,ResolveState("Null"));
return;
}
invoker.chargesize += .75/TICRATE;
invoker.count += 1./TICRATE;
if ( invoker.count > .2 )
@ -249,7 +254,7 @@ Class ImpactHammer : UTWeapon
Release:
IMPF A 0
{
A_Overlay(-9999,null);
A_Overlay(-9999,"Null");
if ( self is 'UTPlayer' )
UTPlayer(self).PlayAttacking3();
A_FireBlast();

2
zscript/minigun.zsc
View file

@ -188,6 +188,7 @@ Class Minigun : UTWeapon
return;
}
weap.bAltFire = !!(player.cmd.buttons&BT_ALTATTACK);
invoker.bcnt = 5;
A_Refire("Hold");
}
@ -229,6 +230,7 @@ Class Minigun : UTWeapon
FireDummy:
TNT1 A 1
{
if ( Health <= 0 ) return ResolveState("Null");
let weap = Weapon(invoker);
if ( !(player.cmd.buttons&(BT_ATTACK|BT_ALTATTACK)) || (weap.Ammo1.Amount <= 0) )
{