diff --git a/RotationSolver/RotationSolverPlugin.cs b/RotationSolver/RotationSolverPlugin.cs index 7f5d422d2..c4fd3fede 100644 --- a/RotationSolver/RotationSolverPlugin.cs +++ b/RotationSolver/RotationSolverPlugin.cs @@ -15,6 +15,8 @@ using RotationSolver.Localization; using RotationSolver.UI; using RotationSolver.Updaters; +using System.Drawing; +using System.Runtime.InteropServices; using Module = ECommons.Module; namespace RotationSolver; diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs index 3b5cec164..f416d5cc4 100644 --- a/RotationSolver/UI/RotationConfigWindow.cs +++ b/RotationSolver/UI/RotationConfigWindow.cs @@ -12,6 +12,7 @@ using ECommons.ImGuiMethods; using ExCSS; using FFXIVClientStructs.FFXIV.Client.Game.Fate; +using FFXIVClientStructs.FFXIV.Client.Game.UI; using FFXIVClientStructs.FFXIV.Common.Component.BGCollision; using Lumina.Excel.GeneratedSheets; using RotationSolver.Basic.Configuration; @@ -1101,7 +1102,7 @@ private static void DrawRotationInformation() { var userName = info.GitHubUserName; var repository = info.GitHubRepository; - DrawGitHubBadge(userName, repository, $"https://github.com/{userName}/{repository}/blob/{link.Path}", center: true); + DrawGitHubBadge(userName, repository, link.Path, $"https://github.com/{userName}/{repository}/blob/{link.Path}", center: true); } ImGui.NewLine(); @@ -2280,9 +2281,18 @@ private static void DrawLastAction() private static unsafe void DrawIcon() { - if (Player.Available) + ImGui.Text("Hate"); + foreach (var hate in UIState.Instance()->Hate.HateArraySpan) { - ImGui.Text(Player.GameObject->Height.ToString()); + var name = Svc.Objects.SearchById(hate.ObjectId)?.Name ?? "Unknown"; + ImGui.Text($"{name} : {hate.Enmity}"); + } + ImGui.Spacing(); + ImGui.Text("Hater"); + foreach (var hater in UIState.Instance()->Hater.HaterArraySpan) + { + var name = Svc.Objects.SearchById(hater.ObjectId)?.Name ?? "Unknown"; + ImGui.Text($"{name} : {hater.Enmity}"); } ImGui.Text(DataCenter.TerritoryContentType.ToString()); diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs index 1445ac52f..00588d250 100644 --- a/RotationSolver/Updaters/MajorUpdater.cs +++ b/RotationSolver/Updaters/MajorUpdater.cs @@ -7,6 +7,7 @@ using ECommons.DalamudServices; using ECommons.GameHelpers; using ECommons.ImGuiMethods; +using FFXIVClientStructs.FFXIV.Client.Game; using FFXIVClientStructs.FFXIV.Client.Game.Control; using FFXIVClientStructs.FFXIV.Client.Game.UI; using FFXIVClientStructs.FFXIV.Component.GUI; @@ -69,6 +70,11 @@ private unsafe static void FrameworkUpdate(IFramework framework) }); } +#if DEBUG + //*(float*)((IntPtr)(void*)CameraManager.Instance()->Camera + 0x130) = 0; + +#endif + try { SocialUpdater.UpdateSocial();