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

Timestamp:

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

Author:

alloc

Message:

Fixes 6_8_10

File:

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

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

@@ -59 +59 @@
                 private InvItem CreateInvItem (ItemValue _itemValue, int _count, int _playerId) {
                         if (_count > 0 && _itemValue != null && !_itemValue.Equals (ItemValue.None)) {
-                                int maxAllowed = ItemClass.list [_itemValue.type].Stacknumber.Value;
-                                string name = ItemClass.list [_itemValue.type].GetItemName ();
+                                ItemClass itemClass = ItemClass.list [_itemValue.type];
+                                int maxAllowed = itemClass.Stacknumber.Value;
+                                string name = itemClass.GetItemName ();
 
                                 if (_count > maxAllowed) {
@@ -73 +74 @@
                                 }
 
-                // Figure out the icon's name
-                string icon_name = "";
+                                item.icon = itemClass.GetIconName ();
 
-                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";
-                }
+                                item.iconcolor = AllocsUtils.ColorToHex (itemClass.GetIconTint ());
                     
                                 return item;