From 323c34e6781988da6e9c723bd3f48c35cc06b362 Mon Sep 17 00:00:00 2001 From: grande1900 Date: Tue, 9 Jan 2024 08:32:25 -0500 Subject: [PATCH] folder list script + fix firemode glyph + forgot loc script for listing a glob to a dictionary table fix the firemode glyph on the hud some loc stuff --- .Stuff for developers/folderlist.py | 10 ++++++++++ lua/arc9/client/cl_hud.lua | 10 +++++----- lua/arc9/common/localization/base_de.lua | 4 ++++ lua/arc9/common/localization/base_en.lua | 5 ++--- lua/arc9/common/localization/base_es-es.lua | 4 ++++ lua/arc9/common/localization/base_ru.lua | 4 ++++ lua/arc9/common/localization/base_sv-se.lua | 6 ++++-- lua/arc9/common/localization/base_uwu.lua | 6 +++++- lua/arc9/common/localization/base_zh-cn.lua | 4 ++++ 9 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 .Stuff for developers/folderlist.py diff --git a/.Stuff for developers/folderlist.py b/.Stuff for developers/folderlist.py new file mode 100644 index 00000000..ef506f29 --- /dev/null +++ b/.Stuff for developers/folderlist.py @@ -0,0 +1,10 @@ +# btw this doesn't read subfolders even if you use ** +import glob, os +pydir = os.getcwd() +os.chdir(input("Work dir:\n")) +with open(pydir+"/list.txt","w") as f: + f.writelines("{\n") + for txt in glob.glob(input("Filter:\n")): + print(txt) + f.writelines(f" [\"{txt}\"] = true,\n") + f.writelines("}\n") diff --git a/lua/arc9/client/cl_hud.lua b/lua/arc9/client/cl_hud.lua index 34e6d1f5..1aa65fe8 100644 --- a/lua/arc9/client/cl_hud.lua +++ b/lua/arc9/client/cl_hud.lua @@ -1081,17 +1081,17 @@ function ARC9.DrawHUD() if ARC9.CTRL_Lookup[fmh_text] then fmh_text = ARC9.CTRL_Lookup[fmh_text] end if ARC9.CTRL_ConvertTo[fmh_text] then fmh_text = ARC9.CTRL_ConvertTo[fmh_text] end - if ARC9.CTRL_Exists[fmh_text] then fmh_text = Material( "arc9/glyphs_knockout/" .. fmh_text .. "_lg" .. ".png", "smooth" ) else fmh_text = "["..fmh_text.."]" end + if ARC9.CTRL_Exists[fmh_text] then fmh_text = Material( "arc9/glyphs/" .. fmh_text .. ".png", "smooth" ) else fmh_text = "["..fmh_text.."]" end fmh_text = isstring(fmh_text) and fmh_text or { fmh_text, 16 } - surface.SetDrawColor(ARC9.GetHUDColor("shadow_3d", 100)) - surface.SetTextColor(ARC9.GetHUDColor("shadow_3d", 100)) + surface.SetDrawColor(ARC9.GetHUDColor("shadow", 100 * hint_alpha)) + surface.SetTextColor(ARC9.GetHUDColor("shadow", 100 * hint_alpha)) surface.SetFont("ARC9_12_LCD") local fmh_w = GetControllerKeyLineSize( { font = "ARC9_12_LCD" }, fmh_text ) CreateControllerKeyLine( { x = fmh_x + s_right - fmh_w, y = fmh_y + s_down, size = 16, font = "ARC9_12_LCD" }, fmh_text ) - surface.SetDrawColor(ARC9.GetHUDColor("fg_3d", 255)) - surface.SetTextColor(ARC9.GetHUDColor("fg_3d", 255)) + surface.SetDrawColor(ARC9.GetHUDColor("fg", 200 * hint_alpha)) + surface.SetTextColor(ARC9.GetHUDColor("fg", 200 * hint_alpha)) surface.SetFont("ARC9_12_LCD") CreateControllerKeyLine( { x = fmh_x - fmh_w, y = fmh_y, size = 16, font = "ARC9_12_LCD" }, fmh_text ) end diff --git a/lua/arc9/common/localization/base_de.lua b/lua/arc9/common/localization/base_de.lua index ffe6fcfa..cc379145 100644 --- a/lua/arc9/common/localization/base_de.lua +++ b/lua/arc9/common/localization/base_de.lua @@ -544,6 +544,10 @@ L["settings.hud_cust.hud_scale.desc"] = "Skalierungsmultiplikator für die Oberf L["settings.hud_cust.hud_color.title"] = "UI-Farbe" L["settings.hud_cust.hud_color.desc"] = "Hervorhebungsfarbe für das HUD.\nDie Akzentfarbe." +-- L["settings.hud_cust.hud_holiday.title"] = "Holiday Themes" + +-- L["settings.hud_cust.hud_holiday.desc"] = "Themes that activate during certain holidays.\nWill override highlight color" + -- L["settings.hud_cust.language_id.title"] = "Language" -- L["settings.hud_cust.language_id.desc"] = "Language pack to use for ARC9." -- L["settings.hud_cust.hud_darkmode.title"] = "Dark Theme" diff --git a/lua/arc9/common/localization/base_en.lua b/lua/arc9/common/localization/base_en.lua index 2b704bb8..3cbf826a 100644 --- a/lua/arc9/common/localization/base_en.lua +++ b/lua/arc9/common/localization/base_en.lua @@ -114,9 +114,6 @@ L["customize.hint.unattach"] = "Unattach" L["customize.hint.unfavorite"] = "Remove Favorite" L["customize.hint.zoom"] = "Zoom" -L["hud.hint.lowammo"] = "Low Ammo" -L["hud.hint.noammo"] = "No Ammo" - L["customize.trivia.description"] = "Description" L["customize.stats.explain.firepower"] = "The damage potential at point-blank range." @@ -464,6 +461,8 @@ L["settings.hud_cust.hud_deadzonex.title"] = "HUD Width Deadzone" L["settings.hud_cust.hud_deadzonex.desc"] = "Horizontal \"deadzone\" for customization menu and HUD panel.\nUseful for ultrawide monitors." L["settings.hud_cust.hud_color.title"] = "HUD Color" L["settings.hud_cust.hud_color.desc"] = "Highlight color for the HUD.\nThe accent color." +L["settings.hud_cust.hud_holiday.title"] = "Holiday Themes" +L["settings.hud_cust.hud_holiday.desc"] = "Themes that activate during certain holidays.\nWill override highlight color" -- L["settings.hud_cust.language_id.title"] = "Language" -- L["settings.hud_cust.language_id.desc"] = "Language pack to use for ARC9." L["settings.hud_cust.hud_darkmode.title"] = "Dark Theme" diff --git a/lua/arc9/common/localization/base_es-es.lua b/lua/arc9/common/localization/base_es-es.lua index eb66c926..e9c89b62 100644 --- a/lua/arc9/common/localization/base_es-es.lua +++ b/lua/arc9/common/localization/base_es-es.lua @@ -463,6 +463,10 @@ L["settings.hud_cust.hud_deadzonex.title"] = "Anchura de zona muerta del HUD" L["settings.hud_cust.hud_deadzonex.desc"] = "\"Zona Muerta\" Horizontal para el menú de personalización y el panel HUD.\nÚtil para monitores ultrawide." L["settings.hud_cust.hud_color.title"] = "Color del HUD" L["settings.hud_cust.hud_color.desc"] = "Color de realce para el HUD.\nEl color de acento." +-- L["settings.hud_cust.hud_holiday.title"] = "Holiday Themes" + +-- L["settings.hud_cust.hud_holiday.desc"] = "Themes that activate during certain holidays.\nWill override highlight color" + -- L["settings.hud_cust.language_id.title"] = "Language" -- L["settings.hud_cust.language_id.desc"] = "Language pack to use for ARC9." L["settings.hud_cust.hud_darkmode.title"] = "Tema Oscuro" diff --git a/lua/arc9/common/localization/base_ru.lua b/lua/arc9/common/localization/base_ru.lua index 1a3c8f9f..7e3f362d 100644 --- a/lua/arc9/common/localization/base_ru.lua +++ b/lua/arc9/common/localization/base_ru.lua @@ -466,6 +466,10 @@ L["settings.hud_cust.hud_deadzonex.title"] = "Гориз. мёртвая зон L["settings.hud_cust.hud_deadzonex.desc"] = "Горизонтальная \"мёртвая зона\" для меню кастомизации и HUD панели.\nПолезно на ультрашироких мониторах." L["settings.hud_cust.hud_color.title"] = "Цвет интерфейса" L["settings.hud_cust.hud_color.desc"] = "Главный цвет интерфейса, акцент." +-- L["settings.hud_cust.hud_holiday.title"] = "Holiday Themes" + +-- L["settings.hud_cust.hud_holiday.desc"] = "Themes that activate during certain holidays.\nWill override highlight color" + -- L["settings.hud_cust.language_id.title"] = "Language" -- L["settings.hud_cust.language_id.desc"] = "Language pack to use for ARC9." L["settings.hud_cust.hud_darkmode.title"] = "Темная тема" diff --git a/lua/arc9/common/localization/base_sv-se.lua b/lua/arc9/common/localization/base_sv-se.lua index 45780712..b7fcffb3 100644 --- a/lua/arc9/common/localization/base_sv-se.lua +++ b/lua/arc9/common/localization/base_sv-se.lua @@ -353,10 +353,8 @@ L["settings.desc"] = "Beskrivning" L["settings.default_convar"] = "Standard värde" L["settings.convar_server"] = "Servervariabel" - L["settings.convar_client"] = "Client-variabel" - ////////////////////// General L["settings.tabname.general"] = "Generellt" @@ -463,6 +461,10 @@ L["settings.hud_cust.hud_deadzonex.title"] = "Gräns. Bredd Dödszon" L["settings.hud_cust.hud_deadzonex.desc"] = "Horisontell \"dödszon\" för anpassningsmenyn och gränssnitt panelen.\nAnvändbra för ultrawide-skärmar." L["settings.hud_cust.hud_color.title"] = "Gränssnitt Färg" L["settings.hud_cust.hud_color.desc"] = "Markerar färgen för gränssnittet.\nAccentfärgen." +-- L["settings.hud_cust.hud_holiday.title"] = "Holiday Themes" + +-- L["settings.hud_cust.hud_holiday.desc"] = "Themes that activate during certain holidays.\nWill override highlight color" + -- L["settings.hud_cust.language_id.title"] = "Language" -- L["settings.hud_cust.language_id.desc"] = "Language pack to use for ARC9." L["settings.hud_cust.hud_darkmode.title"] = "Mörkt Tema" diff --git a/lua/arc9/common/localization/base_uwu.lua b/lua/arc9/common/localization/base_uwu.lua index 780e8aca..9d80c6ae 100644 --- a/lua/arc9/common/localization/base_uwu.lua +++ b/lua/arc9/common/localization/base_uwu.lua @@ -254,7 +254,7 @@ L["autostat.secondary._beforephrase"] = false L["autostat.secondary._divider"] = " " -- space between the secondary phrase from the stat phrase. set true to use empty string --- L["autostat.secondary.blindfire"] = "while Blind-Firing" +L["autostat.secondary.blindfire"] = "w-whiwe bwind-fiwing" L["autostat.secondary.bipod"] = "on bipOwOd" L["autostat.secondary.crouch"] = "w-whiwe cwouchiwuwung" L["autostat.secondary.empty"] = "owon wast wound in mag" @@ -463,6 +463,10 @@ L["settings.hud_cust.hud_deadzonex.title"] = "HUD Widh dewdzowne" L["settings.hud_cust.hud_deadzonex.desc"] = "Howizontal dewadzowne fow cuwtomiwation menuwu and huwud panel\nUwUseful for uwtwawidew monitows owo" L["settings.hud_cust.hud_color.title"] = "HUD Colow" L["settings.hud_cust.hud_color.desc"] = "Highlight colow fow de HUD.\nde accent colow" +-- L["settings.hud_cust.hud_holiday.title"] = "Holiday Themes" + +-- L["settings.hud_cust.hud_holiday.desc"] = "Themes that activate during certain holidays.\nWill override highlight color" + -- L["settings.hud_cust.language_id.title"] = "Language" -- L["settings.hud_cust.language_id.desc"] = "Language pack to use for ARC9." L["settings.hud_cust.hud_darkmode.title"] = "Dawk deme" diff --git a/lua/arc9/common/localization/base_zh-cn.lua b/lua/arc9/common/localization/base_zh-cn.lua index efe932f7..0a27231c 100644 --- a/lua/arc9/common/localization/base_zh-cn.lua +++ b/lua/arc9/common/localization/base_zh-cn.lua @@ -543,6 +543,10 @@ L["settings.hud_cust.hud_scale.desc"] = "全局界面大小倍率。" L["settings.hud_cust.hud_color.title"] = "HUD 颜色" L["settings.hud_cust.hud_color.desc"] = "主题高亮颜色。" +-- L["settings.hud_cust.hud_holiday.title"] = "Holiday Themes" + +-- L["settings.hud_cust.hud_holiday.desc"] = "Themes that activate during certain holidays.\nWill override highlight color" + -- L["settings.hud_cust.language_id.title"] = "Language" -- L["settings.hud_cust.language_id.desc"] = "Language pack to use for ARC9." -- L["settings.hud_cust.hud_darkmode.title"] = "Dark Theme"