(af16ecdfa) Merge branch 'dev' into human-ai

Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs

@@ -440,14 +440,15 @@ namespace Barotrauma
                 return;
             }
 
-            //foreach (Limb limb in Limbs)
-            //{
-            //    limb.Draw(spriteBatch, cam);
-            //}
+            Color? color = null;
+            if (character.ExternalHighlight)
+            {
+                color = Color.Lerp(Color.White, Color.OrangeRed, (float)Math.Sin(Timing.TotalTime * 3.5f));
+            }
 
             for (int i = 0; i < limbs.Length; i++)
             {
-                inversedLimbDrawOrder[i].Draw(spriteBatch, cam);
+                inversedLimbDrawOrder[i].Draw(spriteBatch, cam, color);
             }
             LimbJoints.ForEach(j => j.Draw(spriteBatch));
         }

Barotrauma/BarotraumaClient/Source/Characters/Character.cs

@@ -111,6 +111,33 @@ namespace Barotrauma
             get { return gibEmitters; }
         }
 
+        public class ObjectiveEntity
+        {
+            public Entity Entity;
+            public Sprite Sprite;
+            public Color Color;
+
+            public ObjectiveEntity(Entity entity, Sprite sprite, Color? color = null)
+            {
+                Entity = entity;
+                Sprite = sprite;
+                if (color.HasValue)
+                {
+                    Color = color.Value;
+                }
+                else
+                {
+                    Color = Color.White;
+                }
+            }
+        }
+
+        private List<ObjectiveEntity> activeObjectiveEntities = new List<ObjectiveEntity>();
+        public IEnumerable<ObjectiveEntity> ActiveObjectiveEntities
+        {
+            get { return activeObjectiveEntities; }
+        }
+
         partial void InitProjSpecific(XDocument doc)
         {
             soundInterval = doc.Root.GetAttributeFloat("soundinterval", 10.0f);
@@ -140,9 +167,6 @@ namespace Barotrauma
             }
         }
 
-            hudProgressBars = new Dictionary<object, HUDProgressBar>();
-        }
-
         partial void UpdateLimbLightSource(Limb limb)
         {
             if (limb.LightSource != null)
@@ -735,6 +759,20 @@ namespace Barotrauma
             soundTimer = soundInterval;
         }
 
+        public void AddActiveObjectiveEntity(Entity entity, Sprite sprite, Color? color = null)
+        {
+            if (activeObjectiveEntities.Any(aoe => aoe.Entity == entity)) return;
+            ObjectiveEntity objectiveEntity = new ObjectiveEntity(entity, sprite, color);
+            activeObjectiveEntities.Add(objectiveEntity);
+        }
+
+        public void RemoveActiveObjectiveEntity(Entity entity)
+        {
+            ObjectiveEntity found = activeObjectiveEntities.Find(aoe => aoe.Entity == entity);
+            if (found == null) return;
+            activeObjectiveEntities.Remove(found);
+        }
+
         partial void ImplodeFX()
         {
             Vector2 centerOfMass = AnimController.GetCenterOfMass();

Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs

@@ -168,7 +168,12 @@ namespace Barotrauma
                     DrawOrderIndicator(spriteBatch, cam, character, character.CurrentOrder, 1.0f);                    
                 }                
             }
-            
+
+            foreach (Character.ObjectiveEntity objectiveEntity in character.ActiveObjectiveEntities)
+            {
+                DrawObjectiveIndicator(spriteBatch, cam, character, objectiveEntity, 1.0f);
+            }
+
             foreach (Item brokenItem in brokenItems)
             {
                 float dist = Vector2.Distance(character.WorldPosition, brokenItem.WorldPosition);
@@ -371,5 +376,13 @@ namespace Barotrauma
 
             orderIndicatorCount[target] = orderIndicatorCount[target] + 1;
         }        
+
+        private static void DrawObjectiveIndicator(SpriteBatch spriteBatch, Camera cam, Character character, Character.ObjectiveEntity objectiveEntity, float iconAlpha = 1.0f)
+        {
+            if (objectiveEntity == null) return;
+
+            Vector2 drawPos = objectiveEntity.Entity.WorldPosition;// + Vector2.UnitX * objectiveEntity.Sprite.size.X * 1.5f;
+            GUI.DrawIndicator(spriteBatch, drawPos, cam, 100.0f, objectiveEntity.Sprite, objectiveEntity.Color * iconAlpha);
+        }
     }
 }

Barotrauma/BarotraumaClient/Source/Characters/Health/CharacterHealth.cs

@@ -136,6 +136,17 @@ namespace Barotrauma
             }
         }
 
+        public GUIButton CPRButton
+        {
+            get { return cprButton; }
+        }
+
+        public float HealthBarPulsateTimer
+        {
+            get { return healthBarPulsateTimer; }
+            set { healthBarPulsateTimer = MathHelper.Clamp(value, 0.0f, 10.0f); }
+        }
+
         static CharacterHealth()
         {
             damageOverlay = new Sprite("Content/UI/damageOverlay.png", Vector2.Zero);