From 0dea6f5c9c2a0c192d04896158cba1e80c3b7dad Mon Sep 17 00:00:00 2001 From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Date: Sun, 7 Apr 2024 11:35:55 +1000 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D1=83=D1=8E=20=D1=82=D0=B5=D0=BC=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Client/Entry/EntryPoint.cs | 3 +- Content.Shared/CCVar/CCVars.cs | 7 ++- Resources/Prototypes/_CP14/hud.yml | 5 ++ Resources/Prototypes/_CP14/themes.yml | 14 +++++ Resources/Prototypes/hud.yml | 73 ++++++++++++++------------- 5 files changed, 64 insertions(+), 38 deletions(-) create mode 100644 Resources/Prototypes/_CP14/hud.yml create mode 100644 Resources/Prototypes/_CP14/themes.yml diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 47f11ee161..88f5bb82ab 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -22,6 +22,7 @@ using Content.Client.Stylesheets; using Content.Client.Viewport; using Content.Client.Voting; using Content.Shared.Ame.Components; +using Content.Shared.CCVar; using Content.Shared.Gravity; using Content.Shared.Localizations; using Robust.Client; @@ -157,7 +158,7 @@ namespace Content.Client.Entry _clientPreferencesManager.Initialize(); _euiManager.Initialize(); _voteManager.Initialize(); - _userInterfaceManager.SetDefaultTheme("SS14DefaultTheme"); + _userInterfaceManager.SetDefaultTheme(_configManager.GetCVar(CCVars.UIDefaultInterfaceTheme)); _userInterfaceManager.SetActiveTheme(_configManager.GetCVar(CVars.InterfaceTheme)); _documentParsingManager.Initialize(); diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 1300a3dc98..72f7526651 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -631,6 +631,9 @@ namespace Content.Shared.CCVar * Interface */ + public static readonly CVarDef UIDefaultInterfaceTheme = + CVarDef.Create("interface.default_theme", "CP14DefaultTheme", CVar.CLIENTONLY); + public static readonly CVarDef UIClickSound = CVarDef.Create("interface.click_sound", "/Audio/UserInterface/click.ogg", CVar.REPLICATED); @@ -726,7 +729,7 @@ namespace Content.Shared.CCVar public static readonly CVarDef CombatModeIndicatorsPointShow = CVarDef.Create("hud.combat_mode_indicators_point_show", true, CVar.ARCHIVE | CVar.CLIENTONLY); - + public static readonly CVarDef LoocAboveHeadShow = CVarDef.Create("hud.show_looc_above_head", true, CVar.ARCHIVE | CVar.CLIENTONLY); @@ -1225,7 +1228,7 @@ namespace Content.Shared.CCVar /// public static readonly CVarDef OocEnableDuringRound = CVarDef.Create("ooc.enable_during_round", false, CVar.NOTIFY | CVar.REPLICATED | CVar.SERVER); - + public static readonly CVarDef ShowOocPatronColor = CVarDef.Create("ooc.show_ooc_patron_color", true, CVar.ARCHIVE | CVar.REPLICATED | CVar.CLIENT); diff --git a/Resources/Prototypes/_CP14/hud.yml b/Resources/Prototypes/_CP14/hud.yml new file mode 100644 index 0000000000..f13082d24e --- /dev/null +++ b/Resources/Prototypes/_CP14/hud.yml @@ -0,0 +1,5 @@ +- type: hudTheme + id: CP14DefaultTheme + name: ui-options-hud-theme-default + path: Default + order: -1 diff --git a/Resources/Prototypes/_CP14/themes.yml b/Resources/Prototypes/_CP14/themes.yml new file mode 100644 index 0000000000..6bb4f9b957 --- /dev/null +++ b/Resources/Prototypes/_CP14/themes.yml @@ -0,0 +1,14 @@ +- type: uiTheme + id: CP14DefaultTheme + path: /Textures/_CP14/Interface/Default/ + colors: + whiteText: "#FFF5EE" + slotSelectedGold: "#e6b812" + slotColor: "#0f1215" + slotOutline: "#333850" + slotText: "#333850" + nanoGold: "#A88B5E" + goodGreenFore: "#31843E" + concerningOrangeFore: "#A5762F" + dangerousRedFore: "#BB3232" + disabledFore: "#5A5A5A" \ No newline at end of file diff --git a/Resources/Prototypes/hud.yml b/Resources/Prototypes/hud.yml index 637fbe2e6f..16780b2a01 100644 --- a/Resources/Prototypes/hud.yml +++ b/Resources/Prototypes/hud.yml @@ -1,41 +1,44 @@ -- type: hudTheme - id: SS14DefaultTheme - name: ui-options-hud-theme-default - path: Default - order: -1 +# Они не будут работать с новыми слотами +# А так же они не подходят под нашу атмосферу -- type: hudTheme - id: SS14PlasmafireTheme - name: ui-options-hud-theme-plasmafire - path: Plasmafire - order: 3 +# - type: hudTheme +# id: SS14DefaultTheme +# name: ui-options-hud-theme-default +# path: Default +# order: -1 -- type: hudTheme - id: SS14SlimecoreTheme - name: ui-options-hud-theme-slimecore - path: Slimecore - order: 2 +# - type: hudTheme +# id: SS14PlasmafireTheme +# name: ui-options-hud-theme-plasmafire +# path: Plasmafire +# order: 3 -- type: hudTheme - id: SS14ClockworkTheme - name: ui-options-hud-theme-clockwork - path: Clockwork - order: 4 +# - type: hudTheme +# id: SS14SlimecoreTheme +# name: ui-options-hud-theme-slimecore +# path: Slimecore +# order: 2 -- type: hudTheme - id: SS14RetroTheme - name: ui-options-hud-theme-retro - path: Retro - order: 6 +# - type: hudTheme +# id: SS14ClockworkTheme +# name: ui-options-hud-theme-clockwork +# path: Clockwork +# order: 4 -- type: hudTheme - id: SS14MinimalistTheme - name: ui-options-hud-theme-minimalist - path: Minimalist - order: 1 +# - type: hudTheme +# id: SS14RetroTheme +# name: ui-options-hud-theme-retro +# path: Retro +# order: 6 -- type: hudTheme - id: SS14AshenTheme - name: ui-options-hud-theme-ashen - path: Ashen - order: 5 +# - type: hudTheme +# id: SS14MinimalistTheme +# name: ui-options-hud-theme-minimalist +# path: Minimalist +# order: 1 + +# - type: hudTheme +# id: SS14AshenTheme +# name: ui-options-hud-theme-ashen +# path: Ashen +# order: 5