From e578cbc07768b7fae804834460a95265239c05b8 Mon Sep 17 00:00:00 2001
From: juanjp600 <juanjprot@gmail.com>
Date: Wed, 19 Sep 2018 14:57:22 -0300
Subject: [PATCH] Explosions now use Character.Controlled.WorldPosition to
 determine camera shake

---
 .../BarotraumaShared/Content/Items/Weapons/weapons.xml    | 8 ++++----
 Barotrauma/BarotraumaShared/Source/Map/Explosion.cs       | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
index aa495d3fe..87d41a842 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
@@ -46,7 +46,7 @@
       <Sound file="Content/Items/Weapons/harpoon1.ogg" type="OnUse"/>
       <Sound file="Content/Items/Weapons/harpoon2.ogg" type="OnUse"/>
       <StatusEffect type="OnUse">
-        <Explosion range="150.0" force="5" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" camerashake="5.0"/>
+        <Explosion range="150.0" force="5" shockwave="false" smoke="false" flames="false" flash="false" sparks="false" camerashake="6.0"/>
       </StatusEffect>
       <RequiredItems name="Spear" type="Contained" msg="Spear required to shoot"/>
       <RequiredSkill name="Weapons" level="30"/>
@@ -130,7 +130,7 @@
     <RangedWeapon barrelpos="14,6" spread="0" unskilledspread="2">
       <Sound file="Content/Items/Weapons/revolver.ogg" type="OnUse" range="3000"/>
       <StatusEffect type="OnUse">
-        <Explosion range="150.0" force="5" shockwave="false" smoke="false" flames="false" sparks="false" camerashake="5.0"/>
+        <Explosion range="150.0" force="5" shockwave="false" smoke="false" flames="false" sparks="false" camerashake="6.0"/>
       </StatusEffect>
       <RequiredItems name="Revolver Round" type="Contained" msg="Out of ammo"/>
       <RequiredSkill name="Weapons" level="40"/>
@@ -230,12 +230,12 @@
       <StatusEffect type="OnUse" target="Contained,Character" Condition="-25.0" stun="15.0" disabledeltatime="true">
         <sound file="Content/Items/Weapons/stunbaton.ogg"/>
         <RequiredItem name="Battery Cell" type="Contained" msg="Loaded Battery Cell required"/>        
-        <Explosion range="100.0" force="0.1" shockwave="false" flames="false" smoke="false" camerashake="5.0"/>
+        <Explosion range="100.0" force="0.1" shockwave="false" flames="false" smoke="false" camerashake="6.0"/>
       </StatusEffect>
       <StatusEffect type="OnUse" target="Contained,Character" Condition="-15.0" stun="30.0" disabledeltatime="true">
         <sound file="Content/Items/Weapons/stunbaton.ogg"/>
         <RequiredItem name="Fulgurium Battery Cell" type="Contained" msg="Loaded Battery Cell required"/>        
-        <Explosion range="100.0" force="0.5" shockwave="false" flames="false" camerashake="5.0"/>
+        <Explosion range="100.0" force="0.5" shockwave="false" flames="false" camerashake="6.0"/>
       </StatusEffect>      
     </MeleeWeapon>
 
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Explosion.cs b/Barotrauma/BarotraumaShared/Source/Map/Explosion.cs
index 3280a3f51..04a23267a 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Explosion.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Explosion.cs
@@ -63,9 +63,10 @@ namespace Barotrauma
             float displayRange = attack.Range;
             if (displayRange < 0.1f) return;
 
-            float cameraDist = Vector2.Distance(GameMain.GameScreen.Cam.Position, worldPosition) / 2.0f;
+            Vector2 cameraPos = Character.Controlled != null ? Character.Controlled.WorldPosition : GameMain.GameScreen.Cam.Position;
+            float cameraDist = Vector2.Distance(cameraPos, worldPosition) / 2.0f;
             GameMain.GameScreen.Cam.Shake = CameraShake * Math.Max((displayRange - cameraDist) / displayRange, 0.0f);
-
+            
             if (attack.GetStructureDamage(1.0f) > 0.0f)
             {
                 RangedStructureDamage(worldPosition, displayRange, attack.GetStructureDamage(1.0f));