OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

1.3 update, cleaning up and GZDoom 4.11 features.

Browse source
This commit is contained in:
Marisa the Magician 2023-08-25 23:45:52 +02:00
commit ac4c53b3ef
21 changed files with 279 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

26
zscript/enforcer.zsc
View file

@ -33,9 +33,7 @@ Class EnforcerLight : DynamicLight
}
if ( target.player )
{
Vector3 x, y, z, origin;
[x, y, z] = dt_Utility.GetAxes(target.angle,target.pitch,target.roll);
origin = level.Vec3Offset(target.Vec2OffsetZ(0,0,target.player.viewz),x*12);
Vector3 origin = dt_Utility.GetFireOffset(target,12,0,0);
SetOrigin(origin,true);
}
else SetOrigin(target.pos,true);
@ -378,13 +376,13 @@ Class Enforcer : UTWeapon
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*3+ydir*y);
else origin = level.Vec3Offset(origin,-z+ydir*y*4);
Vector3 origin;
if ( alt ) origin = dt_Utility.GetFireOffset(self,10,ydir,-3);
else origin = dt_Utility.GetFireOffset(self,10,4*ydir,-1);
double a = FRandom[Enforcer](0,360), s = FRandom[Enforcer](0,alt?invoker.altaccuracy:0.004);
[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);
@ -488,6 +486,7 @@ Class Enforcer : UTWeapon
Weapon.Kickback 180;
UTWeapon.DropAmmo 10;
UTWeapon.NameColor "C8 C8 FF";
UTWeapon.BobDamping 1.2;
Enforcer.ClipCount 20;
Enforcer.SlaveClipCount 20;
}
@ -507,7 +506,8 @@ Class Enforcer : UTWeapon
invoker.slavedown = false;
if ( !invoker.slaveactive && (CountInv("Enforcer") > 1) )
{
invoker.slavereload = invoker.slaverefire = 0;
invoker.slavereload = false;
invoker.slaverefire = 0;
A_Overlay(2,"LeftReady");
}
}
@ -634,8 +634,8 @@ Class Enforcer : UTWeapon
UTPlayer(self).PlayReloading();
invoker.slavereload = (flak_enforcerreload&&invoker.slaveactive&&(invoker.slaveclipcount<min(invoker.default.slaveclipcount,invoker.Ammo1.Amount)));
Vector3 x, y, z, origin;
[x,y,z] = dt_Utility.GetAxes(angle,pitch,roll);
origin = level.Vec3Offset(Vec2OffsetZ(0,0,player.viewz),x*4.+y*4.-z*8.);
[x,y,z] = dt_Utility.GetPlayerAxes(self);
origin = dt_Utility.GetFireOffset(self,4,4,-8);
let c = Spawn("EnforcerMag",origin);
c.angle = angle;
c.pitch = pitch;
@ -668,8 +668,8 @@ Class Enforcer : UTWeapon
UTPlayer(self).PlayReloading();
invoker.slavereload = false;
Vector3 x, y, z, origin;
[x,y,z] = dt_Utility.GetAxes(angle,pitch,roll);
origin = level.Vec3Offset(Vec2OffsetZ(0,0,player.viewz),x*4.-y*4.-z*8.);
[x,y,z] = dt_Utility.GetPlayerAxes(self);
origin = dt_Utility.GetFireOffset(self,4,-4,-8);
let c = Spawn("EnforcerMag",origin);
c.angle = angle;
c.pitch = pitch;