Changeset 256 for binary-improvements

Timestamp:

Feb 7, 2016, 12:47:06 PM (9 years ago)

Author:

alloc

Message:

Mod 6-8-12

Location:

binary-improvements

Files:

• MapRendering/ModInfo.xml (modified) (1 diff)
• MapRendering/Web/API/GetPlayersLocation.cs (modified) (1 diff)
• MapRendering/Web/API/GetPlayersOnline.cs (modified) (1 diff)
• server-fixes.userprefs (modified) (2 diffs)
• webserver/index.html (modified) (1 diff)
• webserver/js/inventory_dialog.js (modified) (1 diff)
• webserver/js/leaflet.layer.landclaims.js (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="11" />
+                <Version value="12" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

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

@@ -39 +39 @@
                     JSONObject pJson = new JSONObject ();
                     pJson.Add("steamid", new JSONString (sid));
+                                        pJson.Add("entityid", new JSONNumber (p.EntityID));
                     pJson.Add("ip", new JSONString (p.IP));
                     pJson.Add("name", new JSONString (p.Name));

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

@@ -25 +25 @@
                                 JSONObject p = new JSONObject();
                                 p.Add ("steamid", new JSONString (ci.playerId));
+                                p.Add ("entityid", new JSONNumber (ci.entityId));
                                 p.Add ("ip", new JSONString (ci != null ? ci.ip : string.Empty));
                                 p.Add ("name", new JSONString (current.Value.EntityName));

binary-improvements/server-fixes.userprefs

@@ -1 +1 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release_Version" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="AllocsCommands/Commands/TeleportPlayer.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="MapRendering/ModInfo.xml">
     <Files>
       <File FileName="7dtd-server-fixes/ModInfo.xml" Line="1" Column="1" />
       <File FileName="AllocsCommands/ModInfo.xml" Line="1" Column="1" />
-      <File FileName="MapRendering/ModInfo.xml" Line="1" Column="1" />
+      <File FileName="MapRendering/ModInfo.xml" Line="21" Column="21" />
       <File FileName="MapRendering/Web/Web.cs" Line="1" Column="1" />
       <File FileName="MapRendering/Web/API/ExecuteConsoleCommand.cs" Line="1" Column="1" />
@@ -12 +12 @@
       <File FileName="MapRendering/Web/API/GetWebUIUpdates.cs" Line="1" Column="1" />
       <File FileName="MapRendering/Web/Handlers/ApiHandler.cs" Line="1" Column="1" />
-      <File FileName="MapRendering/Commands/WebTokens.cs" Line="67" Column="67" />
+      <File FileName="MapRendering/Commands/WebTokens.cs" Line="1" Column="1" />
       <File FileName="AllocsCommands/Commands/TeleportPlayer.cs" Line="63" Column="63" />
+      <File FileName="MapRendering/Web/Handlers/ItemIconHandler.cs" Line="42" Column="42" />
     </Files>
   </MonoDevelop.Ide.Workbench>

binary-improvements/webserver/index.html

@@ -108 +108 @@
         <div id="playerInventoryDialog" title="Player inventory">
                 Player: <span id="invPlayerName"></span><br/>
+                SteamID: <span id="invSteamId"></span><br/>
                 <br/>
                 <table>

binary-improvements/webserver/js/inventory_dialog.js

@@ -39 +39 @@
                 }
         }
-
+        
+//      function linkId(steamid) {
+//              var value = "https://steamid.io/lookup/"+steamid;
+//      }
+        
         $.getJSON( "../api/getplayerinventory", { steamid: steamid  })
         .done(function(data) {
                 $("#invPlayerName").text(data.playername);
+                $("#invSteamId").text(steamid);
                 
                 for (var y = 0; y < BAG_ROWS; y++) {

binary-improvements/webserver/js/leaflet.layer.landclaims.js

@@ -40 +40 @@
                                 var r = L.rectangle(bounds, {color: color, weight: 1, opacity: 0.8, fillOpacity: 0.15});
                                 var m = L.marker(pos, { clickable: false, keyboard: false, zIndexOffset:-1000, iconSize: [0,0], icon: L.divIcon({className: 'invisIcon', iconSize:[0,0]}) });
-                                r.bindPopup("Owner: " + name + " ("+steamid+")<br/>Position: " + val.x + " / " + val.y + " / " + val.z);
+                                r.bindPopup("Owner: " + name + " ("+steamid+")<br/>Position: " + val.x + " " + val.y + " " + val.z);
                                 landClaimsRectGroup.addLayer(r);
                                 landClaimsClusterGroup.addLayer(m);