Merge pull request #226 from Xian55/feature/frontend/header-comp

Frontend: BotHeader component shows more info about the status of the initial obtaining process.
Xian55 · Jan 15, 2022 · 10b1ff6 · 10b1ff6
2 parents a1c632f + 15501b2
commit 10b1ff6
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/BlazorServer/Pages/BotHeader.razor b/BlazorServer/Pages/BotHeader.razor
@@ -6,32 +6,33 @@
     <div class="card-header">
         Player <ToggleButton />
         <span class="float-right badge @CombatBadge()">@Core.GOAP.GoapKeyDescription.ToString(Core.GOAP.GoapKey.incombat, PlayerInCombat)</span>
+        <span class="float-right">@playerReader.Race @playerReader.Class | </span>
     </div>
     <div class="card-body" style="padding-bottom: 0">
         <table class="table table-bordered">
             <tr>
-                <th>Level @playerReader.Level.Value (XP: @((int)playerReader.PlayerXpPercentage)%)</th>
+                <th>Level @playerReader.Level.Value<br>(XP: @((int)playerReader.PlayerXpPercentage)%)</th>
+                <th>Health / Resource:</th>
                 <th>Bag Items:</th>
-                <th>Health:</th>
-                <th>Mana / Rage / Energy:</th>
+                <th>Actionbar / Spell / Talent:</th>
                 <th>Target:</th>
-                <th>Actionbar:</th>
             </tr>
             <tr>
                 <td>
                     Time to level: @levelTracker.TimeToLevel<br />
                     at @levelTracker.PredictedLevelUpTime.ToString("HH:mm:ss")
                 </td>
+                <td>@playerReader.HealthCurrent (@playerReader.HealthPercent %)<br />@playerReader.PTCurrent (@playerReader.PTPercentage %)</td>
+
                 <td>@addonReader.BagReader.BagItems.Count / @addonReader.BagReader.SlotCount</td>
-                <td>@playerReader.HealthPercent %</td>
-                <td>@playerReader.PTCurrent (@playerReader.PTPercentage %) </td>
+                <td>@addonReader.ActionBarCostReader.Count / @addonReader.SpellBookReader.Count / @addonReader.TalentReader.Count</td>
                 <td>
-                    @if (!string.IsNullOrEmpty(addonReader.TargetName))
+                    @if (addonReader.PlayerReader.Bits.HasTarget)
                     {
                         <a href="https://tbc.wowhead.com/[email protected]" target="_blank">
                             <div>
-                                @addonReader.TargetName<br/>
-                                (@playerReader.TargetLevel) @((int)playerReader.TargetHealthPercentage) %<br/>
+                                @addonReader.TargetName<br />
+                                (@playerReader.TargetLevel) @((int)playerReader.TargetHealthPercentage) %<br />
                                 GUID: @playerReader.TargetGuid
 
                                 @if (!playerReader.Bits.TargetIsNormal)
@@ -55,7 +56,6 @@
                         <div>Kills: @levelTracker.MobsKilled</div>
                     }
                 </td>
-                <td>@addonReader.ActionBarCostReader.Count</td>
             </tr>
         </table>
 

diff --git a/Core/Addon/ConfigAddonReader.cs b/Core/Addon/ConfigAddonReader.cs
@@ -13,6 +13,9 @@ public class ConfigAddonReader : IAddonReader
         public LevelTracker LevelTracker { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public ActionBarCostReader ActionBarCostReader { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 
+        public SpellBookReader SpellBookReader { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public TalentReader TalentReader { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+
         public WorldMapAreaDB WorldMapAreaDb { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 
         public double AvgUpdateLatency => throw new NotImplementedException();

diff --git a/Core/Addon/IAddonReader.cs b/Core/Addon/IAddonReader.cs
@@ -14,6 +14,10 @@ public interface IAddonReader
 
         ActionBarCostReader ActionBarCostReader { get; }
 
+        SpellBookReader SpellBookReader { get; }
+
+        TalentReader TalentReader { get; }
+
         LevelTracker LevelTracker { get; }
 
         WorldMapAreaDB WorldMapAreaDb { get; }

diff --git a/Core/Addon/SpellBookReader.cs b/Core/Addon/SpellBookReader.cs
@@ -11,6 +11,8 @@ public class SpellBookReader
         private readonly ISquareReader reader;
         public SpellDB SpellDB { private set; get; }
 
+        public int Count => Spells.Count;
+
         public Dictionary<int, Spell> Spells { get; private set; } = new Dictionary<int, Spell>();
 
         public SpellBookReader(ISquareReader reader, int cSpellId, SpellDB spellDB)

diff --git a/Core/Bag/BagReader.cs b/Core/Bag/BagReader.cs
@@ -45,7 +45,7 @@ public void Read()
 
             if (metaChanged || inventoryChanged || (DateTime.Now - this.lastEvent).TotalSeconds > 11)
             {
-                DataChanged?.Invoke(this, new EventArgs());
+                DataChanged?.Invoke(this, EventArgs.Empty);
                 lastEvent = DateTime.Now;
             }
         }

diff --git a/Core/Talents/TalentReader.cs b/Core/Talents/TalentReader.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Core.Talents;
 using Core.Database;
+using System.Linq;
 
 namespace Core
 {
@@ -11,6 +12,7 @@ public class TalentReader
         private readonly ISquareReader reader;
         private readonly PlayerReader playerReader;
         private readonly TalentDB talentDB;
+        public int Count => Talents.Sum(x => x.Value.CurrentRank);
 
         public Dictionary<int, Talent> Talents { get; private set; } = new Dictionary<int, Talent>();