OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Portal awareness adjustments to various vector operations.

Browse source 
Got rid of the deprecated Matrix4.GetAxes method. Next step is to get rid of more stuff by migrating to libeye.
Mirrored Translocator model so it shows the actually detailed side. At some point in UT's development it got flipped around for some reason.
Weapon code cleanup (most noticeable on states).
Backported scope shader from Doomreal.
Added optional "dummied out" Sniper zoom sounds from a dubious source.
This commit is contained in:
Marisa the Magician 2019-09-28 17:14:55 +02:00
commit fb96c7523e
27 changed files with 445 additions and 777 deletions
Download patch file Download diff file Expand all files Collapse all files

68
zscript/biorifle.zsc
View file

@ -116,7 +116,7 @@ Class BioHitbox : Actor
Destroy();
return;
}
SetOrigin(target.pos-(0,0,height*0.5),true);
SetOrigin(target.Vec3Offset(0,0,-height*0.5),true);
}
override bool CanCollideWith( Actor other, bool passive )
{
@ -698,7 +698,7 @@ Class BioRifle : UTWeapon
Vector3 x, y, z;
double a, s;
[x, y, z] = dt_CoordUtil.GetAxes(pitch,angle,roll);
Vector3 origin = (pos.x,pos.y,player.viewz)+10.0*x+8.0*y-5.0*z;
Vector3 origin = level.Vec3Offset(Vec2OffsetZ(0,0,player.viewz),10*x+8*y-5*z);
Actor p;
if ( alt )
{
@ -733,6 +733,7 @@ Class BioRifle : UTWeapon
Weapon weap = Weapon(invoker);
if ( !weap ) return;
invoker.charge = 0;
invoker.special1 = 0;
A_PlaySound("ges/charge",CHAN_WEAPON);
invoker.bCharging = true;
}
@ -740,6 +741,12 @@ Class BioRifle : UTWeapon
{
Weapon weap = Weapon(invoker);
if ( !weap ) return;
if ( invoker.special1 > 0 )
{
invoker.special1--;
return;
}
invoker.special1 = 2;
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;
@ -788,63 +795,26 @@ Class BioRifle : UTWeapon
BIOF BCDEFGHI 1;
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;
TNT1 A 1
{
if ( player.cmd.buttons&BT_ALTATTACK )
return ResolveState(null);
player.SetPSprite(PSP_WEAPON,ResolveState("AltRelease"));
return ResolveState("Null");
}
Wait;
AltFire:
BIOC A 0 A_Overlay(-9999,"AltCheck");
BIOC A 4 A_BeginCharge();
BIOC B 5 A_ChargeUp();
BIOC CD 5;
BIOC E 0 A_Refire(1);
Goto AltRelease;
BIOC E 5 A_ChargeUp();
BIOC FG 5;
BIOC H 0 A_Refire(1);
Goto AltRelease;
BIOC H 5 A_ChargeUp();
BIOC IJ 5;
BIOC K 0 A_Refire(1);
Goto AltRelease;
BIOC K 5 A_ChargeUp();
BIOC LM 5;
BIOC N 0 A_Refire(1);
Goto AltRelease;
BIOC N 5 A_ChargeUp();
BIOC OP 5;
BIOC Q 0 A_Refire(1);
Goto AltRelease;
BIOC Q 5 A_ChargeUp();
BIOC RS 5;
BIOC T 0 A_Refire(1);
Goto AltRelease;
BIOC T 5 A_ChargeUp();
BIOC UV 5;
BIOC W 0 A_Refire(1);
Goto AltRelease;
BIOC W 5 A_ChargeUp();
BIOC XY 5;
BIOC Z 0 A_Refire(1);
Goto AltRelease;
BIOC Z 5 A_ChargeUp();
BIC2 AB 5;
BIC2 C 0 A_Refire(1);
Goto AltRelease;
BIC2 C 5 A_ChargeUp();
BIC2 DE 5;
BIOM A 0 A_Refire(1);
Goto AltRelease;
AltHeld:
BIOC BCDEFGHIJKLMNOPQRSTUVWXYZ 5 A_ChargeUp();
BIC2 ABCDE 5 A_ChargeUp();
BIOM A 1;
BIOM A 0 A_Refire("AltHeld");
Wait;
AltRelease:
BIOE A 1
{
invoker.charge = min(5.1,invoker.charge+0.1);
A_Overlay(-9999,null);
A_WeaponOffset(0,32); // fix sudden psprite lowering
if ( self is 'UTPlayer' )
UTPlayer(self).PlayAttacking3();
}