diff --git a/Dalamud.Injector/Program.cs b/Dalamud.Injector/Program.cs index dfa91a07f..75c0a8a75 100644 --- a/Dalamud.Injector/Program.cs +++ b/Dalamud.Injector/Program.cs @@ -19,7 +19,7 @@ namespace Dalamud.Injector { Process.GetCurrentProcess().Kill(); }; - int pid = int.Parse(args[0]); + var pid = int.Parse(args[0]); Process process = null; diff --git a/Dalamud/Configuration/CustomComboPreset.cs b/Dalamud/Configuration/CustomComboPreset.cs new file mode 100644 index 000000000..903563642 --- /dev/null +++ b/Dalamud/Configuration/CustomComboPreset.cs @@ -0,0 +1,172 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace XIVLauncher.Dalamud +{ + + //CURRENT HIGHEST FLAG IS 44 + [Flags] + public enum CustomComboPreset : long + { + None = 0, + + // DRAGOON + [CustomComboInfo("Coerthan Torment Combo", "Replace Coerthan Torment with its combo chain", 22)] + DragoonCoerthanTormentCombo = 1L << 0, + + [CustomComboInfo("Chaos Thrust Combo", "Replace Chaos Thrust with its combo chain", 22)] + DragoonChaosThrustCombo = 1L << 1, + + [CustomComboInfo("Full Thrust Combo", "Replace Full Thrust with its combo chain", 22)] + DragoonFullThrustCombo = 1L << 2, + + // DARK KNIGHT + [CustomComboInfo("Souleater Combo", "Replace Souleater with its combo chain", 32)] + DarkSouleaterCombo = 1L << 3, + + [CustomComboInfo("Stalwart Soul Combo", "Replace Stalwart Soul with its combo chain", 32)] + DarkStalwartSoulCombo = 1L << 4, + + // PALADIN + [CustomComboInfo("Goring Blade Combo", "Replace Goring Blade with its combo chain", 19)] + PaladinGoringBladeCombo = 1L << 5, + + [CustomComboInfo("Royal Authority Combo", "Replace Royal Authority with its combo chain", 19)] + PaladinRoyalAuthorityCombo = 1L << 6, + + [CustomComboInfo("Prominence Combo", "Replace Prominence with its combo chain", 19)] + PaladinProminenceCombo = 1L << 7, + + // WARRIOR + [CustomComboInfo("Storms Path Combo", "Replace Storms Path with its combo chain", 21)] + WarriorStormsPathCombo = 1L << 8, + + [CustomComboInfo("Storms Eye Combo", "Replace Storms Eye with its combo chain", 21)] + WarriorStormsEyeCombo = 1L << 9, + + [CustomComboInfo("Mythril Tempest Combo", "Replace Mythril Tempest with its combo chain", 21)] + WarriorMythrilTempestCombo = 1L << 10, + + // SAMURAI + [CustomComboInfo("Yukikaze Combo", "Replace Yukikaze with its combo chain", 34)] + SamuraiYukikazeCombo = 1L << 11, + + [CustomComboInfo("Gekko Combo", "Replace Gekko with its combo chain", 34)] + SamuraiGekkoCombo = 1L << 12, + + [CustomComboInfo("Kasha Combo", "Replace Kasha with its combo chain", 34)] + SamuraiKashaCombo = 1L << 13, + + [CustomComboInfo("Mangetsu Combo", "Replace Mangetsu with its combo chain", 34)] + SamuraiMangetsuCombo = 1L << 14, + + [CustomComboInfo("Oka Combo", "Replace Oka with its combo chain", 34)] + SamuraiOkaCombo = 1L << 15, + + + // NINJA + [CustomComboInfo("Armor Crush Combo", "Replace Armor Crush with its combo chain", 30)] + NinjaArmorCrushCombo = 1L << 17, + + [CustomComboInfo("Aeolian Edge Combo", "Replace Aeolian Edge with its combo chain", 30)] + NinjaAeolianEdgeCombo = 1L << 18, + + [CustomComboInfo("Hakke Mujinsatsu Combo", "Replace Hakke Mujinsatsu with its combo chain", 30)] + NinjaHakkeMujinsatsuCombo = 1L << 19, + + // GUNBREAKER + [CustomComboInfo("Solid Barrel Combo", "Replace Solid Barrel with its combo chain", 37)] + GunbreakerSolidBarrelCombo = 1L << 20, + + [CustomComboInfo("Gnashing Fang Combo", "Replace Gnashing Fang with its combo chain", 37)] + GunbreakerGnashingFangCombo = 1L << 21, + + [CustomComboInfo("Demon Slaughter Combo", "Replace Demon Slaughter with its combo chain", 37)] + GunbreakerDemonSlaughterCombo = 1L << 22, + + // MACHINIST + [CustomComboInfo("Heated Clan Shot Combo/Heat", "Replace Heated Clan Shot with its combo chain or with Heat Blast when overheated.", 31)] + MachinistHeatedClanShotFeature = 1L << 23, + + [CustomComboInfo("Spread Shot Heat", "Replace Spread Shot with Auto Crossbow when overheated.", 31)] + MachinistSpreadShotFeature = 1L << 24, + + // BLACK MAGE + [CustomComboInfo("Enochian Stance Switcher", "Change Enochian to Fire 4 or Blizzard 4 depending on stance.", 25)] + BlackEnochianFeature = 1L << 25, + + [CustomComboInfo("Umbral Soul/Transpose Switcher", "Change between Umbral Soul and Transpose automatically.", 25)] + BlackManaFeature = 1L << 26, + + // ASTROLOGIAN + [CustomComboInfo("Draw on Play", "Play turns into Draw when no card is drawn, as well as the usual Play behavior.", 33)] + AstrologianCardsOnDrawFeature = 1L << 27, + + // SUMMONER + [CustomComboInfo("Demi-summon combiners", "Dreadwyrm Trance, Summon Bahamut, and Firebird Trance are now one button. Deathflare, Enkindle Bahamut, and Enkindle Phoenix are now one button.", 27)] + SummonerDemiCombo = 1L << 28, + + [CustomComboInfo("Brand of Purgatory Combo", "Replaces Fountain of Fire with Brand of Purgatory when under the affect of Hellish Conduit.", 27)] + SummonerBoPCombo = 1L << 38, + + [CustomComboInfo("ED Fester", "Change Energy Drain into Fester while you have Aetherflow stacks.", 27)] + SummonerEDFesterCombo = 1L << 39, + + [CustomComboInfo("ES Painflare", "Change Energy Siphon into Painflare while you have Aetherflow stacks.", 27)] + SummonerESPainflareCombo = 1L << 40, + + // SCHOLAR + [CustomComboInfo("Seraph Fey Blessing/Consolation", "Change Fey Blessing into Consolation when Seraph is out.", 28)] + ScholarSeraphConsolationFeature = 1L << 29, + + [CustomComboInfo("ED Aetherflow", "Change Energy Drain into Aetherflow when you have no more Aetherflow stacks.", 28)] + ScholarEnergyDrainFeature = 1L << 37, + + // DANCER + [CustomComboInfo("AoE GCD procs", "Replaces all AoE GCDs with their procced version when available.", 38)] + DancerAoeGcdFeature = 1L << 32, + + [CustomComboInfo("Fan Dance Combos", "Change Fan Dance and Fan Dance 2 into Fan Dance 3 while flourishing.", 38)] + DancerFanDanceCombo = 1L << 33, + + // WHITE MAGE + [CustomComboInfo("Solace into Misery", "Replaces Afflatus Solace with Afflatus Misery when Misery is ready to be used.", 24)] + WhiteMageSolaceMiseryFeature = 1L << 35, + + [CustomComboInfo("Rapture into Misery", "Replaces Afflatus Rapture with Afflatus Misery when Misery is ready to be used.", 24)] + WhiteMageRaptureMiseryFeature = 1L << 36, + + // BARD + [CustomComboInfo("Wanderer's into Pitch Perfect", "Replaces Wanderer's Minuet with Pitch Perfect while in WM.", 23)] + BardWandererPPFeature = 1L << 41, + + [CustomComboInfo("Heavy Shot into Straight Shot", "Replaces Heavy Shot/Burst Shot with Straight Shot/Refulgent Arrow when procced.", 23)] + BardStraightShotUpgradeFeature = 1L << 42, + + // MONK + + // RED MAGE + [CustomComboInfo("Red Mage AoE Combo", "Replaces Veraero/thunder 2 with Impact when Dualcast or Swiftcast are active.", 35)] + RedMageAoECombo = 1L << 48, + + [CustomComboInfo("Redoublement combo", "Replaces Redoublement with its combo chain, following enchantment rules.", 35)] + RedMageMeleeCombo = 1L << 49 + } + + public class CustomComboInfoAttribute : Attribute + { + internal CustomComboInfoAttribute(string fancyName, string description, byte classJob) + { + FancyName = fancyName; + Description = description; + ClassJob = classJob; + } + + public string FancyName { get; } + public string Description { get; } + public byte ClassJob { get; } + } +} diff --git a/Dalamud/Configuration/DalamudConfiguration.cs b/Dalamud/Configuration/DalamudConfiguration.cs new file mode 100644 index 000000000..ebc5106c6 --- /dev/null +++ b/Dalamud/Configuration/DalamudConfiguration.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.IO; +using Dalamud.DiscordBot; +using Newtonsoft.Json; +using XIVLauncher.Dalamud; + +namespace Dalamud +{ + [Serializable] + public class DalamudConfiguration + { + public DiscordFeatureConfiguration DiscordFeatureConfig { get; set; } + + public bool OptOutMbCollection { get; set; } = false; + + public CustomComboPreset ComboPresets { get; set; } + + public List BadWords { get; set; } + + public class FateInfo { + public string Name { get; set; } + public int Id { get; set; } + } + + public List Fates; + + + public static DalamudConfiguration Load(string path) { + return JsonConvert.DeserializeObject(File.ReadAllText(path)); + } + + public void Save(string path) { + File.WriteAllText(path, JsonConvert.SerializeObject(this)); + } + } +} diff --git a/Dalamud/Dalamud.cs b/Dalamud/Dalamud.cs index ac2c028f1..3f756922a 100644 --- a/Dalamud/Dalamud.cs +++ b/Dalamud/Dalamud.cs @@ -11,10 +11,11 @@ using Dalamud.Game.ClientState.Actors.Types; using Dalamud.Game.ClientState.Actors.Types.NonPlayer; using Dalamud.Game.Command; using Dalamud.Game.Internal; +using Dalamud.Game.Internal.Gui; using Dalamud.Game.Network; using Dalamud.Plugin; -using Dalamud.Settings; using Serilog; +using XIVLauncher.Dalamud; namespace Dalamud { public sealed class Dalamud : IDisposable { @@ -39,8 +40,13 @@ namespace Dalamud { public readonly DalamudStartInfo StartInfo; + public readonly IconReplacer IconReplacer; + + public readonly DalamudConfiguration Configuration; + public Dalamud(DalamudStartInfo info) { this.StartInfo = info; + this.Configuration = DalamudConfiguration.Load(info.ConfigurationPath); this.baseDirectory = info.WorkingDirectory; @@ -58,14 +64,16 @@ namespace Dalamud { SetupCommands(); ChatHandlers = new ChatHandlers(this); - NetworkHandlers = new NetworkHandlers(this, info.OptOutMbCollection); + NetworkHandlers = new NetworkHandlers(this, this.Configuration.OptOutMbCollection); this.ClientState = new ClientState(this, info, this.sigScanner, this.targetModule); - this.BotManager = new DiscordBotManager(this, info.DiscordFeatureConfig); + this.BotManager = new DiscordBotManager(this, this.Configuration.DiscordFeatureConfig); this.PluginManager = new PluginManager(this, info.PluginDirectory, info.DefaultPluginDirectory); + this.IconReplacer = new IconReplacer(this, this.sigScanner); + try { this.PluginManager.LoadPlugins(); } catch (Exception ex) { @@ -79,6 +87,8 @@ namespace Dalamud { Framework.Enable(); this.BotManager.Start(); + + this.IconReplacer.Enable(); } public void Unload() { @@ -95,6 +105,8 @@ namespace Dalamud { this.BotManager.Dispose(); this.unloadSignal.Dispose(); + + this.IconReplacer.Dispose(); } private void SetupCommands() { @@ -113,6 +125,11 @@ namespace Dalamud { ShowInHelp = false }); + CommandManager.AddHandler("/xldcombo", new CommandInfo(OnCommandDebugCombo) { + HelpMessage = "COMBO debug", + ShowInHelp = false + }); + CommandManager.AddHandler("/xlhelp", new CommandInfo(OnCommandHelp) { HelpMessage = "Shows list of commands available." }); @@ -141,8 +158,8 @@ namespace Dalamud { HelpMessage = "Unmute a word or sentence. Usage: /fatewatchremove " }); - CommandManager.AddHandler("/xldactortable", new CommandInfo(OnDebugActorTable) { - HelpMessage = "Actor table operations", + CommandManager.AddHandler("/xldstate", new CommandInfo(OnDebugPrintGameState) { + HelpMessage = "Print parsed game state", ShowInHelp = false }); @@ -200,8 +217,8 @@ namespace Dalamud { } private void OnFateWatchAdd(string command, string arguments) { - if (PersistentSettings.Instance.Fates == null) - PersistentSettings.Instance.Fates = new List(); + if (this.Configuration.Fates == null) + this.Configuration.Fates = new List(); dynamic candidates = XivApi.Search(arguments, "Fate").GetAwaiter().GetResult(); @@ -210,32 +227,36 @@ namespace Dalamud { return; } - var fateInfo = new PersistentSettings.FateInfo { + var fateInfo = new DalamudConfiguration.FateInfo { Id = candidates.Results[0].ID, Name = candidates.Results[0].Name }; - PersistentSettings.Instance.Fates.Add(fateInfo); + this.Configuration.Fates.Add(fateInfo); + + this.Configuration.Save(this.StartInfo.ConfigurationPath); Framework.Gui.Chat.Print($"Added fate \"{fateInfo.Name}\"."); } private void OnFateWatchList(string command, string arguments) { - if (PersistentSettings.Instance.Fates == null) - PersistentSettings.Instance.Fates = new List(); + if (this.Configuration.Fates == null) + this.Configuration.Fates = new List(); - if (PersistentSettings.Instance.Fates.Count == 0) { + if (this.Configuration.Fates.Count == 0) { Framework.Gui.Chat.Print("No fates on your watchlist."); return; } - foreach (var fate in PersistentSettings.Instance.Fates) + this.Configuration.Save(this.StartInfo.ConfigurationPath); + + foreach (var fate in this.Configuration.Fates) Framework.Gui.Chat.Print($"Fate {fate.Id}: {fate.Name}"); } private void OnFateWatchRemove(string command, string arguments) { - if (PersistentSettings.Instance.Fates == null) - PersistentSettings.Instance.Fates = new List(); + if (this.Configuration.Fates == null) + this.Configuration.Fates = new List(); dynamic candidates = XivApi.Search(arguments, "Fate").GetAwaiter().GetResult(); @@ -244,37 +265,45 @@ namespace Dalamud { return; } - PersistentSettings.Instance.Fates.RemoveAll(x => x.Id == candidates.Results[0].ID); + this.Configuration.Fates.RemoveAll(x => x.Id == candidates.Results[0].ID); + + this.Configuration.Save(this.StartInfo.ConfigurationPath); Framework.Gui.Chat.Print($"Removed fate \"{candidates.Results[0].Name}\"."); } private void OnBadWordsAdd(string command, string arguments) { - if (PersistentSettings.Instance.BadWords == null) - PersistentSettings.Instance.BadWords = new List(); + if (this.Configuration.BadWords == null) + this.Configuration.BadWords = new List(); - PersistentSettings.Instance.BadWords.Add(arguments); + this.Configuration.BadWords.Add(arguments); + + this.Configuration.Save(this.StartInfo.ConfigurationPath); Framework.Gui.Chat.Print($"Muted \"{arguments}\"."); } private void OnBadWordsList(string command, string arguments) { - if (PersistentSettings.Instance.BadWords == null) - PersistentSettings.Instance.BadWords = new List(); + if (this.Configuration.BadWords == null) + this.Configuration.BadWords = new List(); - if (PersistentSettings.Instance.BadWords.Count == 0) { + if (this.Configuration.BadWords.Count == 0) { Framework.Gui.Chat.Print("No muted words or sentences."); return; } - foreach (var word in PersistentSettings.Instance.BadWords) Framework.Gui.Chat.Print($"\"{word}\""); + this.Configuration.Save(this.StartInfo.ConfigurationPath); + + foreach (var word in this.Configuration.BadWords) Framework.Gui.Chat.Print($"\"{word}\""); } private void OnBadWordsRemove(string command, string arguments) { - if (PersistentSettings.Instance.BadWords == null) - PersistentSettings.Instance.BadWords = new List(); + if (this.Configuration.BadWords == null) + this.Configuration.BadWords = new List(); - PersistentSettings.Instance.BadWords.RemoveAll(x => x == arguments); + this.Configuration.BadWords.RemoveAll(x => x == arguments); + + this.Configuration.Save(this.StartInfo.ConfigurationPath); Framework.Gui.Chat.Print($"Unmuted \"{arguments}\"."); } @@ -289,11 +318,13 @@ namespace Dalamud { Process.Start(ChatHandlers.LastLink); } - private void OnDebugActorTable(string command, string arguments) { + private void OnDebugPrintGameState(string command, string arguments) { Framework.Gui.Chat.Print(this.ClientState.Actors.Length + " entries"); Framework.Gui.Chat.Print(this.ClientState.LocalPlayer.Name); Framework.Gui.Chat.Print(this.ClientState.LocalPlayer.CurrentWorld.Name); + Framework.Gui.Chat.Print(this.ClientState.LocalPlayer.HomeWorld.Name); Framework.Gui.Chat.Print(this.ClientState.LocalContentId.ToString("X")); + Framework.Gui.Chat.Print(Framework.Gui.Chat.LastLinkedItemId.ToString()); for (var i = 0; i < this.ClientState.Actors.Length; i++) { var actor = this.ClientState.Actors[i]; @@ -311,6 +342,74 @@ namespace Dalamud { } } + private void OnCommandDebugCombo(string command, string arguments) { + var argumentsParts = arguments.Split(); + + switch (argumentsParts[0]) { + /* Sorry! + case "setall": { + foreach (var value in Enum.GetValues(typeof(CustomComboPreset)).Cast()) { + if (value == CustomComboPreset.None) + continue; + + this.Configuration.ComboPresets |= value; + } + + Framework.Gui.Chat.Print("all SET"); + } + break; + case "unsetall": { + foreach (var value in Enum.GetValues(typeof(CustomComboPreset)).Cast()) { + this.Configuration.ComboPresets &= value; + } + + Framework.Gui.Chat.Print("all UNSET"); + } + break; + case "set": { + foreach (var value in Enum.GetValues(typeof(CustomComboPreset)).Cast()) { + if (value.ToString().ToLower() != argumentsParts[1].ToLower()) + continue; + + this.Configuration.ComboPresets |= value; + } + } + break; + case "toggle": { + foreach (var value in Enum.GetValues(typeof(CustomComboPreset)).Cast()) { + if (value.ToString().ToLower() != argumentsParts[1].ToLower()) + continue; + + this.Configuration.ComboPresets ^= value; + } + } + break; + + case "unset": { + foreach (var value in Enum.GetValues(typeof(CustomComboPreset)).Cast()) { + if (value.ToString().ToLower() != argumentsParts[1].ToLower()) + continue; + + this.Configuration.ComboPresets &= ~value; + } + } + break; + */ + case "list": { + foreach (var value in Enum.GetValues(typeof(CustomComboPreset)).Cast()) { + if (this.Configuration.ComboPresets.HasFlag(value)) + Framework.Gui.Chat.Print(value.ToString()); + } + } + break; + + default: Framework.Gui.Chat.Print("Unknown"); + break; + } + + this.Configuration.Save(this.StartInfo.ConfigurationPath); + } + private void OnBotJoinCommand(string command, string arguments) { if (this.BotManager != null && this.BotManager.IsConnected) Process.Start( diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj index 966984ad6..9a99ab4ff 100644 --- a/Dalamud/Dalamud.csproj +++ b/Dalamud/Dalamud.csproj @@ -2,32 +2,33 @@ AnyCPU net471 - 7.2 + 7.3 AnyCPU;x64 Library - $(SolutionDir)/bin + D:\Sapphire\recorder\FFXIV.Recorder\/bin false true Portable true - 2.1.0.0 - 2.1.0 + 2.2.0.0 + 2.2.0 + 2.2.0.0 - E:\Sapphire\recorder\FFXIV.Recorder\/bin\Dalamud.xml + E:\Sapphire\recorder\FFXIV.Recorder\/bin\Dalamud.xml - E:\Sapphire\recorder\FFXIV.Recorder\/bin\Dalamud.xml + D:\Sapphire\recorder\FFXIV.Recorder\/bin\Dalamud.xml E:\Sapphire\recorder\FFXIV.Recorder\/bin\Dalamud.xml @@ -64,4 +65,7 @@ Resources.Designer.cs + + + \ No newline at end of file diff --git a/Dalamud/DalamudStartInfo.cs b/Dalamud/DalamudStartInfo.cs index b0cac09b2..16d43e5fa 100644 --- a/Dalamud/DalamudStartInfo.cs +++ b/Dalamud/DalamudStartInfo.cs @@ -3,15 +3,14 @@ using Dalamud.DiscordBot; namespace Dalamud { [Serializable] - public sealed class DalamudStartInfo { + public sealed class DalamudStartInfo + { public string WorkingDirectory; + public string ConfigurationPath; + public string PluginDirectory; public string DefaultPluginDirectory; public ClientLanguage Language; - - public DiscordFeatureConfiguration DiscordFeatureConfig { get; set; } - - public bool OptOutMbCollection { get; set; } = false; } public enum ClientLanguage diff --git a/Dalamud/Game/Chat/XivChatType.cs b/Dalamud/Game/Chat/XivChatType.cs index d909947cb..a52584153 100644 --- a/Dalamud/Game/Chat/XivChatType.cs +++ b/Dalamud/Game/Chat/XivChatType.cs @@ -61,6 +61,11 @@ namespace Dalamud.Game.Chat { [XivChatTypeInfo("Novice Network", "nn", 0xFF8B4513)] NoviceNetwork = 27, + [XivChatTypeInfo("Custom Emotes", "nn", 0xFF8B4513)] + CustomEmote = 28, + [XivChatTypeInfo("Standard Emotes", null, 0xFF8B4513)] + StandardEmote = 29, + [XivChatTypeInfo("Yell", "y", 0xFFFFFF00)] Yell = 30, diff --git a/Dalamud/Game/ChatHandlers.cs b/Dalamud/Game/ChatHandlers.cs index dab95d694..4005107a4 100644 --- a/Dalamud/Game/ChatHandlers.cs +++ b/Dalamud/Game/ChatHandlers.cs @@ -5,7 +5,6 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using Dalamud.Game.Chat; -using Dalamud.Settings; using Serilog; namespace Dalamud.Game { @@ -81,8 +80,8 @@ namespace Dalamud.Game { var originalMessage = string.Copy(message); - if (PersistentSettings.Instance.BadWords != null && - PersistentSettings.Instance.BadWords.Any(x => originalMessage.Contains(x))) { + if (this.dalamud.Configuration.BadWords != null && + this.dalamud.Configuration.BadWords.Any(x => originalMessage.Contains(x))) { // This seems to be in the user block list - let's not show it Log.Debug("Blocklist triggered"); isHandled = true; @@ -93,8 +92,8 @@ namespace Dalamud.Game { .GetResult()); - if (this.HandledChatTypeColors.ContainsKey(type) || type == XivChatType.Say || type == XivChatType.Shout || - type == XivChatType.Alliance || type == XivChatType.TellOutgoing || type == XivChatType.Yell) { + if ((this.HandledChatTypeColors.ContainsKey(type) || type == XivChatType.Say || type == XivChatType.Shout || + type == XivChatType.Alliance || type == XivChatType.TellOutgoing || type == XivChatType.Yell) && !message.Contains((char)0x02)) { var italicsStart = message.IndexOf("*"); var italicsEnd = message.IndexOf("*", italicsStart + 1); diff --git a/Dalamud/Game/ClientState/Actors/ActorTable.cs b/Dalamud/Game/ClientState/Actors/ActorTable.cs index 3fea9625f..2dd497bc4 100644 --- a/Dalamud/Game/ClientState/Actors/ActorTable.cs +++ b/Dalamud/Game/ClientState/Actors/ActorTable.cs @@ -9,7 +9,7 @@ namespace Dalamud.Game.ClientState.Actors { /// /// This collection represents the currently spawned FFXIV actors. /// - public unsafe class ActorTable : ICollection { + public class ActorTable : ICollection { private ClientStateAddressResolver Address { get; } /// @@ -29,16 +29,23 @@ namespace Dalamud.Game.ClientState.Actors { /// at the specified spawn index. public Actor this[int index] { get { + if (index > Length) + return null; + + Log.Information("Trying to get actor at {0}", index); var tblIndex = Address.ActorTable + 8 + index * 8; - var offset = *(IntPtr*) tblIndex; + + var offset = Marshal.ReadIntPtr(tblIndex); + + Log.Information("Actor at {0}", offset.ToString()); if (offset == IntPtr.Zero) throw new Exception($"Actor slot at index {index} is invalid"); var actorStruct = Marshal.PtrToStructure(offset); - Log.Debug("ActorTable[{0}]: {1} - {2} - {3}", index, tblIndex.ToString("X"), offset.ToString("X"), - actorStruct.ObjectKind.ToString()); + //Log.Debug("ActorTable[{0}]: {1} - {2} - {3}", index, tblIndex.ToString("X"), offset.ToString("X"), + // actorStruct.ObjectKind.ToString()); switch (actorStruct.ObjectKind) { case ObjectKind.Player: return new PlayerCharacter(actorStruct); @@ -76,7 +83,7 @@ namespace Dalamud.Game.ClientState.Actors { /// /// The amount of currently spawned actors. /// - public int Length => *(int*) Address.ActorTable; + public int Length => Marshal.ReadInt32(Address.ActorTable); int ICollection.Count => Length; diff --git a/Dalamud/Game/ClientState/ClientState.cs b/Dalamud/Game/ClientState/ClientState.cs index 4af069e36..e0e038382 100644 --- a/Dalamud/Game/ClientState/ClientState.cs +++ b/Dalamud/Game/ClientState/ClientState.cs @@ -10,6 +10,7 @@ using System.Threading.Tasks; using Dalamud.Game.ClientState.Actors; using Dalamud.Game.ClientState.Actors.Types; using Dalamud.Game.Internal; +using Serilog; namespace Dalamud.Game.ClientState { @@ -31,13 +32,18 @@ namespace Dalamud.Game.ClientState /// /// The local player character, if one is present. /// - public PlayerCharacter LocalPlayer => (PlayerCharacter) this.Actors[0]; + public PlayerCharacter LocalPlayer { get; private set; } /// /// The content ID of the local character. /// public ulong LocalContentId => (ulong) Marshal.ReadInt64(Address.LocalContentId); + /// + /// The class facilitating Job Gauge data access + /// + public JobGauges JobGauges; + /// /// Set up client state access. /// @@ -49,9 +55,20 @@ namespace Dalamud.Game.ClientState Address = new ClientStateAddressResolver(); Address.Setup(scanner); + Log.Verbose("===== C L I E N T S T A T E ====="); + this.ClientLanguage = startInfo.Language; this.Actors = new ActorTable(Address); + + this.JobGauges = new JobGauges(Address); + + dalamud.Framework.OnUpdateEvent += FrameworkOnOnUpdateEvent; + } + + private void FrameworkOnOnUpdateEvent(Framework framework) { + LocalPlayer = (PlayerCharacter) this.Actors[0]; + Log.Verbose("FRAMEWORK UPDATE"); } } } diff --git a/Dalamud/Game/ClientState/ClientStateAddressResolver.cs b/Dalamud/Game/ClientState/ClientStateAddressResolver.cs index 37d1fde18..885f0b31e 100644 --- a/Dalamud/Game/ClientState/ClientStateAddressResolver.cs +++ b/Dalamud/Game/ClientState/ClientStateAddressResolver.cs @@ -10,10 +10,12 @@ namespace Dalamud.Game.ClientState public sealed class ClientStateAddressResolver : BaseAddressResolver { public IntPtr ActorTable { get; private set; } public IntPtr LocalContentId { get; private set; } + public IntPtr JobGaugeData { get; set; } protected override void Setup64Bit(SigScanner sig) { - ActorTable = sig.Module.BaseAddress + 0x1B29B40; - LocalContentId = sig.Module.BaseAddress + 0x1B58B60; + ActorTable = sig.Module.BaseAddress + 0x1C01D90; + LocalContentId = sig.Module.BaseAddress + 0x1C2E000; + JobGaugeData = sig.Module.BaseAddress + 0x1BFD110; } } } diff --git a/Dalamud/Game/ClientState/JobGauge.cs b/Dalamud/Game/ClientState/JobGauge.cs new file mode 100644 index 000000000..916921af7 --- /dev/null +++ b/Dalamud/Game/ClientState/JobGauge.cs @@ -0,0 +1,20 @@ +using System.Runtime.InteropServices; +using Serilog; + +namespace Dalamud.Game.ClientState { + public class JobGauges { + private ClientStateAddressResolver Address { get; } + + public JobGauges(ClientStateAddressResolver addressResolver) { + Address = addressResolver; + + Log.Verbose("JobGaugeData address {JobGaugeData}", Address.ActorTable); + } + + // Should only be called with the gauge types in + // ClientState.Structs.JobGauge + public T Get() { + return Marshal.PtrToStructure(Address.JobGaugeData); + } + } +} diff --git a/Dalamud/Game/ClientState/Structs/Actor.cs b/Dalamud/Game/ClientState/Structs/Actor.cs index 3e1d9ac7c..4dff763c7 100644 --- a/Dalamud/Game/ClientState/Structs/Actor.cs +++ b/Dalamud/Game/ClientState/Structs/Actor.cs @@ -20,13 +20,13 @@ namespace Dalamud.Game.ClientState.Structs [FieldOffset(140)] public ObjectKind ObjectKind; [FieldOffset(141)] public byte SubKind; [FieldOffset(160)] public Position3 Position; - [FieldOffset(6296)] public byte CurrentWorld; - [FieldOffset(6298)] public byte HomeWorld; - [FieldOffset(6308)] public int CurrentHp; - [FieldOffset(6312)] public int MaxHp; - [FieldOffset(6316)] public int CurrentMp; - [FieldOffset(6320)] public int MaxMp; - [FieldOffset(6364)] public byte ClassJob; - [FieldOffset(6366)] public byte Level; + [FieldOffset(6308)] public byte CurrentWorld; + [FieldOffset(6310)] public byte HomeWorld; + [FieldOffset(6328)] public int CurrentHp; + [FieldOffset(6332)] public int MaxHp; + [FieldOffset(6336)] public int CurrentMp; + [FieldOffset(6340)] public int MaxMp; + [FieldOffset(6388)] public byte ClassJob; + [FieldOffset(6390)] public byte Level; } } diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/ASTGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/ASTGauge.cs new file mode 100644 index 000000000..e6eca6548 --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/ASTGauge.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + + [StructLayout(LayoutKind.Explicit)] + public struct ASTGauge { + [FieldOffset(4)] private CardType Card; + [FieldOffset(5)] private unsafe fixed byte Seals[3]; + + public CardType DrawnCard() { + return Card; + } + + public unsafe bool ContainsSeal(SealType seal) { + if (Seals[0] == (byte)seal) return true; + if (Seals[1] == (byte)seal) return true; + if (Seals[2] == (byte)seal) return true; + return false; + } + } +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/BLMGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/BLMGauge.cs new file mode 100644 index 000000000..8bbb74610 --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/BLMGauge.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + + [StructLayout(LayoutKind.Explicit)] + public struct BLMGauge { + [FieldOffset(0)] public short TimeUntilNextPolyglot; //eno timer (ms) + [FieldOffset(2)] public short ElementTimeRemaining; //ui/af timer + [FieldOffset(4)] private byte ElementStance; //ui/af + [FieldOffset(5)] public byte NumUmbralHearts; //number of umbral hearts + [FieldOffset(6)] public byte NumPolyglotStacks; //number of polyglot stacks + [FieldOffset(7)] private byte EnoState; //eno active? + + public bool InUmbralIce() { + return ElementStance > 4; + } + + public bool InAstralFire() { + return ElementStance > 0 && ElementStance < 4; + } + + public bool IsEnoActive() { + return EnoState > 0; + } + + } + + +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/BRDGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/BRDGauge.cs new file mode 100644 index 000000000..11eb1f5ad --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/BRDGauge.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + + [StructLayout(LayoutKind.Explicit)] + public struct BRDGauge { + [FieldOffset(0)] public short SongTimer; + [FieldOffset(2)] public byte NumSongStacks; + [FieldOffset(4)] public CurrentSong ActiveSong; + } +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/DNCGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/DNCGauge.cs new file mode 100644 index 000000000..b77e6f0e4 --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/DNCGauge.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + + [StructLayout(LayoutKind.Explicit)] + public unsafe struct DNCGauge { + [FieldOffset(0)] public byte NumFeathers; + [FieldOffset(1)] public byte Esprit; + [FieldOffset(2)] private fixed byte StepOrder[4]; + [FieldOffset(6)] public byte NumCompleteSteps; + + public bool IsDancing() { + return StepOrder[0] != 0; + } + + public ulong NextStep() { + return (ulong)(15999 + StepOrder[NumCompleteSteps] - 1); + } + } +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/DRGGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/DRGGauge.cs new file mode 100644 index 000000000..fa71eb541 --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/DRGGauge.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + + [StructLayout(LayoutKind.Explicit)] + public struct DRGGauge { + [FieldOffset(0)] public short BOTDTimer; + [FieldOffset(2)] public BOTDState BOTDState; + [FieldOffset(3)] public byte EyeCount; + } +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/DRKGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/DRKGauge.cs new file mode 100644 index 000000000..5c711cf57 --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/DRKGauge.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + [StructLayout(LayoutKind.Explicit)] + public struct DRKGauge { + [FieldOffset(0)] public byte Blood; + [FieldOffset(2)] public short DarksideTimeRemaining; + [FieldOffset(4)] private byte DarkArtsState; + [FieldOffset(6)] public short ShadowTimeRemaining; + + public bool HasDarkArts() { + return DarkArtsState > 0; + } + } +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/GNBGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/GNBGauge.cs new file mode 100644 index 000000000..969adda1d --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/GNBGauge.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + + [StructLayout(LayoutKind.Explicit)] + public struct GNBGauge { + [FieldOffset(0)] public byte NumAmmo; + [FieldOffset(2)] public short MaxTimerDuration; + [FieldOffset(4)] public byte AmmoComboStepNumber; + } +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/JobEnums.cs b/Dalamud/Game/ClientState/Structs/JobGauge/JobEnums.cs new file mode 100644 index 000000000..69762e295 --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/JobEnums.cs @@ -0,0 +1,67 @@ +using System; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + public enum SealType : byte { + NONE = 0, + SUN, + MOON, + CELESTIAL + } + + public enum CardType : byte { + NONE = 0, + BALANCE, + BOLE, + ARROW, + SPEAR, + EWER, + SPIRE, + LORD = 0x70, + LADY = 0x80 + } + + public enum SummonPet : byte { + NONE = 0, + IFRIT = 3, + TITAN, + GARUDA + } + + public enum PetGlam : byte { + NONE = 0, + EMERALD, + TOPAZ, + RUBY + } + + [Flags] + public enum Sen : byte { + NONE = 0, + SETSU = 1 << 0, + GETSU = 1 << 1, + KA = 1 << 2 + } + + public enum BOTDState : byte { + NONE = 0, + BOTD, + LOTD + } + + public enum CurrentSong : byte { + MAGE = 5, + ARMY = 0xA, + WANDERER = 0xF + } + + public enum DismissedFairy : byte { + EOS = 6, + SELENE + } + + public enum Mudras : byte { + TEN = 1, + CHI = 2, + JIN = 3 + } +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/MCHGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/MCHGauge.cs new file mode 100644 index 000000000..e606cb751 --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/MCHGauge.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + + [StructLayout(LayoutKind.Explicit)] + public struct MCHGauge{ + + [FieldOffset(0)] public short OverheatTimeRemaining; + [FieldOffset(2)] public short RobotTimeRemaining; + [FieldOffset(4)] public byte Heat; + [FieldOffset(5)] public byte Battery; + [FieldOffset(6)] public byte LastRobotBatteryPower; + [FieldOffset(7)] private byte TimerActive; + + public bool IsOverheated() { + return (TimerActive & 1) != 0; + } + public bool IsRobotActive() { + return (TimerActive & 2) != 0; + } + } +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/MNKGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/MNKGauge.cs new file mode 100644 index 000000000..0d40ee780 --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/MNKGauge.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + + [StructLayout(LayoutKind.Explicit)] + public struct MNKGauge { + [FieldOffset(0)] public byte GLTimer; + [FieldOffset(2)] public byte NumGLStacks; + [FieldOffset(3)] public byte NumChakra; + [FieldOffset(4)] private byte GLTimerFreezeState; + + public bool IsGLTimerFroze() { + return GLTimerFreezeState > 0; + } + } +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/NINGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/NINGauge.cs new file mode 100644 index 000000000..672e27b81 --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/NINGauge.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + + [StructLayout(LayoutKind.Explicit)] + public struct NINGauge { + [FieldOffset(0)] public int HutonTimeLeft; + [FieldOffset(4)] public byte TCJMudrasUsed; //some sort of mask + [FieldOffset(5)] public byte Ninki; + [FieldOffset(6)] public byte NumHutonManualCasts; //wtf + } +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/PLDGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/PLDGauge.cs new file mode 100644 index 000000000..30b7f65e3 --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/PLDGauge.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + + [StructLayout(LayoutKind.Explicit)] + public struct PLDGauge { + [FieldOffset(0)] public byte GaugeAmount; + } +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/RDMGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/RDMGauge.cs new file mode 100644 index 000000000..b0a2fa0c6 --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/RDMGauge.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + + [StructLayout(LayoutKind.Explicit)] + public struct RDMGauge { + [FieldOffset(0)] public byte WhiteGauge; + [FieldOffset(1)] public byte BlackGauge; + } +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/SAMGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/SAMGauge.cs new file mode 100644 index 000000000..6c10ba477 --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/SAMGauge.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + + [StructLayout(LayoutKind.Explicit)] + public struct SAMGauge { + + [FieldOffset(3)] public byte Kenki; + [FieldOffset(4)] public Sen Sen; + } +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/SCHGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/SCHGauge.cs new file mode 100644 index 000000000..5d742ee0e --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/SCHGauge.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + + [StructLayout(LayoutKind.Explicit)] + public struct SCHGauge { + [FieldOffset(2)] public byte NumAetherflowStacks; + [FieldOffset(3)] public byte FairyGaugeAmount; + [FieldOffset(4)] public short SeraphTimer; + [FieldOffset(6)] public DismissedFairy DismissedFairy; + } +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/SMNGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/SMNGauge.cs new file mode 100644 index 000000000..1742f4d97 --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/SMNGauge.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + + [StructLayout(LayoutKind.Explicit)] + public struct SMNGauge { + + //Unfinished + [FieldOffset(0)] public short TimerRemaining; + [FieldOffset(2)] public SummonPet ReturnSummon; + [FieldOffset(3)] public PetGlam ReturnSummonGlam; + [FieldOffset(4)] public byte NumStacks; + + public bool IsPhoenixReady() { + return (NumStacks & 0x10) > 0; + } + + public bool IsBahamutReady() { + return (NumStacks & 8) > 0; + } + + public bool HasAetherflowStacks() { + return (NumStacks & 3) > 0; + } + } +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/WARGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/WARGauge.cs new file mode 100644 index 000000000..ed1ecf364 --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/WARGauge.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + + [StructLayout(LayoutKind.Explicit)] + public struct WARGauge { + [FieldOffset(0)] public byte BeastGaugeAmount; + } +} diff --git a/Dalamud/Game/ClientState/Structs/JobGauge/WHMGauge.cs b/Dalamud/Game/ClientState/Structs/JobGauge/WHMGauge.cs new file mode 100644 index 000000000..a5ad15906 --- /dev/null +++ b/Dalamud/Game/ClientState/Structs/JobGauge/WHMGauge.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.ClientState.Structs.JobGauge { + + [StructLayout(LayoutKind.Explicit)] + public struct WHMGauge { + [FieldOffset(2)] public short LilyTimer; //Counts to 30k = 30s + [FieldOffset(4)] public byte NumLilies; + [FieldOffset(5)] public byte NumBloodLily; + } +} diff --git a/Dalamud/Game/Internal/Framework.cs b/Dalamud/Game/Internal/Framework.cs index 487ff699a..b970ac49a 100644 --- a/Dalamud/Game/Internal/Framework.cs +++ b/Dalamud/Game/Internal/Framework.cs @@ -1,6 +1,5 @@ using System; using System.Runtime.InteropServices; -using Dalamud.Settings; using Dalamud.Game.Internal.Gui; using Dalamud.Game.Internal.Libc; using Dalamud.Game.Internal.Network; @@ -56,7 +55,7 @@ namespace Dalamud.Game.Internal { Network = new GameNetwork(dalamud, scanner); - Resource = new ResourceManager(dalamud, scanner); + //Resource = new ResourceManager(dalamud, scanner); } private void HookVTable() { @@ -100,7 +99,7 @@ namespace Dalamud.Game.Internal { } catch (Exception ex) { Log.Error(ex, "Exception while dispatching Framework::Update event."); } - + return this.updateHook.Original(framework); } } diff --git a/Dalamud/Game/Internal/Gui/ChatGuiAddressResolver.cs b/Dalamud/Game/Internal/Gui/ChatGuiAddressResolver.cs index 67478e423..0516fce54 100644 --- a/Dalamud/Game/Internal/Gui/ChatGuiAddressResolver.cs +++ b/Dalamud/Game/Internal/Gui/ChatGuiAddressResolver.cs @@ -76,13 +76,18 @@ namespace Dalamud.Game.Internal.Gui { */ protected override void Setup64Bit(SigScanner sig) { - PrintMessage = sig.ScanText("4055 57 41 ?? 41 ?? 488DAC24D8FEFFFF 4881EC28020000 488B05???????? 4833C4 488985F0000000 4532D2 48894C2448"); + //PrintMessage = sig.ScanText("4055 57 41 ?? 41 ?? 488DAC24D8FEFFFF 4881EC28020000 488B05???????? 4833C4 488985F0000000 4532D2 48894C2448"); LAST PART FOR 5.1??? + PrintMessage = + sig.ScanText( + "4055 57 41 ?? 41 ?? 4157488DAC24E0FE FFFF4881EC2002 0000488B05???? ????48 33C4488985F000 000045 32D248894C2448"); //PrintMessage = sig.ScanText("4055 57 41 ?? 41 ?? 488DAC24E8FEFFFF 4881EC18020000 488B05???????? 4833C4 488985E0000000 4532D2 48894C2438"); old - + //PrintMessage = sig.ScanText("40 55 57 41 56 41 57 48 8D AC 24 D8 FE FF FF 48 81 EC 28 02 00 00 48 8B 05 63 47 4A 01 48 33 C4 48 89 85 F0 00 00 00 45 32 D2 48 89 4C 24 48 33"); //PopulateItemLinkObject = sig.ScanText("48 89 5C 24 08 57 48 83 EC 20 80 7A 06 00 48 8B DA 48 8B F9 74 14 48 8B CA E8 32 03 00 00 48 8B C8 E8 FA F2 B0 FF 8B C8 EB 1D 0F B6 42 14 8B 4A"); - PopulateItemLinkObject = sig.ScanText("48 89 5C 24 08 57 48 83 EC 20 80 7A 06 00 48 8B DA 48 8B F9 74 14 48 8B CA E8 32 03 00 00 48 8B C8 E8 ?? ?? B0 FF 8B C8 EB 1D 0F B6 42 14 8B 4A"); + + //PopulateItemLinkObject = sig.ScanText("48 89 5C 24 08 57 48 83 EC 20 80 7A 06 00 48 8B DA 48 8B F9 74 14 48 8B CA E8 32 03 00 00 48 8B C8 E8 ?? ?? B0 FF 8B C8 EB 1D 0F B6 42 14 8B 4A"); 5.0 + PopulateItemLinkObject = sig.ScanText("48 89 5C 24 08 57 48 83 EC 20 80 7A 06 00 48 8B DA 48 8B F9 74 14 48 8B CA E8 32 03 00 00 48 8B C8 E8 7A 12 AF FF 8B C8 EB 1D 0F B6 42 14 8B 4A"); } } } diff --git a/Dalamud/Game/Internal/Gui/IconReplacer.cs b/Dalamud/Game/Internal/Gui/IconReplacer.cs new file mode 100644 index 000000000..40630cab0 --- /dev/null +++ b/Dalamud/Game/Internal/Gui/IconReplacer.cs @@ -0,0 +1,852 @@ +using Dalamud.Game.ClientState; +using Dalamud.Game.ClientState.Actors.Types; +using Dalamud.Game.ClientState.Structs.JobGauge; +using Dalamud.Hooking; +using Serilog; +using System; +using System.Diagnostics; +using System.Runtime.InteropServices; +using XIVLauncher.Dalamud; + +namespace Dalamud.Game.Internal.Gui { + public class IconReplacer { + public delegate ulong OnGetIconDelegate(byte param1, uint param2); + public delegate ulong OnCheckIsIconReplaceableDelegate(int actionID); + + private Hook iconHook; + private Hook checkerHook; + + private IconReplacerAddressResolver Address; + + private IntPtr comboTimer; + private IntPtr lastComboMove; + private IntPtr activeBuffArray = IntPtr.Zero; + private IntPtr jobInfo; + private IntPtr byteBase; + private Dalamud dalamud; + + public unsafe IconReplacer(Dalamud dalamud, SigScanner scanner) { + this.dalamud = dalamud; + this.Address = new IconReplacerAddressResolver(); + this.Address.Setup(scanner); + + this.byteBase = scanner.Module.BaseAddress; + this.comboTimer = byteBase + 0x1BB5B50; + this.lastComboMove = byteBase + 0x1BB5B54; + + Log.Verbose("===== H O T B A R S ====="); + Log.Verbose("IsIconReplaceable address {IsIconReplaceable}", Address.IsIconReplaceable); + Log.Verbose("GetIcon address {GetIcon}", Address.GetIcon); + + this.iconHook = new Hook(this.Address.GetIcon, new OnGetIconDelegate(GetIconDetour), this); + this.checkerHook = new Hook(this.Address.IsIconReplaceable, new OnCheckIsIconReplaceableDelegate(CheckIsIconReplaceableDetour), this); + } + + public void Enable() { + this.iconHook.Enable(); + this.checkerHook.Enable(); + } + + public void Dispose() { + this.iconHook.Dispose(); + this.checkerHook.Dispose(); + } + + // I hate this function. This is the dumbest function to exist in the game. Just return 1. + // Determines which abilities are allowed to have their icons updated. + private ulong CheckIsIconReplaceableDetour(int actionID) { + return 1; + } + + /// + /// Replace an ability with another ability + /// actionID is the original ability to be "used" + /// Return either actionID (itself) or a new Action table ID as the + /// ability to take its place. + /// I tend to make the "combo chain" button be the last move in the combo + /// For example, Souleater combo on DRK happens by dragging Souleater + /// onto your bar and mashing it. + /// + private ulong GetIconDetour(byte self, uint actionID) { + + // TODO: More jobs, level checking for everything. + + // Check if player is loaded in by trying to get their buffs. + // If not, skip everything until we are (game will crash cause I'm lazy). + /* + if (activeBuffArray == IntPtr.Zero) { + try { + activeBuffArray = FindBuffAddress(); + Log.Verbose("ActiveBuffArray address: {ActiveBuffArray}", activeBuffArray); + } + catch (Exception e) { + activeBuffArray = IntPtr.Zero; + return this.iconHook.Original(self, actionID); + } + } + */ + + // TODO: this is currently broken + // As it stands, don't rely on localCharacter.level for anything. + var localPlayer = this.dalamud.ClientState.LocalPlayer; + + // Don't clutter the spaghetti any worse than it already is. + var lastMove = Marshal.ReadInt32(this.lastComboMove); + var comboTime = Marshal.ReadInt32(this.comboTimer); + var level = 80; + + // DRAGOON + // TODO: Jump/High Jump into Mirage Dive + + // Replace Coerthan Torment with Coerthan Torment combo chain + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.DragoonCoerthanTormentCombo)) { + if (actionID == 16477) { + if (comboTime > 0) { + if (lastMove == 86 && level >= 62) return 7397; + if (lastMove == 7397 && level >= 72) return 16477; + } + return 86; + } + } + + + // Replace Chaos Thrust with the Chaos Thrust combo chain + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.DragoonChaosThrustCombo)) { + if (actionID == 88) { + if (comboTime > 0) { + if ((lastMove == 75 || lastMove == 16479) && level >= 18) return 87; + if (lastMove == 87 && level >= 50) return 88; + } + if (SearchBuffArray(802) && level >= 56) return 3554; + if (SearchBuffArray(803) && level >= 58) return 3556; + if (SearchBuffArray(1863) && level >= 76) return 16479; + + return 75; + } + } + + + // Replace Full Thrust with the Full Thrust combo chain + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.DragoonFullThrustCombo)) { + if (actionID == 84) { + if (comboTime > 0) { + if ((lastMove == 75 || lastMove == 16479) && level >= 4) return 78; + if (lastMove == 78 && level >= 26) return 84; + } + if (SearchBuffArray(802) && level >= 56) return 3554; + if (SearchBuffArray(803) && level >= 58) return 3556; + if (SearchBuffArray(1863) && level >= 76) return 16479; + + return 75; + } + } + + // DARK KNIGHT + + // Replace Souleater with Souleater combo chain + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.DarkSouleaterCombo)) { + if (actionID == 3632) { + if (comboTime > 0) { + if (lastMove == 3617 && level >= 2) return 3623; + if (lastMove == 3623 && level >= 26) return 3632; + } + + return 3617; + } + } + + // Replace Stalwart Soul with Stalwart Soul combo chain + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.DarkStalwartSoulCombo)) { + if (actionID == 16468) { + if (comboTime > 0) { + if (lastMove == 3621 && level >= 72) return 16468; + } + + return 3621; + } + } + + // PALADIN + + // Replace Goring Blade with Goring Blade combo + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.PaladinGoringBladeCombo)) { + if (actionID == 3538) { + if (comboTime > 0) { + if (lastMove == 9 && level >= 4) return 15; + if (lastMove == 15 && level >= 54) return 3538; + } + + return 9; + } + } + + // Replace Royal Authority with Royal Authority combo + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.PaladinRoyalAuthorityCombo)) { + if (actionID == 3539) { + if (comboTime > 0) { + if (lastMove == 9 && level >= 4) return 15; + if (lastMove == 15) { + if (level >= 60) return 3539; + if (level >= 26) return 21; + } + } + + return 9; + } + } + + // Replace Prominence with Prominence combo + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.PaladinProminenceCombo)) { + if (actionID == 16457) { + if (comboTime > 0) { + if (lastMove == 7381 && level >= 40) return 16457; + } + + return 7381; + } + } + + // WARRIOR + + // Replace Storm's Path with Storm's Path combo + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.WarriorStormsPathCombo)) { + if (actionID == 42) { + if (comboTime > 0) { + if (lastMove == 31 && level >= 4) return 37; + if (lastMove == 37 && level >= 26) return 42; + } + + return 31; + } + } + + // Replace Storm's Eye with Storm's Eye combo + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.WarriorStormsEyeCombo)) { + if (actionID == 45) { + if (comboTime > 0) { + if (lastMove == 31 && level >= 4) return 37; + if (lastMove == 37 && level >= 50) return 45; + } + return 31; + } + } + + // Replace Mythril Tempest with Mythril Tempest combo + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.WarriorMythrilTempestCombo)) { + if (actionID == 16462) { + if (comboTime > 0) { + if (lastMove == 41 && level >= 40) return 16462; + } + return 41; + } + } + + // SAMURAI + + // Replace Yukikaze with Yukikaze combo + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.SamuraiYukikazeCombo)) { + if (actionID == 7480) { + if (SearchBuffArray(1233)) return 7480; + if (comboTime > 0) { + if (lastMove == 7477 && level >= 50) return 7480; + } + return 7477; + } + } + + // Replace Gekko with Gekko combo + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.SamuraiGekkoCombo)) { + if (actionID == 7481) { + if (SearchBuffArray(1233)) return 7481; + if (comboTime > 0) { + if (lastMove == 7477 && level >= 4) return 7478; + if (lastMove == 7478 && level >= 30) return 7481; + } + return 7477; + } + } + + // Replace Kasha with Kasha combo + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.SamuraiKashaCombo)) { + if (actionID == 7482) { + if (SearchBuffArray(1233)) return 7482; + if (comboTime > 0) { + if (lastMove == 7477 && level >= 18) return 7479; + if (lastMove == 7479 && level >= 40) return 7482; + } + return 7477; + } + } + + // Replace Mangetsu with Mangetsu combo + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.SamuraiMangetsuCombo)) { + if (actionID == 7484) { + if (SearchBuffArray(1233)) return 7484; + if (comboTime > 0) { + if (lastMove == 7483 && level >= 35) return 7484; + } + return 7483; + } + } + + // Replace Oka with Oka combo + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.SamuraiOkaCombo)) { + if (actionID == 7485) { + if (SearchBuffArray(1233)) return 7485; + if (comboTime > 0) { + if (lastMove == 7483 && level >= 45) return 7485; + } + return 7483; + } + } + + // NINJA + + // Replace Armor Crush with Armor Crush combo + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.NinjaArmorCrushCombo)) { + if (actionID == 3563) { + if (comboTime > 0) { + if (lastMove == 2240 && level >= 4) return 2242; + if (lastMove == 2242 && level >= 54) return 3563; + } + return 2240; + } + } + + // Replace Aeolian Edge with Aeolian Edge combo + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.NinjaAeolianEdgeCombo)) { + if (actionID == 2255) { + if (comboTime > 0) { + if (lastMove == 2240 && level >= 4) return 2242; + if (lastMove == 2242 && level >= 26) return 2255; + } + return 2240; + } + } + + // Replace Hakke Mujinsatsu with Hakke Mujinsatsu combo + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.NinjaHakkeMujinsatsuCombo)) { + if (actionID == 16488) { + if (comboTime > 0) { + if (lastMove == 2254 && level >= 52) return 16488; + } + return 2254; + } + } + + // GUNBREAKER + + // Replace Solid Barrel with Solid Barrel combo + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.GunbreakerSolidBarrelCombo)) { + if (actionID == 16145) { + if (comboTime > 0) { + if (lastMove == 16137 && level >= 4) return 16139; + if (lastMove == 16139 && level >= 26) return 16145; + } + return 16137; + } + } + + // Replace Gnashing Fang with Gnashing Fang combo + // TODO: Potentially add Contuation moves as well? + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.GunbreakerGnashingFangCombo)) { + if (actionID == 16146) { + byte ammoComboState = this.dalamud.ClientState.JobGauges.Get().AmmoComboStepNumber; + if (ammoComboState == 1) return 16147; + if (ammoComboState == 2) return 16150; + return 16146; + } + } + + // Replace Demon Slaughter with Demon Slaughter combo + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.GunbreakerDemonSlaughterCombo)) { + if (actionID == 16149) { + if (comboTime > 0) { + if (lastMove == 16141 && level >= 40) return 16149; + } + return 16141; + } + } + + // MACHINIST + + // Replace Heated Clean Shot with Heated Clean Shot combo + // Or with Heat Blast when overheated. + // For some reason the shots use their unheated IDs as combo moves + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.MachinistHeatedClanShotFeature)) { + if (actionID == 7413) { + MCHGauge gauge = this.dalamud.ClientState.JobGauges.Get(); + // End overheat slightly early to prevent eager button mashing clipping your gcd with a fake 6th HB. + if (gauge.IsOverheated() && level >= 35 && gauge.OverheatTimeRemaining > 30) return 7410; + if (comboTime > 0) { + if (lastMove == 2866) { + if (level >= 60) return 7412; + if (level >= 2) return 2868; + } + if (lastMove == 2868) { + if (level >= 64) return 7413; + if (level >= 26) return 2873; + } + } + return 7411; + } + } + + // Replace Spread Shot with Auto Crossbow when overheated. + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.MachinistSpreadShotFeature)) { + if (actionID == 2870) { + if (this.dalamud.ClientState.JobGauges.Get().IsOverheated() && level >= 52) return 16497; + return 2870; + } + } + + // BLACK MAGE + + // Enochian changes to B4 or F4 depending on stance. + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.BlackEnochianFeature)) { + if (actionID == 3575) { + BLMGauge jobInfo = this.dalamud.ClientState.JobGauges.Get(); + if (jobInfo.IsEnoActive()) { + if (jobInfo.InUmbralIce() && level >= 58) return 3576; + if (level >= 60) return 3577; + } + return 3575; + } + } + + // Umbral Soul and Transpose + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.BlackManaFeature)) { + if (actionID == 149) { + BLMGauge gauge = this.dalamud.ClientState.JobGauges.Get(); + if (gauge.InUmbralIce() && gauge.IsEnoActive() && level >= 76) return 16506; + return 149; + } + } + + // ASTROLOGIAN + + // Make cards on the same button as play + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.AstrologianCardsOnDrawFeature)) { + if (actionID == 17055) { + ASTGauge gauge = this.dalamud.ClientState.JobGauges.Get(); + switch (gauge.DrawnCard()) { + case CardType.BALANCE: + return 4401; + case CardType.BOLE: + return 4404; + case CardType.ARROW: + return 4402; + case CardType.SPEAR: + return 4403; + case CardType.EWER: + return 4405; + case CardType.SPIRE: + return 4406; + /* + case CardType.LORD: + return 7444; + case CardType.LADY: + return 7445; + */ + default: + return 3590; + } + } + } + + // SUMMONER + + // DWT changes. + // Now contains DWT, Deathflare, Summon Bahamut, Enkindle Bahamut, FBT, and Enkindle Phoenix. + // What a monster of a button. + /* + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.SummonerDwtCombo)) { + if (actionID == 3581) { + SMNGauge gauge = this.dalamud.ClientState.JobGauges.Get(); + if (gauge.TimerRemaining > 0) { + if (gauge.ReturnSummon > 0) { + if (gauge.IsPhoenixReady()) return 16516; + return 7429; + } + if (level >= 60) return 3582; + } + else { + if (gauge.IsBahamutReady()) return 7427; + if (gauge.IsPhoenixReady()) return 16513; + return 3581; + } + } + } + */ + + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.SummonerDemiCombo)) { + // Replace Deathflare with demi enkindles + if (actionID == 3582) { + SMNGauge gauge = this.dalamud.ClientState.JobGauges.Get(); + if (gauge.IsPhoenixReady()) return 16516; + if (gauge.TimerRemaining > 0 && gauge.ReturnSummon != SummonPet.NONE) return 7429; + return 3582; + } + + //Replace DWT with demi summons + if (actionID == 3581) { + SMNGauge gauge = this.dalamud.ClientState.JobGauges.Get(); + if (gauge.IsBahamutReady()) return 7427; + if (gauge.IsPhoenixReady() || + (gauge.TimerRemaining > 0 && gauge.ReturnSummon != SummonPet.NONE)) return 16513; + return 3581; + } + } + + // Ruin 1 now upgrades to Brand of Purgatory in addition to Ruin 3 and Fountain of Fire + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.SummonerBoPCombo)) { + if (actionID == 163) { + SMNGauge gauge = this.dalamud.ClientState.JobGauges.Get(); + if (gauge.TimerRemaining > 0) { + if (gauge.IsPhoenixReady()) { + if (SearchBuffArray(1867)) { + return 16515; + } + return 16514; + } + } + if (level >= 54) return 3579; + return 163; + } + } + + // Change Energy Drain into Fester + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.SummonerEDFesterCombo)) { + if (actionID == 16508) { + if (this.dalamud.ClientState.JobGauges.Get().HasAetherflowStacks()) + return 181; + return 16508; + } + } + + //Change Energy Siphon into Painflare + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.SummonerESPainflareCombo)) { + if (actionID == 16510) { + if (this.dalamud.ClientState.JobGauges.Get().HasAetherflowStacks()) + if (level >= 52) return 3578; + return 16510; + } + } + + // SCHOLAR + + // Change Fey Blessing into Consolation when Seraph is out. + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.ScholarSeraphConsolationFeature)) { + if (actionID == 16543) { + if (this.dalamud.ClientState.JobGauges.Get().SeraphTimer > 0) return 16546; + return 16543; + } + } + + // Change Energy Drain into Aetherflow when you have no more Aetherflow stacks. + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.ScholarEnergyDrainFeature)) { + if (actionID == 167) { + if (this.dalamud.ClientState.JobGauges.Get().NumAetherflowStacks == 0) return 166; + return 167; + } + } + + // DANCER + + /* + + // Standard Step is one button. + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.DancerStandardStepCombo)) { + if (actionID == 15997) { + DNCGauge gauge = this.dalamud.ClientState.JobGauges.Get(); + if (gauge.IsDancing()) { + if (gauge.NumCompleteSteps == 2) { + return 16192; + } + else { + // C# can't implicitly cast from int to ulong. + return gauge.NextStep(); + } + } + return 15997; + } + } + + // Technical Step is one button. + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.DancerTechnicalStepCombo)) { + if (actionID == 15998) { + DNCGauge gauge = this.dalamud.ClientState.JobGauges.Get(); + if (gauge.IsDancing()) { + if (gauge.NumCompleteSteps == 4) { + return 16196; + } + else { + // C# can't implicitly cast from int to ulong. + return gauge.NextStep(); + } + } + return 15998; + } + } + + // Fountain changes into Fountain combo, prioritizing procs over combo, + // and Fountainfall over Reverse Cascade. + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.DancerFountainCombo)) { + if (actionID == 15990) { + if (this.dalamud.ClientState.JobGauges.Get().IsDancing()) return 15999; + if (SearchBuffArray(1815)) return 15992; + if (SearchBuffArray(1814)) return 15991; + if (comboTime > 0) { + if (lastMove == 15989 && level >= 2) return 15990; + } + return 15989; + } + } + + */ + + // AoE GCDs are split into two buttons, because priority matters + // differently in different single-target moments. Thanks yoship. + // Replaces each GCD with its procced version. + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.DancerAoeGcdFeature)) { + if (actionID == 15994) { + if (SearchBuffArray(1817)) return 15996; + return 15994; + } + + if (actionID == 15993) { + if (SearchBuffArray(1816)) return 15995; + return 15993; + } + } + + // Fan Dance changes into Fan Dance 3 while flourishing. + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.DancerFanDanceCombo)) { + if (actionID == 16007) { + if (SearchBuffArray(1820)) return 16009; + + return 16007; + } + + // Fan Dance 2 changes into Fan Dance 3 while flourishing. + if (actionID == 16008) { + if (SearchBuffArray(1820)) return 16009; + return 16008; + } + } + + // WHM + + // Replace Solace with Misery when full blood lily + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.WhiteMageSolaceMiseryFeature)) { + if (actionID == 16531) { + if (this.dalamud.ClientState.JobGauges.Get().NumBloodLily == 3) + return 16535; + return 16531; + } + } + + // Replace Solace with Misery when full blood lily + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.WhiteMageRaptureMiseryFeature)) { + if (actionID == 16534) { + if (this.dalamud.ClientState.JobGauges.Get().NumBloodLily == 3) + return 16535; + return 16534; + } + } + + // BARD + + // Replace Wanderer's Minuet with PP when in WM. + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.BardWandererPPFeature)) { + if (actionID == 3559) { + if (this.dalamud.ClientState.JobGauges.Get().ActiveSong == CurrentSong.WANDERER) { + return 7404; + } + return 3559; + } + } + + // Replace HS/BS with SS/RA when procced. + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.BardStraightShotUpgradeFeature)) { + if (actionID == 97) { + if (SearchBuffArray(122)) { + if (level >= 70) return 7409; + return 98; + } + if (level >= 76) return 16495; + return 97; + } + } + + // MONK + + /* + + // Replace Snap Punch with flank positional combo. + // During PB, Snap (with sub-max stacks) > Twin (with no active Twin) > DK + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.MonkFlankCombo)) { + if (actionID == 56) { + if (SearchBuffArray(110)) { + MNKGauge gauge = this.dalamud.ClientState.JobGauges.Get(); + if ((gauge.NumGLStacks < 3 && level < 76) || SearchBuffArray(103)) { + return 56; + } + else if (gauge.NumGLStacks < 4 && level >= 76 && SearchBuffArray(105)) { + return 56; + } + else if (!SearchBuffArray(101)) return 61; + else return 74; + } + else { + if (SearchBuffArray(107) && level >= 50) return 74; + if (SearchBuffArray(108) && level >= 18) return 61; + if (SearchBuffArray(109) && level >= 6) return 56; + return 74; + } + } + } + + // Replace Demolish with rear positional combo. + // During PB, Demo (with sub-max stacks) > Bootshine. + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.MonkRearCombo)) { + if (actionID == 66) { + if (SearchBuffArray(110)) { + MNKGauge gauge = this.dalamud.ClientState.JobGauges.Get(); + if ((gauge.NumGLStacks < 3 && level < 76) || SearchBuffArray(103)) { + return 66; + } + else if (gauge.NumGLStacks < 4 && level >= 76 && SearchBuffArray(105)) { + return 66; + } + else return 53; + } + else { + if (SearchBuffArray(107)) return 53; + if (SearchBuffArray(108) && level >= 4) return 54; + if (SearchBuffArray(109) && level >= 30) return 66; + return 53; + } + } + } + + // Replace Rockbreaker with AoE combo. + // During PB, RB (with sub-max stacks) > Twin Snakes (if not applied) > RB. + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.MonkAoECombo)) { + if (actionID == 70) { + if (SearchBuffArray(110)) { + MNKGauge gauge = this.dalamud.ClientState.JobGauges.Get(); + if ((gauge.NumGLStacks < 3 && level < 76) || SearchBuffArray(103)) { + return 70; + } + else if (gauge.NumGLStacks < 4 && level >= 76 && SearchBuffArray(105)) { + return 70; + } + else if (!SearchBuffArray(101)) return 61; + else return 70; + } + else { + if (SearchBuffArray(107)) return 62; + if (SearchBuffArray(108)) { + if (!SearchBuffArray(101)) return 61; + if (level >= 45) return 16473; + } + if (SearchBuffArray(109) && level >= 30) return 70; + return 62; + } + } + } + + */ + + // RED MAGE + + /* + + // Replace Verstone with White Magic spells. Priority order: + // Scorch > Verholy > Verstone = Veraero (with Dualcast active) > opener Veraero > Jolt + // Impact is not the first available spell to allow for precast openers. + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.RedMageWhiteMagicFeature)) { + if (actionID == 7511) { + if ((lastMove == 7526 || lastMove == 7525) && level >= 80) return 16530; + if (lastMove == 7529 && level >= 70) return 7526; + if ((SearchBuffArray(1249) || SearchBuffArray(167)) && level >= 10) return 7507; + if (SearchBuffArray(1235) && level >= 30) return 7511; + RDMGauge gauge = this.dalamud.ClientState.JobGauges.Get(); + if ((gauge.BlackGauge == 0 && gauge.WhiteGauge == 0) && level >= 10) return 7507; + if (level >= 62) return 7524; + return 7503; + } + } + + // Replace Verfire with Black Magic spells. Priority order: + // Scorch > Verflare> Verfire = Verthunder (with Dualcast active) > opener Verthunder > Jolt + // Impact is not the first available spell to allow for precast openers. + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.RedMageBlackMagicFeature)) { + if (actionID == 7510) { + if ((lastMove == 7526 || lastMove == 7525) && level >= 80) return 16530; + if (lastMove == 7529 && level >= 68) return 7525; + if ((SearchBuffArray(1249) || SearchBuffArray(167)) && level >= 4) return 7505; + if (SearchBuffArray(1234) && level >= 26) return 7510; + RDMGauge gauge = this.dalamud.ClientState.JobGauges.Get(); + if ((gauge.BlackGauge == 0 && gauge.WhiteGauge == 0) && level >= 4) return 7505; + if (level >= 62) return 7524; + return 7503; + } + } + */ + // Replace Veraero/thunder 2 with Impact when Dualcast is active + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.RedMageAoECombo)) { + if (actionID == 16525) { + if (level >= 66 && (SearchBuffArray(1249) || SearchBuffArray(167))) return 16526; + return 16525; + } + + if (actionID == 16524) { + if (level >= 66 && (SearchBuffArray(1249) || SearchBuffArray(167))) return 16526; + return 16524; + } + } + + + + // Replace Redoublement with Redoublement combo, Enchanted if possible. + if (this.dalamud.Configuration.ComboPresets.HasFlag(CustomComboPreset.RedMageMeleeCombo)) { + if (actionID == 7516) { + RDMGauge gauge = this.dalamud.ClientState.JobGauges.Get(); + if ((lastMove == 7504 || lastMove == 7527) && level >= 35) { + if (gauge.BlackGauge >= 25 && gauge.WhiteGauge >= 25) return 7528; + return 7512; + } + if (lastMove == 7512 && level >= 50) { + if (gauge.BlackGauge >= 25 && gauge.WhiteGauge >= 25) return 7529; + return 7516; + } + if (gauge.BlackGauge >= 30 && gauge.WhiteGauge >= 30) return 7527; + return 7516; + } + } + + return this.iconHook.Original(self, actionID); + } + + private bool SearchBuffArray(short needle) {/* + for (int i = 0; i < 60; i++) { + if (Marshal.ReadInt16(activeBuffArray + 4 * i) == needle) return true; + } + */ + return false; + } + + private unsafe delegate int* getArray(long* address); + + private unsafe IntPtr FindBuffAddress() { + IntPtr randomAddress = byteBase + 0x1c04be0; + IntPtr num = Marshal.ReadIntPtr(randomAddress); + IntPtr step2 = (IntPtr)(Marshal.ReadInt64(num) + 0x248); + IntPtr step3 = Marshal.ReadIntPtr(step2); + var callback = Marshal.GetDelegateForFunctionPointer(step3); + return (IntPtr)callback((long*)num); + } + } +} diff --git a/Dalamud/Game/Internal/Gui/IconReplacerAddressResolver.cs b/Dalamud/Game/Internal/Gui/IconReplacerAddressResolver.cs new file mode 100644 index 000000000..dd84a7bfb --- /dev/null +++ b/Dalamud/Game/Internal/Gui/IconReplacerAddressResolver.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.Internal.Gui { + class IconReplacerAddressResolver : BaseAddressResolver { + public IntPtr GetIcon { get; private set; } + public IntPtr IsIconReplaceable { get; private set; } + + protected override void Setup64Bit(SigScanner sig) { + this.GetIcon = sig.ScanText("48 89 5c 24 08 48 89 6c 24 10 48 89 74 24 18 57 48 83 ec 30 8b da be dd 1c 00 00 bd d3 0d 00 00"); + this.IsIconReplaceable = sig.ScanText("81 f9 2e 01 00 00 7f 39 81 f9 2d 01 00 00 0f 8d 11 02 00 00 83 c1 eb"); + } + } +} diff --git a/Dalamud/Game/Internal/Gui/TargetManager.cs b/Dalamud/Game/Internal/Gui/TargetManager.cs new file mode 100644 index 000000000..a6a1c45ee --- /dev/null +++ b/Dalamud/Game/Internal/Gui/TargetManager.cs @@ -0,0 +1,55 @@ +using Dalamud.Game.ClientState; +using Dalamud.Game.ClientState.Actors.Types; +using Dalamud.Game.ClientState.Structs.JobGauge; +using Dalamud.Hooking; +using Serilog; +using System; +using System.Diagnostics; +using System.Runtime.InteropServices; +using XIVLauncher.Dalamud; + +namespace Dalamud.Game.Internal.Gui { + public class TargetManager { + public delegate IntPtr GetTargetDelegate(IntPtr manager); + + private Hook getTargetHook; + + private TargetManagerAddressResolver Address; + + public unsafe TargetManager(Dalamud dalamud, SigScanner scanner) { + this.Address = new TargetManagerAddressResolver(); + this.Address.Setup(scanner); + + Log.Verbose("===== T A R G E T M A N A G E R ====="); + Log.Verbose("GetTarget address {GetTarget}", Address.GetTarget); + + this.getTargetHook = new Hook(this.Address.GetTarget, new GetTargetDelegate(GetTargetDetour), this); + } + + public void Enable() { + this.getTargetHook.Enable(); + } + + public void Dispose() { + this.getTargetHook.Dispose(); + } + + private IntPtr GetTargetDetour(IntPtr manager) + { + try { + var res = this.getTargetHook.Original(manager); + + var test = Marshal.ReadInt32(res); + + Log.Debug($"GetTargetDetour {manager.ToInt64():X} -> RET: {res:X}"); + + return res; + } + catch (Exception ex) + { + Log.Error(ex, "Exception GetTargetDetour hook."); + return this.getTargetHook.Original(manager); + } + } + } +} diff --git a/Dalamud/Game/Internal/Gui/TargetManagerAddressResolver.cs b/Dalamud/Game/Internal/Gui/TargetManagerAddressResolver.cs new file mode 100644 index 000000000..137742bc0 --- /dev/null +++ b/Dalamud/Game/Internal/Gui/TargetManagerAddressResolver.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Dalamud.Game.Internal.Gui { + class TargetManagerAddressResolver : BaseAddressResolver { + public IntPtr GetTarget { get; private set; } + + protected override void Setup64Bit(SigScanner sig) { + this.GetTarget = sig.ScanText("40 57 48 83 EC 40 48 8B F9 48 8B 49 08 48 8B 01 FF 50 40 66 83 B8 CA 81 00 00 00 74 33 48 8B 4F 08 48 8B 01 FF 50 40 66 83 B8 CA 81 00 00 04 74"); + } + } +} diff --git a/Dalamud/Game/Internal/Network/GameNetworkAddressResolver.cs b/Dalamud/Game/Internal/Network/GameNetworkAddressResolver.cs index 08868c3a4..02f76e865 100644 --- a/Dalamud/Game/Internal/Network/GameNetworkAddressResolver.cs +++ b/Dalamud/Game/Internal/Network/GameNetworkAddressResolver.cs @@ -5,7 +5,8 @@ namespace Dalamud.Game.Internal.Network { public IntPtr ProcessZonePacket { get; private set; } protected override void Setup64Bit(SigScanner sig) { - ProcessZonePacket = sig.ScanText("48 89 74 24 18 57 48 83 EC 50 8B F2 49 8B F8 41 0F B7 50 02 8B CE E8 ?? ?? 7A FF 0F B7 57 02 8D 42 89 3D 5F 02 00 00 0F 87 60 01 00 00 4C 8D 05"); + //ProcessZonePacket = sig.ScanText("48 89 74 24 18 57 48 83 EC 50 8B F2 49 8B F8 41 0F B7 50 02 8B CE E8 ?? ?? 7A FF 0F B7 57 02 8D 42 89 3D 5F 02 00 00 0F 87 60 01 00 00 4C 8D 05"); + ProcessZonePacket = sig.ScanText("48 89 74 24 18 57 48 83 EC 50 8B F2 49 8B F8 41 0F B7 50 02 8B CE E8 ?? ?? 73 FF 0F B7 57 02 8D 42 ?? 3D ?? ?? 00 00 0F 87 60 01 00 00 4C 8D 05"); } } } diff --git a/Dalamud/Game/Network/NetworkHandlers.cs b/Dalamud/Game/Network/NetworkHandlers.cs index 02d5c0e2b..ba3a636ac 100644 --- a/Dalamud/Game/Network/NetworkHandlers.cs +++ b/Dalamud/Game/Network/NetworkHandlers.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Dalamud.Game.Network.MarketBoardUploaders; using Dalamud.Game.Network.Structures; using Dalamud.Game.Network.Universalis.MarketBoardUploaders; -using Dalamud.Settings; using Serilog; namespace Dalamud.Game.Network { @@ -46,14 +45,14 @@ namespace Dalamud.Game.Network { } if (opCode == ZoneOpCode.FateSpawn) { - if (PersistentSettings.Instance.Fates == null) + if (this.dalamud.Configuration.Fates == null) return; var data = new byte[64]; Marshal.Copy(dataPtr, data, 0, 64); var fateId = data[16]; - if (PersistentSettings.Instance.Fates.Any(x => x.Id == fateId) && + if (this.dalamud.Configuration.Fates.Any(x => x.Id == fateId) && this.dalamud.BotManager.IsConnected) Task.Run(() => this.dalamud.BotManager.ProcessFate(fateId)); @@ -65,18 +64,16 @@ namespace Dalamud.Game.Network { Marshal.Copy(dataPtr, data, 0, 64); var notifyType = data[16]; - var contentFinderConditionId = BitConverter.ToInt16(data, 38); + var contentFinderConditionId = BitConverter.ToInt16(data, 28); Task.Run(async () => { - if (notifyType != 4) + if (notifyType != 2 || contentFinderConditionId == 0) return; var contentFinderCondition = await XivApi.GetContentFinderCondition(contentFinderConditionId); - this.dalamud.Framework.Gui.Chat.Print("Duty Finder pop: " + contentFinderCondition["Name"]); - if (this.dalamud.BotManager.IsConnected) await this.dalamud.BotManager.ProcessCfPop(contentFinderCondition); }); @@ -180,13 +177,13 @@ namespace Dalamud.Game.Network { } private enum ZoneOpCode { - CfNotify = 0x78, + CfNotify = 0x8F, RetainerSaleItemId = 0x13F, // TODO these are probably not accurate RetainerSaleFinish = 0x138, FateSpawn = 0x226, - MarketBoardItemRequestStart = 0x13B, - MarketBoardOfferings = 0x13C, - MarketBoardHistory = 0x140 + MarketBoardItemRequestStart = 0x39D, + MarketBoardOfferings = 0x36A, + MarketBoardHistory = 0x194 } } } diff --git a/Dalamud/Settings/PersistentSettings.cs b/Dalamud/Settings/PersistentSettings.cs deleted file mode 100644 index 243202586..000000000 --- a/Dalamud/Settings/PersistentSettings.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; -using Newtonsoft.Json; - -namespace Dalamud.Settings -{ - public class PersistentSettings { - private static PersistentSettings _instance = null; - - private static readonly string ConfigPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "settings.json"); - - public static PersistentSettings Instance { - get { - if (_instance == null) { - if (!File.Exists(ConfigPath)) { - _instance = new PersistentSettings(); - return _instance; - } - - _instance = JsonConvert.DeserializeObject(File.ReadAllText(ConfigPath)); - } - - return _instance; - } - } - - public class FateInfo { - public string Name { get; set; } - public int Id { get; set; } - } - - public List Fates; - - public List BadWords; - - public void Save() { - File.WriteAllText(ConfigPath, JsonConvert.SerializeObject(this)); - } - - public static void Reset() { - _instance = new PersistentSettings(); - Instance.Save(); - } - } -} diff --git a/Dalamud/XivApi.cs b/Dalamud/XivApi.cs index 6515541a5..dc5e5fa8b 100644 --- a/Dalamud/XivApi.cs +++ b/Dalamud/XivApi.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using Microsoft.CSharp.RuntimeBinder; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using Serilog; namespace Dalamud { @@ -68,6 +69,8 @@ namespace Dalamud public static async Task Get(string endpoint, bool noCache = false) { + Log.Verbose("XIVAPI FETCH: {0}", endpoint); + if (cachedResponses.ContainsKey(endpoint) && !noCache) return cachedResponses[endpoint];