Merge pull request #9 from Regalis11/master

0.14.9.0
2021-08-25 13:18:02 -03:00
parent 5ffe372908 265a2e7ab3
commit 970ee8a93f
140 changed files with 1448 additions and 621 deletions
@@ -108,6 +108,16 @@ namespace Barotrauma
        public enum Animation { None, Climbing, UsingConstruction, Struggle, CPR };
        public Animation Anim;

+        public Vector2 AimSourceWorldPos
+        {
+            get
+            {
+                Vector2 sourcePos = character.AnimController.AimSourcePos;
+                if (character.Submarine != null) { sourcePos += character.Submarine.Position; }
+                return sourcePos;
+            }
+        }
+
        public Vector2 AimSourcePos => ConvertUnits.ToDisplayUnits(AimSourceSimPos);
        public virtual Vector2 AimSourceSimPos => Collider.SimPosition;

@@ -1463,7 +1463,7 @@ namespace Barotrauma
                target.CharacterHealth.CalculateVitality();
                if (wasCritical && target.Vitality > 0.0f && Timing.TotalTime > lastReviveTime + 10.0f)
                {
-                    character.Info.IncreaseSkillLevel("medical", SkillSettings.Current.SkillIncreasePerCprRevive, character.Position + Vector2.UnitY * 150.0f);
+                    character.Info?.IncreaseSkillLevel("medical", SkillSettings.Current.SkillIncreasePerCprRevive, character.Position + Vector2.UnitY * 150.0f);
                    SteamAchievementManager.OnCharacterRevived(target, character);
                    lastReviveTime = (float)Timing.TotalTime;
 #if SERVER