fix: changed the duty name.

ArchiDog1998 · May 17, 2023 · 3e565f2 · 3e565f2
1 parent 1ed1d1f
commit 3e565f2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/RotationSolver/UI/ImGuiHelper.cs b/RotationSolver/UI/ImGuiHelper.cs
@@ -479,7 +479,7 @@ public unsafe static void Display(this ICustomRotation rotation, ICustomRotation
             else if (!rotation.IsAllowed(out _))
             {
                 var showStr = string.Format(LocalizationManager.RightLang.ConfigWindow_Helper_HighEndWarning, rotation)
-                + string.Join("", SocialUpdater.HighEndDuties.Select(x => x.PlaceName?.Value?.Name.ToString())
+                + string.Join("", SocialUpdater.HighEndDuties.Select(SocialUpdater.GetDutyName)
                 .Where(s => !string.IsNullOrEmpty(s)).Select(t => "\n - " + t));
 
                 HoveredString(showStr);

diff --git a/RotationSolver/Updaters/SocialUpdater.cs b/RotationSolver/Updaters/SocialUpdater.cs
@@ -31,6 +31,12 @@ internal class SocialUpdater
     static bool _canSaying = false;
     public static TerritoryType[] HighEndDuties { get; private set; } = Array.Empty<TerritoryType>();
 
+    public static string GetDutyName(TerritoryType territory)
+    {
+        return territory.ContentFinderCondition?.Value?.Name?.RawString ?? "High-end Duty";
+        //return territory.PlaceName?.Value?.Name.ToString() ?? "High-end Duty";
+    }
+
     static bool CanSocial
     {
         get
@@ -100,8 +106,7 @@ static void DutyState_DutyStarted(object sender, ushort e)
         var territory = Service.GetSheet<TerritoryType>().GetRow(e);
         if (HighEndDuties.Any(t => t.RowId == territory.RowId))
         {
-            var str = territory.PlaceName?.Value?.Name.ToString() ?? "High-end Duty";
-            var message = string.Format(LocalizationManager.RightLang.HighEndWarning, str);
+            var message = string.Format(LocalizationManager.RightLang.HighEndWarning, GetDutyName(territory));
 
             Service.ChatGui.PrintChat(new Dalamud.Game.Text.XivChatEntry()
             {

diff --git a/RotationSolver/Watcher.cs b/RotationSolver/Watcher.cs
@@ -19,7 +19,7 @@ public class Watcher : IDisposable
     /// https://github.com/Tischel/ActionTimeline/blob/master/ActionTimeline/Helpers/TimelineManager.cs#L86
     /// </summary>
     [Signature("4C 89 44 24 ?? 55 56 41 54 41 55 41 56", DetourName = nameof(ReceiveAbilityEffect))]
-    private static Hook<ReceiveAbilityDelegate> _receiveAbilityHook;
+    private static Hook<ReceiveAbilityDelegate> _receiveAbilityHook = null;
 
 
     public static ICallGateSubscriber<object, object> IpcSubscriber;