Changeset 273 for binary-improvements/AllocsCommands/Commands/ListLandProtection.cs

Timestamp:

May 11, 2016, 8:54:19 PM (9 years ago)

Author:

alloc

Message:

fixes 8_10_13_1

File:

• binary-improvements/AllocsCommands/Commands/ListLandProtection.cs (modified) (5 diffs)

binary-improvements/AllocsCommands/Commands/ListLandProtection.cs

@@ -13 +13 @@
                 public override string GetHelp () {
                         return "Usage:\n" +
-                                   "  1. listlandprotection summary\n" +
-                                   "  2. listlandprotection <steam id>\n" +
-                                   "  3. listlandprotection <player name / entity id>\n" +
-                                   "  4. listlandprotection nearby\n" +
-                                   "  5. listlandprotection nearby <radius>\n" +
-                                   "1. Lists only players that own claimstones, the number they own and the protection status\n" +
-                                   "2. Lists only the claims of the player given by his SteamID including the individual claim positions\n" +
-                                   "3. Same as 2 but player given by his player name or entity id (as given by e.g. \"lpi\")\n" +
-                                   "4. Lists claims in a square with edge length of 64 around the executing player\n" +
-                                   "5. Same as 4 but square edge length can be specified";
+                        "  1. listlandprotection summary\n" +
+                        "  2. listlandprotection <steam id / player name / entity id> [parseable]\n" +
+                        "  3. listlandprotection nearby [length]\n" +
+                        "1. Lists only players that own claimstones, the number they own and the protection status\n" +
+                        "2. Lists only the claims of the player given by his SteamID / entity id / playername, including the individual claim positions.\n" +
+                        "   If \"parseable\" is specified the output of the individual claims will be in a format better suited for programmatical readout.\n" +
+                        "3. Lists claims in a square with edge length of 64 (or the optionally specified size) around the executing player\n";
                 }
 
@@ -47 +44 @@
                                 bool onlyCloseToPlayer = false;
                                 int closeToDistance = 32;
+                                bool parseableOutput = false;
+
+                                if (_params.Contains ("parseable")) {
+                                        parseableOutput = true;
+                                        _params.Remove ("parseable");
+                                }
 
                                 if (_params.Count == 1) {
@@ -69 +72 @@
                                                         if (_params.Count == 3) {
                                                                 if (!int.TryParse (_params[1], out closeToDistance)) {
-                                                                        SdtdConsole.Instance.Output ("Given radius is not an integer!");
+                                                                        SdtdConsole.Instance.Output ("Given length is not an integer!");
+                                                                        return;
                                                                 }
+                                                                closeToDistance /= 2;
                                                         }
                                                         ClientInfo ci = ConsoleHelper.ParseParamSteamIdOnline (_params [_params.Count - 1]);
@@ -79 +84 @@
                                                         SdtdConsole.Instance.Output ("Error getting current player's position");
                                                         Log.Out ("Error in ListLandProtection.Run: " + e);
+                                                        return;
                                                 }
                                         } else {
@@ -108 +114 @@
                                         if (!summaryOnly) {
                                                 foreach (Vector3i v in kvp.Value) {
-                                                        SdtdConsole.Instance.Output ("   (" + v.ToString () + ")");
+                                                        if (parseableOutput) {
+                                                                SdtdConsole.Instance.Output ("LandProtectionOf: id=" + kvp.Key.SteamID + ", playerName=" + kvp.Key.Name + ", location=" + v.ToString ());
+                                                        } else {
+                                                                SdtdConsole.Instance.Output ("   (" + v.ToString () + ")");
+                                                        }
                                                 }
                                         }