Unstable v0.10.6.0 (October 13th 2020)

2020-10-13 12:59:45 -03:00
parent 768f516e7c
commit 6b36bf809d
59 changed files with 1036 additions and 421 deletions
@@ -147,6 +147,14 @@ namespace Barotrauma
                    c.InGame && (IsOwner(c) || c.HasPermission(ClientPermissions.ManageCampaign)));
        }

+        public void LoadPets()
+        {
+            if (petsElement != null)
+            {
+                PetBehavior.LoadPets(petsElement);
+            }
+        }
+
        protected override IEnumerable<object> DoLevelTransition(TransitionType transitionType, LevelData newLevel, Submarine leavingSub, bool mirror, List<TraitorMissionResult> traitorResults)
        {
            lastUpdateID++;
@@ -229,6 +237,9 @@ namespace Barotrauma
                    c.Inventory.DeleteAllItems();
                }

+                petsElement = new XElement("pets");
+                PetBehavior.SavePets(petsElement);
+
                yield return CoroutineStatus.Running;

                if (leavingSub != Submarine.MainSub && !leavingSub.DockedTo.Contains(Submarine.MainSub))
@@ -768,6 +779,11 @@ namespace Barotrauma
            CargoManager?.SavePurchasedItems(modeElement);
            UpgradeManager?.SavePendingUpgrades(modeElement, UpgradeManager?.PendingUpgrades);

+            if (petsElement != null)
+            {
+                modeElement.Add(petsElement);
+            }
+
            // save bots
            CrewManager.SaveMultiplayer(modeElement);