Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -52,9 +52,8 @@ body:
       label: Version
       description: Which version of the game did the bug happen in? You can see the current version number in the bottom left corner of your screen in the main menu.
       options:      
-        - 0.21.6.0
+        - v1.0.8.0
-        - 0.22.0.0 (Unstable)
+        - Unstable (v1.1.3.0)
-        - Faction/endgame test branch
         - Other
     validations:
       required: true

Barotrauma/BarotraumaClient/ClientSource/GUI/GUI.cs

@@ -2587,10 +2587,11 @@ namespace Barotrauma
 
         public static void AddMessage(string message, Color color, float? lifeTime = null, bool playSound = true, GUIFont font = null)
         {
+            var guiMessage = new GUIMessage(message, color, lifeTime ?? MathHelper.Clamp(message.Length / 5.0f, 3.0f, 10.0f), font ?? GUIStyle.LargeFont);
             lock (mutex)
             {
                 if (messages.Any(msg => msg.Text == message)) { return; }
-                messages.Add(new GUIMessage(message, color, lifeTime ?? MathHelper.Clamp(message.Length / 5.0f, 3.0f, 10.0f), font ?? GUIStyle.LargeFont));
+                messages.Add(guiMessage);
             }
             if (playSound) { SoundPlayer.PlayUISound(GUISoundType.UIMessage); }
         }

Barotrauma/BarotraumaClient/ClientSource/Map/Map/Map.cs

@@ -1147,12 +1147,14 @@ namespace Barotrauma
                             unlockFaction = GameMain.GameSession.Campaign.Factions.Find(f => f.Prefab.Identifier == unlockEvent.Faction);
                             unlockReputation = unlockFaction?.Reputation;
                         }
-
+                        if (unlockReputation != null)
-                        DrawIcon(
+                        {
-                            "LockedLocationConnection", (int)(28 * zoom),
+                            DrawIcon(
-                            RichString.Rich(TextManager.GetWithVariables(unlockEvent.UnlockPathTooltip ?? "LockedPathTooltip",
+                                "LockedLocationConnection", (int)(28 * zoom),
-                              ("[requiredreputation]", Reputation.GetFormattedReputationText(MathUtils.InverseLerp(unlockReputation.MinReputation, unlockReputation.MaxReputation, unlockEvent.UnlockPathReputation), unlockEvent.UnlockPathReputation, addColorTags: true)),
+                                RichString.Rich(TextManager.GetWithVariables(unlockEvent.UnlockPathTooltip ?? "LockedPathTooltip",
-                              ("[currentreputation]", unlockReputation.GetFormattedReputationText(addColorTags: true)))));
+                                  ("[requiredreputation]", Reputation.GetFormattedReputationText(MathUtils.InverseLerp(unlockReputation.MinReputation, unlockReputation.MaxReputation, unlockEvent.UnlockPathReputation), unlockEvent.UnlockPathReputation, addColorTags: true)),
+                                  ("[currentreputation]", unlockReputation.GetFormattedReputationText(addColorTags: true)))));
+                        }
                     }
                     else
                     {

Barotrauma/BarotraumaClient/LinuxClient.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>1.0.7.0</Version>
+    <Version>1.0.8.0</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>

Barotrauma/BarotraumaClient/MacClient.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>1.0.7.0</Version>
+    <Version>1.0.8.0</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>

Barotrauma/BarotraumaClient/WindowsClient.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>1.0.7.0</Version>
+    <Version>1.0.8.0</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>

Barotrauma/BarotraumaServer/LinuxServer.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>1.0.7.0</Version>
+    <Version>1.0.8.0</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>

Barotrauma/BarotraumaServer/MacServer.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>1.0.7.0</Version>
+    <Version>1.0.8.0</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>

Barotrauma/BarotraumaServer/WindowsServer.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>1.0.7.0</Version>
+    <Version>1.0.8.0</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>

Barotrauma/BarotraumaShared/Data/languageoptions.xml

@@ -18,5 +18,5 @@
 <option label="Español" identifier="Spanish" mapsFrom="Castilian Spanish, Latinamerican Spanish" />
 <option label="Svenska" identifier="Swedish" />
 <option label="Türkçe" identifier="Turkish" />
-<option label="украї́нська" identifier="Ukrainian" />
+<option label="Украї́нська" identifier="Ukrainian" />
 </options>

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveCombat.cs

@@ -1195,7 +1195,7 @@ namespace Barotrauma
                         {
                             target = limb.character;
                         }
-                        if (target != null && (target != Enemy || HumanAIController.IsFriendly(target)))
+                        if (target != null && target != Enemy && HumanAIController.IsFriendly(target))
                         {
                             return;
                         }

Barotrauma/BarotraumaShared/SharedSource/Map/Outposts/OutpostGenerationParams.cs

@@ -198,6 +198,7 @@ namespace Barotrauma
             {
                 foreach (var entry in entries)
                 {
+                    if (entry == null) { continue; }
                     yield return entry.HumanPrefab;
                 }
             }
@@ -330,7 +331,7 @@ namespace Barotrauma
             {
                 foreach (var prefab in collection)
                 {
-                    if (prefab.CampaignInteractionType == interactionType)
+                    if (prefab != null && prefab.CampaignInteractionType == interactionType)
                     {
                         return true;
                     }

Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs

@@ -1539,7 +1539,7 @@ namespace Barotrauma
                             {
                                 targetCharacter.TryAdjustHealerSkill(user, healthChange);
 #if SERVER
-                                GameMain.Server.KarmaManager.OnCharacterHealthChanged(targetCharacter, user, healthChange, 0.0f);
+                                GameMain.Server.KarmaManager.OnCharacterHealthChanged(targetCharacter, user, -healthChange, 0.0f);
 #endif
                             }
                         }
@@ -2168,7 +2168,7 @@ namespace Barotrauma
                                 {
                                     targetCharacter.TryAdjustHealerSkill(element.User, healthChange);
 #if SERVER
-                                    GameMain.Server.KarmaManager.OnCharacterHealthChanged(targetCharacter, element.User, healthChange, 0.0f);
+                                    GameMain.Server.KarmaManager.OnCharacterHealthChanged(targetCharacter, element.User, -healthChange, 0.0f);
 #endif
                                 }
                             }

Barotrauma/BarotraumaShared/changelog.txt

@@ -1,3 +1,13 @@
+---------------------------------------------------------------------------------------------------------
+v1.0.8.0
+---------------------------------------------------------------------------------------------------------
+
+- Fixed loading screens sometimes getting stuck when playing in Chinese, Japanese or Korean.
+- Fixed certain mods that override outpost generation parameters causing crashes due to missing outpost NPC prefabs.
+- Fixed outpost NPCs never attacking you (just aiming their guns at you) if you attack them, but your reputation is not low enough to turn the outpost hostile. 
+- Fixed broken dialog line in the waytoascension1 event.
+- Fixed healing your crewmates causing your karma to decrease.
+
 ---------------------------------------------------------------------------------------------------------
 v1.0.7.0
 ---------------------------------------------------------------------------------------------------------