Merge pull request #4 from FFXIV-CombatReborn/feather-improvements

Improvements to Feather to the Metal
FFXIV-CombatReborn · Oct 9, 2024 · 9b54584 · 9b54584
2 parents 7fa68f1 + bb81678
commit 9b54584
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/RebornToolbox/Features/ChocoboRacing/ChocoboRacing.UI.cs b/RebornToolbox/Features/ChocoboRacing/ChocoboRacing.UI.cs
@@ -18,6 +18,8 @@ public override void Draw()
         if (ImGui.Checkbox("Enable", ref enabled))
         {
             _chocoboRacing.IsRunning = enabled;
+            if (!enabled && _chocoboRacing.IsMoving)
+                _chocoboRacing.IsMoving = false;
         }
         var route = Plugin.Configuration.ChocoboRacingConfig.RaceRoute;
         if (ImGuiUtil.GenericEnumCombo("Race Route", 150, route, out var newRoute, r => r.ToFriendlyString()))

diff --git a/RebornToolbox/Features/ChocoboRacing/ChocoboRacing.cs b/RebornToolbox/Features/ChocoboRacing/ChocoboRacing.cs
@@ -7,18 +7,23 @@
 using ECommons.Reflection;
 using ECommons.Throttlers;
 using FFXIVClientStructs.FFXIV.Client.Game;
+using FFXIVClientStructs.FFXIV.Client.Game.UI;
 using FFXIVClientStructs.FFXIV.Client.UI;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using FFXIVClientStructs.FFXIV.Component.GUI;
+using Lumina.Excel.GeneratedSheets;
 
 namespace RebornToolbox.Features.ChocoboRacing;
 
 public class ChocoboRacing
 {
     public bool IsRunning { get; set; } = false;
 
+    public IEnumerable<ContentRoulette> ContentRoulettes;
+
     public ChocoboRacing()
     {
+        ContentRoulettes = Svc.Data.GetExcelSheet<ContentRoulette>(Svc.ClientState.ClientLanguage)!;
         Svc.Framework.Update += OnUpdate;
     }
 
@@ -127,14 +132,21 @@ private unsafe void OnUpdate(IFramework framework)
             }
 
             var selectedDutyName = addon->AtkValues[18].GetValueAsString();
-            if (selectedDutyName.Contains(Plugin.Configuration.ChocoboRacingConfig.RaceRoute.ToFriendlyString(), StringComparison.OrdinalIgnoreCase))
+            if (selectedDutyName.Contains(GetSelectedDutyName(), StringComparison.InvariantCultureIgnoreCase))
             {
                 Callback.Fire((AtkUnitBase*)addon, true, 12, 0);
             }
         }
     }
 
-// Credit: https://github.com/ffxivcode/AutoDuty/blob/26a61eefdba148bc5f46694f915f402315e9f128/AutoDuty/Helpers/QueueHelper.cs#L247
+    private string GetSelectedDutyName()
+    {
+        var routeId = (byte)Plugin.Configuration.ChocoboRacingConfig.RaceRoute;
+        var row = ContentRoulettes.First(c => c.RowId == routeId);
+        return row.Name.ToString();
+    }
+
+    // Credit: https://github.com/ffxivcode/AutoDuty/blob/26a61eefdba148bc5f46694f915f402315e9f128/AutoDuty/Helpers/QueueHelper.cs#L247
     private uint HeadersCount(uint before, List<AtkComponentTreeListItem> list)
     {
         uint count = 0;