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

Timestamp:

Jul 26, 2015, 4:47:49 PM (9 years ago)

Author:

alloc

Message:

Fixes

File:

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

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

@@ -7 +7 @@
 {
         [Serializable]
-        public class Inventory
-        {
+        public class Inventory {
                 public List<InvItem> bag;
                 public List<InvItem> belt;
+                public InvItem[] equipment;
 
-                public Inventory ()
-                {
+                public Inventory () {
                         bag = new List<InvItem> ();
                         belt = new List<InvItem> ();
+                        equipment = null;
                 }
 
-                public void Update (PlayerDataFile pdf)
-                {
-                        //Log.Out ("Updating player inventory - player id: " + pdf.id);
-                        ProcessInv (bag, pdf.bag, pdf.id);
-                        ProcessInv (belt, pdf.inventory, pdf.id);
+                public void Update (PlayerDataFile pdf) {
+                        lock (this) {
+                                //Log.Out ("Updating player inventory - player id: " + pdf.id);
+                                ProcessInv (bag, pdf.bag, pdf.id);
+                                ProcessInv (belt, pdf.inventory, pdf.id);
+                                ProcessEqu (pdf.equipment);
+                        }
                 }
 
-                private void ProcessInv (List<InvItem> target, ItemStack[] sourceFields, int id)
-                {
-                        lock (target) {
-                                target.Clear ();
-                                for (int i = 0; i < sourceFields.Length; i++) {
-                                        if (sourceFields [i].count > 0) {
-                                                int count = sourceFields [i].count;
-                                                int maxAllowed = ItemClass.list [sourceFields [i].itemValue.type].Stacknumber.Value;
-                                                string name = ItemClass.list [sourceFields [i].itemValue.type].GetItemName ();
+                private void ProcessInv (List<InvItem> target, ItemStack[] sourceFields, int id) {
+                        target.Clear ();
+                        for (int i = 0; i < sourceFields.Length; i++) {
+                                if (sourceFields [i].count > 0) {
+                                        int count = sourceFields [i].count;
+                                        int maxAllowed = ItemClass.list [sourceFields [i].itemValue.type].Stacknumber.Value;
+                                        string name = ItemClass.list [sourceFields [i].itemValue.type].GetItemName ();
 
-                                                if (count > maxAllowed)
-                                                        Log.Out ("Player with ID " + id + " has stack for \"" + name + "\" greater than allowed (" + count + " > " + maxAllowed + ")");
-                                                target.Add (new InvItem (name, count));
-                                        } else {
-                                                target.Add (null);
+                                        if (count > maxAllowed) {
+                                                Log.Out ("Player with ID " + id + " has stack for \"" + name + "\" greater than allowed (" + count + " > " + maxAllowed + ")");
                                         }
+                                        target.Add (new InvItem (name, count));
+                                } else {
+                                        target.Add (null);
+                                }
+                        }
+                }
+
+                private void ProcessEqu (Equipment sourceEquipment) {
+                        equipment = new InvItem[sourceEquipment.GetSlotCount ()];
+                        for (int i = 0; i < sourceEquipment.GetSlotCount (); i++) {
+                                if (sourceEquipment.GetSlotItem (i) != null && !sourceEquipment.GetSlotItem (i).Equals (ItemValue.None)) {
+                                        int count = 1;
+                                        string name = ItemClass.list [sourceEquipment.GetSlotItem (i).type].GetItemName ();
+
+                                        equipment [i] = new InvItem (name, count);
+                                } else {
+                                        equipment [i] = null;
                                 }
                         }