Changeset 253 for binary-improvements/AllocsCommands/Commands/ShowInventory.cs

Timestamp:

Dec 12, 2015, 4:08:53 PM (9 years ago)

Author:

alloc

Message:

Fixes 6_8_10

File:

• binary-improvements/AllocsCommands/Commands/ShowInventory.cs (modified) (2 diffs)

binary-improvements/AllocsCommands/Commands/ShowInventory.cs

@@ -6 +6 @@
 {
         public class ShowInventory : ConsoleCmdAbstract {
+
                 public override string GetDescription () {
                         return "list inventory of a given player";
@@ -69 +70 @@
 
                 private void PrintEquipment (InvItem[] _equipment) {
-                        AddEquipment ("head", _equipment, XMLData.Item.EnumEquipmentSlot.Head, NGuiInvGridEquipment.EnumClothingLayer.Middle);
-                        AddEquipment ("eyes", _equipment, XMLData.Item.EnumEquipmentSlot.Eyes, NGuiInvGridEquipment.EnumClothingLayer.Middle);
-                        AddEquipment ("face", _equipment, XMLData.Item.EnumEquipmentSlot.Face, NGuiInvGridEquipment.EnumClothingLayer.Middle);
+                        AddEquipment ("head", _equipment, EquipmentSlots.Headgear);
+                        AddEquipment ("eyes", _equipment, EquipmentSlots.Eyewear);
+                        AddEquipment ("face", _equipment, EquipmentSlots.Face);
 
-                        AddEquipment ("armor", _equipment, XMLData.Item.EnumEquipmentSlot.Chest, NGuiInvGridEquipment.EnumClothingLayer.Outer);
-                        AddEquipment ("jacket", _equipment, XMLData.Item.EnumEquipmentSlot.Chest, NGuiInvGridEquipment.EnumClothingLayer.Middle);
-                        AddEquipment ("shirt", _equipment, XMLData.Item.EnumEquipmentSlot.Chest, NGuiInvGridEquipment.EnumClothingLayer.Inner);
+                        AddEquipment ("armor", _equipment, EquipmentSlots.ChestArmor);
+                        AddEquipment ("jacket", _equipment, EquipmentSlots.Jacket);
+                        AddEquipment ("shirt", _equipment, EquipmentSlots.Shirt);
 
-                        AddEquipment ("legarmor", _equipment, XMLData.Item.EnumEquipmentSlot.Legs, NGuiInvGridEquipment.EnumClothingLayer.Outer);
-                        AddEquipment ("pants", _equipment, XMLData.Item.EnumEquipmentSlot.Legs, NGuiInvGridEquipment.EnumClothingLayer.Inner);
-                        AddEquipment ("boots", _equipment, XMLData.Item.EnumEquipmentSlot.Feet, NGuiInvGridEquipment.EnumClothingLayer.Inner);
+                        AddEquipment ("legarmor", _equipment, EquipmentSlots.LegArmor);
+                        AddEquipment ("pants", _equipment, EquipmentSlots.Legs);
+                        AddEquipment ("boots", _equipment, EquipmentSlots.Feet);
 
-                        AddEquipment ("gloves", _equipment, XMLData.Item.EnumEquipmentSlot.Hands, NGuiInvGridEquipment.EnumClothingLayer.Inner);
-                        AddEquipment ("backpack", _equipment, XMLData.Item.EnumEquipmentSlot.Back, NGuiInvGridEquipment.EnumClothingLayer.Outer);
+                        AddEquipment ("gloves", _equipment, EquipmentSlots.Hands);
                 }
 
-                private void AddEquipment (string _slotname, InvItem[] _items, XMLData.Item.EnumEquipmentSlot _slot, NGuiInvGridEquipment.EnumClothingLayer _layer) {
-                        int index = (int)_slot + (int)_layer * (int)XMLData.Item.EnumEquipmentSlot.Count;
-                        if (_items != null && _items [index] != null) {
-                                if (_items [index].quality < 0) {
-                                        SdtdConsole.Instance.Output (string.Format ("    Slot {0:8}: {1:000}", _slotname, _items [index].itemName));
-                                } else {
-                                        SdtdConsole.Instance.Output (string.Format ("    Slot {0:8}: {1:000} - quality: {2}", _slotname, _items [index].itemName, _items [index].quality));
+                private void AddEquipment (string _slotname, InvItem[] _items, EquipmentSlots _slot) {
+                        int[] slotindices = XUiM_PlayerEquipment.GetSlotIndicesByEquipmentSlot (_slot);
+
+                        for (int i = 0; i < slotindices.Length; i++) {
+                                if (_items != null && _items [slotindices [i]] != null) {
+                                        InvItem item = _items [slotindices [i]];
+                                        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);
+                                        return;
                                 }
-                                DoParts (_items [index].parts, 1);
                         }
                 }