Update booster calculations to play nicely with the fixed CurrentSP c…

…ount. Calculates booster time and counts down correctly now!
mgoeppner · Dec 20, 2022 · 71c4d56 · 71c4d56
1 parent bdc0bfe
commit 71c4d56
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/EVEMon.Common/Models/SkillQueue.cs b/src/EVEMon.Common/Models/SkillQueue.cs
@@ -65,7 +65,7 @@ internal void Dispose()
         /// Gets the expected booster duration
         /// </summary>
         public TimeSpan BoosterDuration => !Items.Any() ? TimeSpan.Zero : TimeSpan.FromHours(Items.Select(i => {
-            var actualTime = i.EndTime.Subtract(i.StartTime);
+            var actualTime = i.RemainingTime;
 
             var expectedTime = m_character.GetTimeSpanForPointsWithoutBoosters(i.Skill.StaticData, i.Level);
             expectedTime = expectedTime.Subtract(TimeSpan.FromMilliseconds(expectedTime.Milliseconds));

diff --git a/src/EVEMon/CharacterMonitoring/CharacterMonitorFooter.cs b/src/EVEMon/CharacterMonitoring/CharacterMonitorFooter.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Drawing;
+using System.Globalization;
 using System.Windows.Forms;
 using EVEMon.Common;
 using EVEMon.Common.Constants;
@@ -170,7 +171,7 @@ private void UpdateTrainingSkillInfo()
             TimeSpan booster = ccpCharacter.SkillQueue.BoosterDuration;
             if (booster.TotalSeconds > 0)
             {
-                lblSPPerHour.Text += string.Format(", Booster Remaining: ~{0} hours", (int)booster.TotalHours);
+                lblSPPerHour.Text += string.Format(", Booster: ~{0}:{1}", (int)booster.TotalHours, booster.ToString("mm"));
             }
 
             // Do not show the "DOWNTIME" warning if character's skill queue has more than one skills