Changeset 245 for binary-improvements/MapRendering

Timestamp:

Jul 26, 2015, 4:47:49 PM (9 years ago)

Author:

alloc

Message:

Fixes

Location:

binary-improvements/MapRendering

Files:

• ModInfo.xml (modified) (1 diff)
• Web/API/ExecuteConsoleCommand.cs (added)
• Web/API/GetLandClaims.cs (modified) (1 diff)
• Web/API/GetPlayerInventory.cs (modified) (2 diffs)
• Web/API/GetStats.cs (modified) (1 diff)

binary-improvements/MapRendering/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Render the game map to image map tiles as it is uncovered" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="6" />
+                <Version value="7" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

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

@@ -53 +53 @@
                                                 owner.Add ("claimactive", new JSONBoolean (isActive));
 
+                                                if (PersistentContainer.Instance.Players [curID, false] != null) {
+                                                        owner.Add ("playername", new JSONString (PersistentContainer.Instance.Players [curID, false].Name));
+                                                } else {
+                                                        owner.Add ("playername", new JSONNull ());
+                                                }
+
                                                 JSONArray claims = new JSONArray ();
                                                 owner.Add ("claims", claims);

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

@@ -7 +7 @@
 namespace AllocsFixes.NetConnections.Servers.Web.API
 {
-        public class GetPlayerInventory : WebAPI
-        {
-                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, int permissionLevel)
-                {
+        public class GetPlayerInventory : WebAPI {
+                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, int permissionLevel) {
                         if (req.QueryString ["steamid"] == null) {
                                 resp.StatusCode = (int)HttpStatusCode.InternalServerError;
@@ -31 +29 @@
                         JSONArray bag = new JSONArray ();
                         JSONArray belt = new JSONArray ();
+                        JSONObject equipment = new JSONObject ();
+                        result.Add ("playername", new JSONString (p.Name));
                         result.Add ("bag", bag);
                         result.Add ("belt", belt);
+                        result.Add ("equipment", equipment);
 
                         for (int i = 0; i < inv.belt.Count; i++) {
-                                JSONObject item = new JSONObject();
+                                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));
+                                        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));
+                                        item.Add ("count", new JSONNumber (0));
+                                        item.Add ("name", new JSONString (string.Empty));
                                 }
-                                belt.Add(item);
+                                belt.Add (item);
                         }
                         for (int i = 0; i < inv.bag.Count; i++) {
-                                JSONObject item = new JSONObject();
+                                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));
+                                        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));
+                                        item.Add ("count", new JSONNumber (0));
+                                        item.Add ("name", new JSONString (string.Empty));
                                 }
-                                bag.Add(item);
+                                bag.Add (item);
                         }
+
+                        AddEquipment (equipment, "head", inv.equipment, XMLData.Item.EnumEquipmentSlot.Head, NGuiInvGridEquipment.EnumClothingLayer.Middle);
+                        AddEquipment (equipment, "eyes", inv.equipment, XMLData.Item.EnumEquipmentSlot.Eyes, NGuiInvGridEquipment.EnumClothingLayer.Middle);
+                        AddEquipment (equipment, "face", inv.equipment, XMLData.Item.EnumEquipmentSlot.Face, NGuiInvGridEquipment.EnumClothingLayer.Middle);
+
+                        AddEquipment (equipment, "armor", inv.equipment, XMLData.Item.EnumEquipmentSlot.Chest, NGuiInvGridEquipment.EnumClothingLayer.Outer);
+                        AddEquipment (equipment, "jacket", inv.equipment, XMLData.Item.EnumEquipmentSlot.Chest, NGuiInvGridEquipment.EnumClothingLayer.Middle);
+                        AddEquipment (equipment, "shirt", inv.equipment, XMLData.Item.EnumEquipmentSlot.Chest, NGuiInvGridEquipment.EnumClothingLayer.Inner);
+
+                        AddEquipment (equipment, "legarmor", inv.equipment, XMLData.Item.EnumEquipmentSlot.Legs, NGuiInvGridEquipment.EnumClothingLayer.Outer);
+                        AddEquipment (equipment, "pants", inv.equipment, XMLData.Item.EnumEquipmentSlot.Legs, NGuiInvGridEquipment.EnumClothingLayer.Inner);
+                        AddEquipment (equipment, "boots", inv.equipment, XMLData.Item.EnumEquipmentSlot.Feet, NGuiInvGridEquipment.EnumClothingLayer.Inner);
+
+                        AddEquipment (equipment, "gloves", inv.equipment, XMLData.Item.EnumEquipmentSlot.Hands, NGuiInvGridEquipment.EnumClothingLayer.Inner);
+                        AddEquipment (equipment, "backpack", inv.equipment, XMLData.Item.EnumEquipmentSlot.Back, NGuiInvGridEquipment.EnumClothingLayer.Outer);
 
                         WriteJSON (resp, result);
                 }
+
+                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));
+                        } else {
+                                _eq.Add (_slotname, new JSONBoolean (false));
+                        }
+                }
+
         }
 }

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

@@ -19 +19 @@
                         result.Add ("gametime", time);
 
+                        result.Add ("players", new JSONNumber (GameManager.Instance.World.Players.Count));
+
                         WriteJSON (resp, result);
                 }