From ff9d2d1627f0b40d11a2fc6f6e56da83dba2fc00 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Thu, 12 May 2016 09:15:58 +1000 Subject: [PATCH] Make additional permission descriptions in /help more concise. --- Commands/Chat/CmdChatRoom.cs | 14 +++++++------- Commands/Economy/CmdEconomy.cs | 2 +- Commands/Fun/CmdCountdown.cs | 4 ++-- Commands/Fun/CmdTntWars.cs | 2 +- Commands/Information/CmdFaq.cs | 2 +- Commands/Information/CmdHelp.cs | 2 +- Commands/Information/CmdNews.cs | 2 +- Commands/Information/CmdRankReqs.cs | 2 +- Commands/Information/CmdRules.cs | 2 +- Commands/Information/CmdWhois.cs | 2 +- Commands/Moderation/CmdHide.cs | 3 +-- Commands/Moderation/CmdPatrol.cs | 4 ++-- Commands/Moderation/CmdZone.cs | 6 +++--- Commands/World/CmdMap.cs | 2 +- Commands/World/CmdReveal.cs | 2 +- Commands/building/CmdUndo.cs | 4 ++-- Commands/other/CmdBotSet.cs | 2 +- Commands/other/CmdChangeLog.cs | 2 +- Commands/other/CmdMain.cs | 2 +- Commands/other/CmdReport.cs | 2 +- Commands/other/CmdTnt.cs | 6 +++--- Commands/other/CmdWarp.cs | 6 +++--- 22 files changed, 37 insertions(+), 38 deletions(-) diff --git a/Commands/Chat/CmdChatRoom.cs b/Commands/Chat/CmdChatRoom.cs index 3cb24f869..d6f3f2421 100644 --- a/Commands/Chat/CmdChatRoom.cs +++ b/Commands/Chat/CmdChatRoom.cs @@ -27,13 +27,13 @@ namespace MCGalaxy.Commands { public override LevelPermission defaultRank { get { return LevelPermission.Banned; } } public override CommandPerm[] AdditionalPerms { get { return new[] { - new CommandPerm(LevelPermission.AdvBuilder, "Lowest rank that can create chatrooms"), - new CommandPerm(LevelPermission.AdvBuilder, "Lowest rank that can delete a chatroom if empty"), - new CommandPerm(LevelPermission.Operator, "Lowest rank that can delete a chatroom"), - new CommandPerm(LevelPermission.Operator, "Lowest rank that can spy on a chatroom"), - new CommandPerm(LevelPermission.Operator, "Lowest rank that can force a player to join a chatroom"), - new CommandPerm(LevelPermission.Operator, "Lowest rank that can kick a player from a chatroom"), - new CommandPerm(LevelPermission.Operator, "Lowest rank that can send a global message to a chatroom (without any delay)"), + new CommandPerm(LevelPermission.AdvBuilder, "+ can create chatrooms"), + new CommandPerm(LevelPermission.AdvBuilder, "+ can delete an empty chatroom"), + new CommandPerm(LevelPermission.Operator, "+ can delete a chatroom"), + new CommandPerm(LevelPermission.Operator, "+ can spy on a chatroom"), + new CommandPerm(LevelPermission.Operator, "+ can force a player to join a chatroom"), + new CommandPerm(LevelPermission.Operator, "+ can kick a player from a chatroom"), + new CommandPerm(LevelPermission.Operator, "+ can send a global message to a chatroom (without any delay)"), }; } } diff --git a/Commands/Economy/CmdEconomy.cs b/Commands/Economy/CmdEconomy.cs index 3b49e3028..fff49423b 100644 --- a/Commands/Economy/CmdEconomy.cs +++ b/Commands/Economy/CmdEconomy.cs @@ -30,7 +30,7 @@ namespace MCGalaxy.Commands { public override bool museumUsable { get { return true; } } public override LevelPermission defaultRank { get { return LevelPermission.Guest; } } public override CommandPerm[] AdditionalPerms { - get { return new[] { new CommandPerm(LevelPermission.Operator, "Lowest rank that can setup the economy") }; } + get { return new[] { new CommandPerm(LevelPermission.Operator, "+ can setup the economy") }; } } public override void Use(Player p, string message) { diff --git a/Commands/Fun/CmdCountdown.cs b/Commands/Fun/CmdCountdown.cs index 96f47ab4b..dc3af8519 100644 --- a/Commands/Fun/CmdCountdown.cs +++ b/Commands/Fun/CmdCountdown.cs @@ -33,8 +33,8 @@ namespace MCGalaxy.Commands { public override LevelPermission defaultRank { get { return LevelPermission.Banned; } } public override CommandPerm[] AdditionalPerms { get { return new[] { - new CommandPerm(LevelPermission.Operator, "Lowest rank that can send the countdown rules to everybody"), - new CommandPerm(LevelPermission.Operator, "Lowest rank that can setup countdown (download, start, restart, enable, disable, cancel)"), + new CommandPerm(LevelPermission.Operator, "+ can send the countdown rules to everybody"), + new CommandPerm(LevelPermission.Operator, "+ can setup countdown (download/start/restart/enable/disable/cancel)"), }; } } diff --git a/Commands/Fun/CmdTntWars.cs b/Commands/Fun/CmdTntWars.cs index efdf8fbec..266b2d5de 100644 --- a/Commands/Fun/CmdTntWars.cs +++ b/Commands/Fun/CmdTntWars.cs @@ -30,7 +30,7 @@ namespace MCGalaxy.Commands public override bool museumUsable { get { return false; } } public override LevelPermission defaultRank { get { return LevelPermission.Guest; } } public override CommandPerm[] AdditionalPerms { - get { return new[] { new CommandPerm(LevelPermission.Operator, "Lowest rank that can use admin commands for tntwars") }; } + get { return new[] { new CommandPerm(LevelPermission.Operator, "+ can use admin commands for tntwars") }; } } public bool DeleteZone = false; diff --git a/Commands/Information/CmdFaq.cs b/Commands/Information/CmdFaq.cs index 18696ee9a..fbd52d8fb 100644 --- a/Commands/Information/CmdFaq.cs +++ b/Commands/Information/CmdFaq.cs @@ -27,7 +27,7 @@ namespace MCGalaxy.Commands { public override bool museumUsable { get { return true; } } public override LevelPermission defaultRank { get { return LevelPermission.Banned; } } public override CommandPerm[] AdditionalPerms { - get { return new[] { new CommandPerm(LevelPermission.Builder, "Lowest rank that can send the faq to other players") }; } + get { return new[] { new CommandPerm(LevelPermission.Builder, "+ can send the faq to other players") }; } } public override void Use(Player p, string message) { diff --git a/Commands/Information/CmdHelp.cs b/Commands/Information/CmdHelp.cs index 0366786c7..d203568e2 100644 --- a/Commands/Information/CmdHelp.cs +++ b/Commands/Information/CmdHelp.cs @@ -88,7 +88,7 @@ namespace MCGalaxy.Commands for (int i = 0; i < perms.Length; i++) { var addition = CommandOtherPerms.Find(cmd, i + 1); LevelPermission perm = (LevelPermission)addition.Permission; - Player.Message(p, GetColoredRank(perm) + " %S- " + addition.Description); + Player.Message(p, GetColoredRank(perm) + "%S" + addition.Description); } return true; } diff --git a/Commands/Information/CmdNews.cs b/Commands/Information/CmdNews.cs index 8e31073c6..e9231c54d 100644 --- a/Commands/Information/CmdNews.cs +++ b/Commands/Information/CmdNews.cs @@ -28,7 +28,7 @@ namespace MCGalaxy.Commands public override bool museumUsable { get { return true; } } public override LevelPermission defaultRank { get { return LevelPermission.Banned; } } public override CommandPerm[] AdditionalPerms { - get { return new[] { new CommandPerm(LevelPermission.Operator, "Lowest rank that can send the news to everyone") }; } + get { return new[] { new CommandPerm(LevelPermission.Operator, "+ can send the news to everyone") }; } } const string newsFile = "text/news.txt"; diff --git a/Commands/Information/CmdRankReqs.cs b/Commands/Information/CmdRankReqs.cs index c19aaf8ad..3219263bc 100644 --- a/Commands/Information/CmdRankReqs.cs +++ b/Commands/Information/CmdRankReqs.cs @@ -31,7 +31,7 @@ namespace MCGalaxy.Commands { public override LevelPermission defaultRank { get { return LevelPermission.Guest; } } public override CommandPerm[] AdditionalPerms { get { return new[] { - new CommandPerm(LevelPermission.Operator, "Lowest rank able to set rank requirements."), + new CommandPerm(LevelPermission.Operator, "+ can set rank requirements."), }; } } static char[] trimChars = new[] { ' ' }; diff --git a/Commands/Information/CmdRules.cs b/Commands/Information/CmdRules.cs index 75e039638..34cbbdf38 100644 --- a/Commands/Information/CmdRules.cs +++ b/Commands/Information/CmdRules.cs @@ -28,7 +28,7 @@ namespace MCGalaxy.Commands public override bool museumUsable { get { return true; } } public override LevelPermission defaultRank { get { return LevelPermission.Banned; } } public override CommandPerm[] AdditionalPerms { - get { return new[] { new CommandPerm(LevelPermission.Builder, "Lowest rank that can send rules to other players") }; } + get { return new[] { new CommandPerm(LevelPermission.Builder, "can send rules to other players") }; } } public override void Use(Player p, string message) { diff --git a/Commands/Information/CmdWhois.cs b/Commands/Information/CmdWhois.cs index d999b3a0d..2643a0bd1 100644 --- a/Commands/Information/CmdWhois.cs +++ b/Commands/Information/CmdWhois.cs @@ -27,7 +27,7 @@ namespace MCGalaxy.Commands { public override bool museumUsable { get { return true; } } public override LevelPermission defaultRank { get { return LevelPermission.Banned; } } public override CommandPerm[] AdditionalPerms { - get { return new[] { new CommandPerm(LevelPermission.AdvBuilder, "Lowest rank which can see IPs and if whitelisted") }; } + get { return new[] { new CommandPerm(LevelPermission.AdvBuilder, "+ can see IPs and if a player is whitelisted") }; } } public override void Use(Player p, string message) { diff --git a/Commands/Moderation/CmdHide.cs b/Commands/Moderation/CmdHide.cs index e28368094..0a8c5689c 100644 --- a/Commands/Moderation/CmdHide.cs +++ b/Commands/Moderation/CmdHide.cs @@ -26,8 +26,7 @@ namespace MCGalaxy.Commands public override bool museumUsable { get { return true; } } public override LevelPermission defaultRank { get { return LevelPermission.Operator; } } public override CommandPerm[] AdditionalPerms { - get { return new[] { new CommandPerm(LevelPermission.Admin, - "Lowest rank that can hide/unhide without showing a message to ops") }; } + get { return new[] { new CommandPerm(LevelPermission.Admin, "+ can hide/unhide without showing a message to ops") }; } } public override CommandAlias[] Aliases { get { return new[] { new CommandAlias("xhide", "silent") }; } diff --git a/Commands/Moderation/CmdPatrol.cs b/Commands/Moderation/CmdPatrol.cs index 85ed1b237..69fb71b21 100644 --- a/Commands/Moderation/CmdPatrol.cs +++ b/Commands/Moderation/CmdPatrol.cs @@ -30,7 +30,7 @@ namespace MCGalaxy.Commands public override bool museumUsable { get { return false; } } public override LevelPermission defaultRank { get { return LevelPermission.Builder; } } public override CommandPerm[] AdditionalPerms { - get { return new[] { new CommandPerm(LevelPermission.Guest, "The highest rank to be patrolled") }; } + get { return new[] { new CommandPerm(LevelPermission.Guest, " and below are patrolled") }; } } public override void Help(Player p) @@ -54,7 +54,7 @@ namespace MCGalaxy.Commands string value = getpatrol[index]; Player who = PlayerInfo.FindExact(value); Command.all.Find("tp").Use(p, who.name); - Player.Message(p, "You are now visiting " + who.color + who.name + "!"); + Player.Message(p, "Now visiting " + who.ColoredName + "%S."); } } } diff --git a/Commands/Moderation/CmdZone.cs b/Commands/Moderation/CmdZone.cs index cf62e37c9..9046fca21 100644 --- a/Commands/Moderation/CmdZone.cs +++ b/Commands/Moderation/CmdZone.cs @@ -29,9 +29,9 @@ namespace MCGalaxy.Commands public override LevelPermission defaultRank { get { return LevelPermission.Operator; } } public override CommandPerm[] AdditionalPerms { get { return new[] { - new CommandPerm(LevelPermission.Operator, "Lowest rank to delete zones"), - new CommandPerm(LevelPermission.Operator, "Lowest rank to delete all zones"), - new CommandPerm(LevelPermission.Operator, "Lowest rank to create zones"), + new CommandPerm(LevelPermission.Operator, "+ can delete zones"), + new CommandPerm(LevelPermission.Operator, "+ can delete all zones"), + new CommandPerm(LevelPermission.Operator, "+ can create zones"), }; } } diff --git a/Commands/World/CmdMap.cs b/Commands/World/CmdMap.cs index c5a708819..ea6f3b798 100644 --- a/Commands/World/CmdMap.cs +++ b/Commands/World/CmdMap.cs @@ -25,7 +25,7 @@ namespace MCGalaxy.Commands public override bool museumUsable { get { return true; } } public override LevelPermission defaultRank { get { return LevelPermission.Guest; } } public override CommandPerm[] AdditionalPerms { - get { return new[] { new CommandPerm(LevelPermission.Operator, "Lowest rank that can edit map options") }; } + get { return new[] { new CommandPerm(LevelPermission.Operator, "+ can edit map options") }; } } public override CommandAlias[] Aliases { get { return new[] { new CommandAlias("ps", "ps") }; } diff --git a/Commands/World/CmdReveal.cs b/Commands/World/CmdReveal.cs index dc99513da..96cb6aef3 100644 --- a/Commands/World/CmdReveal.cs +++ b/Commands/World/CmdReveal.cs @@ -26,7 +26,7 @@ namespace MCGalaxy.Commands { public override bool museumUsable { get { return true; } } public override LevelPermission defaultRank { get { return LevelPermission.AdvBuilder; } } public override CommandPerm[] AdditionalPerms { - get { return new[] { new CommandPerm(LevelPermission.Operator, "Lowest rank that can reveal to everyone") }; } + get { return new[] { new CommandPerm(LevelPermission.Operator, "+ can reveal to everyone") }; } } public override void Use(Player p, string message) { diff --git a/Commands/building/CmdUndo.cs b/Commands/building/CmdUndo.cs index 2cc21b16a..a6b766740 100644 --- a/Commands/building/CmdUndo.cs +++ b/Commands/building/CmdUndo.cs @@ -32,8 +32,8 @@ namespace MCGalaxy.Commands public override LevelPermission defaultRank { get { return LevelPermission.Guest; } } public override CommandPerm[] AdditionalPerms { get { return new[] { - new CommandPerm(LevelPermission.Operator, "Lowest rank able to undo other players"), - new CommandPerm(LevelPermission.AdvBuilder, "Lowest rank able to undo physics"), + new CommandPerm(LevelPermission.Operator, "+ can undo other players"), + new CommandPerm(LevelPermission.AdvBuilder, "+ can undo physics"), }; } } public override CommandAlias[] Aliases { diff --git a/Commands/other/CmdBotSet.cs b/Commands/other/CmdBotSet.cs index fad1e649c..28b9d52aa 100644 --- a/Commands/other/CmdBotSet.cs +++ b/Commands/other/CmdBotSet.cs @@ -27,7 +27,7 @@ namespace MCGalaxy.Commands { public override bool museumUsable { get { return false; } } public override LevelPermission defaultRank { get { return LevelPermission.AdvBuilder; } } public override CommandPerm[] AdditionalPerms { - get { return new[] { new CommandPerm(LevelPermission.Operator, "Lowest rank that can set the bot to killer") }; } + get { return new[] { new CommandPerm(LevelPermission.Operator, "+ can set bots to be killer") }; } } public override void Use(Player p, string message) { diff --git a/Commands/other/CmdChangeLog.cs b/Commands/other/CmdChangeLog.cs index 22a6ebe75..3ae28251d 100644 --- a/Commands/other/CmdChangeLog.cs +++ b/Commands/other/CmdChangeLog.cs @@ -28,7 +28,7 @@ namespace MCGalaxy.Commands public override bool museumUsable { get { return true; } } public override LevelPermission defaultRank { get { return LevelPermission.Banned; } } public override CommandPerm[] AdditionalPerms { - get { return new[] { new CommandPerm(LevelPermission.Operator, "Lowest rank that can send the changelog to everybody") }; } + get { return new[] { new CommandPerm(LevelPermission.Operator, "+ can send the changelog to everybody") }; } } public override void Use(Player p, string message) diff --git a/Commands/other/CmdMain.cs b/Commands/other/CmdMain.cs index bcca555d3..6011078bd 100644 --- a/Commands/other/CmdMain.cs +++ b/Commands/other/CmdMain.cs @@ -24,7 +24,7 @@ namespace MCGalaxy.Commands { public override bool museumUsable { get { return true; } } public override LevelPermission defaultRank { get { return LevelPermission.Banned; } } public override CommandPerm[] AdditionalPerms { - get { return new[] { new CommandPerm(LevelPermission.Admin, "Lowest rank which can can change the main level") }; } + get { return new[] { new CommandPerm(LevelPermission.Admin, "+ can change the main level") }; } } public CmdMain() { } diff --git a/Commands/other/CmdReport.cs b/Commands/other/CmdReport.cs index d12f4b6bd..733acb32d 100644 --- a/Commands/other/CmdReport.cs +++ b/Commands/other/CmdReport.cs @@ -29,7 +29,7 @@ namespace MCGalaxy.Commands { public override bool museumUsable { get { return true; } } public override LevelPermission defaultRank { get { return LevelPermission.Guest; } } public override CommandPerm[] AdditionalPerms { - get { return new[] { new CommandPerm(LevelPermission.Operator, "Lowest rank which can check, view and delete reports") }; } + get { return new[] { new CommandPerm(LevelPermission.Operator, "+ can check, view and delete reports") }; } } static char[] trimChars = {' '}; diff --git a/Commands/other/CmdTnt.cs b/Commands/other/CmdTnt.cs index 2d9348ab7..4093c2933 100644 --- a/Commands/other/CmdTnt.cs +++ b/Commands/other/CmdTnt.cs @@ -26,9 +26,9 @@ namespace MCGalaxy.Commands public override LevelPermission defaultRank { get { return LevelPermission.Builder; } } public override CommandPerm[] AdditionalPerms { get { return new[] { - new CommandPerm(LevelPermission.Operator, "Lowest rank at which big tnt can be used"), - new CommandPerm(LevelPermission.Operator, "Lowest rank at which the user can allow/disallow tnt"), - new CommandPerm(LevelPermission.Operator, "Lowest rank at which nuke tnt can be used"), + new CommandPerm(LevelPermission.Operator, "+ can use big TNT"), + new CommandPerm(LevelPermission.Operator, "+ can allow/disallow tnt"), + new CommandPerm(LevelPermission.Operator, "+ can use nuke TNT"), }; } } diff --git a/Commands/other/CmdWarp.cs b/Commands/other/CmdWarp.cs index 9122a0c16..bbc3e4baf 100644 --- a/Commands/other/CmdWarp.cs +++ b/Commands/other/CmdWarp.cs @@ -28,9 +28,9 @@ namespace MCGalaxy.Commands public override LevelPermission defaultRank { get { return LevelPermission.Guest; } } public override CommandPerm[] AdditionalPerms { get { return new[] { - new CommandPerm(LevelPermission.Operator, "Lowest rank to create warps"), - new CommandPerm(LevelPermission.Operator, "Lowest rank to delete warps"), - new CommandPerm(LevelPermission.Operator, "Lowest rank to move/edit warps"), + new CommandPerm(LevelPermission.Operator, "+ can create warps"), + new CommandPerm(LevelPermission.Operator, "+ can delete warps"), + new CommandPerm(LevelPermission.Operator, "+ can move/edit warps"), }; } }