Changeset 253 for binary-improvements/7dtd-server-fixes/src

Timestamp:

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

Author:

alloc

Message:

Fixes 6_8_10

Location:

binary-improvements/7dtd-server-fixes/src

Files:

• AllocsUtils.cs (added)
• LandClaimList.cs (added)
• PersistentData/InvItem.cs (modified) (1 diff)
• PersistentData/Inventory.cs (modified) (2 diffs)
• PersistentData/Player.cs (modified) (1 diff)
• PersistentData/Players.cs (modified) (2 diffs)
• PetesUtils.cs (deleted)

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

@@ -5 +5 @@
 {
         [Serializable]
-        public class InvItem
-        {
+        public class InvItem {
                 public string itemName;
                 public int count;
                 public int quality;
                 public InvItem[] parts;
-        public string icon = "";
-        public string iconcolor = "";
+                public string icon = "";
+                public string iconcolor = "";
 
-                public InvItem (string itemName, int count, int quality = -1)
-                {
+                public InvItem (string itemName, int count, int quality = -1) {
                         this.itemName = itemName;
                         this.count = count;

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;

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

@@ -96 +96 @@
                 }
 
+                public bool LandProtectionActive {
+                        get {
+                                return GameManager.Instance.World.IsLandProtectionValidForPlayer (GameManager.Instance.GetPersistentPlayerList ().GetPlayerData (SteamID));
+                        }
+                }
+
+                public float LandProtectionMultiplier {
+                        get {
+                                return GameManager.Instance.World.GetLandProtectionHardnessModifierForPlayer (GameManager.Instance.GetPersistentPlayerList ().GetPlayerData (SteamID));
+                        }
+                }
+
                 public uint Experience {
                         get {

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

@@ -6 +6 @@
 namespace AllocsFixes.PersistentData
 {
-    [Serializable]
-        public class Players
-        {
+        [Serializable]
+        public class Players {
                 private Dictionary<string, Player> players = new Dictionary<string, Player> ();
 
                 public Player this [string steamId, bool create] {
                         get {
-                                if (players.ContainsKey (steamId))
+                                if (players.ContainsKey (steamId)) {
                                         return players [steamId];
-                                else {
+                                } else {
                                         if (create && steamId != null && steamId.Length == 17) {
                                                 Log.Out ("Created new player entry for ID: " + steamId);
@@ -44 +43 @@
 //              }
 
-                public string GetSteamID (string _nameOrId, bool _ignoreColorCodes)
-                {
-                        if (_nameOrId == null || _nameOrId.Length == 0)
+                public string GetSteamID (string _nameOrId, bool _ignoreColorCodes) {
+                        if (_nameOrId == null || _nameOrId.Length == 0) {
                                 return null;
+                        }
 
                         long tempLong;