From 1aaa3294713f760b0ad2a05d7efc71aa1719f103 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Wed, 13 Jan 2021 19:02:12 +0100 Subject: [PATCH] Fix crash if no tag recolor add-ons are loaded (oops). Omnisight labels game end exits differently. More tips? More tips. 120 now. Localization adjustments. --- language.def_base | 17 +++++++++++++---- language.es_base | 18 ++++++++++++++---- language.version | 2 +- zscript/swwm_hud.zsc | 6 +++++- zscript/swwm_inter.zsc | 4 ++-- zscript/swwm_player.zsc | 2 +- 6 files changed, 36 insertions(+), 13 deletions(-) diff --git a/language.def_base b/language.def_base index e9a6cdc8c..dbf8479aa 100644 --- a/language.def_base +++ b/language.def_base @@ -925,9 +925,10 @@ SWWM_OVERKILL = "Overkill"; SWWM_MULTIKILL = "Multi Kill"; SWWM_SPREEKILL = "Untouchable"; SWWM_BOSSKILL = "Boss Kill"; -SWWM_EXIT = "Exit: "; +SWWM_EXIT = "Exit: "; // can't be used until we can get the names of remote levels SWWM_NEXIT = "Exit"; SWWM_SEXIT = "Secret Exit"; +SWWM_EEXIT = "The End"; SWWM_LEG = "Legendary "; SWWM_LEGPREFIX = "L"; SWWM_LTFORM = "\cfLegendary %s\cf has transformed!\c-"; @@ -946,7 +947,7 @@ SWWM_SELLEXTRA = "\cf%s\cf sold an extra %s\cf. +%d\c-"; SWWM_ALLCLEAR = "\cxLevel all clear! \cf+%d\c-"; SWWM_NEWMISSION = "Mission briefing has been updated."; // intermission tips -SWWM_NINTERTIP = "112"; +SWWM_NINTERTIP = "120"; SWWM_INTERTIP = "Tip #%d:"; SWWM_INTERTIP1 = "The Demolitionist is immune to drowning, poison and even fall damage (excluding instant kill pits)."; SWWM_INTERTIP2 = "The Explodium Gun's altfire has an explosive yield proportional to the bullets left in the mag."; @@ -1006,8 +1007,8 @@ SWWM_INTERTIP55 = "Fun things are fun."; SWWM_INTERTIP56 = "Some of these tips aren't really tips, but you probably already know that."; SWWM_INTERTIP57 = "Kinylum salt is not edible. Not only is it radioactive, but it would easily ignite in your stomach."; SWWM_INTERTIP58 = "Always keep your GZDoom up to date. Especially for mods like this one."; -SWWM_INTERTIP59 = "Carbonated drinks are best consumed with a straw, to avoid damaging your teeth."; -SWWM_INTERTIP60 = "The Reinforced Combat Hammer is pretty strong on its own, but with a Ragekit active, it will be boosted into a beastly headsmasher."; +SWWM_INTERTIP59 = "The Reinforced Combat Hammer is pretty strong on its own, but with a Ragekit active, it will be boosted into a beastly headsmasher."; +SWWM_INTERTIP60 = "Despite its seemingly puny size, the Plasma Blaster has a lot of destructive potential, especially through its charged alt fire."; SWWM_INTERTIP61 = "The Puntzer guns will gradually lose accuracy the quicker you shoot. Always remember: Short, controlled bursts."; SWWM_INTERTIP62 = "\"The Sheen HMG is such a delicious festival of dakka that the mere sound of it firing makes me unleash Leviathan in my panties, and you can quote me on that.\" — Saya Miyamoto"; SWWM_INTERTIP63 = "Pressing fire immediately after hitting something with the Quadravol's blades will result in a boosted point-blank explosion that'll send whatever's at the other end of the gun flying."; @@ -1060,6 +1061,14 @@ SWWM_INTERTIP109 = "Did you know the Hellblazer can show its magazine state when SWWM_INTERTIP110 = "If you didn't know already, the mod can also be used with Heretic and Hexen. New things will be unlocked in each of them, as the overarching story of the mod progresses."; SWWM_INTERTIP111 = "Ironic shitposting is still shitposting."; SWWM_INTERTIP112 = "There are no buses in Gensokyo."; +SWWM_INTERTIP113 = "Carbonated drinks are best consumed with a straw, to avoid damaging your teeth."; +SWWM_INTERTIP114 = "A non-lethal takedown is the most silent takedown."; +SWWM_INTERTIP115 = "There was a tip here, but it's gone now."; +SWWM_INTERTIP116 = "Over two billion devices run Java. That's two billion too many."; +SWWM_INTERTIP117 = "Food tastes best when you make it yourself."; +SWWM_INTERTIP118 = "This tip mesage contains a typo."; +SWWM_INTERTIP119 = "If enemies are getting in your way while you're admiring the shiny new key you just found, you can punch them with your free hand."; +SWWM_INTERTIP120 = "I find that if you just talk, your mouth comes up with stuff."; // intermission fanart SWWM_FANART = "Art: "; SWWM_NFANART = "6"; diff --git a/language.es_base b/language.es_base index 6891fb796..f4b72f275 100644 --- a/language.es_base +++ b/language.es_base @@ -856,12 +856,14 @@ BT_KORAX_FUN = "Korax el Bastardo Feo Asqueroso"; BT_ARCHANGELUS = "Archangelus, Agente Celestial"; BT_ARCHANGELUS_FUN = "Un Putísimo Ángel Enorme"; // targetter +SWWM_OVERKILL = "Sobremuerte"; SWWM_MULTIKILL = "Racha"; SWWM_SPREEKILL = "Intocable"; -SWWM_BOSSKILL = "Jefazo"; -SWWM_EXIT = "Salida: "; +SWWM_BOSSKILL = "Matajefes"; +SWWM_EXIT = "Salida: "; // can't be used until we can get the names of remote levels SWWM_NEXIT = "Salida"; SWWM_SEXIT = "Salida Secreta"; +SWWM_EEXIT = "Fin"; SWWM_LEG = " Legendario"; SWWM_LEGPREFIX = "R"; SWWM_LTFORM = "\cf¡%s\cf Legendario se ha transformado!\c-"; @@ -938,8 +940,8 @@ SWWM_INTERTIP55 = "Las cosas divertidas son divertidas."; SWWM_INTERTIP56 = "Algunos de estos consejos no son realmente consejos, pero seguro que eso ya lo sabes."; SWWM_INTERTIP57 = "La sal de Kinylum no es comestible. No solo es radioactiva, sino que también explotará en tu estómago."; SWWM_INTERTIP58 = "Mantén siempre GZDoom actualizado. Especialmente para mods como este."; -SWWM_INTERTIP59 = "Las bebidas carbonatadas se toman mejor con una pajita, para evitar dañar tus dientes."; -SWWM_INTERTIP60 = "El Mazo de Combate Reforzado es bastante fuerte de por sí, pero con un Ragekit activo, se transformará en todo un revientacráneos."; +SWWM_INTERTIP59 = "El Mazo de Combate Reforzado es bastante fuerte de por sí, pero con un Ragekit activo, se transformará en todo un revientacráneos."; +SWWM_INTERTIP61 = "A pesar de su aparentemente penoso tamaño, el Blaster de Plasma tiene mucho potencial destructivo, sobre todo a través de su fuego alternativo cargado."; SWWM_INTERTIP61 = "Las armas Puntzer perderán puntería gradualmente cuanto más rápido dispares. Recuerda siempre: Ráfagas cortas y controladas."; SWWM_INTERTIP62 = "\"La Ametralladora Sheen es tal festival delicioso de dakka que el mero sonido de dispararla hace que desate a Leviatán en mis bragas, y puedes citarme en eso.\" — Saya Miyamoto"; SWWM_INTERTIP63 = "Pulsando disparo inmediatamente después de golpear algo con las bayonetas del Quadravol resultará en una explosión aumentada a bocajarro que mandará a lo que sea que esté al otro lado volando."; @@ -989,6 +991,14 @@ SWWM_INTERTIP109 = "¿Sabías que el Hellblazer puede mostrar el estado de su ca SWWM_INTERTIP110 = "Si no lo sabías ya, el mod puede ser usado también con Heretic y Hexen. Cosas nuevas serán desbloqueadas en cada uno, a medida que progresa la historia principal del mod."; SWWM_INTERTIP111 = "El shitposting irónico sigue siendo shitposting."; SWWM_INTERTIP112 = "No hay autobuses en Gensokyo."; +SWWM_INTERTIP113 = "Las bebidas carbonatadas se toman mejor con una pajita, para evitar dañar tus dientes."; +SWWM_INTERTIP114 = "Un derribo no letal es el derribo más silencioso."; +SWWM_INTERTIP115 = "Había un consejo aquí, pero se ha ido ahora."; +SWWM_INTERTIP116 = "Más de dos mil millones de dispositivos ejecutan Java. Eso es dos mil millones de más."; +SWWM_INTERTIP117 = "La comida sabe mejor cuando te la preparas tú."; +SWWM_INTERTIP118 = "Este mesaje de consejo tiene una errata."; +SWWM_INTERTIP119 = "Si los enemigos se entrometen mientras estás admirando la brillante llave nueva que acabas de encontrar, puedes darles un puñetazo con tu mano libre."; +SWWM_INTERTIP120 = "Me he dado cuenta de que si te pones a hablar, a tu boca se le van ocurriendo cosas."; // intermission fanart SWWM_FANART = "Arte: "; // achievements diff --git a/language.version b/language.version index 0ae057023..e339f639f 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r748 \cu(Wed 13 Jan 14:30:04 CET 2021)"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r749 \cu(Wed 13 Jan 19:05:14 CET 2021)"; diff --git a/zscript/swwm_hud.zsc b/zscript/swwm_hud.zsc index 3cbf864e4..e710f9784 100644 --- a/zscript/swwm_hud.zsc +++ b/zscript/swwm_hud.zsc @@ -683,7 +683,11 @@ Class SWWMStatusBar : BaseStatusBar if ( poi.type == INT_Key ) tag = String.Format("\cf%s\c-",poi.keytag); else if ( poi.type == INT_Exit ) { - if ( poi.trackedline.special == Exit_Secret ) + if ( (poi.trackedline.special == Teleport_EndGame) + || ((poi.trackedline.special == Exit_Secret) && (level.nextsecretmap.Left(6) == "enDSeQ")) + || ((poi.trackedline.special == Exit_Normal) && (level.nextmap.Left(6) == "enDSeQ")) ) + tag = String.Format("\cg%s\c-",StringTable.Localize("$SWWM_EEXIT")); + else if ( poi.trackedline.special == Exit_Secret ) tag = String.Format("\cx%s\c-",StringTable.Localize("$SWWM_SEXIT")); else tag = String.Format("\cy%s\c-",StringTable.Localize("$SWWM_NEXIT")); } diff --git a/zscript/swwm_inter.zsc b/zscript/swwm_inter.zsc index 8ce5346dd..b7a5eaec2 100644 --- a/zscript/swwm_inter.zsc +++ b/zscript/swwm_inter.zsc @@ -117,11 +117,11 @@ Class SWWMStatScreen : StatusScreen abstract for ( int i=1; i<=maxtip; i++ ) { // skip DLC tips for now - if ( (i >= 60) && (i <= 68) ) continue; + if ( (i >= 59) && (i <= 68) ) continue; ents.Push(i); } // account for skipped dlc tips (important, will crash otherwise) - maxtip -= 9; + maxtip -= 10; if ( pdata.lasttip.Size() >= maxtip ) { // exclude last one, start over diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index 08a72bfd7..2fbd74fb1 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -2898,7 +2898,7 @@ Class DemolitionistSelfLight : Actor if ( tagcolor.a == 0 ) { let lmp = Wads.FindLump("tagcolor.txt"); - if ( lmp ) + if ( lmp != -1 ) { String str = Wads.ReadLump(lmp); Array rgb;