OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Remove first person smoke effects from Pusher.

Browse source
This commit is contained in:
Mari the Deer 2020-11-23 16:36:53 +01:00
commit 5ea8f8018d
2 changed files with 1 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

36
zscript/swwm_jackhammer.zsc
View file

@ -450,16 +450,6 @@ Class PusherWeapon : SWWMWeapon
}
if ( swwm_omnibust ) BusterWall.BustLinetrace(d,dmg,self,d.HitDir,d.HitLocation.z);
}
int numpt = Random[Pusher](1,3);
for ( int i=0; i<numpt; i++ )
{
let s = Spawn("SWWMViewSmoke",origin);
SWWMViewSmoke(s).ofs = (10,2,-3.5);
s.target = self;
s.special1 = 1;
s.scale *= 1.4;
s.alpha *= .03;
}
if ( swwm_extraalert || !(invoker.hitcnt%20) ) A_AlertMonsters(swwm_uncapalert?0:500);
invoker.hitcnt++;
}
@ -547,19 +537,6 @@ Class PusherWeapon : SWWMWeapon
p.target = self;
SWWMUtility.DoKnockback(self,x,85000.);
}
if ( !gone )
{
int numpt = Random[Pusher](3,5);
for ( int i=0; i<numpt; i++ )
{
let s = Spawn("SWWMViewSmoke",origin);
SWWMViewSmoke(s).ofs = (10,2,-3.5);
s.target = self;
s.special1 = 2;
s.scale *= 1.4;
s.alpha *= .1;
}
}
A_AlertMonsters(swwm_uncapalert?0:1200);
invoker.chargelevel = 0.;
}
@ -576,19 +553,6 @@ Class PusherWeapon : SWWMWeapon
{
invoker.chargelevel = min(1.,invoker.chargelevel+.035);
if ( invoker.chargelevel >= .5 ) invoker.vibe = min(1.,invoker.vibe+.02);
Vector3 x, y, z;
[x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll);
Vector3 origin = level.Vec3Offset(Vec2OffsetZ(0,0,player.viewz),10*x+2*y-3*z);
int numpt = Random[Pusher](3,5);
for ( int i=0; i<numpt; i++ )
{
let s = Spawn("SWWMViewSmoke",origin);
SWWMViewSmoke(s).ofs = (10,2,-3);
s.target = self;
s.special1 = 1;
s.scale *= 1.4;
s.alpha *= .1*(invoker.chargelevel-invoker.vibe);
}
A_WeaponOffset(FRandom[Pusher](-1,1)*(invoker.chargelevel-invoker.vibe),32+FRandom[Pusher](-1,1)*(invoker.chargelevel-invoker.vibe));
if ( !(player.cmd.buttons&BT_ALTATTACK) && (invoker.chargelevel > .3) )
player.SetPSprite(PSP_WEAPON,ResolveState("AltRelease"));