Merge branch 'general-devel' into fragments

This commit is contained in:
Lucas Nicodemus 2017-12-06 23:45:05 -07:00
commit dbed5e3d5a
2 changed files with 17 additions and 5 deletions

View file

@ -78,6 +78,18 @@ namespace TShockAPI
[Description("Disables any building / placing of blocks.")] [Description("Disables any building / placing of blocks.")]
public bool DisableBuild; public bool DisableBuild;
/// <summary>SuperAdminChatRGB - The chat color for the superadmin group.</summary>
[Description("#.#.# = Red/Blue/Green - RGB Colors for the Admin Chat Color. Max value: 255.")]
public int[] SuperAdminChatRGB = { 255, 255, 255 };
/// <summary>SuperAdminChatPrefix - The superadmin chat prefix.</summary>
[Description("Super admin group chat prefix.")]
public string SuperAdminChatPrefix = "(Super Admin) ";
/// <summary>SuperAdminChatSuffix - The superadmin chat suffix.</summary>
[Description("Super admin group chat suffix.")]
public string SuperAdminChatSuffix = "";
/// <summary>BackupInterval - The backup frequency in minutes.</summary> /// <summary>BackupInterval - The backup frequency in minutes.</summary>
[Description("Backup frequency in minutes. So, a value of 60 = 60 minutes. Backups are stored in the \\tshock\\backups folder.")] [Description("Backup frequency in minutes. So, a value of 60 = 60 minutes. Backups are stored in the \\tshock\\backups folder.")]
public int BackupInterval; public int BackupInterval;

View file

@ -340,11 +340,11 @@ namespace TShockAPI
public SuperAdminGroup() public SuperAdminGroup()
: base("superadmin") : base("superadmin")
{ {
R = (byte)255; R = (byte)TShock.Config.SuperAdminChatRGB[0];
G = (byte)255; G = (byte)TShock.Config.SuperAdminChatRGB[1];
B = (byte)255; B = (byte)TShock.Config.SuperAdminChatRGB[2];
Prefix = "(Super Admin) "; Prefix = TShock.Config.SuperAdminChatPrefix;
Suffix = ""; Suffix = TShock.Config.SuperAdminChatSuffix;
} }
/// <summary> /// <summary>