OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Improved responsiveness of Biorifle alt-fire.

Browse source 
Small tweaks to Biorifle glob.
Redude size of ANIMDEFS.
Small corrections to biorifle gel (starts with a 3 second countdown, delay before explosion when on surface should be 3 to 10 tics)
This commit is contained in:
Marisa the Magician 2019-02-02 21:13:54 +01:00
commit 4a8b7543e8
2 changed files with 23 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

38
animdefs.txt
View file

@ -1,40 +1,6 @@
texture static1 texture static1
allowdecals allowdecals
random random
pic static1 tics 1 range static4 tics 1
pic static2 tics 1
pic static3 tics 1
pic static4 tics 1
texture invis00 texture invis00
pic invis00 tics 2 range invis31 tics 2
pic invis01 tics 2
pic invis02 tics 2
pic invis03 tics 2
pic invis04 tics 2
pic invis05 tics 2
pic invis06 tics 2
pic invis07 tics 2
pic invis08 tics 2
pic invis09 tics 2
pic invis10 tics 2
pic invis11 tics 2
pic invis12 tics 2
pic invis13 tics 2
pic invis14 tics 2
pic invis15 tics 2
pic invis16 tics 2
pic invis17 tics 2
pic invis18 tics 2
pic invis19 tics 2
pic invis20 tics 2
pic invis21 tics 2
pic invis22 tics 2
pic invis23 tics 2
pic invis24 tics 2
pic invis25 tics 2
pic invis26 tics 2
pic invis27 tics 2
pic invis28 tics 2
pic invis29 tics 2
pic invis30 tics 2
pic invis31 tics 2

29
zscript/biorifle.zsc
View file

@ -195,7 +195,7 @@ Class BioGel : Actor
{ {
Super.PostBeginPlay(); Super.PostBeginPlay();
vel.z += 3; vel.z += 3;
deadtimer = -1; deadtimer = 105;
l = Spawn("BioLight",pos); l = Spawn("BioLight",pos);
l.target = self; l.target = self;
rollvel = FRandom[GES](10,30)*RandomPick[GES](-1,1); rollvel = FRandom[GES](10,30)*RandomPick[GES](-1,1);
@ -274,7 +274,7 @@ Class BioGel : Actor
let bi = BlockThingsIterator.Create(self,4*Scale.x); let bi = BlockThingsIterator.Create(self,4*Scale.x);
while ( bi.Next() ) while ( bi.Next() )
{ {
if ( !bi.Thing || !bi.Thing.bSHOOTABLE || (bi.Thing == b) || ((bi.Thing is 'BioHitbox') && ((bi.Thing.target.master == self) || (bi.Thing.target == master))) ) continue; if ( !bi.Thing || !bi.Thing.bSHOOTABLE || (bi.Thing == b) || ((bi.Thing is 'BioHitbox') && ((bi.Thing.target.master == self) || (bi.Thing.target == master))) || (bi.Thing == target && !bHITOWNER) ) continue;
if ( (Distance2D(bi.Thing)-bi.Thing.radius <= 4*Scale.x) && ((bi.Thing.pos.z <= pos.z+4*Scale.x) && (bi.Thing.pos.z+bi.Thing.height >= pos.z-4*Scale.x)) ) deadtimer = 0; if ( (Distance2D(bi.Thing)-bi.Thing.radius <= 4*Scale.x) && ((bi.Thing.pos.z <= pos.z+4*Scale.x) && (bi.Thing.pos.z+bi.Thing.height >= pos.z-4*Scale.x)) ) deadtimer = 0;
} }
if ( deadtimer-- <= 0 ) if ( deadtimer-- <= 0 )
@ -571,9 +571,9 @@ Class BioGel : Actor
XDeath: XDeath:
TNT1 A 0 A_JumpIf(invoker.HitType==HIT_NONE,"Explode"); TNT1 A 0 A_JumpIf(invoker.HitType==HIT_NONE,"Explode");
TNT1 A 0 A_JumpIf(invoker.HitType==HIT_WALL,2); TNT1 A 0 A_JumpIf(invoker.HitType==HIT_WALL,2);
GELH J 1 Bright A_SetTics(Random[GES](1,3)); GELH J 1 Bright A_SetTics(Random[GES](3,10));
Goto Explode; Goto Explode;
GELS G 1 Bright A_SetTics(Random[GES](1,3)); GELS G 1 Bright A_SetTics(Random[GES](3,10));
Goto Explode; Goto Explode;
Explode: Explode:
TNT1 A 0 A_Jump(255,"Explode1","Explode2","Explode3"); TNT1 A 0 A_Jump(255,"Explode1","Explode2","Explode3");
@ -602,7 +602,7 @@ Class BioGlob : BioGel
override void AlignSelf() override void AlignSelf()
{ {
Super.AlignSelf(); Super.AlignSelf();
if ( !bAMBUSH ) numsplash = int(2*Scale.x)-1; if ( !bAMBUSH && (Scale.x > 1) ) numsplash = int(2*Scale.x)-1;
} }
override void Tick() override void Tick()
{ {
@ -613,14 +613,15 @@ Class BioGlob : BioGel
{ {
if ( numsplash-- <= 0 ) return; if ( numsplash-- <= 0 ) return;
Vector3 dir = (ofs+(FRandom[GES](-.8,.8),FRandom[GES](-.8,.8),FRandom[GES](-.8,.8))).unit(); Vector3 dir = (ofs+(FRandom[GES](-.8,.8),FRandom[GES](-.8,.8),FRandom[GES](-.8,.8))).unit();
A_SetScale(scale.x-0.15);
let d = Spawn("BioSplash",pos+ofs*4); let d = Spawn("BioSplash",pos+ofs*4);
d.target = target; d.target = target;
d.master = self; d.master = self;
d.scale *= FRandom[GES](0.5,0.7); d.scale *= FRandom[GES](0.5,0.7);
d.angle = atan2(dir.y,dir.x); d.angle = atan2(dir.y,dir.x);
d.pitch = -asin(dir.z); d.pitch = -asin(dir.z);
d.vel = (cos(d.angle)*cos(d.pitch),sin(d.angle)*cos(d.pitch),-sin(d.pitch))*d.speed*FRandom[GES](0.3,0.4); d.vel = (cos(d.angle)*cos(d.pitch),sin(d.angle)*cos(d.pitch),-sin(d.pitch))*d.speed*FRandom[GES](0.4,0.6);
d.vel.z -= 3; d.vel.z -= 2;
} }
} }
} }
@ -744,7 +745,14 @@ Class BioRifle : UTWeapon
BIOF A 1 A_BioFire(); BIOF A 1 A_BioFire();
BIOF BCDEFGHI 1; BIOF BCDEFGHI 1;
Goto Idle; Goto Idle;
AltCheck:
TNT1 A 1;
TNT1 A 0 A_JumpIf(player.cmd.buttons&BT_ALTATTACK,"AltCheck");
TNT1 A 0 A_Overlay(PSP_WEAPON,"AltRelease");
TNT1 A 1;
Wait;
AltFire: AltFire:
BIOC A 0 A_Overlay(-9999,"AltCheck");
BIOC A 4 A_BeginCharge(); BIOC A 4 A_BeginCharge();
BIOC B 5 A_ChargeUp(); BIOC B 5 A_ChargeUp();
BIOC CD 5; BIOC CD 5;
@ -790,7 +798,12 @@ Class BioRifle : UTWeapon
BIOM A 1; BIOM A 1;
BIOM A 0 A_Refire("AltHeld"); BIOM A 0 A_Refire("AltHeld");
AltRelease: AltRelease:
BIOE A 1 { invoker.charge = min(5.1,invoker.charge+0.1); } BIOE A 1
{
invoker.charge = min(5.1,invoker.charge+0.1);
A_Overlay(-9999,null);
A_WeaponOffset(0,32); // fix sudden psprite lowering
}
BIOF A 2 A_BioFire(true); BIOF A 2 A_BioFire(true);
BIOF BCDEFGHI 2; BIOF BCDEFGHI 2;
Goto Idle; Goto Idle;