Unstable 0.17.1.0

2022-03-17 01:25:04 +09:00
parent 3974067915
commit 6d410cc1b7
302 changed files with 5878 additions and 3317 deletions
@@ -1,5 +1,4 @@
 using Barotrauma.Networking;
-using System.Globalization;
 using System.Xml.Linq;

 namespace Barotrauma
@@ -32,8 +31,26 @@ namespace Barotrauma
            {
                CharacterInfo.SaveOrderData(client.CharacterInfo, OrderData);
            }
+
+            if (client.Character?.Wallet.Save() is { } walletSave)
+            {
+                WalletData = walletSave;
+            }
        }

+        public void Refresh(Character character)
+        {
+            healthData = new XElement("health");
+            character.CharacterHealth.Save(healthData);
+            if (character.Inventory != null)
+            {
+                itemData = new XElement("inventory");
+                Character.SaveInventory(character.Inventory, itemData);
+            }
+            OrderData = new XElement("orders");
+            CharacterInfo.SaveOrderData(character.Info, OrderData);
+            WalletData = character.Wallet.Save();
+        }

        public CharacterCampaignData(XElement element)
        {
@@ -63,6 +80,9 @@ namespace Barotrauma
                    case "orders":
                        OrderData = subElement;
                        break;
+                    case Wallet.LowerCaseSaveElementName:
+                        WalletData = subElement;
+                        break;
                }
            }
        }
@@ -98,7 +118,7 @@ namespace Barotrauma
        }

        public void ApplyHealthData(Character character)
-        {            
+        {
            CharacterInfo.ApplyHealthData(character, healthData);
        }

@@ -106,5 +126,26 @@ namespace Barotrauma
        {
            CharacterInfo.ApplyOrderData(character, OrderData);
        }
+
+        public void ApplyWalletData(Character character)
+        {
+            character.Wallet = new Wallet(WalletData);
+        }
+
+        public XElement Save()
+        {
+            XElement element = new XElement("CharacterCampaignData",
+                new XAttribute("name", Name),
+                new XAttribute("endpoint", ClientEndPoint),
+                new XAttribute("steamid", SteamID));
+
+            CharacterInfo?.Save(element);
+            if (itemData != null) { element.Add(itemData); }
+            if (healthData != null) { element.Add(healthData); }
+            if (OrderData != null) { element.Add(OrderData); }
+            if (WalletData != null) { element.Add(WalletData); }
+
+            return element;
+        }
    }
 }