Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
a40ad24b53 | |||
2228338a33 | |||
cf0e72ba4d | |||
6891846716 | |||
4fe1ab1825 | |||
9ade97fbad | |||
4122853a96 | |||
c859e2553c | |||
821311e4cc | |||
dfd77a0256 |
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
[submodule "LLib"]
|
||||
path = LLib
|
||||
url = https://git.carvel.li/liza/LLib.git
|
1
LLib
Submodule
1
LLib
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit e206782c1106e1a5292a06af61783faef1ac0c42
|
@ -2,6 +2,8 @@
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Squadronista", "Squadronista\Squadronista.csproj", "{71E7BF47-88EE-48F4-8FBE-F89F20F34F38}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LLib", "LLib\LLib.csproj", "{5D61CA78-142C-4DC8-A780-268DB96D8D5B}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@ -12,5 +14,9 @@ Global
|
||||
{71E7BF47-88EE-48F4-8FBE-F89F20F34F38}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{71E7BF47-88EE-48F4-8FBE-F89F20F34F38}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{71E7BF47-88EE-48F4-8FBE-F89F20F34F38}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{5D61CA78-142C-4DC8-A780-268DB96D8D5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5D61CA78-142C-4DC8-A780-268DB96D8D5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5D61CA78-142C-4DC8-A780-268DB96D8D5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5D61CA78-142C-4DC8-A780-268DB96D8D5B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
1017
Squadronista/.editorconfig
Normal file
1017
Squadronista/.editorconfig
Normal file
File diff suppressed because it is too large
Load Diff
45
Squadronista/Solver/Attributes.cs
Normal file
45
Squadronista/Solver/Attributes.cs
Normal file
@ -0,0 +1,45 @@
|
||||
using System;
|
||||
|
||||
namespace Squadronista.Solver;
|
||||
|
||||
internal class Attributes : IEquatable<Attributes>
|
||||
{
|
||||
public required int PhysicalAbility { get; init; }
|
||||
public required int MentalAbility { get; init; }
|
||||
public required int TacticalAbility { get; init; }
|
||||
|
||||
public bool Equals(Attributes? other)
|
||||
{
|
||||
if (ReferenceEquals(null, other)) return false;
|
||||
if (ReferenceEquals(this, other)) return true;
|
||||
return PhysicalAbility == other.PhysicalAbility && MentalAbility == other.MentalAbility && TacticalAbility == other.TacticalAbility;
|
||||
}
|
||||
|
||||
public override bool Equals(object? obj)
|
||||
{
|
||||
if (ReferenceEquals(null, obj)) return false;
|
||||
if (ReferenceEquals(this, obj)) return true;
|
||||
if (obj.GetType() != this.GetType()) return false;
|
||||
return Equals((Attributes)obj);
|
||||
}
|
||||
|
||||
public override int GetHashCode()
|
||||
{
|
||||
return HashCode.Combine(PhysicalAbility, MentalAbility, TacticalAbility);
|
||||
}
|
||||
|
||||
public static bool operator ==(Attributes? left, Attributes? right)
|
||||
{
|
||||
return Equals(left, right);
|
||||
}
|
||||
|
||||
public static bool operator !=(Attributes? left, Attributes? right)
|
||||
{
|
||||
return !Equals(left, right);
|
||||
}
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return $"{PhysicalAbility} / {MentalAbility} / {TacticalAbility}";
|
||||
}
|
||||
}
|
@ -6,11 +6,8 @@ namespace Squadronista.Solver;
|
||||
/// Bonus stats from training, these apply to the whole squadron (e.g. if you have 120/80/80, and no members selected,
|
||||
/// the mission would be at 120/80/80).
|
||||
/// </summary>
|
||||
internal sealed class BonusAttributes : IEquatable<BonusAttributes>
|
||||
internal sealed class BonusAttributes : Attributes, IEquatable<BonusAttributes>
|
||||
{
|
||||
public required int PhysicalAbility { get; init; }
|
||||
public required int MentalAbility { get; init; }
|
||||
public required int TacticalAbility { get; init; }
|
||||
public required int Cap { get; init; }
|
||||
|
||||
public BonusAttributes ApplyTraining(Training training)
|
||||
@ -57,7 +54,7 @@ internal sealed class BonusAttributes : IEquatable<BonusAttributes>
|
||||
}
|
||||
}
|
||||
|
||||
private void Fix(ref int mainStat, int mainGained, ref int otherStatA, int otherGainedA, ref int otherStatB, int otherGainedB)
|
||||
private static void Fix(ref int mainStat, int mainGained, ref int otherStatA, int otherGainedA, ref int otherStatB, int otherGainedB)
|
||||
{
|
||||
if (mainStat >= 0 || mainGained > 0)
|
||||
return;
|
||||
|
@ -1,3 +1,4 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Dalamud.Plugin.Services;
|
||||
@ -5,16 +6,16 @@ using Lumina.Excel.GeneratedSheets;
|
||||
|
||||
namespace Squadronista.Solver;
|
||||
|
||||
internal sealed class SquadronMember
|
||||
internal sealed class SquadronMember : IEquatable<SquadronMember>
|
||||
{
|
||||
public required string Name { get; init; }
|
||||
public required int Level { get; init; }
|
||||
public required uint ClassJob { get; init; }
|
||||
// TODO
|
||||
public required Race Race { get; init; }
|
||||
|
||||
// TODO
|
||||
public int Experience { get; init; }
|
||||
public required uint ClassJob { get; init; }
|
||||
|
||||
public required Race Race { 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;
|
||||
public int TacticalAbility => GrowthParams[Level].TacticalAbility;
|
||||
@ -33,8 +34,44 @@ internal sealed class SquadronMember
|
||||
{
|
||||
growthAsList.Add((growth.Physical[i], growth.Mental[i], growth.Tactical[i]));
|
||||
}
|
||||
|
||||
growthAsList.Add((growth.Unknown123, growth.Unknown184, growth.Unknown245));
|
||||
GrowthParams = growthAsList;
|
||||
return this;
|
||||
}
|
||||
|
||||
public bool Equals(SquadronMember? other)
|
||||
{
|
||||
if (ReferenceEquals(null, other)) return false;
|
||||
if (ReferenceEquals(this, other)) return true;
|
||||
return Name == other.Name && Level == other.Level && ClassJob == other.ClassJob && Race == other.Race &&
|
||||
Experience == other.Experience && PhysicalAbility == other.PhysicalAbility && MentalAbility == other.MentalAbility && TacticalAbility == other.TacticalAbility;
|
||||
}
|
||||
|
||||
public override bool Equals(object? obj)
|
||||
{
|
||||
return ReferenceEquals(this, obj) || obj is SquadronMember other && Equals(other);
|
||||
}
|
||||
|
||||
public override int GetHashCode()
|
||||
{
|
||||
return HashCode.Combine(Name, Level, ClassJob, (int)Race, Experience);
|
||||
}
|
||||
|
||||
public static bool operator ==(SquadronMember? left, SquadronMember? right)
|
||||
{
|
||||
return Equals(left, right);
|
||||
}
|
||||
|
||||
public static bool operator !=(SquadronMember? left, SquadronMember? right)
|
||||
{
|
||||
return !Equals(left, right);
|
||||
}
|
||||
|
||||
public Attributes ToAttributes() => new()
|
||||
{
|
||||
PhysicalAbility = PhysicalAbility,
|
||||
MentalAbility = MentalAbility,
|
||||
TacticalAbility = TacticalAbility,
|
||||
};
|
||||
}
|
||||
|
11
Squadronista/Solver/SquadronMemberUiInfo.cs
Normal file
11
Squadronista/Solver/SquadronMemberUiInfo.cs
Normal file
@ -0,0 +1,11 @@
|
||||
using System;
|
||||
|
||||
namespace Squadronista.Solver;
|
||||
|
||||
[Flags]
|
||||
public enum SquadronMemberUiInfo : int
|
||||
{
|
||||
Unknown1 = 1,
|
||||
IsPartOfMission = 2,
|
||||
NewChemistryAvailable = 8192,
|
||||
}
|
@ -38,21 +38,21 @@ internal sealed class SquadronSolver
|
||||
_newTrainings = _calculatedTrainings.Keys.ToList();
|
||||
}
|
||||
|
||||
public IEnumerable<CalculationResult> SolveFor(SquadronMission mission)
|
||||
public IEnumerable<CalculationResult> SolveFor(SquadronMission mission, Attributes missionAttributes, int requiredMatchingStats)
|
||||
{
|
||||
int minPhysical = mission.PhysicalAbility;
|
||||
int minMental = mission.MentalAbility;
|
||||
int minTactical = mission.TacticalAbility;
|
||||
int minPhysical = missionAttributes.PhysicalAbility;
|
||||
int minMental = missionAttributes.MentalAbility;
|
||||
int minTactical = missionAttributes.TacticalAbility;
|
||||
|
||||
bool foundWithoutTraining = false;
|
||||
List<CalculationResult> intermediates = CalculateForAllMemberCombinations(mission.Level, _state.Bonus);
|
||||
foreach (var x in intermediates)
|
||||
{
|
||||
//_pluginLog.Information($"{string.Join(" ", x.Members.Select(y => y.Name))} → {x.PhysicalAbility} / {x.MentalAbility} / {x.TacticalAbility}");
|
||||
if (x.PhysicalAbility >= minPhysical && x.MentalAbility >= minMental && x.TacticalAbility >= minTactical)
|
||||
int matchingStats = CountStatMatches(x, minPhysical, minMental, minTactical);
|
||||
if (matchingStats >= requiredMatchingStats)
|
||||
{
|
||||
x.TrainingsCalculated = true;
|
||||
yield return x.WithMission(mission);
|
||||
yield return x.WithExtra(mission, matchingStats);
|
||||
|
||||
foundWithoutTraining = true;
|
||||
}
|
||||
@ -65,19 +65,26 @@ internal sealed class SquadronSolver
|
||||
intermediates = CalculateForAllMemberCombinations(mission.Level, bonus);
|
||||
foreach (var x in intermediates)
|
||||
{
|
||||
if (x.PhysicalAbility >= minPhysical && x.MentalAbility >= minMental &&
|
||||
x.TacticalAbility >= minTactical)
|
||||
int matchingStats = CountStatMatches(x, minPhysical, minMental, minTactical);
|
||||
if (matchingStats >= requiredMatchingStats)
|
||||
{
|
||||
CalculateTrainingsForBonus(x);
|
||||
|
||||
if (x.TrainingsCalculated)
|
||||
yield return x.WithMission(mission);
|
||||
yield return x.WithExtra(mission, matchingStats);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static int CountStatMatches(CalculationResult x, int minPhysical, int minMental, int minTactical)
|
||||
{
|
||||
return (x.PhysicalAbility >= minPhysical ? 1 : 0) +
|
||||
(x.MentalAbility >= minMental ? 1 : 0) +
|
||||
(x.TacticalAbility >= minTactical ? 1 : 0);
|
||||
}
|
||||
|
||||
private List<CalculationResult> CalculateForAllMemberCombinations(int requiredLevel, BonusAttributes bonus)
|
||||
{
|
||||
return _memberCombinations
|
||||
@ -131,7 +138,7 @@ internal sealed class SquadronSolver
|
||||
|
||||
if (_calculatedTrainings.TryGetValue(result.Bonus, out var calculatedTraining))
|
||||
{
|
||||
_pluginLog.Information($"Found existing steps: {string.Join(", ", calculatedTraining.Select(x => x.Name))}");
|
||||
//_pluginLog.Information($"Found existing steps: {string.Join(", ", calculatedTraining.Select(x => x.Name))}");
|
||||
result.Trainings = calculatedTraining;
|
||||
result.TrainingsCalculated = true;
|
||||
return;
|
||||
@ -182,6 +189,8 @@ internal sealed class SquadronSolver
|
||||
public sealed class CalculationResult
|
||||
{
|
||||
public SquadronMission? Mission { get; private set; }
|
||||
public int MatchingAttributes { get; private set; }
|
||||
|
||||
public int PhysicalAbility { get; }
|
||||
public int MentalAbility { get; }
|
||||
public int TacticalAbility { get; }
|
||||
@ -189,6 +198,7 @@ internal sealed class SquadronSolver
|
||||
public BonusAttributes Bonus { get; }
|
||||
public IReadOnlyList<Training> Trainings { get; set; } = new List<Training>().AsReadOnly();
|
||||
public bool TrainingsCalculated { get; set; }
|
||||
public int TotalLevel => Members.Sum(x => x.Level);
|
||||
|
||||
public CalculationResult(List<SquadronMember> members, BonusAttributes bonus)
|
||||
{
|
||||
@ -199,10 +209,27 @@ internal sealed class SquadronSolver
|
||||
Bonus = bonus;
|
||||
}
|
||||
|
||||
public CalculationResult WithMission(SquadronMission mission)
|
||||
public CalculationResult WithExtra(SquadronMission mission, int matchingAttributes)
|
||||
{
|
||||
Mission = mission;
|
||||
MatchingAttributes = matchingAttributes;
|
||||
return this;
|
||||
}
|
||||
|
||||
public int ToSuccessProbability() => MatchingAttributes == 3 ? 100 : 66;
|
||||
|
||||
public string ToLabel()
|
||||
{
|
||||
if (Trainings.Count == 0)
|
||||
return $"{ToSuccessProbability()}%%, no training";
|
||||
else
|
||||
return $"{ToSuccessProbability()}%%";
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class CalculationResults
|
||||
{
|
||||
public bool IsFlaggedMission { get; set; }
|
||||
public List<CalculationResult> Results { get; } = new();
|
||||
}
|
||||
}
|
||||
|
@ -5,9 +5,20 @@ namespace Squadronista.Solver;
|
||||
|
||||
internal sealed class SquadronState
|
||||
{
|
||||
public required byte Rank { get; init; }
|
||||
private readonly Dictionary<(int id, Attributes attributes), Task<SquadronSolver.CalculationResults>> _calculationResults = new();
|
||||
|
||||
public required IReadOnlyList<SquadronMember> Members { get; init; }
|
||||
public required BonusAttributes Bonus { get; set; }
|
||||
public required uint CurrentTraining { get; set; }
|
||||
|
||||
public Task<SquadronSolver.CalculationResult?>? CalculationTask { get; set; }
|
||||
public Task<SquadronSolver.CalculationResults>? GetCalculation(SquadronMission mission, Attributes? attributes)
|
||||
{
|
||||
if (attributes == null)
|
||||
return null;
|
||||
|
||||
return _calculationResults.GetValueOrDefault((mission.Id, attributes));
|
||||
}
|
||||
|
||||
public void SetCalculation(SquadronMission mission, Attributes attributes, Task<SquadronSolver.CalculationResults> task)
|
||||
=> _calculationResults[(mission.Id, attributes)] = task;
|
||||
}
|
||||
|
@ -12,7 +12,7 @@ public class Training
|
||||
public int CappedMentalGained => CalculateCapped(MentalGained, PhysicalGained, TacticalGained);
|
||||
public int CappedTacticalGained => CalculateCapped(TacticalGained, PhysicalGained, MentalGained);
|
||||
|
||||
private int CalculateCapped(int mainStat, int otherA, int otherB)
|
||||
private static int CalculateCapped(int mainStat, int otherA, int otherB)
|
||||
{
|
||||
if (mainStat > 0)
|
||||
return mainStat;
|
||||
|
@ -1,4 +1,7 @@
|
||||
namespace Squadronista;
|
||||
using System.Collections.Generic;
|
||||
using Squadronista.Solver;
|
||||
|
||||
namespace Squadronista;
|
||||
|
||||
internal sealed class SquadronMission
|
||||
{
|
||||
@ -6,7 +9,6 @@ internal sealed class SquadronMission
|
||||
public required string Name { get; init; }
|
||||
public required byte Level { get; init; }
|
||||
public required bool IsFlaggedMission { get; init; }
|
||||
public int PhysicalAbility { get; init; }
|
||||
public int MentalAbility { get; init; }
|
||||
public int TacticalAbility { get; init; }
|
||||
|
||||
public required IReadOnlyList<Attributes> PossibleAttributes { get; init; }
|
||||
}
|
||||
|
@ -1,60 +1,13 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Dalamud.NET.Sdk/9.0.2">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0-windows</TargetFramework>
|
||||
<Version>0.2</Version>
|
||||
<LangVersion>11.0</LangVersion>
|
||||
<Nullable>enable</Nullable>
|
||||
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
|
||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
|
||||
<Version>4.0</Version>
|
||||
<OutputPath>dist</OutputPath>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<DebugType>portable</DebugType>
|
||||
<PathMap Condition="$(SolutionDir) != ''">$(SolutionDir)=X:\</PathMap>
|
||||
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
|
||||
<DebugType>portable</DebugType>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">
|
||||
<DalamudLibPath>$(DALAMUD_HOME)/</DalamudLibPath>
|
||||
</PropertyGroup>
|
||||
<Import Project="..\LLib\LLib.targets"/>
|
||||
<Import Project="..\LLib\RenameZip.targets"/>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="DalamudPackager" Version="2.1.12"/>
|
||||
<ProjectReference Include="..\LLib\LLib.csproj" />
|
||||
</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>
|
||||
|
@ -1,8 +1,8 @@
|
||||
{
|
||||
"Name": "Squadronista",
|
||||
"Author": "Liza Carvelli",
|
||||
"Punchline": "Simplified Squadron Calculator for Flagged Missions, heavily inspired by https://ffxivsquadron.com/",
|
||||
"Punchline": "Simplified Squadron Calculator, heavily inspired by https://ffxivsquadron.com/",
|
||||
"Description": "",
|
||||
"RepoUrl": "https://git.carvel.li/liza/Squadronista",
|
||||
"IconUrl": "https://git.carvel.li/liza/plugin-repo/raw/branch/master/dist/Squadronista.png"
|
||||
"IconUrl": "https://plugins.carvel.li/icons/Squadronista.png"
|
||||
}
|
||||
|
@ -1,15 +1,14 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq;
|
||||
using System.Runtime.InteropServices;
|
||||
using Dalamud.Game.Addon.Lifecycle;
|
||||
using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
|
||||
using Dalamud.Interface.Windowing;
|
||||
using Dalamud.Memory;
|
||||
using Dalamud.Plugin;
|
||||
using Dalamud.Plugin.Services;
|
||||
using FFXIVClientStructs.FFXIV.Client.Game;
|
||||
using FFXIVClientStructs.FFXIV.Client.UI;
|
||||
using FFXIVClientStructs.FFXIV.Component.GUI;
|
||||
using Lumina.Excel.GeneratedSheets;
|
||||
using Squadronista.Solver;
|
||||
using Squadronista.Windows;
|
||||
@ -17,34 +16,29 @@ using Race = Squadronista.Solver.Race;
|
||||
|
||||
namespace Squadronista;
|
||||
|
||||
public class SquadronistaPlugin : IDalamudPlugin
|
||||
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;
|
||||
private readonly IAddonLifecycle _addonLifecycle;
|
||||
private readonly IReadOnlyDictionary<string, uint> _classNamesToId;
|
||||
private readonly IReadOnlyList<SquadronMission> _allMissions;
|
||||
private readonly MainWindow _mainWindow;
|
||||
|
||||
public SquadronistaPlugin(DalamudPluginInterface pluginInterface, IClientState clientState, IPluginLog pluginLog,
|
||||
IDataManager dataManager, IAddonLifecycle addonLifecycle)
|
||||
public SquadronistaPlugin(IDalamudPluginInterface pluginInterface, IClientState clientState, IPluginLog pluginLog,
|
||||
IDataManager dataManager, IAddonLifecycle addonLifecycle, IGameGui gameGui)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(dataManager);
|
||||
|
||||
_pluginInterface = pluginInterface;
|
||||
_clientState = clientState;
|
||||
_pluginLog = pluginLog;
|
||||
_dataManager = dataManager;
|
||||
_addonLifecycle = addonLifecycle;
|
||||
|
||||
_classNamesToId = dataManager.GetExcelSheet<Lumina.Excel.GeneratedSheets.ClassJob>()!
|
||||
.Where(x => x.RowId > 0)
|
||||
.Where(x => x.Name.ToString().Length > 0)
|
||||
.ToDictionary(x => x.Name.ToString().ToLower(), x => x.RowId)
|
||||
.AsReadOnly();
|
||||
|
||||
_allMissions = dataManager.GetExcelSheet<GcArmyExpedition>()!
|
||||
.Where(x => x.RowId > 0)
|
||||
.Select(x => new SquadronMission
|
||||
@ -55,14 +49,15 @@ public class SquadronistaPlugin : IDalamudPlugin
|
||||
|
||||
// 13 and 14 seems to be a duplicate
|
||||
IsFlaggedMission = x.RowId is 7 or 14 or 15 or 34,
|
||||
|
||||
// not sure why this is structured the way it is
|
||||
// 'Supply Wagon Escort', for example, has the following physical values:
|
||||
// 210, 125, 305, 305, 210, 115
|
||||
// and the UI shows 115 as required
|
||||
PhysicalAbility = x.RequiredPhysical.Last(),
|
||||
MentalAbility = x.RequiredMental.Last(),
|
||||
TacticalAbility = x.RequiredTactical.Last(),
|
||||
PossibleAttributes = Enumerable.Range(0, x.RequiredPhysical.Length)
|
||||
.Select(i => new Attributes
|
||||
{
|
||||
PhysicalAbility = x.RequiredPhysical[i],
|
||||
MentalAbility = x.RequiredMental[i],
|
||||
TacticalAbility = x.RequiredTactical[i],
|
||||
})
|
||||
.ToList()
|
||||
.AsReadOnly(),
|
||||
})
|
||||
.ToList()
|
||||
.AsReadOnly();
|
||||
@ -81,12 +76,12 @@ public class SquadronistaPlugin : IDalamudPlugin
|
||||
.AsReadOnly();
|
||||
|
||||
_pluginInterface.UiBuilder.Draw += _windowSystem.Draw;
|
||||
_clientState.Logout += Logout;
|
||||
_clientState.Logout += ResetCharacterSpecificData;
|
||||
_addonLifecycle.RegisterListener(AddonEvent.PostSetup, "GcArmyMemberList", UpdateSquadronState);
|
||||
_addonLifecycle.RegisterListener(AddonEvent.PostRefresh, "GcArmyExpedition", UpdateExpeditionState);
|
||||
_addonLifecycle.RegisterListener(AddonEvent.PostSetup, "GcArmyExpedition", UpdateExpeditionState);
|
||||
|
||||
_mainWindow = new MainWindow(this, pluginLog, addonLifecycle);
|
||||
_mainWindow = new MainWindow(this, pluginLog, addonLifecycle, gameGui);
|
||||
_windowSystem.AddWindow(_mainWindow);
|
||||
}
|
||||
|
||||
@ -96,62 +91,89 @@ public class SquadronistaPlugin : IDalamudPlugin
|
||||
|
||||
private unsafe void UpdateSquadronState(AddonEvent type, AddonArgs args)
|
||||
{
|
||||
AtkUnitBase* addon = (AtkUnitBase*)args.Addon;
|
||||
if (addon->AtkValuesCount != 133)
|
||||
_pluginLog.Information("Updating squadron state from member list");
|
||||
var gcArmyManager = GcArmyManager.Instance();
|
||||
if (gcArmyManager == null)
|
||||
{
|
||||
_pluginLog.Error("Unexpected AddonGcArmyMemberList atkvalues count");
|
||||
SquadronState = null;
|
||||
_pluginLog.Warning("No GcArmyManager");
|
||||
ResetCharacterSpecificData();
|
||||
return;
|
||||
}
|
||||
|
||||
var atkValues = addon->AtkValues;
|
||||
uint memberCount = atkValues[4].UInt;
|
||||
|
||||
// can't do any missions like this...
|
||||
if (memberCount < 4)
|
||||
if (gcArmyManager->Data == null)
|
||||
{
|
||||
SquadronState = null;
|
||||
_pluginLog.Warning("No GcArmyManager->Data");
|
||||
ResetCharacterSpecificData();
|
||||
return;
|
||||
}
|
||||
|
||||
IReadOnlyList<SquadronMember> members = Enumerable.Range(0, (int)memberCount)
|
||||
.Select(i => new SquadronMember
|
||||
if (gcArmyManager->GetMemberCount() < 4)
|
||||
{
|
||||
_pluginLog.Warning($"Not enough squadron members to send on missions, only got {gcArmyManager->GetMemberCount()} members");
|
||||
ResetCharacterSpecificData();
|
||||
return;
|
||||
}
|
||||
|
||||
IReadOnlyList<SquadronMember> members = Enumerable.Range(0, (int)gcArmyManager->GetMemberCount())
|
||||
.Select(i =>
|
||||
{
|
||||
Name = ReadAtkString(atkValues[6 + 15 * i])!,
|
||||
Level = atkValues[10 + 15 * i].Int,
|
||||
ClassJob = _classNamesToId[ReadAtkString(atkValues[7 + 15 * i])!.ToLower()],
|
||||
Race = Race.Lalafell, // TODO
|
||||
Experience = 0, // TODO
|
||||
}.InitializeFrom(_dataManager))
|
||||
var member = gcArmyManager->GetMember((uint)i);
|
||||
if (member == null)
|
||||
return null;
|
||||
|
||||
return new SquadronMember
|
||||
{
|
||||
Name = _dataManager.GetExcelSheet<ENpcResident>()!.GetRow(member->ENpcResidentId)!
|
||||
.Singular.ToString(),
|
||||
Level = member->Level,
|
||||
ClassJob = member->ClassJob,
|
||||
Race = (Race)member->Race,
|
||||
Experience = member->Experience,
|
||||
EnlistmentTimestamp = member->EnlistmentTimestamp,
|
||||
}.InitializeFrom(_dataManager);
|
||||
})
|
||||
.Where(x => x != null)
|
||||
.Cast<SquadronMember>()
|
||||
.OrderBy(x => x.EnlistmentTimestamp)
|
||||
.ToList()
|
||||
.AsReadOnly();
|
||||
byte rank = byte.Parse(ReadAtkString(atkValues[0])!.Split(":")[1].Trim());
|
||||
int[] attributes = ReadAtkString(atkValues[1])!.Split(":")[1].Trim()
|
||||
.Split("/")
|
||||
.Select(int.Parse)
|
||||
.ToArray();
|
||||
|
||||
var bonus = new BonusAttributes
|
||||
{
|
||||
PhysicalAbility = gcArmyManager->Data->BonusPhysical,
|
||||
MentalAbility = gcArmyManager->Data->BonusMental,
|
||||
TacticalAbility = gcArmyManager->Data->BonusTactical,
|
||||
Cap = gcArmyManager->Data->BonusPhysical + gcArmyManager->Data->BonusMental + gcArmyManager->Data->BonusTactical,
|
||||
};
|
||||
|
||||
if (SquadronState != null &&
|
||||
members.SequenceEqual(SquadronState.Members) &&
|
||||
bonus == SquadronState.Bonus)
|
||||
{
|
||||
// nothing changed...
|
||||
_pluginLog.Verbose("Not updating SquadronState, not changed");
|
||||
return;
|
||||
}
|
||||
|
||||
SquadronState = new SquadronState
|
||||
{
|
||||
Members = members,
|
||||
Rank = rank,
|
||||
Bonus = new BonusAttributes
|
||||
{
|
||||
PhysicalAbility = attributes[0],
|
||||
MentalAbility = attributes[1],
|
||||
TacticalAbility = attributes[2],
|
||||
Cap = attributes.Sum()
|
||||
},
|
||||
Bonus = bonus,
|
||||
CurrentTraining = ((ExtendedGcArmyData*)gcArmyManager->Data)->CurrentTraining,
|
||||
};
|
||||
|
||||
_pluginLog.Verbose(
|
||||
$"Bonus stats: {bonus} (Cap: {bonus.Cap})");
|
||||
foreach (var member in members)
|
||||
_pluginLog.Information($"MM → {member.Name}, {member.ClassJob}, Lv{member.Level}");
|
||||
_pluginLog.Verbose(
|
||||
$"Squadron Member {member.Name}: ClassJob {member.ClassJob}, Lv{member.Level} → {member.ToAttributes()}");
|
||||
}
|
||||
|
||||
private unsafe void UpdateExpeditionState(AddonEvent type, AddonArgs args)
|
||||
{
|
||||
AvailableMissions.Clear();
|
||||
SquadronState = null;
|
||||
if (type == AddonEvent.PostSetup)
|
||||
ResetCharacterSpecificData();
|
||||
|
||||
AddonGcArmyExpedition* addonExpedition = (AddonGcArmyExpedition*)args.Addon;
|
||||
if (addonExpedition->AtkUnitBase.AtkValuesCount != 216)
|
||||
@ -163,21 +185,13 @@ public class SquadronistaPlugin : IDalamudPlugin
|
||||
var atkValues = addonExpedition->AtkUnitBase.AtkValues;
|
||||
int missionCount = atkValues[6].Int;
|
||||
|
||||
_pluginLog.Information($"Missions → {missionCount}");
|
||||
_pluginLog.Verbose($"Missions: {missionCount}");
|
||||
AvailableMissions = Enumerable.Range(0, missionCount)
|
||||
.Where(i => atkValues[8 + 4 * i].Int > 0)
|
||||
.Select(i => _allMissions.Single(x => x.Id == atkValues[9 + 4 * i].Int))
|
||||
.ToList();
|
||||
}
|
||||
|
||||
private unsafe string? ReadAtkString(AtkValue atkValue)
|
||||
{
|
||||
if (atkValue.String != null)
|
||||
return MemoryHelper.ReadSeStringNullTerminated(new nint(atkValue.String)).ToString();
|
||||
return null;
|
||||
}
|
||||
|
||||
private void Logout()
|
||||
private void ResetCharacterSpecificData()
|
||||
{
|
||||
SquadronState = null;
|
||||
}
|
||||
@ -188,7 +202,12 @@ public class SquadronistaPlugin : IDalamudPlugin
|
||||
_addonLifecycle.UnregisterListener(AddonEvent.PostSetup, "GcArmyExpedition", UpdateExpeditionState);
|
||||
_addonLifecycle.UnregisterListener(AddonEvent.PostRefresh, "GcArmyExpedition", UpdateExpeditionState);
|
||||
_addonLifecycle.UnregisterListener(AddonEvent.PostSetup, "GcArmyMemberList", UpdateSquadronState);
|
||||
_clientState.Logout -= Logout;
|
||||
_clientState.Logout -= ResetCharacterSpecificData;
|
||||
_pluginInterface.UiBuilder.Draw -= _windowSystem.Draw;
|
||||
}
|
||||
|
||||
[StructLayout(LayoutKind.Explicit, Size = 0xB28)]
|
||||
private struct ExtendedGcArmyData {
|
||||
[FieldOffset(0x2C4)] public ushort CurrentTraining;
|
||||
}
|
||||
}
|
||||
|
@ -1,46 +1,74 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Numerics;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Dalamud.Game.Addon.Lifecycle;
|
||||
using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
|
||||
using Dalamud.Game.Text;
|
||||
using Dalamud.Interface.Colors;
|
||||
using Dalamud.Interface.Windowing;
|
||||
using Dalamud.Plugin.Services;
|
||||
using FFXIVClientStructs.FFXIV.Client.UI;
|
||||
using FFXIVClientStructs.FFXIV.Client.UI.Agent;
|
||||
using FFXIVClientStructs.FFXIV.Component.GUI;
|
||||
using ImGuiNET;
|
||||
using LLib.GameUI;
|
||||
using LLib.ImGui;
|
||||
using Squadronista.Solver;
|
||||
using Task = System.Threading.Tasks.Task;
|
||||
using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType;
|
||||
|
||||
namespace Squadronista.Windows;
|
||||
|
||||
internal sealed class MainWindow : Window, IDisposable
|
||||
internal sealed class MainWindow : LWindow, IDisposable
|
||||
{
|
||||
private readonly SquadronistaPlugin _plugin;
|
||||
private readonly IPluginLog _pluginLog;
|
||||
private readonly IAddonLifecycle _addonLifecycle;
|
||||
private readonly IGameGui _gameGui;
|
||||
|
||||
public MainWindow(SquadronistaPlugin plugin, IPluginLog pluginLog, IAddonLifecycle addonLifecycle)
|
||||
public MainWindow(SquadronistaPlugin plugin, IPluginLog pluginLog,
|
||||
IAddonLifecycle addonLifecycle, IGameGui gameGui)
|
||||
: base("Squadronista##SquadronistaMainWindow")
|
||||
{
|
||||
_plugin = plugin;
|
||||
_pluginLog = pluginLog;
|
||||
_addonLifecycle = addonLifecycle;
|
||||
_gameGui = gameGui;
|
||||
|
||||
Position = new Vector2(100, 100);
|
||||
PositionCondition = ImGuiCond.Always;
|
||||
Flags = ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoNav | ImGuiWindowFlags.NoCollapse
|
||||
;
|
||||
Flags = ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoNav | ImGuiWindowFlags.NoCollapse;
|
||||
|
||||
SizeConstraints = new()
|
||||
{
|
||||
MinimumSize = new Vector2(150, 50),
|
||||
MaximumSize = new Vector2(9999, 9999),
|
||||
};
|
||||
|
||||
_addonLifecycle.RegisterListener(AddonEvent.PostSetup, "GcArmyExpedition", ExpeditionPostSetup);
|
||||
_addonLifecycle.RegisterListener(AddonEvent.PreFinalize, "GcArmyExpedition", ExpeditionPreFinalize);
|
||||
_addonLifecycle.RegisterListener(AddonEvent.PostUpdate, "GcArmyExpedition", ExpeditionPostUpdate);
|
||||
|
||||
}
|
||||
|
||||
private void ExpeditionPostSetup(AddonEvent type, AddonArgs args)
|
||||
private unsafe void ExpeditionPostSetup(AddonEvent type, AddonArgs args)
|
||||
{
|
||||
IsOpen = true;
|
||||
|
||||
_pluginLog.Information("Opening GC member list...");
|
||||
var openMemmberList = stackalloc AtkValue[]
|
||||
{
|
||||
new() { Type = ValueType.Int, Int = 13 },
|
||||
new() { Type = 0, Int = 0 },
|
||||
new() { Type = 0, Int = 0 },
|
||||
new() { Type = 0, Int = 0 },
|
||||
new() { Type = 0, Int = 0 },
|
||||
new() { Type = 0, Int = 0 }
|
||||
};
|
||||
((AddonGcArmyExpedition*)args.Addon)->AtkUnitBase.FireCallback(6, openMemmberList);
|
||||
}
|
||||
|
||||
private void ExpeditionPreFinalize(AddonEvent type, AddonArgs args)
|
||||
@ -62,61 +90,116 @@ internal sealed class MainWindow : Window, IDisposable
|
||||
Position = new Vector2(x, y);
|
||||
}
|
||||
|
||||
public override void Draw()
|
||||
public override unsafe void Draw()
|
||||
{
|
||||
var flaggedMission = _plugin.AvailableMissions.FirstOrDefault(x => x.IsFlaggedMission);
|
||||
if (flaggedMission == null)
|
||||
var agentExpedition = AgentGcArmyExpedition.Instance();
|
||||
if (agentExpedition == null || agentExpedition->SelectedRow >= _plugin.AvailableMissions.Count)
|
||||
{
|
||||
ImGui.Text("No flagged mission available.");
|
||||
ImGui.Text($"Could not find mission... ({(agentExpedition != null ? agentExpedition->SelectedRow.ToString(CultureInfo.InvariantCulture) : "null")}; {_plugin.AvailableMissions.Count})");
|
||||
return;
|
||||
}
|
||||
|
||||
ImGui.Text($"{flaggedMission.Name}");
|
||||
ImGui.Indent();
|
||||
var selectedMission = _plugin.AvailableMissions[agentExpedition->SelectedRow];
|
||||
var missionAttributes = FindCurrentAttributeIndex(agentExpedition, selectedMission);
|
||||
if (missionAttributes != null)
|
||||
ImGui.Text($"{selectedMission.Name} ({missionAttributes})");
|
||||
else
|
||||
ImGui.Text($"{selectedMission.Name}");
|
||||
|
||||
var state = _plugin.SquadronState;
|
||||
if (state == null)
|
||||
{
|
||||
ImGui.TextColored(ImGuiColors.DalamudYellow, "Open Squadron Member list to continue.");
|
||||
}
|
||||
else if (state.CurrentTraining != 0)
|
||||
{
|
||||
ImGui.TextColored(ImGuiColors.DalamudRed, "Your squadron is currently in training.");
|
||||
}
|
||||
else
|
||||
{
|
||||
var task = state.CalculationTask;
|
||||
var task = state.GetCalculation(selectedMission, missionAttributes);
|
||||
if (task != null)
|
||||
{
|
||||
if (task.IsCompletedSuccessfully)
|
||||
{
|
||||
SquadronSolver.CalculationResult? result = task.Result;
|
||||
if (result != null)
|
||||
SquadronSolver.CalculationResults results = task.Result;
|
||||
if (results.Results.Count > 0)
|
||||
{
|
||||
if (result.Mission?.Id != flaggedMission.Id)
|
||||
// if the member list window is open, we can trivially check which member is part of the party
|
||||
List<string>? activeMembers = null;
|
||||
if (_gameGui.TryGetAddonByName("GcArmyMemberList", out AtkUnitBase* addonMemberList) &&
|
||||
LAddon.IsAddonReady(addonMemberList) && addonMemberList->AtkValuesCount == 133)
|
||||
{
|
||||
state.CalculationTask = null;
|
||||
return;
|
||||
var atkValues = addonMemberList->AtkValues;
|
||||
activeMembers = Enumerable.Range(0, (int)atkValues[4].UInt)
|
||||
.Where(i => ((SquadronMemberUiInfo)atkValues[5 + i * 15].Int).HasFlag(SquadronMemberUiInfo.IsPartOfMission))
|
||||
.Select(i => atkValues[6 + i * 15].ReadAtkString())
|
||||
.Where(x => !string.IsNullOrEmpty(x))
|
||||
.Cast<string>()
|
||||
.ToList();
|
||||
}
|
||||
|
||||
ImGui.Text("Squadron Members");
|
||||
ImGui.Indent();
|
||||
foreach (var member in result.Members)
|
||||
ImGui.Text($"{member.Name}");
|
||||
ImGui.Unindent();
|
||||
|
||||
if (result.Trainings.Count > 0)
|
||||
foreach (var result in results.Results)
|
||||
{
|
||||
ImGui.Spacing();
|
||||
ImGui.Text($"Trainings needed ({result.Trainings.Count})");
|
||||
ImGui.TextColored(
|
||||
result.MatchingAttributes == 3 ? ImGuiColors.HealerGreen : ImGuiColors.DalamudYellow,
|
||||
$"{result.ToLabel()}");
|
||||
ImGui.Indent();
|
||||
foreach (var training in result.Trainings)
|
||||
ImGui.Text($"{training.Name}");
|
||||
|
||||
ImGui.Text($"Squadron Members ({SeIconChar.LevelEn.ToIconString()}{result.TotalLevel / 4:N0})");
|
||||
ImGui.Indent();
|
||||
foreach (var member in result.Members)
|
||||
{
|
||||
if (activeMembers != null)
|
||||
ImGui.TextColored(
|
||||
activeMembers.Contains(member.Name)
|
||||
? ImGuiColors.HealerGreen
|
||||
: ImGuiColors.DalamudYellow, $"{member.Name}");
|
||||
else
|
||||
ImGui.Text($"{member.Name}");
|
||||
}
|
||||
|
||||
ImGui.Unindent();
|
||||
|
||||
if (result.Trainings.Count > 0)
|
||||
{
|
||||
ImGui.Spacing();
|
||||
ImGui.Text($"Trainings needed ({result.Trainings.Count})");
|
||||
ImGui.Indent();
|
||||
foreach (var training in result.Trainings)
|
||||
ImGui.TextColored(ImGuiColors.DalamudYellow, $"{training.Name}");
|
||||
ImGui.Unindent();
|
||||
}
|
||||
|
||||
ImGui.Spacing();
|
||||
ImGui.Text("Final Stats:");
|
||||
ImGui.SameLine(0);
|
||||
ImGui.TextColored(
|
||||
result.PhysicalAbility >= missionAttributes!.PhysicalAbility
|
||||
? ImGuiColors.HealerGreen
|
||||
: ImGuiColors.DalamudYellow, $"{result.PhysicalAbility}");
|
||||
ImGui.SameLine(0);
|
||||
ImGui.Text("/");
|
||||
ImGui.SameLine(0);
|
||||
ImGui.TextColored(
|
||||
result.MentalAbility >= missionAttributes.MentalAbility
|
||||
? ImGuiColors.HealerGreen
|
||||
: ImGuiColors.DalamudYellow, $"{result.MentalAbility}");
|
||||
ImGui.SameLine(0);
|
||||
ImGui.Text("/");
|
||||
ImGui.SameLine(0);
|
||||
ImGui.TextColored(
|
||||
result.TacticalAbility >= missionAttributes.TacticalAbility
|
||||
? ImGuiColors.HealerGreen
|
||||
: ImGuiColors.DalamudYellow, $"{result.TacticalAbility}");
|
||||
|
||||
ImGui.Unindent();
|
||||
}
|
||||
|
||||
ImGui.Spacing();
|
||||
ImGui.TextColored(result.Trainings.Count == 0 ? ImGuiColors.HealerGreen : ImGuiColors.DalamudYellow, $"Final Stats: {result.PhysicalAbility} / {result.MentalAbility} / {result.TacticalAbility}");
|
||||
}
|
||||
else
|
||||
{
|
||||
ImGui.TextColored(ImGuiColors.DalamudRed,
|
||||
$"No combination of members/trainings can achieve {flaggedMission.PhysicalAbility} / {flaggedMission.MentalAbility} / {flaggedMission.TacticalAbility}.");
|
||||
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.");
|
||||
}
|
||||
}
|
||||
@ -127,26 +210,146 @@ internal sealed class MainWindow : Window, IDisposable
|
||||
}
|
||||
else
|
||||
{
|
||||
state.CalculationTask = Task.Factory.StartNew(() =>
|
||||
if (missionAttributes == null)
|
||||
{
|
||||
ImGui.Text("No matching mission found...?");
|
||||
return;
|
||||
}
|
||||
|
||||
state.SetCalculation(selectedMission, missionAttributes, Task.Factory.StartNew(() =>
|
||||
{
|
||||
var solver = new SquadronSolver(_pluginLog, state, _plugin.Trainings);
|
||||
var allSolutions = solver.SolveFor(flaggedMission).ToList();
|
||||
if (allSolutions.Count == 0)
|
||||
return null;
|
||||
|
||||
int shortestTrainings = allSolutions.Min(x => x.Trainings.Count);
|
||||
return allSolutions
|
||||
.Where(x => x.Trainings.Count == shortestTrainings)
|
||||
.OrderBy(x => x.Members.Sum(y => y.Level))
|
||||
.First();
|
||||
});
|
||||
SquadronSolver.CalculationResults results = new SquadronSolver.CalculationResults
|
||||
{
|
||||
IsFlaggedMission = selectedMission.IsFlaggedMission
|
||||
};
|
||||
|
||||
if (selectedMission.IsFlaggedMission)
|
||||
{
|
||||
// only relevant when all 3 stats match
|
||||
var perfectMatches = solver.SolveFor(selectedMission, missionAttributes, 3).ToList();
|
||||
if (perfectMatches.Count > 0)
|
||||
{
|
||||
results.Results.Add(perfectMatches
|
||||
.OrderBy(x => x.Trainings.Count)
|
||||
.ThenBy(x => x.Members.Sum(y => y.Level))
|
||||
.First());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var matches = solver.SolveFor(selectedMission, missionAttributes, 2)
|
||||
.OrderByDescending(x => x.MatchingAttributes)
|
||||
.ThenBy(x => x.Trainings.Count)
|
||||
.ThenBy(x => x.Members.Sum(y => y.Level))
|
||||
.ToList();
|
||||
|
||||
// optimal solution without training
|
||||
var perfectMatches =
|
||||
matches.Where(x => x.MatchingAttributes == 3 && x.Trainings.Count == 0).ToList();
|
||||
if (perfectMatches.Count > 0)
|
||||
{
|
||||
results.Results.Add(perfectMatches.First());
|
||||
matches = matches.Except(perfectMatches)
|
||||
// we only want lower-level member combinations for any option with training or at 66%
|
||||
.Where(x => x.TotalLevel < perfectMatches.First().TotalLevel)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
// optimal solution, with training
|
||||
var perfectMatchesWithTraining = matches.Where(x => x.MatchingAttributes == 3).ToList();
|
||||
if (perfectMatchesWithTraining.Count > 0)
|
||||
{
|
||||
results.Results.Add(perfectMatchesWithTraining.First());
|
||||
matches = matches.Except(perfectMatchesWithTraining).ToList();
|
||||
}
|
||||
|
||||
// suboptimal solutions
|
||||
if (matches.Count > 0)
|
||||
{
|
||||
var suboptimalMatch = matches.First();
|
||||
if (suboptimalMatch.Trainings.Count == 0 && perfectMatchesWithTraining.Count != 0)
|
||||
results.Results.Insert(results.Results.Count - 1, suboptimalMatch);
|
||||
else
|
||||
results.Results.Add(suboptimalMatch);
|
||||
}
|
||||
}
|
||||
|
||||
return results;
|
||||
}, default, TaskCreationOptions.LongRunning, TaskScheduler.Default));
|
||||
}
|
||||
}
|
||||
ImGui.Unindent();
|
||||
}
|
||||
|
||||
private unsafe Attributes? FindCurrentAttributeIndex(AgentGcArmyExpedition* agentExpedition,
|
||||
SquadronMission selectedMission)
|
||||
{
|
||||
AddonGcArmyExpedition* addonExpedition =
|
||||
(AddonGcArmyExpedition*)LAddon.GetAddonById(agentExpedition->AgentInterface.AddonId);
|
||||
|
||||
// should never happen
|
||||
if (addonExpedition == null || !LAddon.IsAddonReady(&addonExpedition->AtkUnitBase))
|
||||
return null;
|
||||
|
||||
AtkComponentBase* requiredAttribComponent = addonExpedition->RequiredAttributesComponentNode;
|
||||
if (requiredAttribComponent == null)
|
||||
return null;
|
||||
|
||||
AtkComponentNode* physicalComponent = GetNodeById<AtkComponentNode>(requiredAttribComponent->UldManager, 2);
|
||||
AtkComponentNode* mentalComponent = GetNodeById<AtkComponentNode>(requiredAttribComponent->UldManager, 4);
|
||||
AtkComponentNode* tacticalComponent = GetNodeById<AtkComponentNode>(requiredAttribComponent->UldManager, 6);
|
||||
if (physicalComponent == null || mentalComponent == null || tacticalComponent == null)
|
||||
{
|
||||
_pluginLog.Warning("Could not parse required attribute children");
|
||||
return null;
|
||||
}
|
||||
|
||||
AtkTextNode* physicalText = GetNodeById<AtkTextNode>(physicalComponent->Component->UldManager, 2);
|
||||
AtkTextNode* mentalText = GetNodeById<AtkTextNode>(mentalComponent->Component->UldManager, 2);
|
||||
AtkTextNode* tacticalText = GetNodeById<AtkTextNode>(tacticalComponent->Component->UldManager, 2);
|
||||
if (physicalText == null || mentalText == null || tacticalText == null)
|
||||
{
|
||||
_pluginLog.Warning("Could not parse required attribute texts");
|
||||
return null;
|
||||
}
|
||||
|
||||
int physical = int.Parse(physicalText->NodeText.ToString(), CultureInfo.InvariantCulture);
|
||||
int mental = int.Parse(mentalText->NodeText.ToString(), CultureInfo.InvariantCulture);
|
||||
int tactical = int.Parse(tacticalText->NodeText.ToString(), CultureInfo.InvariantCulture);
|
||||
|
||||
var newAttributes = new Attributes
|
||||
{
|
||||
PhysicalAbility = physical,
|
||||
MentalAbility = mental,
|
||||
TacticalAbility = tactical,
|
||||
};
|
||||
if (selectedMission.PossibleAttributes.Contains(newAttributes))
|
||||
return newAttributes;
|
||||
else
|
||||
{
|
||||
_pluginLog.Warning($"Wrong attributes for {selectedMission.Name}: {newAttributes}");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static unsafe T* GetNodeById<T>(AtkUldManager uldManager, uint nodeId, NodeType? type = null)
|
||||
where T : unmanaged
|
||||
{
|
||||
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;
|
||||
return (T*)n;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
_addonLifecycle.UnregisterListener(AddonEvent.PostUpdate, "GcArmyExpedition", ExpeditionPostUpdate);
|
||||
_addonLifecycle.UnregisterListener(AddonEvent.PreFinalize, "GcArmyExpedition", ExpeditionPreFinalize);
|
||||
_addonLifecycle.UnregisterListener(AddonEvent.PostSetup, "GcArmyExpedition", ExpeditionPostSetup);
|
||||
}
|
||||
|
@ -1,12 +1,86 @@
|
||||
{
|
||||
"version": 1,
|
||||
"dependencies": {
|
||||
"net7.0-windows7.0": {
|
||||
"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",
|
||||
"dependencies": {
|
||||
"DalamudPackager": "[2.1.13, )"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"sdk": {
|
||||
"version": "7.0.0",
|
||||
"version": "8.0.0",
|
||||
"rollForward": "latestMinor",
|
||||
"allowPrerelease": false
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user