Changeset 287

Timestamp:

Jul 18, 2016, 1:10:42 PM (8 years ago)

Author:

alloc

Message:

Updated core for Coppi's stuff

Location:

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

Files:

• InvItem.cs (modified) (1 diff)
• Inventory.cs (modified) (1 diff)
• Player.cs (modified) (2 diffs)

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

@@ -12 +12 @@
                 public string icon = "";
                 public string iconcolor = "";
+                [OptionalField]
+                public int maxUseTimes;
+                [OptionalField]
+                public int useTimes;
 
-                public InvItem (string itemName, int count, int quality = -1) {
+                public InvItem (string itemName, int count, int quality, int maxUseTimes, int maxUse) {
                         this.itemName = itemName;
                         this.count = count;
                         this.quality = quality;
+                        this.maxUseTimes = maxUseTimes;
+                        this.useTimes = maxUse;
                 }
         }

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

@@ -69 +69 @@
                                 InvItem item = null;
                                 if (_itemValue.HasQuality) {
-                                        item = new InvItem (name, _count, _itemValue.Quality);
+                                        item = new InvItem (name, _count, _itemValue.Quality, _itemValue.MaxUseTimes, _itemValue.UseTimes);
                                 } else {
-                                        item = new InvItem (name, _count);
+                                        item = new InvItem (name, _count, -1, _itemValue.MaxUseTimes, _itemValue.UseTimes);
                                 }
 

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

@@ -27 +27 @@
                 private int maxChatLength;
                 [OptionalField]
+                private string chatColor;
+                [OptionalField]
+                private bool chatName;
+                [OptionalField]
                 private uint expToNextLevel;
                 [OptionalField]
@@ -151 +155 @@
                         set {
                                 maxChatLength = value;
+                        }
+                }
+
+                public string ChatColor {
+                        get {
+                                if (chatColor == null || chatColor == "") {
+                                        chatColor = "";
+                                }
+                                return chatColor;
+                        }
+
+                        set {
+                                chatColor = value;
+                        }
+                }
+
+                public bool ChatName {
+                        get {
+                                return chatName;
+                        }
+
+                        set {
+                                chatName = value;
                         }
                 }