f8b0295...0671290

FakeFishGames · Mar 18, 2019 · 63eb4d6 · 63eb4d6
1 parent 23687fb
commit 63eb4d6
Show file tree

Hide file tree

Showing 103 changed files with 1,377 additions and 4,691 deletions.
diff --git a/Barotrauma/BarotraumaClient/Icon.bmp b/Barotrauma/BarotraumaClient/Icon.bmp
diff --git a/Barotrauma/BarotraumaClient/LinuxClient.csproj b/Barotrauma/BarotraumaClient/LinuxClient.csproj
@@ -31,6 +31,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <ApplicationIcon>..\BarotraumaShared\IconBmp.bmp</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>..\BarotraumaShared\Icon.ico</ApplicationIcon>
@@ -103,6 +104,7 @@
     <Content Include="OpenTK.dll.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Shaders\solidcolor_opengl.fx" />
     <Content Include="SharpFont.dll.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -152,13 +154,16 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="app.config" />	
+    <None Include="app.config" />
     <Content Include="Shaders\blurshader_opengl.fx" />
     <Content Include="Shaders\damageshader_opengl.fx" />
     <Content Include="Shaders\deformshader_opengl.fx" />
     <Content Include="Shaders\losshader_opengl.fx" />
     <Content Include="Shaders\postprocess_opengl.fx" />
     <Content Include="Shaders\watershader_opengl.fx" />
+    <None Include="Content\Effects\solidcolor_opengl.xnb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Shaders\Content_opengl.mgcb" />
     <None Include="Content\Effects\blurshader_opengl.xnb">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -187,6 +192,11 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />
+  <ItemGroup>
+    <EmbeddedResource Include="Icon.bmp">
+      <LogicalName>Icon.bmp</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="ClientCode.projitems" Label="Shared" />
   <Import Project="..\BarotraumaShared\SharedCode.projitems" Label="Shared" />
   <Import Project="..\BarotraumaShared\SharedContent.projitems" Label="Shared" />

diff --git a/Barotrauma/BarotraumaClient/MacClient.csproj b/Barotrauma/BarotraumaClient/MacClient.csproj
@@ -103,6 +103,7 @@
     <Content Include="OpenTK.dll.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Shaders\solidcolor_opengl.fx" />
     <Content Include="SharpFont.dll.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -159,6 +160,9 @@
     <Content Include="Shaders\losshader_opengl.fx" />
     <Content Include="Shaders\postprocess_opengl.fx" />
     <Content Include="Shaders\watershader_opengl.fx" />
+    <None Include="Content\Effects\solidcolor_opengl.xnb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Shaders\Content_opengl.mgcb" />
     <None Include="Content\Effects\blurshader_opengl.xnb">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/Barotrauma/BarotraumaClient/Properties/AssemblyInfo.cs b/Barotrauma/BarotraumaClient/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.8.9.5")]
-[assembly: AssemblyFileVersion("0.8.9.5")]
+[assembly: AssemblyVersion("0.8.9.6")]
+[assembly: AssemblyFileVersion("0.8.9.6")]
diff --git a/Barotrauma/BarotraumaClient/Shaders/Content.mgcb b/Barotrauma/BarotraumaClient/Shaders/Content.mgcb
@@ -0,0 +1,57 @@
+
+#----------------------------- Global Properties ----------------------------#
+
+/outputDir:bin/$(Platform)
+/intermediateDir:obj/$(Platform)
+/platform:Windows
+/config:
+/profile:Reach
+/compress:False
+
+#-------------------------------- References --------------------------------#
+
+
+#---------------------------------- Content ---------------------------------#
+
+#begin blurshader.fx
+/importer:EffectImporter
+/processor:EffectProcessor
+/processorParam:DebugMode=Auto
+/build:blurshader.fx
+
+#begin damageshader.fx
+/importer:EffectImporter
+/processor:EffectProcessor
+/processorParam:DebugMode=Auto
+/build:damageshader.fx
+
+#begin deformshader.fx
+/importer:EffectImporter
+/processor:EffectProcessor
+/processorParam:DebugMode=Auto
+/build:deformshader.fx
+
+#begin losshader.fx
+/importer:EffectImporter
+/processor:EffectProcessor
+/processorParam:DebugMode=Auto
+/build:losshader.fx
+
+#begin postprocess.fx
+/importer:EffectImporter
+/processor:EffectProcessor
+/processorParam:DebugMode=Auto
+/build:postprocess.fx
+
+#begin watershader.fx
+/importer:EffectImporter
+/processor:EffectProcessor
+/processorParam:DebugMode=Auto
+/build:watershader.fx
+
+#begin solidcolor.fx
+/importer:EffectImporter
+/processor:EffectProcessor
+/processorParam:DebugMode=Auto
+/build:solidcolor.fx
+
diff --git a/Barotrauma/BarotraumaClient/Shaders/Content_opengl.mgcb b/Barotrauma/BarotraumaClient/Shaders/Content_opengl.mgcb
@@ -0,0 +1,62 @@
+
+#----------------------------- Global Properties ----------------------------#
+
+/outputDir:bin/$(Platform)
+/intermediateDir:obj/$(Platform)
+/platform:DesktopGL
+/config:
+/profile:Reach
+/compress:False
+
+#-------------------------------- References --------------------------------#
+
+
+#---------------------------------- Content ---------------------------------#
+
+#begin blurshader_opengl.fx
+/importer:EffectImporter
+/processor:EffectProcessor
+/processorParam:DebugMode=Auto
+/build:blurshader_opengl.fx
+
+#begin Content_opengl.mgcb
+/importer:
+/processor:
+/build:Content_opengl.mgcb
+
+#begin damageshader_opengl.fx
+/importer:EffectImporter
+/processor:EffectProcessor
+/processorParam:DebugMode=Auto
+/build:damageshader_opengl.fx
+
+#begin deformshader_opengl.fx
+/importer:EffectImporter
+/processor:EffectProcessor
+/processorParam:DebugMode=Auto
+/build:deformshader_opengl.fx
+
+#begin losshader_opengl.fx
+/importer:EffectImporter
+/processor:EffectProcessor
+/processorParam:DebugMode=Auto
+/build:losshader_opengl.fx
+
+#begin postprocess_opengl.fx
+/importer:EffectImporter
+/processor:EffectProcessor
+/processorParam:DebugMode=Auto
+/build:postprocess_opengl.fx
+
+#begin solidcolor_opengl.fx
+/importer:EffectImporter
+/processor:EffectProcessor
+/processorParam:DebugMode=Auto
+/build:solidcolor_opengl.fx
+
+#begin watershader_opengl.fx
+/importer:EffectImporter
+/processor:EffectProcessor
+/processorParam:DebugMode=Auto
+/build:watershader_opengl.fx
+
diff --git a/Barotrauma/BarotraumaClient/Shaders/solidcolor.fx b/Barotrauma/BarotraumaClient/Shaders/solidcolor.fx
@@ -0,0 +1,38 @@
+Texture2D xTexture;
+sampler TextureSampler = sampler_state { Texture = <xTexture>; };
+
+float blurDistance;
+float4 color; 
+
+float4 solidColor(float4 position : SV_Position, float4 clr : COLOR0, float2 texCoord : TEXCOORD0) : COLOR0
+{
+    float a = tex2D(TextureSampler, texCoord).a;    
+    return color * a;
+}
+
+float4 solidColorBlur(float4 position : SV_Position, float4 clr : COLOR0, float2 texCoord : TEXCOORD0) : COLOR0
+{
+    float sample;
+    sample = tex2D(TextureSampler, float2(texCoord.x + blurDistance, texCoord.y + blurDistance)).a;
+    sample += tex2D(TextureSampler, float2(texCoord.x - blurDistance, texCoord.y - blurDistance)).a;
+    sample += tex2D(TextureSampler, float2(texCoord.x + blurDistance, texCoord.y - blurDistance)).a;
+    sample += tex2D(TextureSampler, float2(texCoord.x - blurDistance, texCoord.y + blurDistance)).a;
+    sample = sample * 0.25f;
+
+    return color * sample;
+}
+
+technique SolidColor
+{
+    pass Pass1
+    {
+        PixelShader = compile ps_4_0_level_9_1 solidColor();
+    }
+}
+technique SolidColorBlur
+{
+    pass Pass1
+    {
+        PixelShader = compile ps_4_0_level_9_1 solidColorBlur();
+    }
+}
diff --git a/Barotrauma/BarotraumaClient/Shaders/solidcolor_opengl.fx b/Barotrauma/BarotraumaClient/Shaders/solidcolor_opengl.fx
@@ -0,0 +1,38 @@
+Texture xTexture;
+sampler TextureSampler = sampler_state { Texture = <xTexture>; };
+
+float blurDistance;
+float4 color; 
+
+float4 solidColor(float4 position : SV_Position, float4 clr : COLOR0, float2 texCoord : TEXCOORD0) : COLOR0
+{
+    float a = tex2D(TextureSampler, texCoord).a;    
+    return color * a;
+}
+
+float4 solidColorBlur(float4 position : SV_Position, float4 clr : COLOR0, float2 texCoord : TEXCOORD0) : COLOR0
+{
+    float sample;
+    sample = tex2D(TextureSampler, float2(texCoord.x + blurDistance, texCoord.y + blurDistance)).a;
+    sample += tex2D(TextureSampler, float2(texCoord.x - blurDistance, texCoord.y - blurDistance)).a;
+    sample += tex2D(TextureSampler, float2(texCoord.x + blurDistance, texCoord.y - blurDistance)).a;
+    sample += tex2D(TextureSampler, float2(texCoord.x - blurDistance, texCoord.y + blurDistance)).a;
+    sample = sample * 0.25f;
+
+    return color * sample;
+}
+
+technique SolidColor
+{
+    pass Pass1
+    {
+        PixelShader = compile ps_3_0 solidColor();
+    }
+}
+technique SolidColorBlur
+{
+    pass Pass1
+    {
+        PixelShader = compile ps_3_0 solidColorBlur();
+    }
+}
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs b/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs
@@ -242,7 +242,7 @@ public static void Draw(SpriteBatch spriteBatch, Character character, Camera cam
                         GUI.Style.FocusIndicator.Draw(spriteBatch,
                             (int)((focusedItemOverlayTimer - 1.0f) * GUI.Style.FocusIndicator.FrameCount * 3.0f),
                             circlePos,
-                            Color.Orange * 0.3f,
+                            Color.LightBlue * 0.3f,
                             origin: GUI.Style.FocusIndicator.FrameSize.ToVector2() / 2,
                             rotate: (float)Timing.TotalTime,
                             scale: scale);
@@ -274,9 +274,7 @@ public static void Draw(SpriteBatch spriteBatch, Character character, Camera cam
                             GUI.DrawString(spriteBatch, textPos, coloredText.Text, coloredText.Color * alpha, Color.Black * alpha * 0.7f, 2, GUI.SmallFont);
                             textPos.Y += 20;
                         }
-                    }
-
-
+                    }                    
                 }
 
                 foreach (HUDProgressBar progressBar in character.HUDProgressBars.Values)

diff --git a/Barotrauma/BarotraumaClient/Source/Characters/CharacterHealth.cs b/Barotrauma/BarotraumaClient/Source/Characters/CharacterHealth.cs
@@ -544,7 +544,10 @@ public void UpdateHUD(float deltaTime)
             {
                 healthBar.Color = healthWindowHealthBar.Color = ToolBox.GradientLerp(Vitality / MaxVitality, Color.Red, Color.Orange, Color.Green);
                 healthBar.HoverColor = healthWindowHealthBar.HoverColor = healthBar.Color * 2.0f;
-                healthBar.BarSize = healthWindowHealthBar.BarSize = (Vitality > 0.0f) ? Vitality / MaxVitality : 1.0f - Vitality / MinVitality;
+                healthBar.BarSize = healthWindowHealthBar.BarSize = 
+                    (Vitality > 0.0f) ? 
+                    (MaxVitality > 0.0f ? Vitality / MaxVitality : 0.0f) : 
+                    (Math.Abs(MinVitality) > 0.0f ? 1.0f - Vitality / MinVitality : 0.0f);
 
                 if (healthBarPulsateTimer > 0.0f)
                 {

diff --git a/Barotrauma/BarotraumaClient/Source/Characters/CharacterNetworking.cs b/Barotrauma/BarotraumaClient/Source/Characters/CharacterNetworking.cs
@@ -363,7 +363,7 @@ public static Character ReadSpawnData(NetBuffer inc, bool spawn = true)
                 character.ID = id;
                 character.TeamID = (TeamType)teamID;
 
-                if (configPath == HumanConfigFile)
+                if (configPath == HumanConfigFile && character.TeamID != TeamType.FriendlyNPC)
                 {
                     CharacterInfo duplicateCharacterInfo = GameMain.GameSession.CrewManager.GetCharacterInfos().FirstOrDefault(c => c.ID == info.ID);
                     GameMain.GameSession.CrewManager.RemoveCharacterInfo(duplicateCharacterInfo);