Changeset 251 for binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs

Timestamp:

Oct 28, 2015, 7:51:20 PM (9 years ago)

Author:

peter.souza

Message:

Enemies (zombies and hostile animal entities) are now shown on the map as Hostiles and require permission level 'webapi.gethostilelocation' for web viewers to see.

Animals (non-hostile entities) are now shown on the map as Animals and require permission level 'webapi.getanimalslocation' for web viewers to see.

Permission level for 'webapi.viewallclaims' is now required for a viewer to see all claims, otherwise the permission level for 'webapi.getlandclaims' will only show viewer-owned claims. A viewer requires both 'webapi.getlandclaims' and 'webapi.viewallclaims' to be set for all claims to show (you can't just set 'webapi.viewallclaims').
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317405&viewfull=1#post317405

Permission level for 'webapi.viewallplayers' is now required for a viewer to see all players, otherwise the permission level for 'webapi.getplayerslocation' will only show the player for the currently-authenticated viewer. A viewer requires both 'webapi.getplayerslocation' and 'webapi.viewallplayers' to be set for all players to show (you can't just set 'webapi.viewallplayers').
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317405&viewfull=1#post317405

Banned players are now hidden from the web map.
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=320702&viewfull=1#post320702

Items using 'CustomIcon' and 'CustomIconTint' are now supported (although the exact tinting may not be perfectly the same as the game).
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317117&viewfull=1#post317117
​https://7daystodie.com/forums/showthread.php?12837-Improvements-for-the-dedicated-server&p=317679&viewfull=1#post317679

Map marker icons for players, hostiles, and animals have been updated.

File:

• binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs (modified) (2 diffs)

binary-improvements/7dtd-server-fixes/src/PersistentData/Inventory.cs

@@ -72 +72 @@
                                         item = new InvItem (name, _count);
                                 }
+
+                // Figure out the icon's name
+                string icon_name = "";
+
+                ItemClass item_class = ItemClass.list [_itemValue.type];
+
+                if (!PetesUtils.ValidText (icon_name)) {
+                    try {
+                        icon_name = item_class.GetIconName ();
+                    }
+                    catch { }
+                }
+
+                if (!PetesUtils.ValidText (icon_name)) {
+                    try {
+                        icon_name = item_class.MeshFile;
+                    }
+                    catch { }
+                }
+
+                if (!PetesUtils.ValidText (icon_name)) {
+                    try {
+                        icon_name = item_class.DropMeshFile;
+                    }
+                    catch { }
+                }
+
+                if (!PetesUtils.ValidText (icon_name))
+                    icon_name = item_class.GetItemName ();
+
+                if (icon_name.Contains ("\\"))
+                    icon_name = icon_name.Substring (icon_name.LastIndexOf ("\"") + 1);
+
+                item.icon = icon_name;
+
+                try {
+                    item.iconcolor = item_class.CustomIconTint.ToHexStringRGB ();
+                }
+                catch {
+                    item.iconcolor = "FFFFFF";
+                }
+                    
                                 return item;
                         } else {
@@ -77 +119 @@
                         }
                 }
-
-
         }
 }
-