Changeset 250 for binary-improvements/MapRendering/Web/API/GetPlayerInventory.cs

Timestamp:

Aug 12, 2015, 6:10:28 PM (9 years ago)

Author:

alloc

Message:

Fixes 5_7_9

File:

• binary-improvements/MapRendering/Web/API/GetPlayerInventory.cs (modified) (2 diffs)

binary-improvements/MapRendering/Web/API/GetPlayerInventory.cs

@@ -35 +35 @@
                         result.Add ("equipment", equipment);
 
-                        for (int i = 0; i < inv.belt.Count; i++) {
-                                JSONObject item = new JSONObject ();
-                                if (inv.belt [i] != null) {
-                                        item.Add ("count", new JSONNumber (inv.belt [i].count));
-                                        item.Add ("name", new JSONString (inv.belt [i].itemName));
-                                } else {
-                                        item.Add ("count", new JSONNumber (0));
-                                        item.Add ("name", new JSONString (string.Empty));
-                                }
-                                belt.Add (item);
-                        }
-                        for (int i = 0; i < inv.bag.Count; i++) {
-                                JSONObject item = new JSONObject ();
-                                if (inv.bag [i] != null) {
-                                        item.Add ("count", new JSONNumber (inv.bag [i].count));
-                                        item.Add ("name", new JSONString (inv.bag [i].itemName));
-                                } else {
-                                        item.Add ("count", new JSONNumber (0));
-                                        item.Add ("name", new JSONString (string.Empty));
-                                }
-                                bag.Add (item);
-                        }
+                        DoInventory (belt, inv.belt);
+                        DoInventory (bag, inv.bag);
 
                         AddEquipment (equipment, "head", inv.equipment, XMLData.Item.EnumEquipmentSlot.Head, NGuiInvGridEquipment.EnumClothingLayer.Middle);
@@ -76 +56 @@
                 }
 
+                private void DoInventory (JSONArray _jsonRes, List<InvItem> _inv) {
+                        for (int i = 0; i < _inv.Count; i++) {
+                                _jsonRes.Add (GetJsonForItem (_inv [i]));
+                        }
+                }
+
                 private void AddEquipment (JSONObject _eq, 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) {
-                                _eq.Add (_slotname, new JSONString (_items [index].itemName));
+                        if (_items != null) {
+                                _eq.Add (_slotname, GetJsonForItem (_items [index]));
                         } else {
-                                _eq.Add (_slotname, new JSONBoolean (false));
+                                _eq.Add (_slotname, new JSONNull ());
+                        }
+                }
+
+                private JSONNode GetJsonForItem (InvItem _item) {
+                        if (_item != null) {
+                                JSONObject jsonItem = new JSONObject ();
+                                jsonItem.Add ("count", new JSONNumber (_item.count));
+                                jsonItem.Add ("name", new JSONString (_item.itemName));
+                                jsonItem.Add ("quality", new JSONNumber (_item.quality));
+                                if (_item.quality >= 0) {
+                                        jsonItem.Add ("qualitycolor", new JSONString (QualityInfo.GetQualityColorHex (_item.quality)));
+                                }
+                                return jsonItem;
+                        } else {
+                                return new JSONNull ();
                         }
                 }