Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into unstable

Barotrauma/BarotraumaClient/ClientSource/Networking/Primitives/Peers/ClientPeer.cs

@@ -127,9 +127,8 @@ namespace Barotrauma.Networking
                             DebugConsole.ThrowError(errorMsg);
                         }
                         ContentPackageOrderReceived = true;
-                        
-                        SendMsgInternal(headers, null);
                     }
+                    SendMsgInternal(headers, null);                    
 
                     break;
                 }

Barotrauma/BarotraumaClient/LinuxClient.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>0.19.8.0</Version>
+    <Version>0.19.9.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>0.19.8.0</Version>
+    <Version>0.19.9.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>0.19.8.0</Version>
+    <Version>0.19.9.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>0.19.8.0</Version>
+    <Version>0.19.9.0</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>
@@ -150,4 +150,4 @@
     <WriteCodeFragment Language="C#" OutputFile="$(CustomAssemblyInfoFile)" AssemblyAttributes="@(AssemblyAttributes)" />
   </Target>
 
-</Project>
+</Project>

Barotrauma/BarotraumaServer/MacServer.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>0.19.8.0</Version>
+    <Version>0.19.9.0</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>
@@ -162,4 +162,4 @@
     <WriteCodeFragment Language="C#" OutputFile="$(CustomAssemblyInfoFile)" AssemblyAttributes="@(AssemblyAttributes)" />
   </Target>
 
-</Project>
+</Project>

Barotrauma/BarotraumaServer/WindowsServer.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>0.19.8.0</Version>
+    <Version>0.19.9.0</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>
@@ -158,4 +158,4 @@
     <WriteCodeFragment Language="C#" OutputFile="$(CustomAssemblyInfoFile)" AssemblyAttributes="@(AssemblyAttributes)" />
   </Target>
 
-</Project>
+</Project>

Barotrauma/BarotraumaShared/SharedSource/Events/Missions/Mission.cs

@@ -348,11 +348,15 @@ namespace Barotrauma
             completed = 
                 DetermineCompleted() && 
                 (completeCheckDataAction == null ||completeCheckDataAction.GetSuccess());
-            if (Prefab.LocationTypeChangeOnCompleted != null)
+            if (completed)
             {
-                ChangeLocationType(Prefab.LocationTypeChangeOnCompleted);
+                if (Prefab.LocationTypeChangeOnCompleted != null)
+                {
+                    ChangeLocationType(Prefab.LocationTypeChangeOnCompleted);
+                }
+                GiveReward();
             }
-            GiveReward();
+
             EndMissionSpecific(completed);
         }
 

Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs

@@ -3216,6 +3216,7 @@ namespace Barotrauma
             }
 #endif
 
+            item.condition = element.GetAttributeFloat("condition", item.condition);
             foreach (XAttribute attribute in (appliedSwap?.ConfigElement ?? element).Attributes())
             {
                 if (!item.SerializableProperties.TryGetValue(attribute.NameAsIdentifier(), out SerializableProperty property)) { continue; }

Barotrauma/BarotraumaShared/changelog.txt

@@ -1,3 +1,13 @@
+---------------------------------------------------------------------------------------------------------
+v0.19.9.0
+---------------------------------------------------------------------------------------------------------
+
+Fixes to new issues in the previous build:
+- Fixed missions always giving rewards even if you fail them!
+- Fixed clients sometimes failing to reconnect to the server if the connection is momentarily lost.
+- Fixed item conditions resetting to 100% between rounds.
+- Fixed mineral missions always causing a crash.
+
 ---------------------------------------------------------------------------------------------------------
 v0.19.8.0
 ---------------------------------------------------------------------------------------------------------