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

28
zscript/miscitems.zsc
View file

@ -191,12 +191,10 @@ Class VoiceBox : UnrealInventory
override bool Use( bool pickup )
{
if ( pickup || bActive ) return false;
Vector3 x, y, z;
[x, y, z] = dt_Utility.GetAxes(Owner.angle,Owner.pitch,Owner.roll);
Vector3 origin = level.Vec3Offset(Owner.Vec2OffsetZ(0,0,Owner.player.viewz),x*20-z*8);
Vector3 origin = dt_Utility.GetFireOffset(Owner,20,0,-8);
box = Spawn("VoiceBoxActive",origin);
box.ReactionTime = Charge;
box.vel = x*9.;
box.vel = dt_Utility.GetPlayerViewDir(Owner)*9.;
box.vel.z += 1.;
box.target = Owner;
box.angle = Owner.angle;
@ -395,14 +393,12 @@ Class Flare : UnrealInventory
override bool Use( bool pickup )
{
if ( pickup ) return false;
Vector3 x, y, z;
[x, y, z] = dt_Utility.GetAxes(Owner.angle,Owner.pitch,Owner.roll);
Vector3 origin = level.Vec3Offset(Owner.Vec2OffsetZ(0,0,Owner.player.viewz),x*10-z*8);
Vector3 origin = dt_Utility.GetFireOffset(Owner,10,0,-8);
let a = Spawn("FlareThrown",origin);
a.target = Owner;
a.angle = Owner.angle;
a.pitch = Owner.pitch;
a.vel += x*a.speed;
a.vel += dt_Utility.GetPlayerViewDir(Owner)*a.speed;
return true;
}
States
@ -677,14 +673,12 @@ Class BetaFlare : UnrealInventory
override bool Use( bool pickup )
{
if ( pickup || bActive || (charge < defaultcharge) ) return false;
Vector3 x, y, z;
[x, y, z] = dt_Utility.GetAxes(Owner.angle,Owner.pitch,Owner.roll);
Vector3 origin = level.Vec3Offset(Owner.Vec2OffsetZ(0,0,Owner.player.viewz),x*10-z*8);
Vector3 origin = dt_Utility.GetFireOffset(Owner,10,0,-8);
let a = Spawn(ThrownClass,origin);
a.target = Owner;
a.angle = Owner.angle;
a.pitch = Owner.pitch;
a.vel += x*a.speed;
a.vel += dt_Utility.GetPlayerViewDir(Owner)*a.speed;
for ( Inventory i=Owner.Inv; i; i=i.Inv )
{
if ( !(i is 'BetaFlare') ) continue;
@ -1046,7 +1040,7 @@ Class Forcefield : UnrealInventory
override bool Use( bool pickup )
{
if ( pickup ) return false;
Vector3 origin = Owner.Vec2OffsetZ(0,0,Owner.player.viewz);
Vector3 origin = dt_Utility.GetPlayerEye(Owner);
FLineTraceData d;
Owner.LineTrace(Owner.angle,90,Owner.pitch,TRF_ABSPOSITION,origin.z,origin.x,origin.y,data:d);
if ( d.HitType != TRACE_HitNone ) origin = level.Vec3Offset(d.HitLocation,-d.HitDir*(GetDefaultByType("ForceFieldEffect").radius+8));
@ -1193,8 +1187,8 @@ Class UFlashLight1 : DynamicLight
Destroy();
return;
}
if ( target.player ) SetOrigin(target.Vec2OffsetZ(0,0,target.player.viewz),true);
else SetOrigin(target.vec3Offset(0,0,target.height*0.75),true);
if ( target.player ) SetOrigin(dt_Utility.GetPlayerEye(target),true);
else SetOrigin(target.Vec3Offset(0,0,target.height*0.75),true);
A_SetAngle(target.angle,SPF_INTERPOLATE);
A_SetPitch(target.pitch,SPF_INTERPOLATE);
if ( UnrealInventory(master) )
@ -1467,7 +1461,7 @@ Class SentryItem : UnrealInventory
tracer.SetStateLabel("PackUp");
return false;
}
Vector3 origin = Owner.Vec2OffsetZ(0,0,Owner.player.viewz);
Vector3 origin = dt_Utility.GetPlayerEye(Owner);
FLineTraceData d;
Owner.LineTrace(Owner.angle,80,Owner.pitch,TRF_ABSPOSITION,origin.z,origin.x,origin.y,data:d);
if ( d.HitType != TRACE_HitNone )
@ -2218,7 +2212,7 @@ Class SentryGunItem : UnrealInventory
override bool Use( bool pickup )
{
if ( pickup ) return false;
Vector3 origin = Owner.Vec2OffsetZ(0,0,Owner.player.viewz);
Vector3 origin = dt_Utility.GetPlayerEye(Owner);
FLineTraceData d;
Owner.LineTrace(Owner.angle,60,Owner.pitch,TRF_ABSPOSITION,origin.z,origin.x,origin.y,data:d);
if ( d.HitType != TRACE_HitNone )