v0.10.6.2

2020-10-29 17:55:26 +02:00
parent 20a69375ca
commit bbf06f0984
255 changed files with 6196 additions and 3096 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))
@@ -694,6 +705,10 @@ namespace Barotrauma
                            }

                            pendingHireInfos.Add(match);
+                            if (pendingHireInfos.Count + CrewManager.CharacterInfos.Count() >= CrewManager.MaxCrewSize)
+                            {
+                                break;
+                            }
                        }
                        location.HireManager.PendingHires = pendingHireInfos;
                    }
@@ -764,6 +779,11 @@ namespace Barotrauma
            CargoManager?.SavePurchasedItems(modeElement);
            UpgradeManager?.SavePendingUpgrades(modeElement, UpgradeManager?.PendingUpgrades);

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