Fixed #26

smad2005 · Oct 30, 2015 · 7cba0a2 · 7cba0a2
1 parent 1f2dc8d
commit 7cba0a2
Showing 1 changed file with 27 additions and 32 deletions.
diff --git a/src/Hud/Health/HealthBarPlugin.cs b/src/Hud/Health/HealthBarPlugin.cs
@@ -70,24 +70,15 @@ public override void Render()
                     float hpWidth = hpPercent * scaledWidth;
                     float esWidth = esPercent * scaledWidth;
                     var bg = new RectangleF(mobScreenCoords.X - scaledWidth / 2, mobScreenCoords.Y - scaledHeight / 2, scaledWidth, scaledHeight);
-                    float yPosition = bg.Y;
-                    if (Settings.ShowDebuffPanel)
-                    {
-                        yPosition = DrawDebuffPanel(bg, healthBar, healthBar.Life);
-                    }
-
-                    if (healthBar.Settings.ShowFloatingCombatDamage)
-                    {
-                        var middle = bg.X + bg.Width / 2;
-                        ShowDps(healthBar, new Vector2(middle, yPosition));
-                    }
-
+
                     if (hpPercent <= 0.1f)
                     {
                         color = healthBar.Settings.Under10Percent;
                     }
                     bg.Y = DrawFlatLifeAmount(healthBar.Life, hpPercent, healthBar.Settings, bg);
-                    DrawFlatESAmount(healthBar.Life, healthBar.Settings, bg);
+                    var yPosition = DrawFlatESAmount(healthBar, bg);
+                    yPosition = DrawDebuffPanel(new Vector2(bg.Left, yPosition), healthBar, healthBar.Life);
+                    ShowDps(healthBar, new Vector2(bg.Center.X, yPosition));
                     DrawPercents(healthBar.Settings, hpPercent, bg);
                     DrawBackground(color, healthBar.Settings.Outline, bg, hpWidth, esWidth);
                 }
@@ -96,7 +87,11 @@ public override void Render()
 
         private void ShowDps(HealthBar healthBar, Vector2 point)
         {
-            const int MARGIN_TOP = 2;
+            if (!healthBar.Settings.ShowFloatingCombatDamage)
+            {
+                return;
+            }
+                const int MARGIN_TOP = 2;
             const int LAST_DAMAGE_ADD_SIZE = 7;
             var fontSize = healthBar.Settings.FloatingCombatFontSize + LAST_DAMAGE_ADD_SIZE;
             var textHeight = Graphics.MeasureText("100500", fontSize).Height;
@@ -127,10 +122,14 @@ private void ShowDps(HealthBar healthBar, Vector2 point)
             healthBar.DpsDequeue();
         }
 
-        private float DrawDebuffPanel(RectangleF bg, HealthBar healthBar, Life life)
+        private float DrawDebuffPanel(Vector2 startPoint, HealthBar healthBar, Life life)
         {
+            var startY = startPoint.Y;
+            if (!Settings.ShowDebuffPanel)
+            {
+                return startY;
+            }
             var buffs = life.Buffs;
-            var startY = bg.Top;
             if (buffs.Count > 0)
             {
                 var isHostile = healthBar.Entity.IsHostile;
@@ -154,7 +153,7 @@ private float DrawDebuffPanel(RectangleF bg, HealthBar healthBar, Life life)
                 if (debuffTable > 0)
                 {
                     startY -= Settings.DebuffPanelIconSize + 2;
-                    var startX = bg.Left;
+                    var startX = startPoint.X;
                     DrawAllDebuff(debuffTable, startX, startY);
                 }
             }
@@ -239,35 +238,31 @@ private float DrawFlatLifeAmount(Life life, float hpPercent,
 			string curHp = ConvertHelper.ToShorten(life.CurHP);
 			string maxHp = ConvertHelper.ToShorten(life.MaxHP);
 			string text = string.Format("{0}/{1}", curHp, maxHp);
-			Color color = hpPercent <= 0.1f ? settings.HealthTextColorUnder10Percent : 
-				settings.HealthTextColor;
-			var position = new Vector2(bg.X + bg.Width / 2, bg.Y);
-			Size2 size = Graphics.DrawText(text, settings.TextSize, position, color,
-				FontDrawFlags.Center);
+			Color color = hpPercent <= 0.1f ? settings.HealthTextColorUnder10Percent : settings.HealthTextColor;
+            var position = new Vector2(bg.X + bg.Width / 2, bg.Y);
+			Size2 size = Graphics.DrawText(text, settings.TextSize, position, color, FontDrawFlags.Center);
 			return (int)bg.Y + (size.Height - bg.Height) / 2;
 		}
 
 		/**
 		 * I didn't bother to have ES change colour as it gets low, sorry CI
 		 * players!
 		 */
-		private float DrawFlatESAmount(Life life, UnitSettings settings, 
-			RectangleF bg)
+		private float DrawFlatESAmount(HealthBar healthBar, RectangleF bg)
 		{
-			if (!settings.ShowHealthText || (int)life.MaxES == 0)
+			if (!healthBar.Settings.ShowHealthText || healthBar.Life.MaxES == 0)
 			{
 				return bg.Y;
 			}
 
-			string curES = ConvertHelper.ToShorten(life.CurES);
-			string maxES = ConvertHelper.ToShorten(life.MaxES);
+			string curES = ConvertHelper.ToShorten(healthBar.Life.CurES);
+			string maxES = ConvertHelper.ToShorten(healthBar.Life.MaxES);
 			string text = string.Format("{0}/{1}", curES, maxES);
-			Color color = settings.HealthTextColor;
+			Color color = healthBar.Settings.HealthTextColor;
 			var position = new Vector2(bg.X + bg.Width / 2, (bg.Y - 12));
-			Size2 size = Graphics.DrawText(text, settings.TextSize, position, 
-				color, FontDrawFlags.Center);
-			return (int)bg.Y + (size.Height - bg.Height) / 2;
-		}
+			Size2 size = Graphics.DrawText(text, healthBar.Settings.TextSize, position, color, FontDrawFlags.Center);
+            return (int)bg.Y + (size.Height - bg.Height) / 2;
+        }
 
         private void DrawPercents(UnitSettings settings, float hpPercent, RectangleF bg)
         {