Separate theme customisation for Crystall Edge

Content.Client/Entry/EntryPoint.cs

@@ -22,6 +22,7 @@
 using Content.Client.Stylesheets;
 using Content.Client.Viewport;
 using Content.Client.Voting;
+using Content.Shared._CP14.Configuration;
 using Content.Shared.Ame.Components;
 using Content.Shared.CCVar;
 using Content.Shared.Gravity;
@@ -167,8 +168,8 @@ public override void PostInit()
             _clientPreferencesManager.Initialize();
             _euiManager.Initialize();
             _voteManager.Initialize();
-            _userInterfaceManager.SetDefaultTheme("SS14DefaultTheme");
-            _userInterfaceManager.SetActiveTheme(_configManager.GetCVar(CVars.InterfaceTheme));
+            _userInterfaceManager.SetDefaultTheme("CP14DefaultTheme"); // CP14-Theme
+            _userInterfaceManager.SetActiveTheme(_configManager.GetCVar(CP14ConfigVars.PostProcess)); // CP14-Theme
             _documentParsingManager.Initialize();
             _titleWindowManager.Initialize();
 

Content.Client/Options/UI/Tabs/MiscTab.xaml.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Client.UserInterface.Screens;
+using Content.Shared._CP14.Configuration;
 using Content.Shared.CCVar;
 using Content.Shared.HUD;
 using Robust.Client.AutoGenerated;
@@ -21,8 +22,11 @@ public MiscTab()
     {
         RobustXamlLoader.Load(this);
         IoCManager.InjectDependencies(this);
-
-        var themes = _prototypeManager.EnumeratePrototypes<HudThemePrototype>().ToList();
+        // CP14-Theme-Start
+        var themes = _prototypeManager.EnumeratePrototypes<HudThemePrototype>()
+            .Where(theme => theme.IsCP == true)
+            .ToList();
+        // CP14-Theme-End
         themes.Sort();
         var themeEntries = new List<OptionDropDownCVar<string>.ValueOption>();
         foreach (var gear in themes)
@@ -40,7 +44,7 @@ public MiscTab()
         // ReSharper disable once ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
         ShowOocPatronColor.Visible = _playerManager.LocalSession?.Channel?.UserData.PatronTier is { };
 
-        Control.AddOptionDropDown(CVars.InterfaceTheme, DropDownHudTheme, themeEntries);
+        Control.AddOptionDropDown(CP14ConfigVars.InterfaceTheme, DropDownHudTheme, themeEntries); // CP14-Theme
         Control.AddOptionDropDown(CCVars.UILayout, DropDownHudLayout, layoutEntries);
 
         Control.AddOptionCheckBox(CVars.DiscordEnabled, DiscordRich);

Content.Shared/HUD/HudThemePrototype.cs

@@ -11,6 +11,11 @@ public sealed partial class HudThemePrototype : IPrototype, IComparable<HudTheme
         [IdDataField]
         public string ID { get; private set; } = string.Empty;
 
+        // CP14-Theme-Start
+        [DataField]
+        public bool IsCP { get; }
+        // CP14-Theme-End
+
         [DataField("path", required: true)]
         public string Path { get; private set; } = string.Empty;
 

Content.Shared/_CP14/Configuration/CP14ConfigVars.cs

@@ -16,4 +16,10 @@ public static readonly CVarDef<bool>
     /// </summary>
     public static readonly CVarDef<bool>
         PostProcess = CVarDef.Create("cp14_graphics.post_process", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    /// <summary>
+    /// Change the UITheme
+    /// </summary>
+    public static readonly CVarDef<string>
+        InterfaceTheme = CVarDef.Create("cp14_interface.theme", "", CVar.CLIENTONLY | CVar.ARCHIVE);
 }

Resources/Prototypes/_CP14/hud.yml

@@ -0,0 +1,6 @@
+- type: hudTheme
+  id: CP14DefaultTheme
+  isCP: true
+  name: ui-options-hud-theme-default
+  path: Default
+  order: -1

Resources/Prototypes/_CP14/themes.yml

@@ -0,0 +1,16 @@
+- type: uiTheme
+  id: CP14DefaultTheme
+  path: /Textures/Interface/CrystallPunk/
+  colors:
+    whiteText: "#FFF5EE"
+    slotSelectedGold: "#e6b812"
+    slotColor: "#0f1215"
+    slotOutline: "#4a3930"
+    slotText: "#503b33"
+    nanoGold: "#A88B5E"
+    goodGreenFore: "#31843E"
+    concerningOrangeFore: "#A5762F"
+    dangerousRedFore: "#BB3232"
+    disabledFore: "#5A5A5A"
+    _itemstatus_content_margin_right: "#06060404"
+    _itemstatus_content_margin_left: "#04060604"

Resources/Prototypes/hud.yml

@@ -1,46 +1,41 @@
-# Эта тема отредактирована
-
- - 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: SS14SlimecoreTheme
-#   name: ui-options-hud-theme-slimecore
-#   path: Slimecore
-#   order: 2
-
-# - type: hudTheme
-#   id: SS14ClockworkTheme
-#   name: ui-options-hud-theme-clockwork
-#   path: Clockwork
-#   order: 4
-
-# - type: hudTheme
-#   id: SS14RetroTheme
-#   name: ui-options-hud-theme-retro
-#   path: Retro
-#   order: 6
-
-# - 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
+- 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: SS14SlimecoreTheme
+  name: ui-options-hud-theme-slimecore
+  path: Slimecore
+  order: 2
+
+- type: hudTheme
+  id: SS14ClockworkTheme
+  name: ui-options-hud-theme-clockwork
+  path: Clockwork
+  order: 4
+
+- type: hudTheme
+  id: SS14RetroTheme
+  name: ui-options-hud-theme-retro
+  path: Retro
+  order: 6
+
+- 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

Resources/Prototypes/themes.yml

@@ -1,12 +1,12 @@
 - type: uiTheme
   id: SS14DefaultTheme
-  path: /Textures/Interface/CrystallPunk/ #Edited for CP14
+  path: /Textures/Interface/Default/
   colors:
     whiteText: "#FFF5EE"
     slotSelectedGold: "#e6b812"
     slotColor: "#0f1215"
-    slotOutline: "#4a3930" #Edited CP14
-    slotText: "#503b33" #Edited CP14
+    slotOutline: "#333850"
+    slotText: "#333850"
     nanoGold: "#A88B5E"
     goodGreenFore: "#31843E"
     concerningOrangeFore: "#A5762F"