liza
/
Squadronista
1
0
Fork 0
Code Issues Pull Requests Releases 9 Activity

API 10; update mission-attribute logic

master v4.0
Liza 2024-07-07 03:41:07 +02:00
parent 2228338a33
commit a40ad24b53
Signed by: liza
GPG Key ID: 7199F8D727D55F67
9 changed files with 122 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LLib

@ -1 +1 @@
Subproject commit 3792244261a9f5426a7916f5a6dd1966238ba84a Subproject commit e206782c1106e1a5292a06af61783faef1ac0c42

2
Squadronista/Solver/SquadronMember.cs
View File

@ -14,7 +14,7 @@ internal sealed class SquadronMember : IEquatable<SquadronMember>
public required uint ClassJob { get; init; } public required uint ClassJob { get; init; }
public required Race Race { 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 uint Experience { get; init; }
public int PhysicalAbility => GrowthParams[Level].PhysicalAbility; public int PhysicalAbility => GrowthParams[Level].PhysicalAbility;
public int MentalAbility => GrowthParams[Level].MentalAbility; public int MentalAbility => GrowthParams[Level].MentalAbility;

8
Squadronista/Solver/SquadronSolver.cs
View File

@ -38,11 +38,11 @@ internal sealed class SquadronSolver
_newTrainings = _calculatedTrainings.Keys.ToList(); _newTrainings = _calculatedTrainings.Keys.ToList();
} }
public IEnumerable<CalculationResult> SolveFor(SquadronMission mission, int requiredMatchingStats) public IEnumerable<CalculationResult> SolveFor(SquadronMission mission, Attributes missionAttributes, int requiredMatchingStats)
{ {
int minPhysical = mission.CurrentAttributes!.PhysicalAbility; int minPhysical = missionAttributes.PhysicalAbility;
int minMental = mission.CurrentAttributes!.MentalAbility; int minMental = missionAttributes.MentalAbility;
int minTactical = mission.CurrentAttributes!.TacticalAbility; int minTactical = missionAttributes.TacticalAbility;
bool foundWithoutTraining = false; bool foundWithoutTraining = false;
List<CalculationResult> intermediates = CalculateForAllMemberCombinations(mission.Level, _state.Bonus); List<CalculationResult> intermediates = CalculateForAllMemberCombinations(mission.Level, _state.Bonus);

15
Squadronista/Solver/SquadronState.cs
View File

@ -5,15 +5,20 @@ namespace Squadronista.Solver;
internal sealed class SquadronState internal sealed class SquadronState
{ {
private readonly Dictionary<SquadronMission, Task<SquadronSolver.CalculationResults>> _calculationResults = new(); private readonly Dictionary<(int id, Attributes attributes), Task<SquadronSolver.CalculationResults>> _calculationResults = new();
public required IReadOnlyList<SquadronMember> Members { get; init; } public required IReadOnlyList<SquadronMember> Members { get; init; }
public required BonusAttributes Bonus { get; set; } public required BonusAttributes Bonus { get; set; }
public required uint CurrentTraining { get; set; } public required uint CurrentTraining { get; set; }
public Task<SquadronSolver.CalculationResults>? GetCalculation(SquadronMission mission) public Task<SquadronSolver.CalculationResults>? GetCalculation(SquadronMission mission, Attributes? attributes)
=> _calculationResults.TryGetValue(mission, out var task) ? task : null; {
if (attributes == null)
return null;
public void SetCalculation(SquadronMission mission, Task<SquadronSolver.CalculationResults> task) return _calculationResults.GetValueOrDefault((mission.Id, attributes));
=> _calculationResults[mission] = task; }
public void SetCalculation(SquadronMission mission, Attributes attributes, Task<SquadronSolver.CalculationResults> task)
=> _calculationResults[(mission.Id, attributes)] = task;
} }

1
Squadronista/SquadronMission.cs
View File

@ -11,5 +11,4 @@ internal sealed class SquadronMission
public required bool IsFlaggedMission { get; init; } public required bool IsFlaggedMission { get; init; }
public required IReadOnlyList<Attributes> PossibleAttributes { get; init; } public required IReadOnlyList<Attributes> PossibleAttributes { get; init; }
public Attributes? CurrentAttributes { get; set; }
} }

59
Squadronista/Squadronista.csproj
View File

@ -1,64 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Dalamud.NET.Sdk/9.0.2">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework> <Version>4.0</Version>
<Version>3.0</Version>
<LangVersion>12</LangVersion>
<Nullable>enable</Nullable>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<OutputPath>dist</OutputPath> <OutputPath>dist</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugType>portable</DebugType>
<PathMap Condition="$(SolutionDir) != ''">$(SolutionDir)=X:\</PathMap>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<DebugType>portable</DebugType>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <Import Project="..\LLib\LLib.targets"/>
<DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath> <Import Project="..\LLib\RenameZip.targets"/>
</PropertyGroup>
<PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">
<DalamudLibPath>$(DALAMUD_HOME)/</DalamudLibPath>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\LLib\LLib.csproj" /> <ProjectReference Include="..\LLib\LLib.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="DalamudPackager" Version="2.1.12"/>
</ItemGroup>
<ItemGroup>
<Reference Include="Dalamud">
<HintPath>$(DalamudLibPath)Dalamud.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="ImGui.NET">
<HintPath>$(DalamudLibPath)ImGui.NET.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="Lumina">
<HintPath>$(DalamudLibPath)Lumina.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="Lumina.Excel">
<HintPath>$(DalamudLibPath)Lumina.Excel.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="FFXIVClientStructs">
<HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath>
<Private>false</Private>
</Reference>
</ItemGroup>
<Target Name="RenameLatestZip" AfterTargets="PackagePlugin" Condition="'$(Configuration)' == 'Release'">
<Exec Command="rename $(OutDir)$(AssemblyName)\latest.zip $(AssemblyName)-$(Version).zip"/>
</Target>
</Project> </Project>

10
Squadronista/SquadronistaPlugin.cs
View File

@ -20,7 +20,7 @@ public sealed class SquadronistaPlugin : IDalamudPlugin
{ {
private readonly WindowSystem _windowSystem = new(nameof(SquadronistaPlugin)); private readonly WindowSystem _windowSystem = new(nameof(SquadronistaPlugin));
private readonly DalamudPluginInterface _pluginInterface; private readonly IDalamudPluginInterface _pluginInterface;
private readonly IClientState _clientState; private readonly IClientState _clientState;
private readonly IPluginLog _pluginLog; private readonly IPluginLog _pluginLog;
private readonly IDataManager _dataManager; private readonly IDataManager _dataManager;
@ -28,7 +28,7 @@ public sealed class SquadronistaPlugin : IDalamudPlugin
private readonly IReadOnlyList<SquadronMission> _allMissions; private readonly IReadOnlyList<SquadronMission> _allMissions;
private readonly MainWindow _mainWindow; 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) IDataManager dataManager, IAddonLifecycle addonLifecycle, IGameGui gameGui)
{ {
ArgumentNullException.ThrowIfNull(dataManager); ArgumentNullException.ThrowIfNull(dataManager);
@ -194,8 +194,6 @@ public sealed class SquadronistaPlugin : IDalamudPlugin
private void ResetCharacterSpecificData() private void ResetCharacterSpecificData()
{ {
SquadronState = null; SquadronState = null;
foreach (var mission in _allMissions)
mission.CurrentAttributes = null;
} }
public void Dispose() public void Dispose()
@ -208,8 +206,8 @@ public sealed class SquadronistaPlugin : IDalamudPlugin
_pluginInterface.UiBuilder.Draw -= _windowSystem.Draw; _pluginInterface.UiBuilder.Draw -= _windowSystem.Draw;
} }
[StructLayout(LayoutKind.Explicit, Size = 0xB18)] [StructLayout(LayoutKind.Explicit, Size = 0xB28)]
private struct ExtendedGcArmyData { private struct ExtendedGcArmyData {
[FieldOffset(0x284)] public ushort CurrentTraining; [FieldOffset(0x2C4)] public ushort CurrentTraining;
} }
} }

45
Squadronista/Windows/MainWindow.cs
View File

@ -100,8 +100,9 @@ internal sealed class MainWindow : LWindow, IDisposable
} }
var selectedMission = _plugin.AvailableMissions[agentExpedition->SelectedRow]; var selectedMission = _plugin.AvailableMissions[agentExpedition->SelectedRow];
if (selectedMission.CurrentAttributes != null) var missionAttributes = FindCurrentAttributeIndex(agentExpedition, selectedMission);
ImGui.Text($"{selectedMission.Name} ({selectedMission.CurrentAttributes})"); if (missionAttributes != null)
ImGui.Text($"{selectedMission.Name} ({missionAttributes})");
else else
ImGui.Text($"{selectedMission.Name}"); ImGui.Text($"{selectedMission.Name}");
@ -116,7 +117,7 @@ internal sealed class MainWindow : LWindow, IDisposable
} }
else else
{ {
var task = state.GetCalculation(selectedMission); var task = state.GetCalculation(selectedMission, missionAttributes);
if (task != null) if (task != null)
{ {
if (task.IsCompletedSuccessfully) if (task.IsCompletedSuccessfully)
@ -175,21 +176,21 @@ internal sealed class MainWindow : LWindow, IDisposable
ImGui.Text("Final Stats:"); ImGui.Text("Final Stats:");
ImGui.SameLine(0); ImGui.SameLine(0);
ImGui.TextColored( ImGui.TextColored(
result.PhysicalAbility >= selectedMission.CurrentAttributes!.PhysicalAbility result.PhysicalAbility >= missionAttributes!.PhysicalAbility
? ImGuiColors.HealerGreen ? ImGuiColors.HealerGreen
: ImGuiColors.DalamudYellow, $"{result.PhysicalAbility}"); : ImGuiColors.DalamudYellow, $"{result.PhysicalAbility}");
ImGui.SameLine(0); ImGui.SameLine(0);
ImGui.Text("/"); ImGui.Text("/");
ImGui.SameLine(0); ImGui.SameLine(0);
ImGui.TextColored( ImGui.TextColored(
result.MentalAbility >= selectedMission.CurrentAttributes!.MentalAbility result.MentalAbility >= missionAttributes.MentalAbility
? ImGuiColors.HealerGreen ? ImGuiColors.HealerGreen
: ImGuiColors.DalamudYellow, $"{result.MentalAbility}"); : ImGuiColors.DalamudYellow, $"{result.MentalAbility}");
ImGui.SameLine(0); ImGui.SameLine(0);
ImGui.Text("/"); ImGui.Text("/");
ImGui.SameLine(0); ImGui.SameLine(0);
ImGui.TextColored( ImGui.TextColored(
result.TacticalAbility >= selectedMission.CurrentAttributes!.TacticalAbility result.TacticalAbility >= missionAttributes.TacticalAbility
? ImGuiColors.HealerGreen ? ImGuiColors.HealerGreen
: ImGuiColors.DalamudYellow, $"{result.TacticalAbility}"); : ImGuiColors.DalamudYellow, $"{result.TacticalAbility}");
@ -198,7 +199,7 @@ internal sealed class MainWindow : LWindow, IDisposable
} }
else 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."); ImGui.Text("Level the squadron further and check again.");
} }
} }
@ -209,16 +210,13 @@ internal sealed class MainWindow : LWindow, IDisposable
} }
else else
{ {
if (selectedMission.CurrentAttributes == null) if (missionAttributes == null)
FindCurrentAttributeIndex(agentExpedition, selectedMission);
if (selectedMission.CurrentAttributes == null)
{ {
ImGui.Text("No matching mission found...?"); ImGui.Text("No matching mission found...?");
return; return;
} }
state.SetCalculation(selectedMission, Task.Factory.StartNew(() => state.SetCalculation(selectedMission, missionAttributes, Task.Factory.StartNew(() =>
{ {
var solver = new SquadronSolver(_pluginLog, state, _plugin.Trainings); var solver = new SquadronSolver(_pluginLog, state, _plugin.Trainings);
@ -230,7 +228,7 @@ internal sealed class MainWindow : LWindow, IDisposable
if (selectedMission.IsFlaggedMission) if (selectedMission.IsFlaggedMission)
{ {
// only relevant when all 3 stats match // 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) if (perfectMatches.Count > 0)
{ {
results.Results.Add(perfectMatches results.Results.Add(perfectMatches
@ -241,7 +239,7 @@ internal sealed class MainWindow : LWindow, IDisposable
} }
else else
{ {
var matches = solver.SolveFor(selectedMission, 2) var matches = solver.SolveFor(selectedMission, missionAttributes, 2)
.OrderByDescending(x => x.MatchingAttributes) .OrderByDescending(x => x.MatchingAttributes)
.ThenBy(x => x.Trainings.Count) .ThenBy(x => x.Trainings.Count)
.ThenBy(x => x.Members.Sum(y => y.Level)) .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) SquadronMission selectedMission)
{ {
AddonGcArmyExpedition* addonExpedition = AddonGcArmyExpedition* addonExpedition =
@ -292,11 +290,11 @@ internal sealed class MainWindow : LWindow, IDisposable
// should never happen // should never happen
if (addonExpedition == null || !LAddon.IsAddonReady(&addonExpedition->AtkUnitBase)) if (addonExpedition == null || !LAddon.IsAddonReady(&addonExpedition->AtkUnitBase))
return; return null;
AtkComponentBase* requiredAttribComponent = addonExpedition->RequiredAttributesComponentNode; AtkComponentBase* requiredAttribComponent = addonExpedition->RequiredAttributesComponentNode;
if (requiredAttribComponent == null) if (requiredAttribComponent == null)
return; return null;
AtkComponentNode* physicalComponent = GetNodeById<AtkComponentNode>(requiredAttribComponent->UldManager, 2); AtkComponentNode* physicalComponent = GetNodeById<AtkComponentNode>(requiredAttribComponent->UldManager, 2);
AtkComponentNode* mentalComponent = GetNodeById<AtkComponentNode>(requiredAttribComponent->UldManager, 4); AtkComponentNode* mentalComponent = GetNodeById<AtkComponentNode>(requiredAttribComponent->UldManager, 4);
@ -304,7 +302,7 @@ internal sealed class MainWindow : LWindow, IDisposable
if (physicalComponent == null || mentalComponent == null || tacticalComponent == null) if (physicalComponent == null || mentalComponent == null || tacticalComponent == null)
{ {
_pluginLog.Warning("Could not parse required attribute children"); _pluginLog.Warning("Could not parse required attribute children");
return; return null;
} }
AtkTextNode* physicalText = GetNodeById<AtkTextNode>(physicalComponent->Component->UldManager, 2); AtkTextNode* physicalText = GetNodeById<AtkTextNode>(physicalComponent->Component->UldManager, 2);
@ -313,7 +311,7 @@ internal sealed class MainWindow : LWindow, IDisposable
if (physicalText == null || mentalText == null || tacticalText == null) if (physicalText == null || mentalText == null || tacticalText == null)
{ {
_pluginLog.Warning("Could not parse required attribute texts"); _pluginLog.Warning("Could not parse required attribute texts");
return; return null;
} }
int physical = int.Parse(physicalText->NodeText.ToString(), CultureInfo.InvariantCulture); int physical = int.Parse(physicalText->NodeText.ToString(), CultureInfo.InvariantCulture);
@ -327,9 +325,12 @@ internal sealed class MainWindow : LWindow, IDisposable
TacticalAbility = tactical, TacticalAbility = tactical,
}; };
if (selectedMission.PossibleAttributes.Contains(newAttributes)) if (selectedMission.PossibleAttributes.Contains(newAttributes))
selectedMission.CurrentAttributes = newAttributes; return newAttributes;
else else
{
_pluginLog.Warning($"Wrong attributes for {selectedMission.Name}: {newAttributes}"); _pluginLog.Warning($"Wrong attributes for {selectedMission.Name}: {newAttributes}");
return null;
}
} }
private static unsafe T* GetNodeById<T>(AtkUldManager uldManager, uint nodeId, NodeType? type = null) private static unsafe T* GetNodeById<T>(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++) for (var i = 0; i < uldManager.NodeListCount; i++)
{ {
var n = uldManager.NodeList[i]; var n = uldManager.NodeList[i];
if (n->NodeID != nodeId || type != null && n->Type != type.Value) continue; if (n->NodeId != nodeId || type != null && n->Type != type.Value) continue;
if (!n->IsVisible) continue; if (!n->IsVisible()) continue;
return (T*)n; return (T*)n;
} }

79
Squadronista/packages.lock.json
View File

@ -4,12 +4,83 @@
"net8.0-windows7.0": { "net8.0-windows7.0": {
"DalamudPackager": { "DalamudPackager": {
"type": "Direct", "type": "Direct",
"requested": "[2.1.12, )", "requested": "[2.1.13, )",
"resolved": "2.1.12", "resolved": "2.1.13",
"contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg==" "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": { "llib": {
"type": "Project" "type": "Project",
"dependencies": {
"DalamudPackager": "[2.1.13, )"
}
} }
} }
} }