OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Final batch of swingers implemented.

Browse source
This commit is contained in:
Marisa the Magician 2018-09-15 16:11:37 +02:00
commit 816ccd7b37
14 changed files with 62 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

6
zscript/biorifle.zsc
View file

@ -662,12 +662,12 @@ Class BioRifle : UTWeapon
{
p = Spawn("BioGlob",origin);
p.A_SetScale(1.0+invoker.charge*0.8);
UTMainHandler.DoSwing(self,(FRandom[GES](-0.6,-1.3),FRandom[GES](-0.9,-0.2)),1+invoker.charge*0.3,-0.1,3,SWING_Spring2,3);
UTMainHandler.DoSwing(self,(FRandom[GES](-0.6,-1.3),FRandom[GES](-0.9,-0.2)),1+invoker.charge*0.3,-0.1,3,SWING_Spring,3,2);
}
else
{
p = Spawn("BioGel",origin);
UTMainHandler.DoSwing(self,(FRandom[GES](-0.6,-1.3),FRandom[GES](-0.9,-0.2)),2,-0.5,2,SWING_Spring2,2);
UTMainHandler.DoSwing(self,(FRandom[GES](-0.6,-1.3),FRandom[GES](-0.9,-0.2)),2,-0.5,2,SWING_Spring,2,2);
}
p.angle = angle;
p.pitch = BulletSlope();
@ -697,7 +697,7 @@ Class BioRifle : UTWeapon
{
Weapon weap = Weapon(invoker);
if ( !weap ) return;
UTMainHandler.DoSwing(self,(FRandom[GES](-1,1),FRandom[GES](-1,1)),0.02*invoker.charge,0,5,SWING_Spring2);
UTMainHandler.DoSwing(self,(FRandom[GES](-1,1),FRandom[GES](-1,1)),0.02*invoker.charge,0,5,SWING_Spring,0,2);
if ( invoker.charge >= 5.1 ) return;
if ( weap.Ammo1.Amount <= 0 ) return;
if ( !weap.DepleteAmmo(weap.bAltFire,true,1) ) return;