null check fc chest nodes

Jaksuhn · Aug 13, 2024 · b0358fe · b0358fe
1 parent c293b71
commit b0358fe
Show file tree

Hide file tree

Showing 13 changed files with 89 additions and 66 deletions.
diff --git a/Automaton/Features/Commands.cs b/Automaton/Features/Commands.cs
@@ -158,11 +158,10 @@ internal unsafe void OnCommmandLowerQuality(string command, string arguments)
     internal unsafe void OnCommandUseItem(string command, string arguments)
     {
         if (!uint.TryParse(arguments, out var itemId)) return;
-        var agent = AgentInventoryContext.Instance();
+        var agent = ActionManager.Instance();
         if (agent == null) return;
 
-        var item = Inventory.GetItemInInventory(itemId, Inventory.PlayerInventory);
-        agent->UseItem(item->ItemId);
+        agent->UseAction(itemId >= 2_000_000 ? ActionType.KeyItem : ActionType.Item, itemId, extraParam: 65535);
     }
     #endregion
 

diff --git a/Automaton/Features/FCChestTabRename.cs b/Automaton/Features/FCChestTabRename.cs
@@ -31,14 +31,34 @@ private unsafe void PreDraw(AddonEvent type, AddonArgs args)
     {
         var addon = (AtkUnitBase*)args.Addon;
         if (Config.TabOne != string.Empty)
-            Utils.GetNodeByIDChain(addon->GetRootNode(), 1, 9, 10, 9)->GetAsAtkTextNode()->NodeText.SetString(Config.TabOne);
+        {
+            var node = Utils.GetNodeByIDChain(addon->GetRootNode(), 1, 9, 10, 9);
+            if (node is not null)
+                node->GetAsAtkTextNode()->NodeText.SetString(Config.TabOne);
+        }
         if (Config.TabTwo != string.Empty)
-            Utils.GetNodeByIDChain(addon->GetRootNode(), 1, 9, 11, 9)->GetAsAtkTextNode()->NodeText.SetString(Config.TabTwo);
+        {
+            var node = Utils.GetNodeByIDChain(addon->GetRootNode(), 1, 9, 11, 9);
+            if (node is not null)
+                node->GetAsAtkTextNode()->NodeText.SetString(Config.TabTwo);
+        }
         if (Config.TabThree != string.Empty)
-            Utils.GetNodeByIDChain(addon->GetRootNode(), 1, 9, 12, 9)->GetAsAtkTextNode()->NodeText.SetString(Config.TabThree);
+        {
+            var node = Utils.GetNodeByIDChain(addon->GetRootNode(), 1, 9, 12, 9);
+            if (node is not null)
+                node->GetAsAtkTextNode()->NodeText.SetString(Config.TabThree);
+        }
         if (Config.TabFour != string.Empty)
-            Utils.GetNodeByIDChain(addon->GetRootNode(), 1, 9, 13, 9)->GetAsAtkTextNode()->NodeText.SetString(Config.TabFour);
+        {
+            var node = Utils.GetNodeByIDChain(addon->GetRootNode(), 1, 9, 13, 9);
+            if (node is not null)
+                node->GetAsAtkTextNode()->NodeText.SetString(Config.TabFour);
+        }
         if (Config.TabFive != string.Empty)
-            Utils.GetNodeByIDChain(addon->GetRootNode(), 1, 9, 14, 9)->GetAsAtkTextNode()->NodeText.SetString(Config.TabFive);
+        {
+            var node = Utils.GetNodeByIDChain(addon->GetRootNode(), 1, 9, 14, 9);
+            if (node is not null)
+                node->GetAsAtkTextNode()->NodeText.SetString(Config.TabFive);
+        }
     }
 }
diff --git a/Automaton/Features/HuntRelayHelper.cs b/Automaton/Features/HuntRelayHelper.cs
@@ -41,6 +41,7 @@ public class HuntRelayHelperConfiguration
     [BoolConfig] public bool OnlySendLocalHuntsToLocalChannels = true;
     [BoolConfig] public bool AssumeBlankWorldsAreLocal = false;
     [BoolConfig] public bool DontRepeatRelays = true;
+    [BoolConfig] public bool OverrideMinionFlag = true;
     [BoolConfig] public bool AllowPartialWorldMatches = false;
     [BoolConfig] public bool DryRun = false;
     [StringConfig] public string ChatMessagePattern = "[<world>] <type> -> <flag>";
@@ -126,6 +127,9 @@ public override void DrawConfig()
         ImGui.Checkbox("Don't repeat relays", ref Config.DontRepeatRelays);
         ImGuiComponents.HelpMarker("Don't send relays to the channel in which you clicked the relay payload.");
 
+        //ImGui.Checkbox("Override minion flags", ref Config.OverrideMinionFlag);
+        //ImGuiComponents.HelpMarker("Override minion relay flags with the location of the SS Rank");
+
         ImGui.Checkbox("Allow partial world matching", ref Config.AllowPartialWorldMatches);
         ImGuiComponents.HelpMarker("This will allow matching shorthands of worlds (e.g. \"behe\" -> Behemoth) but may result in false positives.");
 

diff --git a/Automaton/Features/ISLock&Move.cs b/Automaton/Features/ISLock&Move.cs
@@ -22,7 +22,6 @@ public override void Disable()
         Svc.Condition.ConditionChange -= CheckToLockAndMove;
     }
 
-    private bool lockingOn;
     private unsafe void CheckToJump(IFramework framework)
     {
         if (Svc.Targets.Target == null || Svc.Targets.Target.ObjectKind != Dalamud.Game.ClientState.Objects.Enums.ObjectKind.CardStand)
@@ -59,9 +58,9 @@ private unsafe void CheckToLockAndMove(ConditionFlag flag, bool value)
 
                 if (MJIManager.Instance()->CurrentMode == 1)
                 {
-                    TaskManager.Enqueue(() => { lockingOn = true; Chat.Instance.SendMessage("/lockon on"); });
+                    TaskManager.Enqueue(() => { Chat.Instance.SendMessage("/lockon on"); });
                     TaskManager.EnqueueDelay(new Random().Next(100, 250));
-                    TaskManager.Enqueue(() => { if (Player.IsTargetLocked) { Chat.Instance.SendMessage("/automove on"); lockingOn = false; } });
+                    TaskManager.Enqueue(() => { if (Player.IsTargetLocked) { Chat.Instance.SendMessage("/automove on"); } });
                 }
             });
         }

diff --git a/Automaton/IPC/PandorasBoxIPC.cs b/Automaton/IPC/PandorasBoxIPC.cs
@@ -3,6 +3,7 @@
 namespace Automaton.IPC;
 
 #nullable disable
+#pragma warning disable CS0649
 internal class PandorasBoxIPC
 {
     public static string Name = "PandorasBox";

diff --git a/Automaton/IPC/QoLBarIPC.cs b/Automaton/IPC/QoLBarIPC.cs
@@ -3,6 +3,7 @@
 namespace Automaton.IPC;
 
 #nullable disable
+#pragma warning disable CS0649
 internal class QoLBarIPC
 {
     public static string Name = "QoLBar";

diff --git a/Automaton/UI/DebugWindow.cs b/Automaton/UI/DebugWindow.cs
@@ -1,6 +1,5 @@
 using Dalamud.Interface.Windowing;
 using Dalamud.Utility;
-using FFXIVClientStructs.FFXIV.Client.Game.UI;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using ImGuiNET;
 
@@ -17,12 +16,8 @@ public DebugWindow() : base($"{Name} - Debug {P.GetType().Assembly.GetName().Ver
         };
     }
 
-    public static void Dispose()
-    {
-
-    }
+    public static void Dispose() { }
 
-    private int id;
     public unsafe override void Draw()
     {
         var agent = AgentMap.Instance();

diff --git a/Automaton/UI/HaselWindow.cs b/Automaton/UI/HaselWindow.cs
@@ -207,8 +207,7 @@ private void DrawConfig()
             {
                 ImGuiHelpers.SafeTextColoredWrapped(Colors.Grey2, $"{entry.InternalName}:");
                 ImGui.SameLine();
-                ImGuiHelpers.ClickToCopyText(entry.Repo);
-                if (ImGui.IsItemHovered()) ImGui.SetMouseCursor(ImGuiMouseCursor.Hand);
+                ImGuiEx.TextCopy(entry.Repo);
             }
         }
 

diff --git a/Automaton/Utilities/Enums.cs b/Automaton/Utilities/Enums.cs
diff --git a/Automaton/Utilities/Memory.cs b/Automaton/Utilities/Memory.cs
@@ -6,6 +6,7 @@
 using System.Runtime.InteropServices;
 
 namespace Automaton.Utilities;
+#pragma warning disable CS0649
 internal unsafe class Memory
 {
     public unsafe delegate void RidePillionDelegate(BattleChara* target, int seatIndex);

diff --git a/Automaton/Utilities/Player.cs b/Automaton/Utilities/Player.cs
@@ -20,9 +20,6 @@ namespace Automaton.Utilities;
 
 public unsafe static class Player
 {
-    private delegate void SetPosition(float x, float y, float z);
-    private static SetPosition _setPosition = null!;
-
     public static IPlayerCharacter Object => Svc.ClientState.LocalPlayer;
     public static bool Available => Svc.ClientState.LocalPlayer != null;
     public static bool Interactable => Available && Object.IsTargetable;

diff --git a/Automaton/Utilities/SSRanks.cs b/Automaton/Utilities/SSRanks.cs
@@ -0,0 +1,51 @@
+using Dalamud.Game.Text.SeStringHandling.Payloads;
+
+namespace Automaton.Utilities;
+public static class SSRanks
+{
+    public static Vector2 Lakeland => new(23.3f, 22.1f);
+    public static Vector2 AmhAraeng => new(27.5f, 35.2f);
+    public static Vector2 IlMheg => new(13.5f, 23.0f);
+    public static Vector2 Raktika => new(24.48f, 37.34f);
+    public static Vector2 Kholusia => new(34.09f, 10.03f);
+    public static Vector2 TheTempest => new(12.9f, 22.2f);
+
+    public static Vector2 Labyrinthos => new(25.56f, 16.13f);
+    public static Vector2 Thavnair => new(24.3f, 16.8f);
+    public static Vector2 Garlemald => new(20.3f, 23.7f);
+    public static Vector2 MareLamentorum => new(18.6f, 30.2f);
+    public static Vector2 Elpis => new(22.7f, 19.5f);
+    public static Vector2 UltimaThule => new(14.05f, 29.41f);
+
+    public static Vector2 YakTel => new(29.59f, 18.56f);
+    public static Vector2 Urqopacha => new(26.0f, 27.9f);
+    public static Vector2 Kozamauka => new(13.8f, 14.8f);
+    public static Vector2 Shaaloni => new(13.35f, 14.33f);
+    public static Vector2 HeritageFound => new(17.46f, 21.22f);
+    public static Vector2 LivingMemory => new(34.4f, 26.3f);
+
+    public static Vector2 TerritoryToSSRank(this uint territory, MapLinkPayload maplink) => territory switch
+    {
+        831 => Lakeland,
+        814 => Kholusia,
+        815 => AmhAraeng,
+        816 => IlMheg,
+        817 => Raktika,
+        818 => TheTempest,
+
+        956 => Labyrinthos,
+        957 => Thavnair,
+        958 => Garlemald,
+        959 => MareLamentorum,
+        961 => Elpis,
+        960 => UltimaThule,
+
+        1189 => YakTel,
+        1187 => Urqopacha,
+        1188 => Kozamauka,
+        1190 => Shaaloni,
+        1191 => HeritageFound,
+        1192 => LivingMemory,
+        _ => new(maplink.RawX, maplink.RawY)
+    };
+}
diff --git a/Automaton/Utilities/Utils.cs b/Automaton/Utilities/Utils.cs
@@ -165,44 +165,4 @@ public static void RemoveWindow<T>() where T : Window
         var sibNode = node->PrevSiblingNode;
         return sibNode != null ? GetNodeByIDChain(sibNode, ids) : null;
     }
-
-    public static unsafe bool GetUnitBase(string name, out AtkUnitBase* unitBase, int index = 1)
-    {
-        unitBase = GetUnitBase(name, index);
-        return unitBase != null;
-    }
-
-    public static unsafe AtkUnitBase* GetUnitBase(string name, int index = 1) => (AtkUnitBase*)Svc.GameGui.GetAddonByName(name, index);
-
-    public static unsafe T* GetUnitBase<T>(string? name = null, int index = 1) where T : unmanaged
-    {
-        if (string.IsNullOrEmpty(name))
-        {
-            var attr = (Addon)typeof(T).GetCustomAttribute(typeof(Addon));
-            if (attr != null)
-            {
-                name = attr.AddonIdentifiers.FirstOrDefault();
-            }
-        }
-
-        return string.IsNullOrEmpty(name) ? null : (T*)Svc.GameGui.GetAddonByName(name, index);
-    }
-
-    public static unsafe bool GetUnitBase<T>(out T* unitBase, string? name = null, int index = 1) where T : unmanaged
-    {
-        unitBase = null;
-        if (string.IsNullOrEmpty(name))
-        {
-            var attr = (Addon)typeof(T).GetCustomAttribute(typeof(Addon));
-            if (attr != null)
-            {
-                name = attr.AddonIdentifiers.FirstOrDefault();
-            }
-        }
-
-        if (string.IsNullOrEmpty(name)) return false;
-
-        unitBase = (T*)Svc.GameGui.GetAddonByName(name, index);
-        return unitBase != null;
-    }
 }