From 8c3139bfdddedf91aac210b6b3a0bfab62a13f2f Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Fri, 5 Feb 2021 23:03:49 +0100 Subject: [PATCH] =?UTF-8?q?Increase=20base=20damage=20of=20dashing=20(15?= =?UTF-8?q?=20=E2=86=92=2030).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- language.version | 4 ++-- zscript/swwm_player.zsc | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/language.version b/language.version index adfa13376..afeafd0df 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r252 \cu(Wed 3 Feb 18:13:49 CET 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r252 \cu(2021-02-03 18:13:49)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r253 \cu(Fri 5 Feb 23:03:49 CET 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r253 \cu(2021-02-05 23:03:49)\c-"; diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index 179a34e32..cbdaa277d 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -904,14 +904,14 @@ Class Demolitionist : PlayerPawn Vector3 pushdir = dirto*.1+dir*.9; if ( !a.bDONTTHRUST && (a.Mass < maxmass) && (a.bSHOOTABLE || a.bPUSHABLE) ) { - a.vel += pushdir*(15+(spd*20/max(50,a.mass))); + a.vel += pushdir*(25+(spd*20/max(50,a.mass))); if ( (a.pos.z <= a.floorz) || !a.TestMobjZ() ) a.vel.z += 5+(spd*(5/max(50,a.mass))); } int flg = DMG_THRUSTLESS; if ( raging ) flg |= DMG_FOILINVUL; if ( !a.player && !a.bDONTBLAST ) a.bBLASTED = true; - int dmg = int(15+spd*2.5); + int dmg = int(25+spd*2.5); bool buttslam = false; // BUTTSLAM if ( dir dot viewdir < -.3 ) @@ -965,7 +965,7 @@ Class Demolitionist : PlayerPawn { // see if we can bust it let tempme = new("LineTracer"); // gross hack to pass needed data - int dmg = int(15+spd*2.5); + int dmg = int(25+spd*2.5); if ( raging ) dmg *= 8; bool buttslam = false; // BUTTSLAM @@ -985,7 +985,7 @@ Class Demolitionist : PlayerPawn let ps = Spawn("BigPunchSplash",Vec3Offset(0,0,Height)); ps.damagetype = buttslam?'Buttslam':'Dash'; ps.target = self; - ps.special1 = int(15+spd*2.5); + ps.special1 = int(25+spd*2.5); raging.DoHitFX(); } A_StartSound("demolitionist/bump",CHAN_DAMAGE,CHANF_OVERLAP); @@ -1017,7 +1017,7 @@ Class Demolitionist : PlayerPawn let ps = Spawn("BigPunchSplash",Vec3Offset(0,0,Height)); ps.damagetype = (dir dot viewdir < -3.)?'Buttslam':'Dash'; ps.target = self; - ps.special1 = int(15+spd*2.5); + ps.special1 = int(25+spd*2.5); raging.DoHitFX(); } } @@ -1056,7 +1056,7 @@ Class Demolitionist : PlayerPawn { // see if we can bust it let tempme = new("LineTracer"); // gross hack to pass needed data - int dmg = int(15+spd*2.5); + int dmg = int(25+spd*2.5); if ( raging ) dmg *= 8; if ( buttslam ) dmg *= 3; tempme.Results.HitLine = BlockingLine; @@ -1080,7 +1080,7 @@ Class Demolitionist : PlayerPawn let ps = Spawn("BigPunchSplash",Vec3Offset(dir.x*radius,dir.y*radius,(tempme.Results.Tier==TIER_UPPER)?Height:(tempme.Results.Tier==TIER_LOWER)?0:(Height/2))); ps.damagetype = buttslam?'Buttslam':'Dash'; ps.target = self; - ps.special1 = int(15+spd*2.5); + ps.special1 = int(30+spd*2.5); raging.DoHitFX(); } A_StartSound("demolitionist/bump",CHAN_DAMAGE,CHANF_OVERLAP); @@ -1097,7 +1097,7 @@ Class Demolitionist : PlayerPawn // wallbump bumped = true; A_StartSound("demolitionist/bump",CHAN_DAMAGE,CHANF_OVERLAP); - bumptic = gametic+int(20+spd/4.); + bumptic = gametic+int(25+spd/4.); A_QuakeEx(8,8,8,16,0,128,"",QF_RELATIVE|QF_SCALEDOWN); A_AlertMonsters(swwm_uncapalert?0:800); vel *= .2; @@ -1110,7 +1110,7 @@ Class Demolitionist : PlayerPawn let ps = Spawn("BigPunchSplash",Vec3Offset(dir.x*radius,dir.y*radius,Height/2.)); ps.damagetype = (dir dot viewdir < -3.)?'Buttslam':'Dash'; ps.target = self; - ps.special1 = int(15+spd*2.5); + ps.special1 = int(25+spd*2.5); raging.DoHitFX(); } // activate it