From 3b1b0bc4ec88e67802c45a92ee8b16a2534065e3 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Tue, 29 Dec 2020 14:37:43 +0100 Subject: [PATCH] owo new patron. Fix Ynykron vortices sucking in non-damaging missiles. Adjust some tags. --- language.def_base | 5 +++-- language.es_base | 11 ++++++----- language.version | 2 +- sndinfo.txt | 1 + sounds/SQUEAK.ogg | Bin 0 -> 17157 bytes zscript/swwm_credits.zsc | 1 + zscript/swwm_handler.zsc | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 sounds/SQUEAK.ogg diff --git a/language.def_base b/language.def_base index 5725f9c9e..c7a3be161 100644 --- a/language.def_base +++ b/language.def_base @@ -700,7 +700,7 @@ FN_NDEMON_FUN1 = "Greenie"; FN_NDEMON_FUN2 = "Angry Greens"; FN_NDEMON_FUN3 = "Spinach Demon"; // obituaries -O_PUSHER = "%k opened some air holes into %o."; +O_PUSHER = "%k carefully removed %o's cavities."; O_DEEPIMPACT = "%o was impacted deeply by %k."; O_DEEPIMPACT_WEAK = "%k coughed in %o's general direction."; O_EXPLODIUM = "%k inflicted severe knee explosions onto %o."; @@ -835,9 +835,10 @@ OB_MBOSS = "%o was assploded by the magic boi's Explodey Staff."; OB_CBOSS = "%o was ghosted by the holy boi's Ghostpenis."; OB_HERESIARCH = "%o saw that coming."; DEFOB_PIG = "%o angered the hams."; // gzdoom will look this up since it has no obituary assigned +OB_PIG = "%o angered the hams."; // for when gzdoom fixes this (come on, graf) // eviternity obituaries OB_FCAPTAIN = "%o was zapped by an angry green lad."; -OB_ANNIHIL = "%o ate cybergoat rocket."; +OB_ANNIHIL = "%o was terminated by a cybergoat."; OB_NDEMON = "%o got scronched."; OB_ANGEL1 = "%o pissed off that angel."; OB_ANGEL2 = "%o really pissed off that angel."; diff --git a/language.es_base b/language.es_base index a30161ef6..cf6c949a2 100644 --- a/language.es_base +++ b/language.es_base @@ -554,7 +554,7 @@ FN_WOLFSS_FUN1 = "Votante de VOX"; FN_WOLFSS_FUN2 = "Rubito"; FN_WOLFSS_FUN3 = "Cosas nasis"; FN_DOG_FUN = "Perrete"; -FN_CHICKEN_FUN = "Gallina"; +FN_CHICKEN_FUN = "POLLO"; FN_CLINK_FUN1 = "Rasguñitos"; FN_CLINK_FUN2 = "Cacharro"; FN_CLINK_FUN3 = "Chatarra"; @@ -630,8 +630,8 @@ FN_PIG_FUN = "Cochinillo"; FN_ANGEL_FUN = "Un Puto Ángel"; FN_ASTRAL = "Cacodemonio Astral"; FN_ASTRAL_FUN1 = "Bolita Gris"; -FN_ASTRAL_FUN2 = "Bolita Gris"; -FN_ASTRAL_FUN3 = "Bolita Gris"; +FN_ASTRAL_FUN2 = "Albóndiga Desaturada"; +FN_ASTRAL_FUN3 = "Cáscara Siseante"; FN_FCAPTAIN = "Capitan Zombi"; FN_FCAPTAIN_FUN1 = "Capullo Verde Tocanarices"; FN_FCAPTAIN_FUN2 = "Enemigo Basura Verde"; @@ -645,7 +645,7 @@ FN_NDEMON_FUN1 = "Verdín"; FN_NDEMON_FUN2 = "Verde Cabreado"; FN_NDEMON_FUN3 = "Demonio de Espinacas"; // obituaries -O_PUSHER = "%k le abrió unos agujeros de ventilación a %o."; +O_PUSHER = "%k le quitó cuidadosamente las caries a %o."; O_DEEPIMPACT = "%o fue impactad@[ao_esp] profundamente por %k."; O_DEEPIMPACT_WEAK = "%k tosió en la dirección general de %o."; O_EXPLODIUM = "%k infligió explosiones de rodilla severas a %o."; @@ -780,9 +780,10 @@ OB_MBOSS = "%o fue reventado por la varita explosiva esa del tío mágico."; OB_CBOSS = "%o fue fantasmado por la verga fantasma del tío santurrón."; OB_HERESIARCH = "%o lo vio venir."; DEFOB_PIG = "%o enfureció a los jamones."; // gzdoom will look this up since it has no obituary assigned +OB_PIG = "%o enfureció a los jamones."; // for when gzdoom fixes this (come on, graf) // eviternity obituaries OB_FCAPTAIN = "%o fue chispad@[ao_esp] por un tío verde cabreado."; -OB_ANNIHIL = "%o comió cohete de cibercabra."; +OB_ANNIHIL = "%o fue exterminad@[ao_esp] por una cibercabra."; OB_NDEMON = "%o fue estronchad@[ao_esp]."; OB_ANGEL1 = "%o cabreó a ese ángel."; OB_ANGEL2 = "%o cabreó mucho a ese ángel."; diff --git a/language.version b/language.version index e998995e5..3f20145f6 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r710 \cu(Sat 26 Dec 23:09:30 CET 2020)"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r711 \cu(Tue 29 Dec 14:37:43 CET 2020)"; diff --git a/sndinfo.txt b/sndinfo.txt index 287cdda0c..62cb18a32 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -7,6 +7,7 @@ brutal/ezmodo sounds/EASYMODO.ogg bestsound sounds/CORK.ogg haha/dab sounds/DAB.ogg bruh sounds/BRUH.ogg +squeak sounds/SQUEAK.ogg saya/giggle1 sounds/saya/saya_giggle1.ogg saya/giggle2 sounds/saya/saya_giggle2.ogg diff --git a/sounds/SQUEAK.ogg b/sounds/SQUEAK.ogg new file mode 100644 index 0000000000000000000000000000000000000000..c3190e80dfbfb19e54115e9df099f8c6282a6eb5 GIT binary patch literal 17157 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 literal 0 HcmV?d00001 diff --git a/zscript/swwm_credits.zsc b/zscript/swwm_credits.zsc index 377f808c3..12764cb1f 100644 --- a/zscript/swwm_credits.zsc +++ b/zscript/swwm_credits.zsc @@ -189,6 +189,7 @@ Class SWWMCreditsMenu : GenericMenu cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Alexa Jones-Gonzales")); cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"John")); cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"NekoMithos")); + cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"bouncytem")); cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Figo")); cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Holly_Rook")); cpatrons.Push(new("SWWMCreditsEntry").Init(sfnt,"Namsan")); diff --git a/zscript/swwm_handler.zsc b/zscript/swwm_handler.zsc index 8e5baebf1..9e913b5bb 100644 --- a/zscript/swwm_handler.zsc +++ b/zscript/swwm_handler.zsc @@ -1737,7 +1737,7 @@ Class SWWMHandler : EventHandler SWWMShadow.Track(e.Thing); } // Ynykron vortex optimization - if ( e.Thing.bSHOOTABLE || e.Thing.bMISSILE ) + if ( e.Thing.bSHOOTABLE || (e.Thing.bMISSILE && !e.Thing.IsZeroDamage()) ) SuckableActors.Push(e.Thing); // vanilla blood color changes if ( (e.Thing.GetClass() == "BaronOfHell") || (e.Thing.GetClass() == "HellKnight") || (e.Thing.GetClass() == "Bishop") || (e.Thing.GetClass() == "Korax") )