OrdinaryMagician/stinger_m
OrdinaryMagician/stinger_m
1
Fork 0
Code Activity

1.3 update and whatnot.

Browse source
This commit is contained in:
Marisa the Magician 2023-08-25 23:47:10 +02:00
commit 2f56442ffb
47 changed files with 153 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

16
zscript/betamag.zsc
View file

@ -264,14 +264,14 @@ Class Betamag : UnrealWeapon
A_OverlayRenderstyle(-2,STYLE_Add);
}
Vector3 x, y, z, x2, y2, z2;
[x, y, z] = dt_Utility.GetAxes(angle,pitch,roll);
Vector3 origin = level.Vec3Offset(Vec2OffsetZ(0,0,player.viewz),10*x);
[x, y, z] = dt_Utility.GetPlayerAxes(self);
int ydir = slave?1:-1;
if ( alt ) origin = level.Vec3Offset(origin,-z*2.5+ydir*y*1.5);
else origin = level.Vec3Offset(origin,-z*1.5+ydir*y*2);
Vector3 origin;
if ( alt ) origin = dt_Utility.GetFireOffset(self,10,ydir*1.5,-2.5);
else origin = dt_Utility.GetFireOffset(self,10,ydir*2,-1.5);
double a = FRandom[Betamag](0,360), s = FRandom[Betamag](0,alt?invoker.altaccuracy:0.);
if ( invoker.Amount > 1 ) s = s*2.+FRandom[Betamag](0,0.01);
[x2, y2, z2] = dt_Utility.GetAxes(angle,BulletSlope(),roll);
[x2, y2, z2] = dt_Utility.GetPlayerAxesAutoAimed(self);
Vector3 dir = dt_Utility.ConeSpread(x2,y2,z2,a,s);
FLineTraceData d;
LineTrace(atan2(dir.y,dir.x),10000,asin(-dir.z),TRF_ABSPOSITION,origin.z,origin.x,origin.y,d);
@ -409,7 +409,8 @@ Class Betamag : UnrealWeapon
invoker.slavedown = false;
if ( !invoker.slaveactive && (CountInv("Betamag") > 1) )
{
invoker.slavespin = invoker.slavewhip = invoker.slaverefire = 0;
invoker.slavespin = invoker.slavewhip = false;
invoker.slaverefire = 0;
player.setpsprite(2,ResolveState("LeftReady"));
}
}
@ -445,7 +446,8 @@ Class Betamag : UnrealWeapon
A_WeaponReady(WRF_ALLOWRELOAD|WRF_ALLOWZOOM);
if ( !invoker.slaveactive && (CountInv("Betamag") > 1) )
{
invoker.slavespin = invoker.slavewhip = invoker.slaverefire = 0;
invoker.slavespin = invoker.slavewhip = false;
invoker.slaverefire = 0;
player.setpsprite(2,ResolveState("LeftReady"));
}
}