Index: binary-improvements/AllocsCommands/Commands/Give.cs =================================================================== --- binary-improvements/AllocsCommands/Commands/Give.cs (revision 324) +++ binary-improvements/AllocsCommands/Commands/Give.cs (revision 325) @@ -3,6 +3,5 @@ using UnityEngine; -namespace AllocsFixes.CustomCommands -{ +namespace AllocsFixes.CustomCommands { public class Give : ConsoleCmdAbstract { public override string GetDescription () { @@ -12,15 +11,15 @@ public override string GetHelp () { return "Give an item to a player by dropping it in front of that player\n" + - "Usage:\n" + - " give \n" + - " give \n" + - "Either pass the full name of a player or his entity id (given by e.g. \"lpi\").\n" + - "Item name has to be the exact name of an item as listed by \"listitems\".\n" + - "Amount is the number of instances of this item to drop (as a single stack).\n" + - "Quality is the quality of the dropped items for items that have a quality."; + "Usage:\n" + + " give \n" + + " give \n" + + "Either pass the full name of a player or his entity id (given by e.g. \"lpi\").\n" + + "Item name has to be the exact name of an item as listed by \"listitems\".\n" + + "Amount is the number of instances of this item to drop (as a single stack).\n" + + "Quality is the quality of the dropped items for items that have a quality."; } public override string[] GetCommands () { - return new string[] { "give", string.Empty }; + return new[] {"give", string.Empty}; } @@ -28,5 +27,6 @@ try { if (_params.Count != 3 && _params.Count != 4) { - SdtdConsole.Instance.Output ("Wrong number of arguments, expected 3 or 4, found " + _params.Count + "."); + SdtdConsole.Instance.Output ("Wrong number of arguments, expected 3 or 4, found " + _params.Count + + "."); return; } @@ -56,5 +56,5 @@ if (_params.Count == 4) { - if(!int.TryParse(_params [1], out quality) || quality <= 0) { + if (!int.TryParse (_params [1], out quality) || quality <= 0) { SdtdConsole.Instance.Output ("Quality is not an integer or not greater than zero."); return; @@ -64,7 +64,7 @@ if (ItemClass.list [iv.type].HasSubItems) { for (int i = 0; i < iv.Modifications.Length; i++) { - ItemValue tmp = iv.Modifications[i]; + ItemValue tmp = iv.Modifications [i]; tmp.Quality = quality; - iv.Modifications[i] = tmp; + iv.Modifications [i] = tmp; } } else if (ItemClass.list [iv.type].HasQuality) { Index: binary-improvements/AllocsCommands/Commands/ListItems.cs =================================================================== --- binary-improvements/AllocsCommands/Commands/ListItems.cs (revision 324) +++ binary-improvements/AllocsCommands/Commands/ListItems.cs (revision 325) @@ -2,29 +2,24 @@ using System.Collections.Generic; -namespace AllocsFixes.CustomCommands -{ - public class ListItems : ConsoleCmdAbstract - { - public override string GetDescription () - { +namespace AllocsFixes.CustomCommands { + public class ListItems : ConsoleCmdAbstract { + public override string GetDescription () { return "lists all items that contain the given substring"; } - public override string[] GetCommands () - { - return new string[] { "listitems", "li" }; + public override string[] GetCommands () { + return new[] {"listitems", "li"}; } public override string GetHelp () { return "List all available item names\n" + - "Usage:\n" + - " 1. listitems \n" + - " 2. listitems *\n" + - "1. List only names that contain the given string.\n" + - "2. List all names."; + "Usage:\n" + + " 1. listitems \n" + + " 2. listitems *\n" + + "1. List only names that contain the given string.\n" + + "2. List all names."; } - public override void Execute (List _params, CommandSenderInfo _senderInfo) - { + public override void Execute (List _params, CommandSenderInfo _senderInfo) { try { if (_params.Count != 1 || _params [0].Length == 0) { @@ -34,5 +29,5 @@ int count = ItemClass.ItemNames.Count; - bool showAll = _params[0].Trim().Equals("*"); + bool showAll = _params [0].Trim ().Equals ("*"); int listed = 0; Index: binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs =================================================================== --- binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs (revision 324) +++ binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs (revision 325) @@ -1,12 +1,9 @@ -using AllocsFixes.PersistentData; using System; using System.Collections.Generic; +using AllocsFixes.PersistentData; -namespace AllocsFixes.CustomCommands -{ - public class ListKnownPlayers : ConsoleCmdAbstract - { - public override string GetDescription () - { +namespace AllocsFixes.CustomCommands { + public class ListKnownPlayers : ConsoleCmdAbstract { + public override string GetDescription () { return "lists all players that were ever online"; } @@ -14,21 +11,19 @@ public override string GetHelp () { return "Usage:\n" + - " 1. listknownplayers\n" + - " 2. listknownplayers -online\n" + - " 3. listknownplayers -notbanned\n" + - " 4. listknownplayers \n" + - "1. Lists all players that have ever been online\n" + - "2. Lists only the players that are currently online\n" + - "3. Lists only the players that are not banned\n" + - "4. Lists all players whose name contains the given string or matches the given SteamID"; + " 1. listknownplayers\n" + + " 2. listknownplayers -online\n" + + " 3. listknownplayers -notbanned\n" + + " 4. listknownplayers \n" + + "1. Lists all players that have ever been online\n" + + "2. Lists only the players that are currently online\n" + + "3. Lists only the players that are not banned\n" + + "4. Lists all players whose name contains the given string or matches the given SteamID"; } - public override string[] GetCommands () - { - return new string[] { "listknownplayers", "lkp" }; + public override string[] GetCommands () { + return new[] {"listknownplayers", "lkp"}; } - public override void Execute (List _params, CommandSenderInfo _senderInfo) - { + public override void Execute (List _params, CommandSenderInfo _senderInfo) { try { AdminTools admTools = GameManager.Instance.adminTools; @@ -56,5 +51,6 @@ if (p != null) { - SdtdConsole.Instance.Output (String.Format ("{0}. {1}, id={2}, steamid={3}, online={4}, ip={5}, playtime={6} m, seen={7}", + SdtdConsole.Instance.Output (string.Format ( + "{0}. {1}, id={2}, steamid={3}, online={4}, ip={5}, playtime={6} m, seen={7}", 0, p.Name, p.EntityID, nameFilter, p.IsOnline, p.IP, p.TotalPlayTime / 60, @@ -62,5 +58,5 @@ ); } else { - SdtdConsole.Instance.Output (String.Format ("SteamID {0} unknown!", nameFilter)); + SdtdConsole.Instance.Output (string.Format ("SteamID {0} unknown!", nameFilter)); } } else { @@ -74,11 +70,13 @@ && (nameFilter.Length == 0 || p.Name.ToLower ().Contains (nameFilter)) ) { - SdtdConsole.Instance.Output (String.Format ("{0}. {1}, id={2}, steamid={3}, online={4}, ip={5}, playtime={6} m, seen={7}", - ++num, p.Name, p.EntityID, sid, p.IsOnline, p.IP, - p.TotalPlayTime / 60, - p.LastOnline.ToString ("yyyy-MM-dd HH:mm")) + SdtdConsole.Instance.Output (string.Format ( + "{0}. {1}, id={2}, steamid={3}, online={4}, ip={5}, playtime={6} m, seen={7}", + ++num, p.Name, p.EntityID, sid, p.IsOnline, p.IP, + p.TotalPlayTime / 60, + p.LastOnline.ToString ("yyyy-MM-dd HH:mm")) ); } } + SdtdConsole.Instance.Output ("Total of " + PersistentContainer.Instance.Players.Count + " known"); } Index: binary-improvements/AllocsCommands/Commands/ListLandProtection.cs =================================================================== --- binary-improvements/AllocsCommands/Commands/ListLandProtection.cs (revision 324) +++ binary-improvements/AllocsCommands/Commands/ListLandProtection.cs (revision 325) @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; +using AllocsFixes.PersistentData; -namespace AllocsFixes.CustomCommands -{ - public class ListLandProtection : ConsoleCmdAbstract - { - public override string GetDescription () - { +namespace AllocsFixes.CustomCommands { + public class ListLandProtection : ConsoleCmdAbstract { + public override string GetDescription () { return "lists all land protection blocks and owners"; } @@ -13,20 +11,18 @@ public override string GetHelp () { return "Usage:\n" + - " 1. listlandprotection summary\n" + - " 2. listlandprotection [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"; + " 1. listlandprotection summary\n" + + " 2. listlandprotection [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"; } - public override string[] GetCommands () - { - return new string[] { "listlandprotection", "llp" }; + public override string[] GetCommands () { + return new[] {"listlandprotection", "llp"}; } - public override void Execute (List _params, CommandSenderInfo _senderInfo) - { + public override void Execute (List _params, CommandSenderInfo _senderInfo) { try { if (_senderInfo.RemoteClientInfo != null) { @@ -41,5 +37,5 @@ bool summaryOnly = false; string steamIdFilter = string.Empty; - Vector3i closeTo = default(Vector3i); + Vector3i closeTo = default (Vector3i); bool onlyCloseToPlayer = false; int closeToDistance = 32; @@ -71,10 +67,12 @@ try { if (_params.Count == 3) { - if (!int.TryParse (_params[1], out closeToDistance)) { + 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 = w.Players.dict [ci.entityId]; @@ -95,15 +93,16 @@ LandClaimList.OwnerFilter[] ownerFilters = null; if (!string.IsNullOrEmpty (steamIdFilter)) { - ownerFilters = new LandClaimList.OwnerFilter[] { LandClaimList.SteamIdFilter (steamIdFilter) }; + ownerFilters = new[] {LandClaimList.SteamIdFilter (steamIdFilter)}; } + LandClaimList.PositionFilter[] posFilters = null; if (onlyCloseToPlayer) { - posFilters = new LandClaimList.PositionFilter[] { LandClaimList.CloseToFilter2dRect (closeTo, closeToDistance) }; + posFilters = new[] {LandClaimList.CloseToFilter2dRect (closeTo, closeToDistance)}; } - Dictionary> claims = LandClaimList.GetLandClaims (ownerFilters, posFilters); + Dictionary> claims = LandClaimList.GetLandClaims (ownerFilters, posFilters); - foreach (KeyValuePair> kvp in claims) { - SdtdConsole.Instance.Output (String.Format ( + foreach (KeyValuePair> kvp in claims) { + SdtdConsole.Instance.Output (string.Format ( "Player \"{0} ({1})\" owns {4} keystones (protected: {2}, current hardness multiplier: {3})", kvp.Key.Name, @@ -115,7 +114,8 @@ foreach (Vector3i v in kvp.Value) { if (parseableOutput) { - SdtdConsole.Instance.Output ("LandProtectionOf: id=" + kvp.Key.SteamID + ", playerName=" + kvp.Key.Name + ", location=" + v.ToString ()); + SdtdConsole.Instance.Output ("LandProtectionOf: id=" + kvp.Key.SteamID + + ", playerName=" + kvp.Key.Name + ", location=" + v); } else { - SdtdConsole.Instance.Output (" (" + v.ToString () + ")"); + SdtdConsole.Instance.Output (" (" + v + ")"); } } @@ -123,6 +123,7 @@ } - if (steamIdFilter.Length == 0) + if (steamIdFilter.Length == 0) { SdtdConsole.Instance.Output ("Total of " + ppl.m_lpBlockMap.Count + " keystones in the game"); + } } catch (Exception e) { Log.Out ("Error in ListLandProtection.Run: " + e); Index: binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs =================================================================== --- binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs (revision 324) +++ binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs (revision 325) @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; +using AllocsFixes.PersistentData; -namespace AllocsFixes.CustomCommands -{ - public class RemoveLandProtection : ConsoleCmdAbstract - { - public override string GetDescription () - { +namespace AllocsFixes.CustomCommands { + public class RemoveLandProtection : ConsoleCmdAbstract { + public override string GetDescription () { return "removes the association of a land protection block to the owner"; } @@ -13,42 +11,45 @@ public override string GetHelp () { return "Usage:" + - " 1. removelandprotection \n" + - " 2. removelandprotection \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\n" + - "3. Remove all claims in a square with edge length of 64 (or the optionally specified size) around the executing player"; + " 1. removelandprotection \n" + + " 2. removelandprotection \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\n" + + "3. Remove all claims in a square with edge length of 64 (or the optionally specified size) around the executing player"; } - public override string[] GetCommands () - { - return new string[] { "removelandprotection", "rlp" }; + public override string[] GetCommands () { + return new[] {"removelandprotection", "rlp"}; } - private void removeById (string _id) - { + private void removeById (string _id) { try { PersistentPlayerList ppl = GameManager.Instance.GetPersistentPlayerList (); if (_id.Length < 1 || !ppl.Players.ContainsKey (_id)) { - SdtdConsole.Instance.Output ("Not a valid Steam ID or user has never logged on. Use \"listlandprotection\" to get a list of keystones."); + SdtdConsole.Instance.Output ( + "Not a valid Steam ID or user has never logged on. Use \"listlandprotection\" to get a list of keystones."); return; } + if (ppl.Players [_id].LPBlocks == null || ppl.Players [_id].LPBlocks.Count == 0) { - SdtdConsole.Instance.Output ("Player does not own any keystones. Use \"listlandprotection\" to get a list of keystones."); + SdtdConsole.Instance.Output ( + "Player does not own any keystones. Use \"listlandprotection\" to get a list of keystones."); return; } List changes = new List (); - foreach (Vector3i pos in ppl.Players[_id].LPBlocks) { + foreach (Vector3i pos in ppl.Players [_id].LPBlocks) { BlockChangeInfo bci = new BlockChangeInfo (pos, new BlockValue (0), true, false); changes.Add (bci); } + GameManager.Instance.SetBlocksRPC (changes); - SdtdConsole.Instance.Output ("Tried to remove #" + changes.Count + " land protection blocks for player \"" + _id + "\". Note "+ - "that only blocks in chunks that are currently loaded (close to any player) could be removed. "+ - "Please check for remaining blocks by running:"); - SdtdConsole.Instance.Output(" listlandprotection " + _id); + SdtdConsole.Instance.Output ("Tried to remove #" + changes.Count + + " land protection blocks for player \"" + _id + "\". Note " + + "that only blocks in chunks that are currently loaded (close to any player) could be removed. " + + "Please check for remaining blocks by running:"); + SdtdConsole.Instance.Output (" listlandprotection " + _id); } catch (Exception e) { Log.Out ("Error in RemoveLandProtection.removeById: " + e); @@ -56,6 +57,5 @@ } - private void removeByPosition (List _coords) - { + private void removeByPosition (List _coords) { try { int x = int.MinValue; @@ -77,5 +77,6 @@ Dictionary d = ppl.m_lpBlockMap; if (d == null || !d.ContainsKey (v)) { - SdtdConsole.Instance.Output ("No land protection block at the given position or not a valid position. Use \"listlandprotection\" to get a list of keystones."); + SdtdConsole.Instance.Output ( + "No land protection block at the given position or not a valid position. Use \"listlandprotection\" to get a list of keystones."); return; } @@ -88,5 +89,5 @@ GameManager.Instance.SetBlocksRPC (changes); - SdtdConsole.Instance.Output ("Land protection block at (" + v.ToString () + ") removed"); + SdtdConsole.Instance.Output ("Land protection block at (" + v + ") removed"); } catch (Exception e) { Log.Out ("Error in RemoveLandProtection.removeByPosition: " + e); @@ -94,6 +95,5 @@ } - public override void Execute (List _params, CommandSenderInfo _senderInfo) - { + public override void Execute (List _params, CommandSenderInfo _senderInfo) { try { if (_senderInfo.RemoteClientInfo != null) { @@ -107,19 +107,22 @@ int closeToDistance = 32; if (_params.Count == 3) { - if (!int.TryParse (_params[1], out closeToDistance)) { + 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> claims = LandClaimList.GetLandClaims (null, posFilters); + LandClaimList.PositionFilter[] posFilters = + {LandClaimList.CloseToFilter2dRect (closeTo, closeToDistance)}; + Dictionary> claims = LandClaimList.GetLandClaims (null, posFilters); try { List changes = new List (); - foreach (KeyValuePair> kvp in claims) { + foreach (KeyValuePair> kvp in claims) { foreach (Vector3i v in kvp.Value) { BlockChangeInfo bci = new BlockChangeInfo (v, new BlockValue (0), true, false); @@ -127,14 +130,13 @@ } } + 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) { Index: binary-improvements/AllocsCommands/Commands/Reply.cs =================================================================== --- binary-improvements/AllocsCommands/Commands/Reply.cs (revision 324) +++ binary-improvements/AllocsCommands/Commands/Reply.cs (revision 325) @@ -1,11 +1,7 @@ -using System; using System.Collections.Generic; -namespace AllocsFixes.CustomCommands -{ - public class Reply : ConsoleCmdAbstract - { - public override string GetDescription () - { +namespace AllocsFixes.CustomCommands { + public class Reply : ConsoleCmdAbstract { + public override string GetDescription () { return "send a message to the player who last sent you a PM"; } @@ -13,15 +9,13 @@ public override string GetHelp () { return "Usage:\n" + - " reply \n" + - "Send the given message to the user you last received a PM from."; + " reply \n" + + "Send the given message to the user you last received a PM from."; } - public override string[] GetCommands () - { - return new string[] { "reply", "re" }; + public override string[] GetCommands () { + return new[] {"reply", "re"}; } - private void RunInternal (ClientInfo _sender, List _params) - { + private void RunInternal (ClientInfo _sender, List _params) { if (_params.Count < 1) { SdtdConsole.Instance.Output ("Usage: reply "); @@ -35,5 +29,6 @@ Chat.SendMessage (receiver, _sender, message); } else { - SdtdConsole.Instance.Output ("You have not received a PM so far or sender of last received PM is no longer online."); + SdtdConsole.Instance.Output ( + "You have not received a PM so far or sender of last received PM is no longer online."); } } Index: binary-improvements/AllocsCommands/Commands/SayToPlayer.cs =================================================================== --- binary-improvements/AllocsCommands/Commands/SayToPlayer.cs (revision 324) +++ binary-improvements/AllocsCommands/Commands/SayToPlayer.cs (revision 325) @@ -2,10 +2,7 @@ using System.Collections.Generic; -namespace AllocsFixes.CustomCommands -{ - public class SayToPlayer : ConsoleCmdAbstract - { - public override string GetDescription () - { +namespace AllocsFixes.CustomCommands { + public class SayToPlayer : ConsoleCmdAbstract { + public override string GetDescription () { return "send a message to a single player"; } @@ -13,15 +10,13 @@ public override string GetHelp () { return "Usage:\n" + - " pm \n" + - "Send a PM to the player given by the player name or entity id (as given by e.g. \"lpi\")."; + " pm \n" + + "Send a PM to the player given by the player name or entity id (as given by e.g. \"lpi\")."; } - public override string[] GetCommands () - { - return new string[] { "sayplayer", "pm" }; + public override string[] GetCommands () { + return new[] {"sayplayer", "pm"}; } - private void RunInternal (ClientInfo _sender, List _params) - { + private void RunInternal (ClientInfo _sender, List _params) { if (_params.Count < 2) { SdtdConsole.Instance.Output ("Usage: sayplayer "); @@ -39,6 +34,5 @@ } - public override void Execute (List _params, CommandSenderInfo _senderInfo) - { + public override void Execute (List _params, CommandSenderInfo _senderInfo) { try { if (_senderInfo.RemoteClientInfo != null) { Index: binary-improvements/AllocsCommands/Commands/ShowInventory.cs =================================================================== --- binary-improvements/AllocsCommands/Commands/ShowInventory.cs (revision 324) +++ binary-improvements/AllocsCommands/Commands/ShowInventory.cs (revision 325) @@ -1,35 +1,28 @@ -using AllocsFixes.PersistentData; using System; using System.Collections.Generic; +using AllocsFixes.PersistentData; -namespace AllocsFixes.CustomCommands -{ - public class ShowInventory : ConsoleCmdAbstract - { - - public override string GetDescription () - { +namespace AllocsFixes.CustomCommands { + public class ShowInventory : ConsoleCmdAbstract { + public override string GetDescription () { return "list inventory of a given player"; } - public override string GetHelp () - { + public override string GetHelp () { return "Usage:\n" + - " showinventory [tag]\n" + - "Show the inventory of the player given by his SteamID, player name or\n" + - "entity id (as given by e.g. \"lpi\").\n" + - "Optionally specify a tag that is included in each line of the output. In\n" + - "this case output is designed to be easily parseable by tools.\n" + - "Note: This only shows the player's inventory after it was first sent to\n" + - "the server which happens at least every 30 seconds."; + " showinventory [tag]\n" + + "Show the inventory of the player given by his SteamID, player name or\n" + + "entity id (as given by e.g. \"lpi\").\n" + + "Optionally specify a tag that is included in each line of the output. In\n" + + "this case output is designed to be easily parseable by tools.\n" + + "Note: This only shows the player's inventory after it was first sent to\n" + + "the server which happens at least every 30 seconds."; } - public override string[] GetCommands () - { - return new string[] { "showinventory", "si" }; + public override string[] GetCommands () { + return new[] {"showinventory", "si"}; } - public override void Execute (List _params, CommandSenderInfo _senderInfo) - { + public override void Execute (List _params, CommandSenderInfo _senderInfo) { try { if (_params.Count < 1) { @@ -40,5 +33,6 @@ string steamid = PersistentContainer.Instance.Players.GetSteamID (_params [0], true); if (steamid == null) { - SdtdConsole.Instance.Output ("Playername or entity/steamid id not found or no inventory saved (first saved after a player has been online for 30s)."); + SdtdConsole.Instance.Output ( + "Playername or entity/steamid id not found or no inventory saved (first saved after a player has been online for 30s)."); return; } @@ -52,24 +46,32 @@ PersistentData.Inventory inv = p.Inventory; - if (tag == null) + if (tag == null) { SdtdConsole.Instance.Output ("Belt of player " + p.Name + ":"); + } + PrintInv (inv.belt, p.EntityID, "belt", tag); - if (tag == null) + if (tag == null) { SdtdConsole.Instance.Output (string.Empty); + } - if (tag == null) + if (tag == null) { SdtdConsole.Instance.Output ("Bagpack of player " + p.Name + ":"); + } + PrintInv (inv.bag, p.EntityID, "backpack", tag); - if (tag == null) + if (tag == null) { SdtdConsole.Instance.Output (string.Empty); + } - if (tag == null) + if (tag == null) { SdtdConsole.Instance.Output ("Equipment of player " + p.Name + ":"); + } + PrintEquipment (inv.equipment, p.EntityID, "equipment", tag); - if (tag != null) { - SdtdConsole.Instance.Output ("tracker_item id=" + p.EntityID + ", tag=" + tag + ", SHOWINVENTORY DONE"); + if (tag != null) { + SdtdConsole.Instance.Output ("tracker_item id=" + p.EntityID + ", tag=" + tag + + ", SHOWINVENTORY DONE"); } - } catch (Exception e) { Log.Out ("Error in ShowInventory.Run: " + e); @@ -77,19 +79,25 @@ } - private void PrintInv (List _inv, int _entityId, string _location, string _tag) - { + private void PrintInv (List _inv, int _entityId, string _location, string _tag) { for (int i = 0; i < _inv.Count; i++) { if (_inv [i] != null) { - if (_tag == null) { // no Tag defined -> readable output + if (_tag == null) { + // no Tag defined -> readable output if (_inv [i].quality < 0) { - SdtdConsole.Instance.Output (string.Format (" Slot {0}: {1:000} * {2}", i, _inv [i].count, _inv [i].itemName)); + SdtdConsole.Instance.Output (string.Format (" Slot {0}: {1:000} * {2}", i, + _inv [i].count, _inv [i].itemName)); } else { - SdtdConsole.Instance.Output (string.Format (" Slot {0}: {1:000} * {2} - quality: {3}", i, _inv [i].count, _inv [i].itemName, _inv [i].quality)); + SdtdConsole.Instance.Output (string.Format (" Slot {0}: {1:000} * {2} - quality: {3}", i, + _inv [i].count, _inv [i].itemName, _inv [i].quality)); } + DoParts (_inv [i].parts, 1, null); - } else { // Tag defined -> parseable output - String partsMsg = DoParts(_inv[i].parts, 1, ""); - String msg = "tracker_item id=" + _entityId + ", tag=" + _tag + ", location=" + _location + ", slot=" + i + ", item=" + _inv[i].itemName + ", qnty=" + _inv[i].count + ", quality=" + _inv[i].quality + ", parts=(" + partsMsg + ")"; - SdtdConsole.Instance.Output(msg); + } else { + // Tag defined -> parseable output + string partsMsg = DoParts (_inv [i].parts, 1, ""); + string msg = "tracker_item id=" + _entityId + ", tag=" + _tag + ", location=" + _location + + ", slot=" + i + ", item=" + _inv [i].itemName + ", qnty=" + _inv [i].count + + ", quality=" + _inv [i].quality + ", parts=(" + partsMsg + ")"; + SdtdConsole.Instance.Output (msg); } } @@ -97,6 +105,5 @@ } - private void PrintEquipment (InvItem[] _equipment, int _entityId, string _location, string _tag) - { + private void PrintEquipment (InvItem[] _equipment, int _entityId, string _location, string _tag) { AddEquipment ("head", _equipment, EquipmentSlots.Headgear, _entityId, _location, _tag); AddEquipment ("eyes", _equipment, EquipmentSlots.Eyewear, _entityId, _location, _tag); @@ -114,6 +121,6 @@ } - private void AddEquipment (string _slotname, InvItem[] _items, EquipmentSlots _slot, int _entityId, string _location, string _tag) - { + private void AddEquipment (string _slotname, InvItem[] _items, EquipmentSlots _slot, int _entityId, + string _location, string _tag) { int[] slotindices = XUiM_PlayerEquipment.GetSlotIndicesByEquipmentSlot (_slot); @@ -121,16 +128,24 @@ if (_items != null && _items [slotindices [i]] != null) { InvItem item = _items [slotindices [i]]; - if (_tag == null) { // no Tag defined -> readable output + if (_tag == null) { + // no Tag defined -> readable output if (item.quality < 0) { - SdtdConsole.Instance.Output (string.Format (" Slot {0:8}: {1:000}", _slotname, item.itemName)); + SdtdConsole.Instance.Output (string.Format (" Slot {0:8}: {1:000}", _slotname, + item.itemName)); } else { - SdtdConsole.Instance.Output (string.Format (" Slot {0:8}: {1:000} - quality: {2}", _slotname, item.itemName, item.quality)); + SdtdConsole.Instance.Output (string.Format (" Slot {0:8}: {1:000} - quality: {2}", + _slotname, item.itemName, item.quality)); } + DoParts (_items [slotindices [i]].parts, 1, null); - } else { // Tag defined -> parseable output - String partsMsg = DoParts(_items[slotindices[i]].parts, 1, ""); - String msg = "tracker_item id=" + _entityId + ", tag=" + _tag + ", location=" + _location + ", slot=" + _slotname + ", item=" + item.itemName + ", qnty=1, quality=" + item.quality + ", parts=(" + partsMsg + ")"; - SdtdConsole.Instance.Output(msg); + } else { + // Tag defined -> parseable output + string partsMsg = DoParts (_items [slotindices [i]].parts, 1, ""); + string msg = "tracker_item id=" + _entityId + ", tag=" + _tag + ", location=" + _location + + ", slot=" + _slotname + ", item=" + item.itemName + ", qnty=1, quality=" + + item.quality + ", parts=(" + partsMsg + ")"; + SdtdConsole.Instance.Output (msg); } + return; } @@ -138,22 +153,27 @@ } - private string DoParts (InvItem[] _parts, int _indent, string _currentMessage) - { + private string DoParts (InvItem[] _parts, int _indent, string _currentMessage) { if (_parts != null && _parts.Length > 0) { string indenter = new string (' ', _indent * 4); for (int i = 0; i < _parts.Length; i++) { if (_parts [i] != null) { - if (_currentMessage == null) { // no currentMessage given -> readable output + if (_currentMessage == null) { + // no currentMessage given -> readable output if (_parts [i].quality < 0) { - SdtdConsole.Instance.Output (string.Format ("{0} - {1}", indenter, _parts [i].itemName)); + SdtdConsole.Instance.Output (string.Format ("{0} - {1}", indenter, + _parts [i].itemName)); } else { - SdtdConsole.Instance.Output (string.Format ("{0} - {1} - quality: {2}", indenter, _parts [i].itemName, _parts [i].quality)); + SdtdConsole.Instance.Output (string.Format ("{0} - {1} - quality: {2}", + indenter, _parts [i].itemName, _parts [i].quality)); } + DoParts (_parts [i].parts, _indent + 1, _currentMessage); - } else { // currentMessage given -> parseable output + } else { + // currentMessage given -> parseable output if (_currentMessage.Length > 0) { _currentMessage += ","; } - _currentMessage += _parts[i].itemName + "@" + _parts[i].quality; + + _currentMessage += _parts [i].itemName + "@" + _parts [i].quality; _currentMessage = DoParts (_parts [i].parts, _indent + 1, _currentMessage); } @@ -161,7 +181,7 @@ } } + return _currentMessage; } - } }