From 7a60ecc744ff7208857db87e6cb6b63100efe4c2 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sat, 12 Jun 2021 15:08:15 +0200 Subject: [PATCH] Small tweaks. --- ENDOOM.bin => ENDSWWM.bin | Bin language.def_menu | 8 ++++++-- language.es_menu | 4 ++++ language.version | 4 ++-- zmapinfo.txt | 2 ++ zscript/menu/swwm_menus.zsc | 8 ++++---- 6 files changed, 18 insertions(+), 8 deletions(-) rename ENDOOM.bin => ENDSWWM.bin (100%) diff --git a/ENDOOM.bin b/ENDSWWM.bin similarity index 100% rename from ENDOOM.bin rename to ENDSWWM.bin diff --git a/language.def_menu b/language.def_menu index 7c4f35ece..8090a8ab0 100644 --- a/language.def_menu +++ b/language.def_menu @@ -181,6 +181,10 @@ SWWM_FILTER_NONE = "No Filter"; SWWM_FILTER_OBFUSCATE = "Obfuscate"; SWWM_FILTER_HIDE = "Hide"; SWWM_PLAYTIME = "Total Play Time"; +SWWM_TIME_DAY = "day"; +SWWM_TIME_HOUR = "hour"; +SWWM_TIME_MINUTE = "minute"; +SWWM_TIME_SECOND = "second"; SWWM_TIME_DAYS = "days"; SWWM_TIME_HOURS = "hours"; SWWM_TIME_MINUTES = "minutes"; @@ -189,7 +193,7 @@ SWWM_ATITLE = "Achievements"; SWWM_SELFLIGHT = "Self-Lighting"; SWWM_USETOPICKUP = "Exclusive Use To Pickup"; SWWM_MELEEPICKUP = "Allow Item Pickup Through Melee"; -SWWM_BUTTSFX = "Slapping Buttcheeks"; +SWWM_BUTTSFX = "Clapping Buttcheeks"; SWWM_MMTITLE = "Minimap Settings"; SWWM_MM_ENABLE = "Show Minimap"; SWWM_MM_ROTATE = "Rotate Minimap"; @@ -328,7 +332,7 @@ TOOLTIP_SWWM_PLAYTIME = "Your total play time with this mod loaded."; TOOLTIP_SWWM_SELFLIGHT = "Emit blue light from the player's face. Disable if this causes performance issues."; TOOLTIP_SWWM_USETOPICKUP = "Prevents picking up mod items through touch, exclusively requiring a use action instead."; TOOLTIP_SWWM_MELEEPICKUP = "Allows picking up items though melee attacks. Do note that some weapons have an extended melee range, allowing you to grab things from farther away."; -TOOLTIP_SWWM_BUTTSFX = "The Demolitionist's buttcheeks will VERY AUDIBLY slap upon executing a successful buttslam."; +TOOLTIP_SWWM_BUTTSFX = "The Demolitionist's buttcheeks will VERY AUDIBLY clap upon executing a successful buttslam."; TOOLTIP_SWWM_MM_ENABLE = "Displays a minimap under the score counter."; TOOLTIP_SWWM_MM_ROTATE = "Rotates the minimap view."; TOOLTIP_SWWM_MM_GRID = "Shows a 128x128 grid on the minimap."; diff --git a/language.es_menu b/language.es_menu index 07bb0f04b..2858dfbc1 100644 --- a/language.es_menu +++ b/language.es_menu @@ -180,6 +180,10 @@ SWWM_FILTER_NONE = "Sin Filtro"; SWWM_FILTER_OBFUSCATE = "Ofuscar"; SWWM_FILTER_HIDE = "Ocultar"; SWWM_PLAYTIME = "Tiempo de Juego Total"; +SWWM_TIME_DAY = "día"; +SWWM_TIME_HOUR = "hora"; +SWWM_TIME_MINUTE = "minuto"; +SWWM_TIME_SECOND = "segundo"; SWWM_TIME_DAYS = "días"; SWWM_TIME_HOURS = "horas"; SWWM_TIME_MINUTES = "minutos"; diff --git a/language.version b/language.version index a8f3b4591..78ed51258 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r536 \cu(Thu 10 Jun 23:12:21 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r536 \cu(2021-06-10 23:12:21)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r537 \cu(Sat 12 Jun 15:08:15 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r537 \cu(2021-06-12 15:08:15)\c-"; diff --git a/zmapinfo.txt b/zmapinfo.txt index 5efc17f96..bc7378bb7 100644 --- a/zmapinfo.txt +++ b/zmapinfo.txt @@ -18,6 +18,8 @@ GameInfo CursorPic = "graphics/swwmcurs.png" DimColor = "Black" DimAmount = 0.5 + BlurAmount = 0 + Endoom = "ENDSWWM" PickupColor = "Gold" MenuFontColor_Title = "Blue" MenuFontColor_Label = "White" diff --git a/zscript/menu/swwm_menus.zsc b/zscript/menu/swwm_menus.zsc index b13e1391e..180b1f57d 100644 --- a/zscript/menu/swwm_menus.zsc +++ b/zscript/menu/swwm_menus.zsc @@ -143,21 +143,21 @@ Class OptionMenuItemSWWMPlayTime : OptionMenuItem String str = ""; if ( dformat ) { - if ( day ) str.AppendFormat("%d %s",day,StringTable.Localize("$SWWM_TIME_DAYS")); + if ( day ) str.AppendFormat("%d %s",day,StringTable.Localize((day!=1)?"$SWWM_TIME_DAYS":"$SWWM_TIME_DAY")); if ( hour ) { if ( str != "" ) str = str..", "; - str.AppendFormat("%d %s",hour,StringTable.Localize("$SWWM_TIME_HOURS")); + str.AppendFormat("%d %s",hour,StringTable.Localize((hour!=1)?"$SWWM_TIME_HOURS":"$SWWM_TIME_HOUR")); } if ( min ) { if ( str != "" ) str = str..", "; - str.AppendFormat("%d %s",min,StringTable.Localize("$SWWM_TIME_MINUTES")); + str.AppendFormat("%d %s",min,StringTable.Localize((min!=1)?"$SWWM_TIME_MINUTES":"$SWWM_TIME_MINUTE")); } if ( sec ) { if ( str != "" ) str = str..", "; - str.AppendFormat("%d %s",sec,StringTable.Localize("$SWWM_TIME_SECONDS")); + str.AppendFormat("%d %s",sec,StringTable.Localize((sec!=1)?"$SWWM_TIME_SECONDS":"$SWWM_TIME_SECOND")); } if ( str == "" ) str.AppendFormat("0 %s",StringTable.Localize("$SWWM_TIME_SECONDS")); }