From e91968ca9116c48d60c679eab820a530f0a2c665 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Wed, 6 Dec 2017 17:35:51 -0700 Subject: [PATCH 1/2] Revert "Remove superadmin customization config options" This reverts commit 1e68ac22c7d7c191f05e6f86b7847c2b4f885340. --- TShockAPI/ConfigFile.cs | 12 ++++++++++++ TShockAPI/Group.cs | 10 +++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs index 5cfed41b..e5fa3320 100644 --- a/TShockAPI/ConfigFile.cs +++ b/TShockAPI/ConfigFile.cs @@ -78,6 +78,18 @@ namespace TShockAPI [Description("Disables any building / placing of blocks.")] public bool DisableBuild; + /// SuperAdminChatRGB - The chat color for the superadmin group. + [Description("#.#.# = Red/Blue/Green - RGB Colors for the Admin Chat Color. Max value: 255.")] + public int[] SuperAdminChatRGB = { 255, 0, 0 }; + + /// SuperAdminChatPrefix - The superadmin chat prefix. + [Description("Super admin group chat prefix.")] + public string SuperAdminChatPrefix = "(Admin) "; + + /// SuperAdminChatSuffix - The superadmin chat suffix. + [Description("Super admin group chat suffix.")] + public string SuperAdminChatSuffix = ""; + /// BackupInterval - The backup frequency in minutes. [Description("Backup frequency in minutes. So, a value of 60 = 60 minutes. Backups are stored in the \\tshock\\backups folder.")] public int BackupInterval; diff --git a/TShockAPI/Group.cs b/TShockAPI/Group.cs index 448f8442..1eb5d48f 100644 --- a/TShockAPI/Group.cs +++ b/TShockAPI/Group.cs @@ -340,11 +340,11 @@ namespace TShockAPI public SuperAdminGroup() : base("superadmin") { - R = (byte)255; - G = (byte)255; - B = (byte)255; - Prefix = "(Super Admin) "; - Suffix = ""; + R = (byte)TShock.Config.SuperAdminChatRGB[0]; + G = (byte)TShock.Config.SuperAdminChatRGB[1]; + B = (byte)TShock.Config.SuperAdminChatRGB[2]; + Prefix = TShock.Config.SuperAdminChatPrefix; + Suffix = TShock.Config.SuperAdminChatSuffix; } /// From 8708d55d86bdc6ed6f0912cd3dd7a636cdd0945a Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Wed, 6 Dec 2017 17:39:09 -0700 Subject: [PATCH 2/2] But still use discouragement colors --- TShockAPI/ConfigFile.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs index e5fa3320..85e340cf 100644 --- a/TShockAPI/ConfigFile.cs +++ b/TShockAPI/ConfigFile.cs @@ -80,11 +80,11 @@ namespace TShockAPI /// SuperAdminChatRGB - The chat color for the superadmin group. [Description("#.#.# = Red/Blue/Green - RGB Colors for the Admin Chat Color. Max value: 255.")] - public int[] SuperAdminChatRGB = { 255, 0, 0 }; + public int[] SuperAdminChatRGB = { 255, 255, 255 }; /// SuperAdminChatPrefix - The superadmin chat prefix. [Description("Super admin group chat prefix.")] - public string SuperAdminChatPrefix = "(Admin) "; + public string SuperAdminChatPrefix = "(Super Admin) "; /// SuperAdminChatSuffix - The superadmin chat suffix. [Description("Super admin group chat suffix.")]