From d760abd3d40d3ef0b6ef96bcd2be6310f25cd288 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Fri, 9 Sep 2022 11:40:50 +0200 Subject: [PATCH] Combat Hammer alt/tertiary buff. --- language.version | 4 ++-- zscript/dlc1/swwm_hammertime.zsc | 4 ++-- zscript/dlc1/swwm_hammertime_fx.zsc | 4 ++-- zscript/swwm_player_fx.zsc | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/language.version b/language.version index 13c647890..fb12854c8 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r418 \cu(Fri 9 Sep 11:29:09 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r418 \cu(2022-09-09 11:29:09)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r419 \cu(Fri 9 Sep 11:40:50 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r419 \cu(2022-09-09 11:40:50)\c-"; diff --git a/zscript/dlc1/swwm_hammertime.zsc b/zscript/dlc1/swwm_hammertime.zsc index 00548b6d6..6f486294b 100644 --- a/zscript/dlc1/swwm_hammertime.zsc +++ b/zscript/dlc1/swwm_hammertime.zsc @@ -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*1.5),"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*2.),"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(100+invoker.charge),"itamex/hit",2.4,2.,1.1,MELEE_Rip|MELEE_FleshSound|MELEE_ExtraWide|MELEE_HammerHit) ) + else if ( A_Melee(int(100+invoker.charge*1.5),"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 a4f12b578..65030d3b3 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,60+special1,100000+special1*2000,80+special1,40,DE_BLAST|DE_EXTRAZTHRUST|DE_NONEXPLOSIVE,'HammerShockwave',target); + SWWMUtility.DoExplosion(self,80+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); @@ -95,6 +95,6 @@ Class HammerRadiusShockwave : DemolitionistRadiusShockwave { Obituary "$O_HAMMER"; DamageType 'HammerShockwave'; - DamageFunction int(200*alpha); + DamageFunction int(150*alpha); } } diff --git a/zscript/swwm_player_fx.zsc b/zscript/swwm_player_fx.zsc index e3a303a13..f11c2d0f5 100644 --- a/zscript/swwm_player_fx.zsc +++ b/zscript/swwm_player_fx.zsc @@ -449,7 +449,7 @@ Class DemolitionistRadiusShockwave : Actor { target.vel.xy += vel.xy.unit()*(30000./max(50,target.mass))*alpha; if ( (target.pos.z <= floorz) || !target.TestMobjZ() ) - target.vel.z += (4000./max(50,target.mass))*alpha; + target.vel.z += (8000./max(50,target.mass))*alpha; } return damage; }