Changeset 306 for binary-improvements/AllocsCommands/Commands

Timestamp:

Aug 2, 2017, 6:46:15 PM (7 years ago)

Author:

alloc

Message:

Fixes update A16.2

Location:

binary-improvements/AllocsCommands/Commands

Files:

• Give.cs (modified) (2 diffs)
• ListItems.cs (modified) (2 diffs)
• RemoveLandProtection.cs (modified) (2 diffs)

binary-improvements/AllocsCommands/Commands/Give.cs

@@ -39 +39 @@
                                 }
 
-                                ItemValue iv = ItemList.Instance.GetItemValue (_params [1]);
-                                if (iv == null) {
+                                ItemValue iv = ItemClass.GetItem (_params [1], true);
+                                if (iv.type == ItemValue.None.type) {
                                         SdtdConsole.Instance.Output ("Item not found.");
                                         return;
                                 }
+
+                                iv = new ItemValue (iv.type, true);
 
                                 int n = int.MinValue;
@@ -88 +90 @@
                                 ItemStack invField = new ItemStack (iv, n);
 
-                                GameManager.Instance.ItemDropServer (invField, p.GetPosition (), Vector3.zero, -1, 50);
+                                GameManager.Instance.ItemDropServer (invField, p.GetPosition (), Vector3.zero);
 
                                 SdtdConsole.Instance.Output ("Dropped item");

binary-improvements/AllocsCommands/Commands/ListItems.cs

@@ -16 +16 @@
                 }
 
+                public override string GetHelp () {
+                        return "List all available item names\n" +
+                                "Usage:\n" +
+                                "   1. listitems <searchString>\n" +
+                                "   2. listitems *\n" +
+                                "1. List only names that contain the given string.\n" +
+                                "2. List all names.";
+                }
+
                 public override void Execute (List<string> _params, CommandSenderInfo _senderInfo)
                 {
@@ -24 +33 @@
                                 }
 
-                                int n = 0;
-                                foreach (string s in ItemList.Instance.ItemNames) {
-                                        if (s.ToLower ().Contains (_params [0].ToLower ()) || _params[0].Trim().Equals("*")) {
+                                int count = ItemClass.ItemNames.Count;
+                                bool showAll = _params[0].Trim().Equals("*");
+
+                                int listed = 0;
+                                for (int i = 0; i < count; i++) {
+                                        string s = ItemClass.ItemNames [i];
+                                        if (showAll || s.IndexOf (_params [0], StringComparison.OrdinalIgnoreCase) >= 0) {
                                                 SdtdConsole.Instance.Output ("    " + s);
-                                                n++;
+                                                listed++;
                                         }
                                 }
 
-                                SdtdConsole.Instance.Output ("Listed " + n + " matching items.");
+                                SdtdConsole.Instance.Output ("Listed " + listed + " matching items.");
                         } catch (Exception e) {
                                 Log.Out ("Error in ListItems.Run: " + e);

binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs

@@ -15 +15 @@
                                    "  1. removelandprotection <steamid>\n" +
                                    "  2. removelandprotection <x> <y> <z>\n" +
+                                   "  3. removelandprotection nearby [length]\n" +
                                    "1. Remove all land claims owned by the user with the given SteamID\n" +
-                                   "2. Remove only the claim block on the exactly given block position";
+                                   "2. Remove only the claim block on the exactly given block position\n" +
+                                   "3. Remove all claims in a square with edge length of 64 (or the optionally specified size) around the executing player";
                 }
 
@@ -95 +97 @@
                 {
                         try {
-                                if (_params.Count == 1) {
+                                if (_senderInfo.RemoteClientInfo != null) {
+                                        if (_params.Count >= 1 && _params [0].EqualsCaseInsensitive ("nearby")) {
+                                                _params.Add (_senderInfo.RemoteClientInfo.playerId);
+                                        }
+                                }
+
+                                if (_params.Count > 0 && _params [0].EqualsCaseInsensitive ("nearby")) {
+                                        try {
+                                                int closeToDistance = 32;
+                                                if (_params.Count == 3) {
+                                                        if (!int.TryParse (_params[1], out closeToDistance)) {
+                                                                SdtdConsole.Instance.Output ("Given length is not an integer!");
+                                                                return;
+                                                        }
+                                                        closeToDistance /= 2;
+                                                }
+                                                ClientInfo ci = ConsoleHelper.ParseParamSteamIdOnline (_params [_params.Count - 1]);
+                                                EntityPlayer ep = GameManager.Instance.World.Players.dict [ci.entityId];
+                                                Vector3i closeTo = new Vector3i (ep.GetPosition ());
+                                                LandClaimList.PositionFilter[] posFilters = new LandClaimList.PositionFilter[] { LandClaimList.CloseToFilter2dRect (closeTo, closeToDistance) };
+                                                Dictionary<PersistentData.Player, List<Vector3i>> claims = LandClaimList.GetLandClaims (null, posFilters);
+
+                                                try {
+                                                        List<BlockChangeInfo> changes = new List<BlockChangeInfo> ();
+                                                        foreach (KeyValuePair<PersistentData.Player, List<Vector3i>> kvp in claims) {
+                                                                foreach (Vector3i v in kvp.Value) {
+                                                                        BlockChangeInfo bci = new BlockChangeInfo (v, new BlockValue (0), true, false);
+                                                                        changes.Add (bci);
+                                                                }
+                                                        }
+                                                        GameManager.Instance.SetBlocksRPC (changes);
+                                                } catch (Exception e) {
+                                                        SdtdConsole.Instance.Output ("Error removing claims");
+                                                        Log.Out ("Error in RemoveLandProtection.Run: " + e);
+                                                        return;
+                                                }
+                                        } catch (Exception e) {
+                                                SdtdConsole.Instance.Output ("Error getting current player's position");
+                                                Log.Out ("Error in RemoveLandProtection.Run: " + e);
+                                                return;
+                                        }
+                                } else if (_params.Count == 1) {
                                         removeById (_params [0]);
                                 } else if (_params.Count == 3) {
                                         removeByPosition (_params);
                                 } else {
-                                        SdtdConsole.Instance.Output ("Usage: removelandprotection <x> <y> <z>  OR  removelandprotection <steamid>");
+                                        SdtdConsole.Instance.Output ("Illegal parameters");
                                 }
                         } catch (Exception e) {