diff --git a/Dalamud/Interface/Colors/ImGuiColors.cs b/Dalamud/Interface/Colors/ImGuiColors.cs index 341460efe..a8cb2f6fb 100644 --- a/Dalamud/Interface/Colors/ImGuiColors.cs +++ b/Dalamud/Interface/Colors/ImGuiColors.cs @@ -10,51 +10,96 @@ namespace Dalamud.Interface.Colors /// /// Gets red used in dalamud. /// - public static Vector4 DalamudRed { get; internal set; } = new Vector4(1f, 0f, 0f, 1f); + public static Vector4 DalamudRed { get; internal set; } = new(1f, 0f, 0f, 1f); /// /// Gets grey used in dalamud. /// - public static Vector4 DalamudGrey { get; internal set; } = new Vector4(0.7f, 0.7f, 0.7f, 1f); + public static Vector4 DalamudGrey { get; internal set; } = new(0.7f, 0.7f, 0.7f, 1f); /// /// Gets grey used in dalamud. /// - public static Vector4 DalamudGrey2 { get; internal set; } = new Vector4(0.7f, 0.7f, 0.7f, 1f); + public static Vector4 DalamudGrey2 { get; internal set; } = new(0.7f, 0.7f, 0.7f, 1f); /// /// Gets grey used in dalamud. /// - public static Vector4 DalamudGrey3 { get; internal set; } = new Vector4(0.5f, 0.5f, 0.5f, 1f); + public static Vector4 DalamudGrey3 { get; internal set; } = new(0.5f, 0.5f, 0.5f, 1f); /// /// Gets white used in dalamud. /// - public static Vector4 DalamudWhite { get; internal set; } = new Vector4(1f, 1f, 1f, 1f); + public static Vector4 DalamudWhite { get; internal set; } = new(1f, 1f, 1f, 1f); /// /// Gets white used in dalamud. /// - public static Vector4 DalamudWhite2 { get; internal set; } = new Vector4(0.878f, 0.878f, 0.878f, 1f); + public static Vector4 DalamudWhite2 { get; internal set; } = new(0.878f, 0.878f, 0.878f, 1f); /// /// Gets orange used in dalamud. /// - public static Vector4 DalamudOrange { get; internal set; } = new Vector4(1f, 0.709f, 0f, 1f); + public static Vector4 DalamudOrange { get; internal set; } = new(1f, 0.709f, 0f, 1f); + + /// + /// Gets yellow used in dalamud. + /// + public static Vector4 DalamudYellow { get; } = new(1f, 1f, .4f, 1f); + + /// + /// Gets violet used in dalamud. + /// + public static Vector4 DalamudViolet { get; } = new(0.770f, 0.700f, 0.965f, 1.000f); /// /// Gets tank blue (UIColor37). /// - public static Vector4 TankBlue { get; internal set; } = new Vector4(0f, 0.6f, 1f, 1f); + public static Vector4 TankBlue { get; internal set; } = new(0f, 0.6f, 1f, 1f); /// /// Gets healer green (UIColor504). /// - public static Vector4 HealerGreen { get; internal set; } = new Vector4(0f, 0.8f, 0.1333333f, 1f); + public static Vector4 HealerGreen { get; internal set; } = new(0f, 0.8f, 0.1333333f, 1f); /// /// Gets dps red (UIColor545). /// - public static Vector4 DPSRed { get; internal set; } = new Vector4(0.7058824f, 0f, 0f, 1f); + public static Vector4 DPSRed { get; internal set; } = new(0.7058824f, 0f, 0f, 1f); + + /// + /// Gets parsed grey. + /// + public static Vector4 ParsedGrey { get; } = new(0.4f, 0.4f, 0.4f, 1f); + + /// + /// Gets parsed green. + /// + public static Vector4 ParsedGreen { get; } = new(0.117f, 1f, 0f, 1f); + + /// + /// Gets parsed blue. + /// + public static Vector4 ParsedBlue { get; } = new(0f, 0.439f, 1f, 1f); + + /// + /// Gets parsed purple. + /// + public static Vector4 ParsedPurple { get; } = new(0.639f, 0.207f, 0.933f, 1f); + + /// + /// Gets parsed orange. + /// + public static Vector4 ParsedOrange { get; } = new(1f, 0.501f, 0f, 1f); + + /// + /// Gets parsed pink. + /// + public static Vector4 ParsedPink { get; } = new(0.886f, 0.407f, 0.658f, 1f); + + /// + /// Gets parsed gold. + /// + public static Vector4 ParsedGold { get; } = new(0.898f, 0.8f, 0.501f, 1f); } } diff --git a/Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs b/Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs index 8dcb1bb95..aeabf5e5f 100644 --- a/Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs +++ b/Dalamud/Interface/Internal/Windows/ColorDemoWindow.cs @@ -34,9 +34,18 @@ namespace Dalamud.Interface.Internal.Windows ("DalamudWhite", ImGuiColors.DalamudWhite), ("DalamudWhite2", ImGuiColors.DalamudWhite2), ("DalamudOrange", ImGuiColors.DalamudOrange), + ("DalamudYellow", ImGuiColors.DalamudYellow), + ("DalamudViolet", ImGuiColors.DalamudViolet), ("TankBlue", ImGuiColors.TankBlue), ("HealerGreen", ImGuiColors.HealerGreen), ("DPSRed", ImGuiColors.DPSRed), + ("ParsedGrey", ImGuiColors.ParsedGrey), + ("ParsedGreen", ImGuiColors.ParsedGreen), + ("ParsedBlue", ImGuiColors.ParsedBlue), + ("ParsedPurple", ImGuiColors.ParsedPurple), + ("ParsedOrange", ImGuiColors.ParsedOrange), + ("ParsedPink", ImGuiColors.ParsedPink), + ("ParsedGold", ImGuiColors.ParsedGold), }.OrderBy(colorDemo => colorDemo.Name).ToList(); }