OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Slight hammer damage nerf.

Browse source
This commit is contained in:
Mari the Deer 2022-08-12 17:56:35 +02:00
commit 2ef3c6bf65
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
zscript/dlc1/swwm_hammertime.zsc
View file

@ -19,7 +19,7 @@ Class ItamexHammer : SWWMWeapon
Vector3 x, y, z;
[x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll);
SWWMUtility.DoKnockback(self,x,120000.);
if ( A_Melee(100,"itamex/hit",1.6,1.1,1.,MELEE_Rip|MELEE_FleshSound|MELEE_HammerHit) )
if ( A_Melee(80,"itamex/hit",1.6,1.1,1.,MELEE_Rip|MELEE_FleshSound|MELEE_HammerHit) )
{
A_BumpFOV(.9);
A_QuakeEx(5,5,5,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.35);
@ -35,7 +35,7 @@ Class ItamexHammer : SWWMWeapon
Vector3 x, y, z;
[x, y, z] = swwm_CoordUtil.GetAxes(pitch,angle,roll);
SWWMUtility.DoKnockback(self,x,3000.*invoker.charge);
if ( A_Melee(int(100+invoker.charge*2),"itamex/hit",2.,1.1,1.2,MELEE_Rip|MELEE_FleshSound|MELEE_HammerHit|MELEE_Vertical|MELEE_ExtraWide|MELEE_ForceBust) )
if ( A_Melee(int(80+invoker.charge*1.6),"itamex/hit",2.,1.1,1.2,MELEE_Rip|MELEE_FleshSound|MELEE_HammerHit|MELEE_Vertical|MELEE_ExtraWide|MELEE_ForceBust) )
{
A_BumpFOV(.9);
A_QuakeEx(5,5,5,20,0,1,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.35);
@ -91,19 +91,19 @@ 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.x,x.y,x.z*.2),2000.*invoker.charge);
SWWMUtility.DoKnockback(self,(x.x,x.y,x.z*.1),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++;
if ( invoker.hitcnt > 0 ) invoker.hitcnt--;
else if ( A_Melee(int(80+invoker.charge*1.2),"itamex/hit",2.4,2.,1.1,MELEE_Rip|MELEE_FleshSound|MELEE_ExtraWide|MELEE_HammerHit) )
else if ( A_Melee(int(80+invoker.charge*.8),"itamex/hit",2.4,2.,1.1,MELEE_Rip|MELEE_FleshSound|MELEE_ExtraWide|MELEE_HammerHit) )
{
A_BumpFOV(.9);
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.x,x.y,x.z*.2),6000.*invoker.charge);
SWWMUtility.DoKnockback(self,-(x.x,x.y,x.z*.1),6000.*invoker.charge);
invoker.hitcnt = 3;
}
if ( invoker.charge <= 30. )