diff --git a/language.version b/language.version index 49760ca28..54a6e810a 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r312 \cu(Fri 12 Aug 16:58:13 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r312 \cu(2022-08-12 16:58:13)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r313 \cu(Fri 12 Aug 17:56:35 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r313 \cu(2022-08-12 17:56:35)\c-"; diff --git a/zscript/dlc1/swwm_hammertime.zsc b/zscript/dlc1/swwm_hammertime.zsc index 87d2a4a6d..e9e63a860 100644 --- a/zscript/dlc1/swwm_hammertime.zsc +++ b/zscript/dlc1/swwm_hammertime.zsc @@ -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. )