From b7493d867d500861be20746c1968e27c9ca425f6 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Mon, 20 Nov 2023 11:51:34 +0100 Subject: [PATCH] Tweak kill oneliner chances. --- language.version | 4 ++-- zscript/handler/swwm_handler_damage.zsc | 10 +++++----- zscript/utility/swwm_utility_blast.zsc | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/language.version b/language.version index feec73b87..f97cae198 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1009 \cu(Sun 19 Nov 22:44:32 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r1009 \cu(2023-11-19 22:44:32)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1010 \cu(Mon 20 Nov 11:51:34 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r1010 \cu(2023-11-20 11:51:34)\c-"; diff --git a/zscript/handler/swwm_handler_damage.zsc b/zscript/handler/swwm_handler_damage.zsc index a0e853cef..068789b8b 100644 --- a/zscript/handler/swwm_handler_damage.zsc +++ b/zscript/handler/swwm_handler_damage.zsc @@ -119,7 +119,7 @@ extend Class SWWMHandler { if ( e.Thing.IsFriend(e.DamageSource) ) lastcombat = AddOneliner("friendhit",1,10); - else if ( (!lastcombat || (gametic > lastcombat+90)) && !Random[DemoLines](0,(e.DamageSource.bBOSS||e.DamageSource.FindInventory("BossMarker"))?1:4) ) + else if ( (!lastcombat || (gametic > lastcombat+90)) && !Random[DemoLines](0,(e.DamageSource.bBOSS||e.DamageSource.FindInventory("BossMarker"))?2:5) ) lastcombat = AddOneliner("gethit",1,15); } highesttic = gametic; @@ -173,14 +173,14 @@ extend Class SWWMHandler { int lc = 0; Inventory buff = inflictor?inflictor.FindInventory('ParriedBuff'):null; - if ( !Random[DemoLines](0,3) && buff && (e.Thing is 'Cyberdemon') && (inflictor is 'Rocket') && (buff.tracer == e.Thing) ) lc = AddOneliner("cybully",1,15); + if ( !Random[DemoLines](0,2) && buff && (e.Thing is 'Cyberdemon') && (inflictor is 'Rocket') && (buff.tracer == e.Thing) ) lc = AddOneliner("cybully",1,15); else if ( !Random[DemoLines](0,(e.Thing.bBOSS||e.Thing.FindInventory("BossMarker"))?1:2) && (e.DamageType == 'CriticalConcussion') ) lc = AddOneliner("ballskill",1,15); - else if ( !Random[DemoLines](0,(e.Thing.bBOSS||e.Thing.FindInventory("BossMarker"))?2:5) && (e.DamageType == 'Buttslam') ) lc = AddOneliner("asskill",1,15); - else if ( !Random[DemoLines](0,(e.Thing.bBOSS||e.Thing.FindInventory("BossMarker"))?3:6) && ((inflictor is 'HeavyMahSheenGun') || (inflictor is 'SheenTrail')) ) + else if ( !Random[DemoLines](0,(e.Thing.bBOSS||e.Thing.FindInventory("BossMarker"))?2:4) && (e.DamageType == 'Buttslam') ) lc = AddOneliner("asskill",1,15); + else if ( !Random[DemoLines](0,(e.Thing.bBOSS||e.Thing.FindInventory("BossMarker"))?3:5) && ((inflictor is 'HeavyMahSheenGun') || (inflictor is 'SheenTrail')) ) lc = AddOneliner("sheenkill",1,15); if ( !lc ) { - if ( !Random[DemoLines](0,(e.Thing.bBOSS||e.Thing.FindInventory("BossMarker"))?1:4) ) + if ( !Random[DemoLines](0,(e.Thing.bBOSS||e.Thing.FindInventory("BossMarker"))?2:4) ) lastcombat = AddOneliner("scorekill",1,15); } else lastcombat = lc; diff --git a/zscript/utility/swwm_utility_blast.zsc b/zscript/utility/swwm_utility_blast.zsc index bf03947fa..58e1dfd52 100644 --- a/zscript/utility/swwm_utility_blast.zsc +++ b/zscript/utility/swwm_utility_blast.zsc @@ -148,7 +148,7 @@ extend Class SWWMUtility { let hnd = SWWMHandler(EventHandler.Find("SWWMHandler")); let demo = Demolitionist(Instigator); - if ( hnd && (gametic > demo.lastbang+30) && (gametic > hnd.lastcombat+10) && !Random[DemoLines](0,1) ) + if ( hnd && (gametic > demo.lastbang+30) && (gametic > hnd.lastcombat+10) && !Random[DemoLines](0,3) ) demo.lastbang = SWWMHandler.AddOneLiner("blast",2,10); } return nhit, nkill;