OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Hammer tertiary fire tweaks.

Browse source
This commit is contained in:
Mari the Deer 2022-08-11 21:49:47 +02:00
commit e97dd5d035
6 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
zscript/dlc1/swwm_hammertime.zsc
View file

@ -53,7 +53,7 @@ Class ItamexHammer : SWWMWeapon
A_BumpFOV(1.+invoker.charge*.001);
Vector3 x, y, z;
[x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll);
SWWMUtility.DoKnockback(self,x,2000.*invoker.charge);
SWWMUtility.DoKnockback(self,x,1000.*invoker.charge);
invoker.hitcnt = 0;
invoker.spintime = 0;
}
@ -69,14 +69,15 @@ Class ItamexHammer : SWWMWeapon
{
A_SetAngle(angle+invoker.charge*.4,SPF_INTERPOLATE);
A_SetPitch(pitch*.9,SPF_INTERPOLATE);
invoker.charge = max(30.,invoker.charge-1.);
invoker.charge = max(30.,invoker.charge-2.);
if ( (player.cmd.buttons&BT_ZOOM) && !(player.oldbuttons&BT_ZOOM) )
invoker.charge = min(100.,invoker.charge+50.);
invoker.charge = min(100.,invoker.charge+20.);
A_SoundVolume(CHAN_WEAPONEXTRA,(invoker.charge/100.)**.5);
A_BumpFOV(1.+invoker.charge*.001);
Vector3 x, y, z;
[x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll);
SWWMUtility.DoKnockback(self,(cos(angle),sin(angle),.004),3000.*invoker.charge);
SWWMUtility.DoKnockback(self,(x.x,x.y,x.z*.2),2000.*invoker.charge);
if ( vel.z < 0 ) vel.z *= 1.-invoker.charge*.008;
A_QuakeEx(1,1,1,15,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.1);
A_PlayerFire();
invoker.spintime++;
@ -87,7 +88,7 @@ Class ItamexHammer : SWWMWeapon
A_QuakeEx(5,5,5,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.35);
A_AlertMonsters(swwm_uncapalert?0:800);
A_WeaponOffset(32,0,WOF_ADD|WOF_INTERPOLATE);
SWWMUtility.DoKnockback(self,-x,6000.*invoker.charge);
SWWMUtility.DoKnockback(self,-(x.x,x.y,x.z*.2),6000.*invoker.charge);
invoker.hitcnt = 3;
}
if ( invoker.charge <= 30. )