diff --git a/language.version b/language.version index 1450710b1..b7b2d9e75 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r377 \cu(Fri 26 Aug 17:59:13 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r377 \cu(2022-08-26 17:59:14)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r378 \cu(Sat 27 Aug 15:12:45 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r378 \cu(2022-08-27 15:12:45)\c-"; diff --git a/zscript/dlc1/swwm_hammertime.zsc b/zscript/dlc1/swwm_hammertime.zsc index c7b820537..00548b6d6 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(80,"itamex/hit",1.6,1.1,1.,MELEE_Rip|MELEE_FleshSound|MELEE_HammerHit) ) + if ( A_Melee(100,"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(80+invoker.charge*1.6),"itamex/hit",2.,1.1,1.2,MELEE_Rip|MELEE_FleshSound|MELEE_HammerHit|MELEE_Vertical|MELEE_ExtraWide|MELEE_ForceBust) ) + if ( A_Melee(int(100+invoker.charge*1.5),"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); @@ -97,7 +97,7 @@ Class ItamexHammer : SWWMWeapon A_PlayerFire(); invoker.spintime++; if ( invoker.hitcnt > 0 ) invoker.hitcnt--; - else if ( A_Melee(int(80+invoker.charge*.8),"itamex/hit",2.4,2.,1.1,MELEE_Rip|MELEE_FleshSound|MELEE_ExtraWide|MELEE_HammerHit) ) + else if ( A_Melee(int(100+invoker.charge),"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); diff --git a/zscript/dlc1/swwm_hammertime_fx.zsc b/zscript/dlc1/swwm_hammertime_fx.zsc index 3c3fe24a2..a4f12b578 100644 --- a/zscript/dlc1/swwm_hammertime_fx.zsc +++ b/zscript/dlc1/swwm_hammertime_fx.zsc @@ -19,7 +19,7 @@ Class HammerShockwave : Actor { Super.PostBeginPlay(); A_QuakeEx(5,5,5,20,0,300+special1*4,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:200,rollIntensity:.8); - SWWMUtility.DoExplosion(self,50+special1,100000+special1*2000,80+special1,40,DE_BLAST|DE_EXTRAZTHRUST|DE_NONEXPLOSIVE,'HammerShockwave',target); + SWWMUtility.DoExplosion(self,60+special1,100000+special1*2000,80+special1,40,DE_BLAST|DE_EXTRAZTHRUST|DE_NONEXPLOSIVE,'HammerShockwave',target); for ( int i=0; i<360; i+=5 ) { Vector3 pvel = SWWMUtility.Vec3FromAngles(FRandom[ExploS](0,360),FRandom[ExploS](-90,90))*FRandom[ExploS](1,3);