From 36a022d48df1e80497aa3c0dc184e242089689d0 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Tue, 28 Sep 2021 20:09:27 +0200 Subject: [PATCH] Add option to hide intermission tips. --- cvarinfo.base | 1 + language.def_menu | 2 ++ language.es_menu | 2 ++ language.version | 4 ++-- menudef.txt | 1 + zscript/menu/swwm_inter.zsc | 1 + 6 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cvarinfo.base b/cvarinfo.base index fbe60dc3e..72c45da97 100644 --- a/cvarinfo.base +++ b/cvarinfo.base @@ -119,6 +119,7 @@ nosave bool swwm_nomapmsg = false; // disables special map dialogue messages nosave bool swwm_weapontooltips = true; // shows a tooltip on weapon operation when first selected nosave string swwm_tooltipshown = ""; // which weapons have already had their tooltips displayed nosave noarchive bool swwm_tooltipnote = false; // set if the note on how to disable tooltips was already displayed +nosave bool swwm_nointertips = false; // hides intermission tips, in case you don't want to see them // minimap settings nosave bool swwm_mm_enable = true; // show a minimap below the score counter diff --git a/language.def_menu b/language.def_menu index d85c5fee6..6ba09d025 100644 --- a/language.def_menu +++ b/language.def_menu @@ -204,6 +204,7 @@ SWWM_WEAPONTOOLTIPS = "Weapon Tooltips"; SWWM_RESETTOOLTIPS = "Reset Weapon Tooltips"; SWWM_CRESET = "Reset to Defaults"; SWWM_ARESET = "Wipe Achievements"; +SWWM_NOINTERTIPS = "Hide Intermission Tips"; SWWM_MMTITLE = "Minimap Settings"; SWWM_MM_ENABLE = "Show Minimap"; SWWM_MM_ROTATE = "Rotate Minimap"; @@ -359,6 +360,7 @@ TOOLTIP_SWWM_WEAPONTOOLTIPS = "Shows a summary of controls when a weapon is sele TOOLTIP_EVENT_SWWMRESETTOOLTIPS = "Resets weapon tooltips so you can see them all over again."; TOOLTIP_EVENT_SWWMRESETCVARS = "Resets all the mod's settings to their original values."; TOOLTIP_EVENT_SWWMRESETACHIEVEMENTS = "Erases all your archievement progress."; +TOOLTIP_SWWM_NOINTERTIPS = "Hides intermission tips, in case you don't want to see them."; TOOLTIP_SWWMMINIMAPMENU = "Configure the minimap."; TOOLTIP_SWWMACHIEVEMENTMENU = "View your achievements."; TOOLTIP_SWWM_MM_ENABLE = "Displays a minimap under the score counter."; diff --git a/language.es_menu b/language.es_menu index 100d92816..b939105f0 100644 --- a/language.es_menu +++ b/language.es_menu @@ -203,6 +203,7 @@ SWWM_WEAPONTOOLTIPS = "Ayuda de Armas"; SWWM_RESETTOOLTIPS = "Resetear Ayuda de Armas"; SWWM_CRESET = "Restaurar Predeterminado"; SWWM_ARESET = "Borrar Logros"; +SWWM_NOINTERTIPS = "Ocultar Consejos de Intermisión"; SWWM_MMTITLE = "Opciones de Minimapa"; SWWM_MM_ENABLE = "Mostrar Minimapa"; SWWM_MM_ROTATE = "Rotar Minimapa"; @@ -358,6 +359,7 @@ TOOLTIP_SWWM_WEAPONTOOLTIPS = "Muestra un resumen de controles cuando se selecci TOOLTIP_EVENT_SWWMRESETTOOLTIPS = "Resetea la ayuda de armas para que puedas volver a verla de nuevo."; TOOLTIP_EVENT_SWWMRESETCVARS = "Resetea todas las opciones del mod a sus valores originales."; TOOLTIP_EVENT_SWWMRESETACHIEVEMENTS = "Borra todo tu progreso de logros."; +TOOLTIP_SWWM_NOINTERTIPS = "Oculta los consejos de intermisión, por si no quieres verlos."; TOOLTIP_SWWMMINIMAPMENU = "Configura el minimapa."; TOOLTIP_SWWMACHIEVEMENTMENU = "Revisa tus logros."; TOOLTIP_SWWM_MM_ENABLE = "Muestra un minimapa bajo el contador de puntuación."; diff --git a/language.version b/language.version index ab90ce7a5..6c6f38a55 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.10 r2 \cu(Tue 28 Sep 18:43:27 CEST 2021)\c-"; -SWWM_SHORTVER="\cw1.1.10 r2 \cu(2021-09-28 18:43:27)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1.10 r3 \cu(Tue 28 Sep 20:09:27 CEST 2021)\c-"; +SWWM_SHORTVER="\cw1.1.10 r3 \cu(2021-09-28 20:09:27)\c-"; diff --git a/menudef.txt b/menudef.txt index 7fa48e48d..5867bc251 100644 --- a/menudef.txt +++ b/menudef.txt @@ -135,6 +135,7 @@ OptionMenu "SWWMOptionMenu" Option "$SWWM_NUMCOLOR_HP", "swwm_numcolor_hp", "TextColors" Option "$SWWM_NUMCOLOR_AP", "swwm_numcolor_ap", "TextColors" Option "$SWWM_INTERART", "swwm_interart", "YesNo" + Option "$SWWM_NOINTERTIPS", "swwm_nointertips", "YesNo" Option "$SWWM_INTERMUSIC", "swwm_intermusic", "YesNo" Option "$SWWM_FUZZ", "swwm_fuzz", "YesNo" Option "$SWWM_SILENCEMAP", "swwm_silencemap", "YesNo" diff --git a/zscript/menu/swwm_inter.zsc b/zscript/menu/swwm_inter.zsc index 4ebee2322..8b3025d83 100644 --- a/zscript/menu/swwm_inter.zsc +++ b/zscript/menu/swwm_inter.zsc @@ -145,6 +145,7 @@ Class SWWMStatScreen : StatusScreen abstract whichtip = ents[Random[InterArt](0,ents.Size()-1)]; pdata.lasttip.Push(whichtip); } + if ( swwm_nointertips ) return; String tipstr = "\cd"..String.Format(StringTable.Localize("$SWWM_INTERTIP"),whichtip).."\c-\n"..StringTable.Localize(String.Format("$SWWM_INTERTIP%d",whichtip)); BrokenLines l = fnt.BreakLines(tipstr,400); int lw = 0;