From a40ad24b5329044f93eb3190aca5de3f840b5a15 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 7 Jul 2024 03:41:07 +0200 Subject: [PATCH] API 10; update mission-attribute logic --- LLib | 2 +- Squadronista/Solver/SquadronMember.cs | 2 +- Squadronista/Solver/SquadronSolver.cs | 8 +-- Squadronista/Solver/SquadronState.cs | 15 +++-- Squadronista/SquadronMission.cs | 1 - Squadronista/Squadronista.csproj | 59 ++------------------ Squadronista/SquadronistaPlugin.cs | 10 ++-- Squadronista/Windows/MainWindow.cs | 45 +++++++-------- Squadronista/packages.lock.json | 79 +++++++++++++++++++++++++-- 9 files changed, 122 insertions(+), 99 deletions(-) diff --git a/LLib b/LLib index 3792244..e206782 160000 --- a/LLib +++ b/LLib @@ -1 +1 @@ -Subproject commit 3792244261a9f5426a7916f5a6dd1966238ba84a +Subproject commit e206782c1106e1a5292a06af61783faef1ac0c42 diff --git a/Squadronista/Solver/SquadronMember.cs b/Squadronista/Solver/SquadronMember.cs index 8b52a4f..96891cf 100644 --- a/Squadronista/Solver/SquadronMember.cs +++ b/Squadronista/Solver/SquadronMember.cs @@ -14,7 +14,7 @@ internal sealed class SquadronMember : IEquatable public required uint ClassJob { get; init; } public required Race Race { get; init; } - public required uint EnlistmentTimestamp { get; init; } + public required int EnlistmentTimestamp { get; init; } public uint Experience { get; init; } public int PhysicalAbility => GrowthParams[Level].PhysicalAbility; public int MentalAbility => GrowthParams[Level].MentalAbility; diff --git a/Squadronista/Solver/SquadronSolver.cs b/Squadronista/Solver/SquadronSolver.cs index 20d2d4a..13d84e4 100644 --- a/Squadronista/Solver/SquadronSolver.cs +++ b/Squadronista/Solver/SquadronSolver.cs @@ -38,11 +38,11 @@ internal sealed class SquadronSolver _newTrainings = _calculatedTrainings.Keys.ToList(); } - public IEnumerable SolveFor(SquadronMission mission, int requiredMatchingStats) + public IEnumerable SolveFor(SquadronMission mission, Attributes missionAttributes, int requiredMatchingStats) { - int minPhysical = mission.CurrentAttributes!.PhysicalAbility; - int minMental = mission.CurrentAttributes!.MentalAbility; - int minTactical = mission.CurrentAttributes!.TacticalAbility; + int minPhysical = missionAttributes.PhysicalAbility; + int minMental = missionAttributes.MentalAbility; + int minTactical = missionAttributes.TacticalAbility; bool foundWithoutTraining = false; List intermediates = CalculateForAllMemberCombinations(mission.Level, _state.Bonus); diff --git a/Squadronista/Solver/SquadronState.cs b/Squadronista/Solver/SquadronState.cs index a416f8b..84153d2 100644 --- a/Squadronista/Solver/SquadronState.cs +++ b/Squadronista/Solver/SquadronState.cs @@ -5,15 +5,20 @@ namespace Squadronista.Solver; internal sealed class SquadronState { - private readonly Dictionary> _calculationResults = new(); + private readonly Dictionary<(int id, Attributes attributes), Task> _calculationResults = new(); public required IReadOnlyList Members { get; init; } public required BonusAttributes Bonus { get; set; } public required uint CurrentTraining { get; set; } - public Task? GetCalculation(SquadronMission mission) - => _calculationResults.TryGetValue(mission, out var task) ? task : null; + public Task? GetCalculation(SquadronMission mission, Attributes? attributes) + { + if (attributes == null) + return null; - public void SetCalculation(SquadronMission mission, Task task) - => _calculationResults[mission] = task; + return _calculationResults.GetValueOrDefault((mission.Id, attributes)); + } + + public void SetCalculation(SquadronMission mission, Attributes attributes, Task task) + => _calculationResults[(mission.Id, attributes)] = task; } diff --git a/Squadronista/SquadronMission.cs b/Squadronista/SquadronMission.cs index 13d4bce..5434bfd 100644 --- a/Squadronista/SquadronMission.cs +++ b/Squadronista/SquadronMission.cs @@ -11,5 +11,4 @@ internal sealed class SquadronMission public required bool IsFlaggedMission { get; init; } public required IReadOnlyList PossibleAttributes { get; init; } - public Attributes? CurrentAttributes { get; set; } } diff --git a/Squadronista/Squadronista.csproj b/Squadronista/Squadronista.csproj index f9b0ec1..55f5b55 100644 --- a/Squadronista/Squadronista.csproj +++ b/Squadronista/Squadronista.csproj @@ -1,64 +1,13 @@ - + - net8.0-windows - 3.0 - 12 - enable - true - false - false + 4.0 dist - true - portable - $(SolutionDir)=X:\ - true - portable - - $(appdata)\XIVLauncher\addon\Hooks\dev\ - - - - $(DALAMUD_HOME)/ - + + - - - - - - - - $(DalamudLibPath)Dalamud.dll - false - - - $(DalamudLibPath)ImGui.NET.dll - false - - - $(DalamudLibPath)Lumina.dll - false - - - $(DalamudLibPath)Lumina.Excel.dll - false - - - $(DalamudLibPath)Newtonsoft.Json.dll - false - - - $(DalamudLibPath)FFXIVClientStructs.dll - false - - - - - - diff --git a/Squadronista/SquadronistaPlugin.cs b/Squadronista/SquadronistaPlugin.cs index e6c080d..f3fb760 100644 --- a/Squadronista/SquadronistaPlugin.cs +++ b/Squadronista/SquadronistaPlugin.cs @@ -20,7 +20,7 @@ public sealed class SquadronistaPlugin : IDalamudPlugin { private readonly WindowSystem _windowSystem = new(nameof(SquadronistaPlugin)); - private readonly DalamudPluginInterface _pluginInterface; + private readonly IDalamudPluginInterface _pluginInterface; private readonly IClientState _clientState; private readonly IPluginLog _pluginLog; private readonly IDataManager _dataManager; @@ -28,7 +28,7 @@ public sealed class SquadronistaPlugin : IDalamudPlugin private readonly IReadOnlyList _allMissions; private readonly MainWindow _mainWindow; - public SquadronistaPlugin(DalamudPluginInterface pluginInterface, IClientState clientState, IPluginLog pluginLog, + public SquadronistaPlugin(IDalamudPluginInterface pluginInterface, IClientState clientState, IPluginLog pluginLog, IDataManager dataManager, IAddonLifecycle addonLifecycle, IGameGui gameGui) { ArgumentNullException.ThrowIfNull(dataManager); @@ -194,8 +194,6 @@ public sealed class SquadronistaPlugin : IDalamudPlugin private void ResetCharacterSpecificData() { SquadronState = null; - foreach (var mission in _allMissions) - mission.CurrentAttributes = null; } public void Dispose() @@ -208,8 +206,8 @@ public sealed class SquadronistaPlugin : IDalamudPlugin _pluginInterface.UiBuilder.Draw -= _windowSystem.Draw; } - [StructLayout(LayoutKind.Explicit, Size = 0xB18)] + [StructLayout(LayoutKind.Explicit, Size = 0xB28)] private struct ExtendedGcArmyData { - [FieldOffset(0x284)] public ushort CurrentTraining; + [FieldOffset(0x2C4)] public ushort CurrentTraining; } } diff --git a/Squadronista/Windows/MainWindow.cs b/Squadronista/Windows/MainWindow.cs index 1138dfb..80aa617 100644 --- a/Squadronista/Windows/MainWindow.cs +++ b/Squadronista/Windows/MainWindow.cs @@ -100,8 +100,9 @@ internal sealed class MainWindow : LWindow, IDisposable } var selectedMission = _plugin.AvailableMissions[agentExpedition->SelectedRow]; - if (selectedMission.CurrentAttributes != null) - ImGui.Text($"{selectedMission.Name} ({selectedMission.CurrentAttributes})"); + var missionAttributes = FindCurrentAttributeIndex(agentExpedition, selectedMission); + if (missionAttributes != null) + ImGui.Text($"{selectedMission.Name} ({missionAttributes})"); else ImGui.Text($"{selectedMission.Name}"); @@ -116,7 +117,7 @@ internal sealed class MainWindow : LWindow, IDisposable } else { - var task = state.GetCalculation(selectedMission); + var task = state.GetCalculation(selectedMission, missionAttributes); if (task != null) { if (task.IsCompletedSuccessfully) @@ -175,21 +176,21 @@ internal sealed class MainWindow : LWindow, IDisposable ImGui.Text("Final Stats:"); ImGui.SameLine(0); ImGui.TextColored( - result.PhysicalAbility >= selectedMission.CurrentAttributes!.PhysicalAbility + result.PhysicalAbility >= missionAttributes!.PhysicalAbility ? ImGuiColors.HealerGreen : ImGuiColors.DalamudYellow, $"{result.PhysicalAbility}"); ImGui.SameLine(0); ImGui.Text("/"); ImGui.SameLine(0); ImGui.TextColored( - result.MentalAbility >= selectedMission.CurrentAttributes!.MentalAbility + result.MentalAbility >= missionAttributes.MentalAbility ? ImGuiColors.HealerGreen : ImGuiColors.DalamudYellow, $"{result.MentalAbility}"); ImGui.SameLine(0); ImGui.Text("/"); ImGui.SameLine(0); ImGui.TextColored( - result.TacticalAbility >= selectedMission.CurrentAttributes!.TacticalAbility + result.TacticalAbility >= missionAttributes.TacticalAbility ? ImGuiColors.HealerGreen : ImGuiColors.DalamudYellow, $"{result.TacticalAbility}"); @@ -198,7 +199,7 @@ internal sealed class MainWindow : LWindow, IDisposable } else { - ImGui.TextColored(ImGuiColors.DalamudRed, $"No combination of members/trainings can achieve\n{(selectedMission.IsFlaggedMission ? "all" : "2 out of 3")} attributes for {selectedMission.CurrentAttributes}."); + ImGui.TextColored(ImGuiColors.DalamudRed, $"No combination of members/trainings can achieve\n{(selectedMission.IsFlaggedMission ? "all" : "2 out of 3")} attributes for {missionAttributes}."); ImGui.Text("Level the squadron further and check again."); } } @@ -209,16 +210,13 @@ internal sealed class MainWindow : LWindow, IDisposable } else { - if (selectedMission.CurrentAttributes == null) - FindCurrentAttributeIndex(agentExpedition, selectedMission); - - if (selectedMission.CurrentAttributes == null) + if (missionAttributes == null) { ImGui.Text("No matching mission found...?"); return; } - state.SetCalculation(selectedMission, Task.Factory.StartNew(() => + state.SetCalculation(selectedMission, missionAttributes, Task.Factory.StartNew(() => { var solver = new SquadronSolver(_pluginLog, state, _plugin.Trainings); @@ -230,7 +228,7 @@ internal sealed class MainWindow : LWindow, IDisposable if (selectedMission.IsFlaggedMission) { // only relevant when all 3 stats match - var perfectMatches = solver.SolveFor(selectedMission, 3).ToList(); + var perfectMatches = solver.SolveFor(selectedMission, missionAttributes, 3).ToList(); if (perfectMatches.Count > 0) { results.Results.Add(perfectMatches @@ -241,7 +239,7 @@ internal sealed class MainWindow : LWindow, IDisposable } else { - var matches = solver.SolveFor(selectedMission, 2) + var matches = solver.SolveFor(selectedMission, missionAttributes, 2) .OrderByDescending(x => x.MatchingAttributes) .ThenBy(x => x.Trainings.Count) .ThenBy(x => x.Members.Sum(y => y.Level)) @@ -284,7 +282,7 @@ internal sealed class MainWindow : LWindow, IDisposable } } - private unsafe void FindCurrentAttributeIndex(AgentGcArmyExpedition* agentExpedition, + private unsafe Attributes? FindCurrentAttributeIndex(AgentGcArmyExpedition* agentExpedition, SquadronMission selectedMission) { AddonGcArmyExpedition* addonExpedition = @@ -292,11 +290,11 @@ internal sealed class MainWindow : LWindow, IDisposable // should never happen if (addonExpedition == null || !LAddon.IsAddonReady(&addonExpedition->AtkUnitBase)) - return; + return null; AtkComponentBase* requiredAttribComponent = addonExpedition->RequiredAttributesComponentNode; if (requiredAttribComponent == null) - return; + return null; AtkComponentNode* physicalComponent = GetNodeById(requiredAttribComponent->UldManager, 2); AtkComponentNode* mentalComponent = GetNodeById(requiredAttribComponent->UldManager, 4); @@ -304,7 +302,7 @@ internal sealed class MainWindow : LWindow, IDisposable if (physicalComponent == null || mentalComponent == null || tacticalComponent == null) { _pluginLog.Warning("Could not parse required attribute children"); - return; + return null; } AtkTextNode* physicalText = GetNodeById(physicalComponent->Component->UldManager, 2); @@ -313,7 +311,7 @@ internal sealed class MainWindow : LWindow, IDisposable if (physicalText == null || mentalText == null || tacticalText == null) { _pluginLog.Warning("Could not parse required attribute texts"); - return; + return null; } int physical = int.Parse(physicalText->NodeText.ToString(), CultureInfo.InvariantCulture); @@ -327,9 +325,12 @@ internal sealed class MainWindow : LWindow, IDisposable TacticalAbility = tactical, }; if (selectedMission.PossibleAttributes.Contains(newAttributes)) - selectedMission.CurrentAttributes = newAttributes; + return newAttributes; else + { _pluginLog.Warning($"Wrong attributes for {selectedMission.Name}: {newAttributes}"); + return null; + } } private static unsafe T* GetNodeById(AtkUldManager uldManager, uint nodeId, NodeType? type = null) @@ -338,8 +339,8 @@ internal sealed class MainWindow : LWindow, IDisposable for (var i = 0; i < uldManager.NodeListCount; i++) { var n = uldManager.NodeList[i]; - if (n->NodeID != nodeId || type != null && n->Type != type.Value) continue; - if (!n->IsVisible) continue; + if (n->NodeId != nodeId || type != null && n->Type != type.Value) continue; + if (!n->IsVisible()) continue; return (T*)n; } diff --git a/Squadronista/packages.lock.json b/Squadronista/packages.lock.json index 9cba519..f5ad582 100644 --- a/Squadronista/packages.lock.json +++ b/Squadronista/packages.lock.json @@ -4,12 +4,83 @@ "net8.0-windows7.0": { "DalamudPackager": { "type": "Direct", - "requested": "[2.1.12, )", - "resolved": "2.1.12", - "contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg==" + "requested": "[2.1.13, )", + "resolved": "2.1.13", + "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ==" + }, + "DotNet.ReproducibleBuilds": { + "type": "Direct", + "requested": "[1.1.1, )", + "resolved": "1.1.1", + "contentHash": "+H2t/t34h6mhEoUvHi8yGXyuZ2GjSovcGYehJrS2MDm2XgmPfZL2Sdxg+uL2lKgZ4M6tTwKHIlxOob2bgh0NRQ==", + "dependencies": { + "Microsoft.SourceLink.AzureRepos.Git": "1.1.1", + "Microsoft.SourceLink.Bitbucket.Git": "1.1.1", + "Microsoft.SourceLink.GitHub": "1.1.1", + "Microsoft.SourceLink.GitLab": "1.1.1" + } + }, + "Microsoft.SourceLink.Gitea": { + "type": "Direct", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "KOBodmDnlWGIqZt2hT47Q69TIoGhIApDVLCyyj9TT5ct8ju16AbHYcB4XeknoHX562wO1pMS/1DfBIZK+V+sxg==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" + } + }, + "Microsoft.Build.Tasks.Git": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" + }, + "Microsoft.SourceLink.AzureRepos.Git": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "qB5urvw9LO2bG3eVAkuL+2ughxz2rR7aYgm2iyrB8Rlk9cp2ndvGRCvehk3rNIhRuNtQaeKwctOl1KvWiklv5w==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.1.1", + "Microsoft.SourceLink.Common": "1.1.1" + } + }, + "Microsoft.SourceLink.Bitbucket.Git": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "cDzxXwlyWpLWaH0em4Idj0H3AmVo3L/6xRXKssYemx+7W52iNskj/SQ4FOmfCb8YQt39otTDNMveCZzYtMoucQ==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.1.1", + "Microsoft.SourceLink.Common": "1.1.1" + } + }, + "Microsoft.SourceLink.Common": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + }, + "Microsoft.SourceLink.GitHub": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.1.1", + "Microsoft.SourceLink.Common": "1.1.1" + } + }, + "Microsoft.SourceLink.GitLab": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "tvsg47DDLqqedlPeYVE2lmiTpND8F0hkrealQ5hYltSmvruy/Gr5nHAKSsjyw5L3NeM/HLMI5ORv7on/M4qyZw==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "1.1.1", + "Microsoft.SourceLink.Common": "1.1.1" + } }, "llib": { - "type": "Project" + "type": "Project", + "dependencies": { + "DalamudPackager": "[2.1.13, )" + } } } }