From edc342fc6baf5a089c405161bfd08e4b402ddd14 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sat, 22 Jan 2022 17:06:49 +0100 Subject: [PATCH] More of those rebalances. --- language.version | 4 ++-- zscript/handler/swwm_handler_damage.zsc | 2 +- zscript/weapons/swwm_deepdarkimpact.zsc | 2 +- zscript/weapons/swwm_deepdarkimpact_fx.zsc | 6 +++--- zscript/weapons/swwm_jackhammer.zsc | 6 +++--- zscript/weapons/swwm_jackhammer_fx.zsc | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/language.version b/language.version index 854d3d40b..7e5085d5b 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r121 \cu(Sat 22 Jan 16:38:26 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.2pre r121 \cu(2022-01-22 16:38:26)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r122 \cu(Sat 22 Jan 17:06:49 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.2pre r122 \cu(2022-01-22 17:06:49)\c-"; diff --git a/zscript/handler/swwm_handler_damage.zsc b/zscript/handler/swwm_handler_damage.zsc index 6e4e572bc..70cc765ce 100644 --- a/zscript/handler/swwm_handler_damage.zsc +++ b/zscript/handler/swwm_handler_damage.zsc @@ -190,7 +190,7 @@ extend Class SWWMHandler { if ( (e.Thing.bBOSS||e.Thing.FindInventory("BossMarker")) && ((e.DamageType == 'Dash') || (e.DamageType == 'Buttslam')) ) SWWMUtility.AchievementProgressInc("bossdash",1,src.player); - if ( e.DamageType == 'Push' ) + if ( (e.Inflictor is 'DeepImpact') && (e.DamageType == 'Push') ) SWWMUtility.AchievementProgressInc("sneeze",1,src.player); else if ( e.DamageType == 'Buttslam' ) SWWMUtility.AchievementProgressInc("butts",1,src.player); diff --git a/zscript/weapons/swwm_deepdarkimpact.zsc b/zscript/weapons/swwm_deepdarkimpact.zsc index 4ce8720d0..0e77beb84 100644 --- a/zscript/weapons/swwm_deepdarkimpact.zsc +++ b/zscript/weapons/swwm_deepdarkimpact.zsc @@ -205,7 +205,7 @@ Class DeepImpact : SWWMWeapon double avgdist = list[i].avgdist/list[i].nhits; double dmg = 5000.*(1.-clamp(avgdist/250.,0.,1.)); SWWMUtility.DoKnockback(list[i].a,avgdir,dmg*35.); - list[i].a.DamageMobj(invoker,self,int(dmg/350.),'Push',DMG_THRUSTLESS); + list[i].a.DamageMobj(invoker,self,int(dmg/250.),'Push',DMG_THRUSTLESS); } let ti = ThinkerIterator.Create("Actor"); Actor m; diff --git a/zscript/weapons/swwm_deepdarkimpact_fx.zsc b/zscript/weapons/swwm_deepdarkimpact_fx.zsc index 4f56910ae..54c722792 100644 --- a/zscript/weapons/swwm_deepdarkimpact_fx.zsc +++ b/zscript/weapons/swwm_deepdarkimpact_fx.zsc @@ -32,7 +32,7 @@ Class AirBullet : FastProjectile } Vector3 dirto = level.Vec3Offset(pos,target.Vec3Offset(0,0,target.Height/2.)); dirto /= dirto.length(); - SWWMUtility.DoKnockback(target,vel.unit()*.6+dirto*.4,120000); + SWWMUtility.DoKnockback(target,vel.unit()*.6+dirto*.4,200000); if ( !target.player ) target.bBLASTED = true; return damage; } @@ -56,7 +56,7 @@ Class AirBullet : FastProjectile s.alpha *= .2; } bAMBUSH = true; - SWWMUtility.DoExplosion(self,GetMissileDamage(0,0),0,80,ignoreme:target); + SWWMUtility.DoExplosion(self,GetMissileDamage(0,0),0,100,25,ignoreme:target); bAMBUSH = false; tcnt++; if ( tcnt < 2 ) return; @@ -76,7 +76,7 @@ Class AirBullet : FastProjectile if ( (target.pos.z > target.floorz) && target.TestMobjZ() ) mm *= 1.6; SWWMUtility.DoKnockback(target,dir,mm); } - SWWMUtility.DoExplosion(self,0,150000,150,ignoreme:target); + SWWMUtility.DoExplosion(self,0,200000,200,80,ignoreme:target); A_QuakeEx(6,6,6,20,0,250,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:1.); A_StartSound("deepimpact/bullethit",CHAN_VOICE,CHANF_DEFAULT,1.,.3); A_SprayDecal("ImpactMark"); diff --git a/zscript/weapons/swwm_jackhammer.zsc b/zscript/weapons/swwm_jackhammer.zsc index 5547ebaa2..ab16f1b4f 100644 --- a/zscript/weapons/swwm_jackhammer.zsc +++ b/zscript/weapons/swwm_jackhammer.zsc @@ -53,8 +53,8 @@ Class PusherWeapon : SWWMWeapon { A_QuakeEx(2,2,2,7,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:.8); A_AlertMonsters(swwm_uncapalert?0:1200); - int dmg = int(3+invoker.chargelevel*7); - if ( invoker.chargelevel > .4 ) invoker.chargelevel -= FRandom[Pusher](.01,.04); + int dmg = int(4+invoker.chargelevel*8); + if ( invoker.chargelevel > .4 ) invoker.chargelevel -= FRandom[Pusher](.01,.03); if ( d.HitType == TRACE_HitActor ) { double diff = deltaangle(self.angle,AngleTo(d.HitActor)); @@ -134,7 +134,7 @@ Class PusherWeapon : SWWMWeapon { A_QuakeEx(8,8,8,12,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:.8); A_AlertMonsters(swwm_uncapalert?0:1600); - int dmg = int(150*invoker.chargelevel); + int dmg = int(240*invoker.chargelevel); if ( d.HitType == TRACE_HitActor ) { double diff = deltaangle(self.angle,AngleTo(d.HitActor)); diff --git a/zscript/weapons/swwm_jackhammer_fx.zsc b/zscript/weapons/swwm_jackhammer_fx.zsc index 1747f06f4..8ed2e02af 100644 --- a/zscript/weapons/swwm_jackhammer_fx.zsc +++ b/zscript/weapons/swwm_jackhammer_fx.zsc @@ -102,7 +102,7 @@ Class PusherProjectile : Actor Speed 50; Radius 10; Height 10; - DamageFunction clamp(int(3*vel.length()),0,150); + DamageFunction clamp(int(4*vel.length()),0,200); DamageType 'Tenderize'; BounceType "Hexen"; BounceFactor 1.0;