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

8
zscript/powerups.zsc
View file

@ -47,6 +47,7 @@ Class DamageAmpLight : DynamicLight
Class DamageAmplifier : Powerup
{
Actor l;
int lasteffect;
Default
{
@ -63,6 +64,7 @@ Class DamageAmplifier : Powerup
override void InitEffect()
{
Super.InitEffect();
lasteffect = int.min;
l = Spawn("DamageAmpLight",Owner.pos);
l.target = Owner;
l.master = self;
@ -88,9 +90,11 @@ Class DamageAmplifier : Powerup
void FireEffect()
{
if ( gametic < lasteffect ) return;
if ( EffectTics < 350 ) Owner.A_PlaySound("udamage/fire2",CHAN_7,1.0,false,0.25);
else Owner.A_PlaySound("udamage/fire1",CHAN_7,1.0,false,0.25);
UTMainHandler.DoFlash(Owner,Color(96,238,0,255),10);
UTMainHandler.DoFlash(Owner,Color(48,238,0,255),6);
lasteffect = gametic+5; // prevent excess flash
}
override void ModifyDamage( int damage, Name damageType, out int newdamage, bool passive )
@ -480,7 +484,7 @@ Class mkLight : DynamicLight
Destroy();
return;
}
if ( target.player ) SetOrigin((target.pos.x,target.pos.y,target.player.viewz),true);
if ( target.player ) SetOrigin(target.Vec2OffsetZ(0,0,target.player.viewz),true);
else SetOrigin(target.vec3Offset(0,0,target.height*0.75),true);
A_SetAngle(target.angle,SPF_INTERPOLATE);
A_SetPitch(target.pitch,SPF_INTERPOLATE);