From 82c6be5cdc09861ff5761a70b4b89bbf94efcf35 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Sat, 23 Jul 2022 17:54:41 +0200 Subject: [PATCH] Sheen kill taunts + some fixes. --- language.def_voice | 6 +++++- language.es_voice | 10 +++------- language.version | 4 ++-- sndinfo.defvoice | 2 ++ sounds/voice/default/va/demosheenkill1.ogg | Bin 0 -> 14369 bytes sounds/voice/default/va/demosheenkill2.ogg | Bin 0 -> 16353 bytes zscript/handler/swwm_handler_damage.zsc | 2 ++ zscript/utility/swwm_utility.zsc | 20 ++++++++++++++++++-- 8 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 sounds/voice/default/va/demosheenkill1.ogg create mode 100644 sounds/voice/default/va/demosheenkill2.ogg diff --git a/language.def_voice b/language.def_voice index e074ced47..b23b7eec9 100644 --- a/language.def_voice +++ b/language.def_voice @@ -431,6 +431,10 @@ SWWM_SUBS_DEFAULT_BLAST3 = "Pew!"; SWWM_SUBS_DEFAULT_BLAST4 = "Boom!"; SWWM_SUBS_DEFAULT_BLAST5 = "Kapow!"; SWWM_SUBS_DEFAULT_BLAST6 = "Kaboom."; +// Sheen HMG kill +SWWM_SUBS_DEFAULT_NSHEENKILL = "2"; +SWWM_SUBS_DEFAULT_SHEENKILL1 = "Dakka dakka dakka."; +SWWM_SUBS_DEFAULT_SHEENKILL2 = "Cry some more!"; // Wall busting SWWM_SUBS_DEFAULT_BUSTKILL = "Bustin' makes me feel good~ ♪"; // Cyberdemon killed by parrying @@ -449,7 +453,7 @@ SWWM_SUBS_DEFAULT_EAT2 = "*eating*"; SWWM_SUBS_DEFAULT_EAT3 = "Mmmmm..."; SWWM_SUBS_DEFAULT_EAT4 = "Mmmm! Tasty!"; SWWM_SUBS_DEFAULT_EAT5 = "Mah favorite!"; -// Hurtfloor damage +// Hurtfloor damage (currently unused) SWWM_SUBS_DEFAULT_NHURTFLOOR = "5"; SWWM_SUBS_DEFAULT_HURTFLOOR1 = "Ffffff..."; SWWM_SUBS_DEFAULT_HURTFLOOR2 = "Huff oof..."; diff --git a/language.es_voice b/language.es_voice index c350c66b3..16ca4287d 100644 --- a/language.es_voice +++ b/language.es_voice @@ -372,40 +372,36 @@ SWWM_SUBS_DEFAULT_BUTTONPUSH2 = "Bup."; SWWM_SUBS_DEFAULT_FALLING = "¡Wiiiiiiiiiiii~!"; /// Special kill messages (rare) // Buttslam -SWWM_SUBS_DEFAULT_NASSKILL = "2"; SWWM_SUBS_DEFAULT_ASSKILL1 = "¡Es hora del CULO!"; SWWM_SUBS_DEFAULT_ASSKILL2 = "¡Masacrando con las nalgas!"; SWWM_SUBS_DEFAULT_ASSKILL3 = "Muy bien, ¿Quien quiere comer CULO?"; // Lead ball crit -SWWM_SUBS_DEFAULT_NBALLSKILL = "2"; SWWM_SUBS_DEFAULT_BALLSKILL1 = "¡Peligrosa Acción de Pelotas!"; SWWM_SUBS_DEFAULT_BALLSKILL2 = "¡Cuidado al jugar con vuestras pelotas, chavales!"; // Explosion kill -SWWM_SUBS_DEFAULT_NBLAST = "6"; SWWM_SUBS_DEFAULT_BLAST1 = "¡Bang!"; SWWM_SUBS_DEFAULT_BLAST2 = "¡Bangabangbangbang!"; SWWM_SUBS_DEFAULT_BLAST3 = "¡Píu!"; SWWM_SUBS_DEFAULT_BLAST4 = "¡Bum!"; SWWM_SUBS_DEFAULT_BLAST5 = "¡Kapow!"; SWWM_SUBS_DEFAULT_BLAST6 = "Kabúm."; +// Sheen HMG kill +SWWM_SUBS_DEFAULT_SHEENKILL2 = "¡Llora un poco más!"; // Wall busting // Cyberdemon killed by parrying SWWM_SUBS_DEFAULT_CYBULLY = "Solo estoy haciendo un poco de cyberbullying..."; // Cacodemon petting -SWWM_SUBS_DEFAULT_NPETCACO = "3"; SWWM_SUBS_DEFAULT_PETCACO1 = "¡Caco!"; SWWM_SUBS_DEFAULT_PETCACO2 = "¿Quien es un buen cacodemonio?"; SWWM_SUBS_DEFAULT_PETCACO3 = "Albondiguilla~"; // (rare) skull key pickup gesture SWWM_SUBS_DEFAULT_SKULLGET = "Ay, probre Yorick. Yo le conocía, Horacio."; // Grilled Cheese Sandwich eating -SWWM_SUBS_DEFAULT_NEAT = "5"; SWWM_SUBS_DEFAULT_EAT1 = "Ñam ñam ñam... Ñam ñam..."; SWWM_SUBS_DEFAULT_EAT2 = "*comiendo*"; SWWM_SUBS_DEFAULT_EAT4 = "¡Mmmm! ¡Rico!"; SWWM_SUBS_DEFAULT_EAT5 = "¡Mi favorito!"; -// Hurtfloor damage -SWWM_SUBS_DEFAULT_NHURTFLOOR = "5"; +// Hurtfloor damage (currently unused) SWWM_SUBS_DEFAULT_HURTFLOOR2 = "Buf uf..."; SWWM_SUBS_DEFAULT_HURTFLOOR3 = "Uuuu uuu... Aaa aaaa ooo..."; SWWM_SUBS_DEFAULT_HURTFLOOR4 = "Uuu aa aaaa... Ooo..."; diff --git a/language.version b/language.version index 158e3786f..c353a897d 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r203 \cu(Sat 23 Jul 17:05:04 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r203 \cu(2022-07-23 17:05:04)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r204 \cu(Sat 23 Jul 17:54:41 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r204 \cu(2022-07-23 17:54:41)\c-"; diff --git a/sndinfo.defvoice b/sndinfo.defvoice index 1bcac391a..43dcc58b6 100644 --- a/sndinfo.defvoice +++ b/sndinfo.defvoice @@ -402,6 +402,8 @@ voice/default/blast3 sounds/voice/default/va/demoblast3.ogg voice/default/blast4 sounds/voice/default/va/demoblast4.ogg voice/default/blast5 sounds/voice/default/va/demoblast5.ogg voice/default/blast6 sounds/voice/default/va/demoblast6.ogg +voice/default/sheenkill1 sounds/voice/default/va/demosheenkill1.ogg +voice/default/sheenkill2 sounds/voice/default/va/demosheenkill2.ogg voice/default/petcaco1 sounds/voice/default/va/demopetcaco1.ogg voice/default/petcaco2 sounds/voice/default/va/demopetcaco2.ogg voice/default/petcaco3 sounds/voice/default/va/demopetcaco3.ogg diff --git a/sounds/voice/default/va/demosheenkill1.ogg b/sounds/voice/default/va/demosheenkill1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..a4aa0c6ff9ca3dece4715fb7a007dc759e403b32 GIT binary patch literal 14369 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 literal 0 HcmV?d00001 diff --git a/sounds/voice/default/va/demosheenkill2.ogg b/sounds/voice/default/va/demosheenkill2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..7ea631f2ad47f744317a4c971be6873ab30708ef GIT binary patch literal 16353 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 literal 0 HcmV?d00001 diff --git a/zscript/handler/swwm_handler_damage.zsc b/zscript/handler/swwm_handler_damage.zsc index d9f9ce9bf..6f57f71ab 100644 --- a/zscript/handler/swwm_handler_damage.zsc +++ b/zscript/handler/swwm_handler_damage.zsc @@ -182,6 +182,8 @@ extend Class SWWMHandler if ( !Random[DemoLines](0,3) && 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')) ) + lc = AddOneliner("sheenkill",1,15); if ( !lc ) { if ( !Random[DemoLines](0,(e.Thing.bBOSS||e.Thing.FindInventory("BossMarker"))?1:4) ) diff --git a/zscript/utility/swwm_utility.zsc b/zscript/utility/swwm_utility.zsc index 85005ab1d..726314ee5 100644 --- a/zscript/utility/swwm_utility.zsc +++ b/zscript/utility/swwm_utility.zsc @@ -1141,6 +1141,22 @@ Class SWWMUtility Victim.vel += Momentum; } + // fixes some false positives for explosion taunts + static bool IsExplosiveSource( Actor s ) + { + if ( s is 'DemolitionistShockwave' ) return false; + if ( s is 'BigPunchSplash' ) return false; + if ( s is 'AirBullet' ) return false; + if ( s is 'SaltBeam' ) return false; + if ( s is 'CorrodeDebuff' ) return false; + if ( s is 'CorrosiveSplash' ) return false; + if ( s is 'TheBall' ) return false; + if ( s is 'SilverAirRip' ) return false; + if ( s is 'SilverImpact' ) return false; + if ( s is 'SheenTrail' ) return false; + return true; + } + // complete spherical and more accurate replacement of A_Explode // 100% free of the buggery GZDoom's own splash damage has // returns the number of shootables hit/killed @@ -1235,7 +1251,7 @@ Class SWWMUtility let hnd = SWWMHandler(EventHandler.Find("SWWMHandler")); if ( !hnd || (hnd.psectors.Size() <= 1) ) { - if ( (Instigator is 'Demolitionist') && haskilled ) + if ( (Instigator is 'Demolitionist') && haskilled && IsExplosiveSource(Source) ) { let demo = Demolitionist(Instigator); if ( (gametic > demo.lastbang+30) && (!hnd || (gametic > hnd.lastcombat+10)) && !Random[DemoLines](0,1) ) @@ -1317,7 +1333,7 @@ Class SWWMUtility if ( (!a || (a.Health <= 0)) && (!(flags&DE_COUNTENEMIES) || hostile) && (!(flags&DE_COUNTSTEALTH) || inactive) ) nkill++; } } - if ( (Instigator is 'Demolitionist') && haskilled ) + if ( (Instigator is 'Demolitionist') && haskilled && IsExplosiveSource(Source) ) { let demo = Demolitionist(Instigator); if ( (gametic > demo.lastbang+30) && (gametic > hnd.lastcombat+10) && !Random[DemoLines](0,1) )