Changeset 488 for binary-improvements/AllocsCommands

Timestamp:

Jun 21, 2024, 2:58:18 PM (5 months ago)

Author:

alloc

Message:

27_32_48

• V1.0 compatibility

Location:

binary-improvements/AllocsCommands

Files:

• Commands/ListKnownPlayers.cs (modified) (2 diffs)
• Commands/ListLandProtection.cs (modified) (2 diffs)
• Commands/RemoveLandProtection.cs (modified) (2 diffs)
• Commands/ShowInventory.cs (modified) (4 diffs)
• ModInfo.xml (modified) (1 diff)

binary-improvements/AllocsCommands/Commands/ListKnownPlayers.cs

@@ -6 +6 @@
         [UsedImplicitly]
         public class ListKnownPlayers : ConsoleCmdAbstract {
-                protected override string getDescription () {
+                public override string getDescription () {
                         return "lists all players that were ever online";
                 }
 
-                protected override string getHelp () {
+                public override string getHelp () {
                         return "Usage:\n" +
                                "  1. listknownplayers\n" +
@@ -22 +22 @@
                 }
 
-                protected override string[] getCommands () {
+                public override string[] getCommands () {
                         return new[] {"listknownplayers", "lkp"};
                 }

binary-improvements/AllocsCommands/Commands/ListLandProtection.cs

@@ -7 +7 @@
         [UsedImplicitly]
         public class ListLandProtection : ConsoleCmdAbstract {
-                protected override string getDescription () {
+                public override string getDescription () {
                         return "lists all land protection blocks and owners";
                 }
 
-                protected override string getHelp () {
+                public override string getHelp () {
                         return "Usage:\n" +
                                "  1. listlandprotection summary\n" +
@@ -22 +22 @@
                 }
 
-                protected override string[] getCommands () {
+                public override string[] getCommands () {
                         return new[] {"listlandprotection", "llp"};
                 }

binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs

@@ -7 +7 @@
         [UsedImplicitly]
         public class RemoveLandProtection : ConsoleCmdAbstract {
-                protected override string getDescription () {
+                public override string getDescription () {
                         return "removes the association of a land protection block to the owner";
                 }
 
-                protected override string getHelp () {
+                public override string getHelp () {
                         return "Usage:" +
                                "  1. removelandprotection <userid>\n" +
@@ -21 +21 @@
                 }
 
-                protected override string[] getCommands () {
+                public override string[] getCommands () {
                         return new[] {"removelandprotection", "rlp"};
                 }

binary-improvements/AllocsCommands/Commands/ShowInventory.cs

@@ -6 +6 @@
         [UsedImplicitly]
         public class ShowInventory : ConsoleCmdAbstract {
-                protected override string getDescription () {
+                public override string getDescription () {
                         return "list inventory of a given player";
                 }
 
-                protected override string getHelp () {
+                public override string getHelp () {
                         return "Usage:\n" +
                                "   showinventory <user id / player name / entity id> [tag]\n" +
@@ -21 +21 @@
                 }
 
-                protected override string[] getCommands () {
+                public override string[] getCommands () {
                         return new[] {"showinventory", "si"};
                 }
@@ -103 +103 @@
 
                 private static void PrintEquipment (IReadOnlyList<InvItem> _equipment, int _entityId, string _location, string _tag) {
-                        AddEquipment ("head", _equipment, EquipmentSlots.Headgear, _entityId, _location, _tag);
-                        AddEquipment ("eyes", _equipment, EquipmentSlots.Eyewear, _entityId, _location, _tag);
-                        AddEquipment ("face", _equipment, EquipmentSlots.Face, _entityId, _location, _tag);
+                        AddEquipment ("head", _equipment, EquipmentSlots.Head, _entityId, _location, _tag);
+                        // AddEquipment ("eyes", _equipment, EquipmentSlots.Eyewear, _entityId, _location, _tag);
+                        // AddEquipment ("face", _equipment, EquipmentSlots.Face, _entityId, _location, _tag);
 
-                        AddEquipment ("armor", _equipment, EquipmentSlots.ChestArmor, _entityId, _location, _tag);
-                        AddEquipment ("jacket", _equipment, EquipmentSlots.Jacket, _entityId, _location, _tag);
-                        AddEquipment ("shirt", _equipment, EquipmentSlots.Shirt, _entityId, _location, _tag);
+                        AddEquipment ("armor", _equipment, EquipmentSlots.Chest, _entityId, _location, _tag);
+                        // AddEquipment ("jacket", _equipment, EquipmentSlots.Jacket, _entityId, _location, _tag);
+                        // AddEquipment ("shirt", _equipment, EquipmentSlots.Shirt, _entityId, _location, _tag);
 
-                        AddEquipment ("legarmor", _equipment, EquipmentSlots.LegArmor, _entityId, _location, _tag);
-                        AddEquipment ("pants", _equipment, EquipmentSlots.Legs, _entityId, _location, _tag);
+                        // AddEquipment ("legarmor", _equipment, EquipmentSlots.LegArmor, _entityId, _location, _tag);
+                        // AddEquipment ("pants", _equipment, EquipmentSlots.Legs, _entityId, _location, _tag);
                         AddEquipment ("boots", _equipment, EquipmentSlots.Feet, _entityId, _location, _tag);
 
@@ -120 +120 @@
                 private static void AddEquipment (string _slotname, IReadOnlyList<InvItem> _items, EquipmentSlots _slot, int _entityId,
                         string _location, string _tag) {
-                        int[] slotindices = XUiM_PlayerEquipment.GetSlotIndicesByEquipmentSlot (_slot);
+                        int slotindex = (int)_slot;
 
-                        for (int i = 0; i < slotindices.Length; i++) {
-                                if (_items == null || _items[slotindices[i]] == null) {
-                                        continue;
+                        if (_items == null || _items[slotindex] == null) {
+                                return;
+                        }
+
+                        InvItem item = _items [slotindex];
+                        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));
+                                } else {
+                                        SdtdConsole.Instance.Output (string.Format ("    Slot {0:8}: {1:000} - quality: {2}",
+                                                _slotname, item.itemName, item.quality));
                                 }
 
-                                InvItem item = _items [slotindices [i]];
-                                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));
-                                        } else {
-                                                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);
-                                }
-
-                                return;
+                                DoParts (_items [slotindex].parts, 1, null);
+                        } else {
+                                // Tag defined -> parseable output
+                                string partsMsg = DoParts (_items [slotindex].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);
                         }
                 }

binary-improvements/AllocsCommands/ModInfo.xml

@@ -5 +5 @@
         <Description value="Additional commands for server operation" />
         <Author value="Christian 'Alloc' Illy" />
-        <Version value="26" />
+        <Version value="27" />
         <Website value="https://7dtd.illy.bz" />
 </xml>