(af16ecdfa) Merge branch 'dev' into human-ai

Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs

@@ -1110,6 +1110,8 @@ namespace Barotrauma
 
         private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
 
+        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
+
         //goes through all the AItargets, evaluates how preferable it is to attack the target,
         //whether the Character can see/hear the target and chooses the most preferable target within
         //sight/hearing range

Barotrauma/BarotraumaShared/Source/Characters/Character.cs

@@ -426,7 +426,7 @@ namespace Barotrauma
             }
         }
 
-        private bool canSpeak;
+        public bool CanSpeak;
 
         private bool speechImpedimentSet;
 
@@ -436,7 +436,7 @@ namespace Barotrauma
         {
             get
             {
-                if (!canSpeak || IsUnconscious || Stun > 0.0f || IsDead) return 100.0f;
+                if (!CanSpeak || IsUnconscious || Stun > 0.0f || IsDead) return 100.0f;
                 return speechImpediment;
             }
             set
@@ -710,7 +710,7 @@ namespace Barotrauma
             displayName = TextManager.Get($"Character.{Path.GetFileName(Path.GetDirectoryName(file))}", true);
 
             IsHumanoid = doc.Root.GetAttributeBool("humanoid", false);
-            canSpeak = doc.Root.GetAttributeBool("canspeak", false);
+            CanSpeak = doc.Root.GetAttributeBool("canspeak", false);
             needsAir = doc.Root.GetAttributeBool("needsair", false);
             Noise = doc.Root.GetAttributeFloat("noise", 100f);
 
@@ -1588,9 +1588,8 @@ namespace Barotrauma
                     }
                 }
             }
-
-
-            if (item.InteractDistance == 0.0f && !item.Prefab.Triggers.Any()) return false;
+            
+            if (item.InteractDistance == 0.0f && !item.Prefab.Triggers.Any()) { return false; }
             
             Pickable pickableComponent = item.GetComponent<Pickable>();
             if (pickableComponent != null && (pickableComponent.Picker != null && !pickableComponent.Picker.IsDead)) { return false; }
@@ -2718,6 +2717,10 @@ namespace Barotrauma
             GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
 #endif
 
+#if CLIENT
+            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
+#endif
+
 #if CLIENT
             GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
 #endif

Barotrauma/BarotraumaShared/Source/Characters/CharacterInfo.cs

@@ -399,7 +399,7 @@ namespace Barotrauma
         {
             ID = idCounter;
             idCounter++;
-            Name = element.GetAttributeString("name", "unnamed");
+            Name = element.GetAttributeString("name", "");
             string genderStr = element.GetAttributeString("gender", "male").ToLowerInvariant();
             File = element.GetAttributeString("file", "");
             SourceElement = GetConfig(File).Root;
@@ -423,6 +423,29 @@ namespace Barotrauma
                 element.GetAttributeInt("beardindex", -1),
                 element.GetAttributeInt("moustacheindex", -1),
                 element.GetAttributeInt("faceattachmentindex", -1));
+
+            if (string.IsNullOrEmpty(Name))
+            {
+                if (SourceElement.Element("name") != null)
+                {
+                    string firstNamePath = SourceElement.Element("name").GetAttributeString("firstname", "");
+                    if (firstNamePath != "")
+                    {
+                        firstNamePath = firstNamePath.Replace("[GENDER]", (Head.gender == Gender.Female) ? "female" : "male");
+                        Name = ToolBox.GetRandomLine(firstNamePath);
+                    }
+
+                    string lastNamePath = SourceElement.Element("name").GetAttributeString("lastname", "");
+                    if (lastNamePath != "")
+                    {
+                        lastNamePath = lastNamePath.Replace("[GENDER]", (Head.gender == Gender.Female) ? "female" : "male");
+                        if (Name != "") Name += " ";
+                        Name += ToolBox.GetRandomLine(lastNamePath);
+                    }
+                }
+            }
+
+
             StartItemsGiven = element.GetAttributeBool("startitemsgiven", false);
             string personalityName = element.GetAttributeString("personality", "");
             ragdollFileName = element.GetAttributeString("ragdoll", string.Empty);

Barotrauma/BarotraumaShared/Source/Items/Components/ItemComponent.cs

@@ -801,10 +801,7 @@ namespace Barotrauma.Items.Components
             string msg = TextManager.Get(Msg, true);
             if (msg != null)
             {
-                foreach (InputType inputType in Enum.GetValues(typeof(InputType)))
-                {
-                    msg = msg.Replace("[" + inputType.ToString().ToLowerInvariant() + "]", GameMain.Config.KeyBind(inputType).ToString());
-                }
+                msg = TextManager.ParseInputTypes(msg);
                 DisplayMsg = msg;
             }
             else

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs

@@ -13,6 +13,11 @@ namespace Barotrauma.Items.Components
 
         private ItemContainer inputContainer, outputContainer;
 
+        public ItemContainer InputContainer
+        {
+            get { return inputContainer; }
+        }
+
         public ItemContainer OutputContainer
         {
             get { return outputContainer; }
@@ -102,6 +107,25 @@ namespace Barotrauma.Items.Components
                     }
                 }
                 
+                if (targetItem.Prefab.DeconstructItems.Any())
+                {
+                    inputContainer.Inventory.RemoveItem(targetItem);
+                    Entity.Spawner.AddToRemoveQueue(targetItem);
+                    MoveInputQueue();
+                    PutItemsToLinkedContainer();
+                }
+                else
+                {
+                    if (outputContainer.Inventory.Items.All(i => i != null))
+                    {
+                        targetItem.Drop(dropper: null);
+                    }
+                    else
+                    {
+                        outputContainer.Inventory.TryPutItem(targetItem, user: null, createNetworkEvent: true);
+                    }
+                }
+                
                 if (targetItem.Prefab.DeconstructItems.Any())
                 {
                     inputContainer.Inventory.RemoveItem(targetItem);

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs

@@ -23,6 +23,16 @@ namespace Barotrauma.Items.Components
 
         private ItemContainer inputContainer, outputContainer;
 
+        public ItemContainer InputContainer
+        {
+            get { return inputContainer; }
+        }
+
+        public ItemContainer OutputContainer
+        {
+            get { return outputContainer; }
+        }
+
         private float progressState;
 
         public Fabricator(Item item, XElement element)
@@ -98,7 +108,23 @@ namespace Barotrauma.Items.Components
         {
             return (picker != null);
         }
-        
+
+        public void RemoveFabricationRecipes(List<string> allowedIdentifiers)
+        {
+            for (int i = 0; i < fabricationRecipes.Count; i++)
+            {
+                if (!allowedIdentifiers.Contains(fabricationRecipes[i].TargetItem.Identifier))
+                {
+                    fabricationRecipes.RemoveAt(i);
+                    i--;
+                }
+            }
+
+            CreateRecipes();
+        }
+
+        partial void CreateRecipes();
+
         private void StartFabricating(FabricationRecipe selectedItem, Character user)
         {
             if (selectedItem == null) return;

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Sonar.cs

@@ -259,7 +259,7 @@ namespace Barotrauma.Items.Components
             int clockDir = (int)Math.Round((angle / MathHelper.TwoPi) * 12);
             if (clockDir == 0) clockDir = 12;
 
-            return TextManager.Get("SubDirOClock").Replace("[dir]", clockDir.ToString());
+            return TextManager.Get("roomname.subdiroclock").Replace("[dir]", clockDir.ToString());
         }
 
         private Vector2 GetTransducerCenter()

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs

@@ -575,6 +575,19 @@ namespace Barotrauma.Items.Components
             return true;
         }
 
+        public override void OnItemLoaded()
+        {
+            sonar = item.GetComponent<Sonar>();
+        }
+
+        public override bool Select(Character character)
+        {
+            if (!CanBeSelected) return false;
+
+            user = character;
+            return true;
+        }
+
         public override void Update(float deltaTime, Camera cam)
         {
             networkUpdateTimer -= deltaTime;

Barotrauma/BarotraumaShared/Source/Items/Inventory.cs

@@ -206,6 +206,16 @@ namespace Barotrauma
             return true;
         }
 
+        public bool IsFull()
+        {
+            for (int i = 0; i < capacity; i++)
+            {
+                if (Items[i] == null) return false;
+            }
+
+            return true;
+        }
+
         protected bool TrySwapping(int index, Item item, Character user, bool createNetworkEvent)
         {
             if (item?.ParentInventory == null || Items[index] == null) return false;

Barotrauma/BarotraumaShared/Source/Items/Item.cs

@@ -1200,6 +1200,10 @@ namespace Barotrauma
             {
                 ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
             }
+            if (!broken)
+            {
+                ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
+            }
             ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
 
             if (body == null || !body.Enabled || !inWater || ParentInventory != null || Removed) { return; }

Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs

@@ -132,14 +132,16 @@ namespace Barotrauma
         //default size
         protected Vector2 size;                
 
-        private float impactTolerance;
+        private List<XElement> fabricationRecipeElements = new List<XElement>();
 
         private bool canSpriteFlipX, canSpriteFlipY;
         
         private Dictionary<string, PriceInfo> prices;
 
-        //an area next to the construction
-        //the construction can be Activated() by a Character inside the area
+        /// <summary>
+        /// Defines areas where the item can be interacted with. If RequireBodyInsideTrigger is set to true, the character
+        /// has to be within the trigger to interact. If it's set to false, having the cursor within the trigger is enough.
+        /// </summary>
         public List<Rectangle> Triggers;
 
         private List<XElement> fabricationRecipeElements = new List<XElement>();

Barotrauma/BarotraumaShared/Source/Map/Explosion.cs

@@ -40,7 +40,7 @@ namespace Barotrauma
             flames = true;
             underwaterBubble = true;
         }
-
+        
         public Explosion(XElement element, string parentDebugName)
         {
             attack = new Attack(element, parentDebugName + ", Explosion");
@@ -62,6 +62,16 @@ namespace Barotrauma
             CameraShake = element.GetAttributeFloat("camerashake", attack.Range * 0.1f);
         }
 
+        public void DisableParticles()
+        {
+            sparks = false;
+            shockwave = false;
+            smoke = false;
+            flash = false;
+            flames = false;
+            underwaterBubble = false;
+        }
+
         public List<Triplet<Explosion, Vector2, float>> GetRecentExplosions(float maxSecondsAgo)
         {
             return prevExplosions.FindAll(e => e.Third >= Timing.TotalTime - maxSecondsAgo);

Barotrauma/BarotraumaShared/Source/Map/FireSource.cs

@@ -15,14 +15,15 @@ namespace Barotrauma
     {
         const float OxygenConsumption = 50.0f;
         const float GrowSpeed = 5.0f;
-        
-        private Hull hull;
+
+        protected Hull hull;
+
+        protected Vector2 position;
+        protected Vector2 size;
 
         private bool removed;
 
-        private bool removed;
-
-        private bool removed;
+        protected bool removed;
 
 #if CLIENT
         private List<Decal> burnDecals = new List<Decal>();
@@ -184,6 +185,16 @@ namespace Barotrauma
             }
         }
 
+        protected virtual void ReduceOxygen(float deltaTime)
+        {
+            hull.Oxygen -= size.X * deltaTime * OxygenConsumption;
+        }
+
+        protected virtual void AdjustXPos(float growModifier, float deltaTime)
+        {
+            position.X -= GrowSpeed * growModifier * 0.5f * deltaTime;
+        }
+
         partial void UpdateProjSpecific(float growModifier);
 
         private void OnChangeHull(Vector2 pos, Hull particleHull)

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -660,6 +660,25 @@ namespace Barotrauma
             }
         }
 
+        public string DisplayName
+        {
+            get;
+            private set;
+        }
+
+        private string roomName;
+        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
+        public string RoomName
+        {
+            get { return roomName; }
+            set
+            {
+                if (roomName == value) { return; }
+                roomName = value;
+                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
+            }
+        }
+
         public override Rectangle Rect
         {
             get

Barotrauma/BarotraumaShared/Source/Map/Levels/Level.cs

@@ -138,6 +138,9 @@ namespace Barotrauma
         public Submarine StartOutpost { get; private set; }
         public Submarine EndOutpost { get; private set; }
 
+        private Submarine preSelectedStartOutpost;
+        private Submarine preSelectedEndOutpost;
+
         public string Seed
         {
             get { return seed; }
@@ -209,7 +212,7 @@ namespace Barotrauma
         /// </summary>
         /// <param name="difficulty">A scalar between 0-100</param>
         /// <param name="sizeFactor">A scalar between 0-1 (0 = the minimum width defined in the generation params is used, 1 = the max width is used)</param>
-        public Level(string seed, float difficulty, float sizeFactor, LevelGenerationParams generationParams, Biome biome)
+        public Level(string seed, float difficulty, float sizeFactor, LevelGenerationParams generationParams, Biome biome, Submarine startOutpost = null, Submarine endOutPost = null)
             : base(null)
         {
 
@@ -225,6 +228,9 @@ namespace Barotrauma
                 (width / GridCellSize) * GridCellSize,
                 (generationParams.Height / GridCellSize) * GridCellSize);
 
+            preSelectedStartOutpost = startOutpost;
+            preSelectedEndOutpost = endOutPost;
+
             //remove from entity dictionary
             base.Remove();
         }
@@ -1510,14 +1516,24 @@ namespace Barotrauma
                     continue;
                 }
 
-                //only create a starting outpost in campaign mode
-                if (GameMain.GameSession?.GameMode as CampaignMode == null && ((i == 0) == !Mirrored))
+                //only create a starting outpost in campaign and tutorial modes
+                if (!IsModeStartOutpostCompatible() && ((i == 0) == !Mirrored))
                 {
                     continue;
                 }
-                
-                string outpostFile = outpostFiles.GetRandom(Rand.RandSync.Server);
-                var outpost = new Submarine(outpostFile, tryLoad: false);
+
+                Submarine outpost = null;
+
+                if (i == 0 && preSelectedStartOutpost == null || i == 1 && preSelectedEndOutpost == null)
+                {
+                    string outpostFile = outpostFiles.GetRandom(Rand.RandSync.Server);
+                    outpost = new Submarine(outpostFile, tryLoad: false);
+                }
+                else
+                {
+                    outpost = (i == 0) ? preSelectedStartOutpost : preSelectedEndOutpost;
+                }
+
                 outpost.Load(unloadPrevious: false);
                 outpost.MakeOutpost();
 
@@ -1569,6 +1585,15 @@ namespace Barotrauma
             }            
         }
 
+        private bool IsModeStartOutpostCompatible()
+        {
+#if CLIENT
+            return GameMain.GameSession?.GameMode as CampaignMode != null || GameMain.GameSession?.GameMode as TutorialMode != null;
+#else
+            return GameMain.GameSession?.GameMode as CampaignMode != null;
+#endif
+        }
+
         public override void Remove()
         {
             base.Remove();

Barotrauma/BarotraumaShared/Source/Map/Submarine.cs

@@ -431,6 +431,12 @@ namespace Barotrauma
                         else if (ic is Pickable pickable)
                         {
                             //prevent picking up (or deattaching) items
+#if CLIENT
+                            if (GameMain.GameSession.GameMode is TutorialMode)
+                            {
+                                continue;
+                            }
+#endif
                             pickable.CanBePicked = false;
                             pickable.CanBeSelected = false;
                         }
@@ -1426,7 +1432,7 @@ namespace Barotrauma
             doc.Root.Add(new XAttribute("md5hash", hash.Hash));
             if (previewImage != null)
             {
-                doc.Root.Add(new XAttribute("previewimage", Convert.ToBase64String(previewImage.ToArray())));
+                //doc.Root.Add(new XAttribute("previewimage", Convert.ToBase64String(previewImage.ToArray())));
             }
 
             try

Barotrauma/BarotraumaShared/Source/PlayerInput.cs

@@ -162,21 +162,6 @@ namespace Barotrauma
             get { return binding; }
         }
 
-        public void SetState()
-        {
-            hit = binding.IsHit();
-            if (hit) hitQueue = true;
-
-            held = binding.IsDown();
-            if (held) heldQueue = true;
-        }
-#endif
-
-        public KeyOrMouse State
-        {
-            get { return binding; }
-        }
-
         public void SetState()
         {
             hit = binding.IsHit();

Barotrauma/BarotraumaShared/Source/Serialization/XMLExtensions.cs

@@ -46,7 +46,15 @@ namespace Barotrauma
 
             if (File.Exists(filePath))
             {
-                doc = XDocument.Load(filePath, LoadOptions.SetBaseUri);
+                try
+                {
+                    doc = XDocument.Load(filePath, LoadOptions.SetBaseUri);
+                }
+                catch
+                {
+                    return null;
+                }
+
                 if (doc.Root == null) return null;
             }
 

Barotrauma/BarotraumaShared/Source/TextManager.cs

@@ -79,6 +79,40 @@ namespace Barotrauma
         }
 
         public static string Get(string textTag, bool returnNull = false)
+        {
+            if (!textPacks.ContainsKey(Language))
+            {
+                DebugConsole.ThrowError("No text packs available for the selected language (" + Language + ")! Switching to English...");
+                Language = "English";
+                if (!textPacks.ContainsKey(Language))
+                {
+                    throw new Exception("No text packs available in English!");
+                }
+            }
+        }
+
+        public static string GetFormatted(string textTag, bool returnNull = false, params object[] args)
+        {
+            string text = Get(textTag, returnNull);
+
+            if (text == null || text.Length == 0)
+            {
+                if (returnNull)
+                {
+                    return null;
+                }
+                else
+                {
+                    DebugConsole.ThrowError("Text \"" + textTag + "\" not found.");
+                    return textTag;
+                }
+            }
+
+            return string.Format(text, args);     
+        }
+
+        // Format: ServerMessage.Identifier1/ServerMessage.Indentifier2~[variable1]=value~[variable2]=value
+        public static string GetServerMessage(string serverMessage)
         {
             if (!textPacks.ContainsKey(Language))
             {
@@ -118,6 +152,16 @@ namespace Barotrauma
             }
         }
 
+        public static string ParseInputTypes(string text)
+        {
+            foreach (InputType inputType in Enum.GetValues(typeof(InputType)))
+            {
+                text = text.Replace("[" + inputType.ToString().ToLowerInvariant() + "]", GameMain.Config.KeyBind(inputType).ToString());
+                text = text.Replace("[InputType." + inputType.ToString() + "]", GameMain.Config.KeyBind(inputType).ToString());
+            }
+            return text;
+        }
+
         public static string GetFormatted(string textTag, bool returnNull = false, params object[] args)
         {
             string text = Get(textTag, returnNull);