v0.14.6.0

2021-06-17 17:54:52 +03:00
parent 3f324b14e8
commit c27e2ea5ab
348 changed files with 13156 additions and 4266 deletions
@@ -186,7 +186,8 @@ namespace Barotrauma
                    foreach (Hull hull in Hull.hullList)
                    {
                        if (hull.Submarine != sub) { continue; }
-                        if (hull.RoomName.Contains("RoomName.", StringComparison.OrdinalIgnoreCase))
+                        if (string.IsNullOrEmpty(hull.RoomName) || 
+                            hull.RoomName.Contains("RoomName.", StringComparison.OrdinalIgnoreCase))
                        {
                            hull.RoomName = hull.CreateRoomName();
                        }
@@ -1436,6 +1437,7 @@ namespace Barotrauma
                var npc = Character.Create(CharacterPrefab.HumanConfigFile, SpawnAction.OffsetSpawnPos(gotoTarget.WorldPosition, 100.0f), ToolBox.RandomSeed(8), characterInfo, hasAi: true, createNetworkEvent: true);
                npc.AnimController.FindHull(gotoTarget.WorldPosition, true);
                npc.TeamID = CharacterTeamType.FriendlyNPC;
+                npc.Prefab = humanPrefab;
                if (!outpost.Info.OutpostNPCs.ContainsKey(humanPrefab.Identifier))
                {
                    outpost.Info.OutpostNPCs.Add(humanPrefab.Identifier, new List<Character>());
@@ -1447,7 +1449,7 @@ namespace Barotrauma
                }
                else
                {
-                    npc.CharacterHealth.MaxVitality *= humanPrefab.HealthMultiplier;
+                    npc.AddStaticHealthMultiplier(humanPrefab.HealthMultiplier);
                }
                humanPrefab.GiveItems(npc, outpost, Rand.RandSync.Server);
                foreach (Item item in npc.Inventory.FindAllItems(it => it != null, recursive: true))