liza/Gearsetter
liza/Gearsetter
1
0
Fork 0
Code Issues 1 Pull Requests Releases 16 Activity

Compare commits

base: liza:master
Branches Tags
liza:master
liza:v2.4
liza:v2.3
liza:v2.2
liza:v2.1
liza:v2.0
liza:v1.3
liza:v1.2
liza:v1.1
liza:v1.0
liza:v0.7
liza:v0.6
liza:v0.5
liza:v0.4
liza:v0.3
liza:v0.2
liza:v0.1
..
compare: liza:v1.1
Branches Tags
liza:master
liza:v2.4
liza:v2.3
liza:v2.2
liza:v2.1
liza:v2.0
liza:v1.3
liza:v1.2
liza:v1.1
liza:v1.0
liza:v0.7
liza:v0.6
liza:v0.5
liza:v0.4
liza:v0.3
liza:v0.2
liza:v0.1

No commits in common. "master" and "v1.1" have entirely different histories.
master ... v1.1

30 changed files with 445 additions and 510 deletions
Show Stats Expand all files Collapse all files

3
Gearsetter.IpcTest/.gitignore vendored
View File

@ -1,3 +0,0 @@
/dist
/obj
/bin

8
Gearsetter.IpcTest/Gearsetter.IpcTest.csproj
View File

@ -1,8 +0,0 @@
<Project Sdk="Dalamud.NET.Sdk/11.0.0">
<PropertyGroup>
<Version>1.0</Version>
<OutputPath>dist</OutputPath>
</PropertyGroup>
<Import Project="..\LLib\LLib.targets"/>
</Project>

6
Gearsetter.IpcTest/Gearsetter.IpcTest.json
View File

@ -1,6 +0,0 @@
{
"Name": "Gearsetter (IPC Test)",
"Author": "Liza Carvelli",
"Punchline": "dev only plugin",
"Description": "dev only plugin"
}

47
Gearsetter.IpcTest/GearsetterIpcTestPlugin.cs
View File

@ -1,47 +0,0 @@
using System.Collections.Generic;
using Dalamud.Game.Command;
using Dalamud.Plugin;
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Game;
using FFXIVClientStructs.FFXIV.Client.UI.Misc;
namespace Gearsetter.IpcTest;
public class GearsetterIpcTestPlugin : IDalamudPlugin
{
private readonly IDalamudPluginInterface _pluginInterface;
private readonly ICommandManager _commandManager;
private readonly IChatGui _chatGui;
public GearsetterIpcTestPlugin(IDalamudPluginInterface pluginInterface, ICommandManager commandManager,
IChatGui chatGui)
{
_pluginInterface = pluginInterface;
_commandManager = commandManager;
_chatGui = chatGui;
_commandManager.AddHandler("/recommendedgear", new CommandInfo(ProcessCommand));
}
private unsafe void ProcessCommand(string command, string arguments)
{
int currentGearsetIndex = RaptureGearsetModule.Instance()->CurrentGearsetIndex;
var recommendations = _pluginInterface
.GetIpcSubscriber<byte, List<(uint ItemId, InventoryType? SourceInventory, byte? SourceInventorySlot, RaptureGearsetModule.GearsetItemIndex TargetSlot)>>(
"Gearsetter.GetRecommendationsForGearset").InvokeFunc((byte)currentGearsetIndex);
if (recommendations.Count == 0)
_chatGui.Print($"No recommendations for gearset #{currentGearsetIndex}.");
else
{
foreach (var recommendation in recommendations)
_chatGui.Print(
$"Recommendation: Equip item {recommendation.ItemId} from {recommendation.SourceInventory} (slot {recommendation.SourceInventorySlot}) as {recommendation.TargetSlot}");
}
}
public void Dispose()
{
_commandManager.RemoveHandler("/recommendedgear");
}
}

81
Gearsetter.IpcTest/packages.lock.json
View File

@ -1,81 +0,0 @@
{
"version": 1,
"dependencies": {
"net8.0-windows7.0": {
"DalamudPackager": {
"type": "Direct",
"requested": "[11.0.0, )",
"resolved": "11.0.0",
"contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA=="
},
"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"
}
}
}
}
}

2
Gearsetter.Test/Gearsetter.Test.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Dalamud.NET.Sdk/11.0.0"> <Project Sdk="Dalamud.NET.Sdk/9.0.2">
<PropertyGroup> <PropertyGroup>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject> <IsTestProject>true</IsTestProject>

11
Gearsetter.Test/ItemSortingTest.cs
View File

@ -3,9 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using Gearsetter.GameData; using Gearsetter.GameData;
using Gearsetter.Model; using Gearsetter.Model;
using LLib.GameData; using Lumina.Excel.GeneratedSheets;
using LLib.Gear;
using Lumina.Excel.Sheets;
using Xunit; using Xunit;
namespace Gearsetter.Test; namespace Gearsetter.Test;
@ -17,10 +15,6 @@ public sealed class ItemSortingTest
[Fact] [Fact]
public void Test1() public void Test1()
{ {
var gearStatsCalculator = new GearStatsCalculator(_lumina.GetExcelSheet<ItemLevel>()!,
_lumina.GetExcelSheet<ExtendedBaseParam>()!,
_lumina.GetExcelSheet<Materia>()!,
_lumina.GetExcelSheet<Item>()!);
var items = _lumina.GetExcelSheet<Item>()!; var items = _lumina.GetExcelSheet<Item>()!;
List<uint> initialItemIds = List<uint> initialItemIds =
[ [
@ -35,13 +29,12 @@ public sealed class ItemSortingTest
32558, 32558,
]; ];
var itemList = new ItemList var itemList = new ItemList
{ {
ClassJob = EClassJob.Marauder, ClassJob = EClassJob.Marauder,
EquipSlotCategory = EEquipSlotCategory.Ears, EquipSlotCategory = EEquipSlotCategory.Ears,
ItemUiCategory = 41, ItemUiCategory = 41,
Items = initialItemIds.Select(rowId => new EquipmentItem(items.GetRow(rowId), false, gearStatsCalculator.CalculateGearStats(items.GetRow(rowId), false, []))) Items = initialItemIds.Select(rowId => new EquipmentItem(items.GetRow(rowId)!, false))
.Cast<BaseItem>() .Cast<BaseItem>()
.ToList(), .ToList(),
}; };

10
Gearsetter.Test/packages.lock.json
View File

@ -10,9 +10,9 @@
}, },
"DalamudPackager": { "DalamudPackager": {
"type": "Direct", "type": "Direct",
"requested": "[11.0.0, )", "requested": "[2.1.13, )",
"resolved": "11.0.0", "resolved": "2.1.13",
"contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA==" "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
}, },
"DotNet.ReproducibleBuilds": { "DotNet.ReproducibleBuilds": {
"type": "Direct", "type": "Direct",
@ -1093,14 +1093,14 @@
"gearsetter": { "gearsetter": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"DalamudPackager": "[11.0.0, )", "DalamudPackager": "[2.1.13, )",
"LLib": "[1.0.0, )" "LLib": "[1.0.0, )"
} }
}, },
"llib": { "llib": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"DalamudPackager": "[11.0.0, )" "DalamudPackager": "[2.1.13, )"
} }
} }
} }

6
Gearsetter.sln
View File

@ -6,8 +6,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gearsetter.Test", "Gearsett
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LLib", "LLib\LLib.csproj", "{66144F9D-AC38-4F16-B269-A610F8EB7A3F}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LLib", "LLib\LLib.csproj", "{66144F9D-AC38-4F16-B269-A610F8EB7A3F}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gearsetter.IpcTest", "Gearsetter.IpcTest\Gearsetter.IpcTest.csproj", "{D5BFA879-0A33-4640-B75E-D92D8F23D6F1}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -26,9 +24,5 @@ Global
{66144F9D-AC38-4F16-B269-A610F8EB7A3F}.Debug|Any CPU.Build.0 = Debug|x64 {66144F9D-AC38-4F16-B269-A610F8EB7A3F}.Debug|Any CPU.Build.0 = Debug|x64
{66144F9D-AC38-4F16-B269-A610F8EB7A3F}.Release|Any CPU.ActiveCfg = Debug|x64 {66144F9D-AC38-4F16-B269-A610F8EB7A3F}.Release|Any CPU.ActiveCfg = Debug|x64
{66144F9D-AC38-4F16-B269-A610F8EB7A3F}.Release|Any CPU.Build.0 = Debug|x64 {66144F9D-AC38-4F16-B269-A610F8EB7A3F}.Release|Any CPU.Build.0 = Debug|x64
{D5BFA879-0A33-4640-B75E-D92D8F23D6F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D5BFA879-0A33-4640-B75E-D92D8F23D6F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D5BFA879-0A33-4640-B75E-D92D8F23D6F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D5BFA879-0A33-4640-B75E-D92D8F23D6F1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

2
Gearsetter/Configuration.cs
View File

@ -1,6 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using Dalamud.Configuration; using Dalamud.Configuration;
using LLib.Gear; using Gearsetter.GameData;
namespace Gearsetter; namespace Gearsetter;

2
Gearsetter/DalamudPackager.targets
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project> <Project>
<Target Name="PackagePluginDebug" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug'"> <Target Name="PackagePlugin" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug'">
<DalamudPackager <DalamudPackager
ProjectDir="$(ProjectDir)" ProjectDir="$(ProjectDir)"
OutputPath="$(OutputPath)" OutputPath="$(OutputPath)"

64
Gearsetter/External/GearsetterIpc.cs vendored
View File

@ -1,64 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Dalamud.Plugin;
using Dalamud.Plugin.Ipc;
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Game;
using FFXIVClientStructs.FFXIV.Client.UI.Misc;
namespace Gearsetter.External;
internal sealed class GearsetterIpc : IDisposable
{
private const string IpcGetRecommendationsForGearset = "Gearsetter.GetRecommendationsForGearset";
private readonly GearsetterPlugin _plugin;
private readonly IPluginLog _pluginLog;
private readonly ICallGateProvider<byte,
List<(uint ItemId, InventoryType? SourceInventory, int? SourceInventorySlot,
RaptureGearsetModule.GearsetItemIndex TargetSlot)>>
_getRecommendationsForGearset;
public GearsetterIpc(GearsetterPlugin plugin, IDalamudPluginInterface pluginInterface, IPluginLog pluginLog)
{
_plugin = plugin;
_pluginLog = pluginLog;
_getRecommendationsForGearset =
pluginInterface
.GetIpcProvider<byte,
List<(uint, InventoryType?, int?, RaptureGearsetModule.GearsetItemIndex TargetSlot)>>(
IpcGetRecommendationsForGearset);
_getRecommendationsForGearset.RegisterFunc(GetRecommendationsForGearset);
}
private unsafe List<(uint ItemId, InventoryType? SourceInventory, int? SourceInventorySlot,
RaptureGearsetModule.GearsetItemIndex TargetSlot)>
GetRecommendationsForGearset(byte gearsetId)
{
if (gearsetId > 100)
throw new ArgumentOutOfRangeException(nameof(gearsetId));
var gearsetModule = RaptureGearsetModule.Instance();
if (gearsetModule == null)
throw new InvalidOperationException($"{nameof(RaptureGearsetModule)} is null");
var gearset = gearsetModule->GetGearset(gearsetId);
if (gearset == null)
throw new InvalidOperationException($"Gearset {gearsetId} is null");
if (!gearset->Flags.HasFlag(RaptureGearsetModule.GearsetFlag.Exists))
throw new InvalidOperationException($"Gearset {gearsetId} does not exist");
_pluginLog.Verbose($"Checking for gearset upgrades for gearset {gearset->Id}.");
return _plugin.GetRecommendedUpgrades(gearset)
.Select(x => (x.ItemId, x.SourceInventory, x.SourceInventorySlot, x.TargetSlot))
.ToList();
}
public void Dispose()
{
_getRecommendationsForGearset.UnregisterFunc();
}
}

32
Gearsetter/GameData/EBaseParam.cs Normal file
View File

@ -0,0 +1,32 @@
namespace Gearsetter.GameData;
internal enum EBaseParam : byte
{
Strength = 1,
Dexterity = 2,
Vitality = 3,
Intelligence = 4,
Mind = 5,
Piety = 6,
GP = 10,
CP = 11,
DamagePhys = 12,
DamageMag = 13,
DefensePhys = 21,
DefenseMag = 24,
Tenacity = 19,
Crit = 27,
DirectHit = 22,
Determination = 44,
SpellSpeed = 46,
SkillSpeed = 45,
Craftsmanship = 70,
Control = 71,
Gathering = 72,
Perception = 73,
}

117
Gearsetter/GameData/EClassJob.cs Normal file
View File

@ -0,0 +1,117 @@
namespace Gearsetter.GameData;
internal enum EClassJob : uint
{
Adventurer = 0,
Gladiator = 1,
Pugilist = 2,
Marauder = 3,
Lancer = 4,
Archer = 5,
Conjurer = 6,
Thaumaturge = 7,
Carpenter = 8,
Blacksmith = 9,
Armorer = 10,
Goldsmith = 11,
Leatherworker = 12,
Weaver = 13,
Alchemist = 14,
Culinarian = 15,
Miner = 16,
Botanist = 17,
Fisher = 18,
Paladin = 19,
Monk = 20,
Warrior = 21,
Dragoon = 22,
Bard = 23,
WhiteMage = 24,
BlackMage = 25,
Arcanist = 26,
Summoner = 27,
Scholar = 28,
Rogue = 29,
Ninja = 30,
Machinist = 31,
DarkKnight = 32,
Astrologian = 33,
Samurai = 34,
RedMage = 35,
BlueMage = 36,
Gunbreaker = 37,
Dancer = 38,
Reaper = 39,
Sage = 40,
Viper = 41,
Pictomancer = 42,
}
internal static class EClassJobExtensions
{
public static EClassJob AsJob(this EClassJob classJob) => classJob switch
{
EClassJob.Gladiator => EClassJob.Paladin,
EClassJob.Marauder => EClassJob.Warrior,
EClassJob.Pugilist => EClassJob.Monk,
EClassJob.Lancer => EClassJob.Dragoon,
EClassJob.Rogue => EClassJob.Ninja,
EClassJob.Archer => EClassJob.Bard,
EClassJob.Conjurer => EClassJob.WhiteMage,
EClassJob.Thaumaturge => EClassJob.BlackMage,
EClassJob.Arcanist => EClassJob.Summoner,
_ => classJob,
};
public static bool IsTank(this EClassJob classJob) =>
classJob is EClassJob.Gladiator
or EClassJob.Paladin
or EClassJob.Marauder
or EClassJob.Warrior
or EClassJob.DarkKnight
or EClassJob.Gunbreaker;
public static bool IsHealer(this EClassJob classJob) =>
classJob is EClassJob.Conjurer
or EClassJob.WhiteMage
or EClassJob.Scholar
or EClassJob.Astrologian
or EClassJob.Sage;
public static bool IsMelee(this EClassJob classJob) =>
classJob is EClassJob.Pugilist
or EClassJob.Monk
or EClassJob.Lancer
or EClassJob.Dragoon
or EClassJob.Rogue
or EClassJob.Ninja
or EClassJob.Samurai
or EClassJob.Reaper
or EClassJob.Viper;
public static bool IsPhysicalRanged(this EClassJob classJob) =>
classJob is EClassJob.Archer
or EClassJob.Bard
or EClassJob.Machinist
or EClassJob.Dancer;
public static bool IsCaster(this EClassJob classJob) =>
classJob is EClassJob.Thaumaturge
or EClassJob.BlackMage
or EClassJob.Arcanist
or EClassJob.Summoner
or EClassJob.RedMage
or EClassJob.BlueMage
or EClassJob.Pictomancer;
public static bool DealsPhysicalDamage(this EClassJob classJob) =>
classJob.IsTank() || classJob.IsMelee() || classJob.IsPhysicalRanged();
public static bool DealsMagicDamage(this EClassJob classJob) =>
classJob.IsHealer() || classJob.IsCaster();
public static bool IsCrafter(this EClassJob classJob) =>
classJob is >= EClassJob.Carpenter and <= EClassJob.Culinarian;
public static bool IsGatherer(this EClassJob classJob) => classJob is >= EClassJob.Miner and <= EClassJob.Fisher;
}

44
Gearsetter/GameData/GameDataHolder.cs
View File

@ -1,29 +1,25 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Dalamud;
using Dalamud.Game; using Dalamud.Game;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Game; using FFXIVClientStructs.FFXIV.Client.Game;
using Gearsetter.Model; using Gearsetter.Model;
using LLib.GameData; using Lumina.Excel.GeneratedSheets;
using LLib.Gear;
using Lumina.Excel.Sheets;
namespace Gearsetter.GameData; namespace Gearsetter.GameData;
internal sealed class GameDataHolder internal sealed class GameDataHolder
{ {
private readonly Configuration _configuration; private readonly Configuration _configuration;
private readonly GearStatsCalculator _gearStatsCalculator;
private readonly Dictionary<uint, List<EClassJob>> _classJobCategories; private readonly Dictionary<uint, List<EClassJob>> _classJobCategories;
private readonly IReadOnlyList<ItemList> _allItemLists; private readonly IReadOnlyList<ItemList> _allItemLists;
public GameDataHolder(IDataManager dataManager, Configuration configuration, public GameDataHolder(IDataManager dataManager, Configuration configuration)
GearStatsCalculator gearStatsCalculator)
{ {
_configuration = configuration; _configuration = configuration;
_gearStatsCalculator = gearStatsCalculator; _classJobCategories = dataManager.GetExcelSheet<ClassJobCategory>()!
_classJobCategories = dataManager.GetExcelSheet<ClassJobCategory>()
.ToDictionary(x => x.RowId, x => .ToDictionary(x => x.RowId, x =>
new Dictionary<EClassJob, bool> new Dictionary<EClassJob, bool>
{ {
@ -74,30 +70,33 @@ internal sealed class GameDataHolder
.Where(y => y.Value) .Where(y => y.Value)
.Select(y => y.Key) .Select(y => y.Key)
.ToList()); .ToList());
ClassJobNames = dataManager.GetExcelSheet<ClassJob>() ClassJobNames = dataManager.GetExcelSheet<ClassJob>()!
.Where(x => x.RowId > 0 && Enum.IsDefined(typeof(EClassJob), x.RowId)) .Where(x => x.RowId > 0 && Enum.IsDefined(typeof(EClassJob), x.RowId))
.OrderBy(x => x.UIPriority) .OrderBy(x => x.UIPriority)
.Select(x => ((EClassJob)x.RowId, .Select(x => ((EClassJob)x.RowId,
dataManager.Language == ClientLanguage.English ? x.NameEnglish.ToString() : x.Name.ToString())) dataManager.Language == ClientLanguage.English ? x.NameEnglish.ToString() : x.Name.ToString()))
.ToList(); .ToList();
PrimaryStats = dataManager.GetExcelSheet<ClassJob>() PrimaryStats = dataManager.GetExcelSheet<ClassJob>()!
.Where(x => x.RowId > 0 && Enum.IsDefined(typeof(EClassJob), x.RowId)) .Where(x => x.RowId > 0 && Enum.IsDefined(typeof(EClassJob), x.RowId))
.Where(x => x.PrimaryStat > 0) .Where(x => x.PrimaryStat > 0)
.ToDictionary(x => (EClassJob)x.RowId, x => (EBaseParam)x.PrimaryStat); .ToDictionary(x => (EClassJob)x.RowId, x => (EBaseParam)x.PrimaryStat);
ItemUiCategoryNames = dataManager.GetExcelSheet<ItemUICategory>() ItemUiCategoryNames = dataManager.GetExcelSheet<ItemUICategory>()!
.Where(x => x.RowId > 0) .Where(x => x.RowId > 0)
.OrderBy(x => x.OrderMajor) .OrderBy(x => x.OrderMajor)
.ThenBy(x => x.OrderMinor) .ThenBy(x => x.OrderMinor)
.Select(x => (x.RowId, x.Name.ToString())) .Select(x => (x.RowId, x.Name.ToString()))
.ToList(); .ToList();
Materias = dataManager.GetExcelSheet<Materia>()!
.Where(x => x.RowId > 0 && Enum.IsDefined(typeof(EBaseParam), (byte)x.BaseParam.Row))
.ToDictionary(x => x.RowId, x => new MateriaStat((EBaseParam)x.BaseParam.Row, x.Value));
_allItemLists = _allItemLists =
dataManager.GetExcelSheet<Item>() dataManager.GetExcelSheet<Item>()!
.Where(x => x.RowId > 1600) // exclude outdated names .Where(x => x.RowId > 1600) // exclude outdated names
.Where(x => x.EquipSlotCategory.RowId > 0 && .Where(x => x.EquipSlotCategory.Row > 0 &&
Enum.IsDefined(typeof(EEquipSlotCategory), x.EquipSlotCategory.RowId)) Enum.IsDefined(typeof(EEquipSlotCategory), x.EquipSlotCategory.Row))
.Where(x => x.LevelItem.RowId > 1) // ignore ilvl 1 glamour items (also includes starter weapons) .Where(x => x.LevelItem.Row > 1) // ignore ilvl 1 glamour items (also includes starter weapons)
.Where(x => x.ItemSeries.RowId is <= 3 or >= 28) .Where(x => x.ItemSeries.Row is <= 3 or >= 28)
.SelectMany(LoadItem) .SelectMany(LoadItem)
.SelectMany(x => x.ClassJobs.Select(y => x.Item with { ClassJob = y })) .SelectMany(x => x.ClassJobs.Select(y => x.Item with { ClassJob = y }))
.Where(x => x.ClassJob != EClassJob.Scholar || x.ItemUiCategory != 10) // exclude ACN weapon as scholar .Where(x => x.ClassJob != EClassJob.Scholar || x.ItemUiCategory != 10) // exclude ACN weapon as scholar
@ -135,6 +134,7 @@ internal sealed class GameDataHolder
public IReadOnlyList<(EClassJob ClassJob, string Name)> ClassJobNames { get; } public IReadOnlyList<(EClassJob ClassJob, string Name)> ClassJobNames { get; }
public IReadOnlyList<(uint ItemUiCategory, string Name)> ItemUiCategoryNames { get; } public IReadOnlyList<(uint ItemUiCategory, string Name)> ItemUiCategoryNames { get; }
public Dictionary<EClassJob, EBaseParam> PrimaryStats { get; } public Dictionary<EClassJob, EBaseParam> PrimaryStats { get; }
public Dictionary<uint, MateriaStat> Materias { get; set; }
public Dictionary<EBaseParam, string> StatNames { get; } = new() public Dictionary<EBaseParam, string> StatNames { get; } = new()
{ {
@ -205,15 +205,9 @@ internal sealed class GameDataHolder
private IEnumerable<(EquipmentItem Item, List<EClassJob> ClassJobs)> LoadItem(Item item) private IEnumerable<(EquipmentItem Item, List<EClassJob> ClassJobs)> LoadItem(Item item)
{ {
var classJobCategories = _classJobCategories[item.ClassJobCategory.RowId]; var classJobCategories = _classJobCategories[item.ClassJobCategory.Row];
yield return ( yield return (new EquipmentItem(item, false), classJobCategories);
new EquipmentItem(item, false, _gearStatsCalculator.CalculateGearStats(item, false, [])),
classJobCategories);
if (item.CanBeHq) if (item.CanBeHq)
{ yield return (new EquipmentItem(item, true), classJobCategories);
yield return (
new EquipmentItem(item, true, _gearStatsCalculator.CalculateGearStats(item, true, [])),
classJobCategories);
}
} }
} }

4
Gearsetter/Gearsetter.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Dalamud.NET.Sdk/11.0.0"> <Project Sdk="Dalamud.NET.Sdk/9.0.2">
<PropertyGroup> <PropertyGroup>
<Version>2.4</Version> <Version>1.1</Version>
<OutputPath>dist</OutputPath> <OutputPath>dist</OutputPath>
</PropertyGroup> </PropertyGroup>

8
Gearsetter/Gearsetter.json
View File

@ -2,11 +2,7 @@
"Name": "Gearsetter", "Name": "Gearsetter",
"Author": "Liza Carvelli", "Author": "Liza Carvelli",
"Punchline": "Find gear upgrades", "Punchline": "Find gear upgrades",
"Description": "Browse through all gear pieces available for each class/job and show possible upgrades", "Description": "",
"RepoUrl": "https://git.carvel.li/liza/Gearsetter", "RepoUrl": "https://git.carvel.li/liza/Gearsetter",
"IconUrl": "https://plugins.carvel.li/icons/Gearsetter.png", "IconUrl": "https://plugins.carvel.li/icons/Gearsetter.png"
"Tags": [
"gearset",
"gearsets"
]
} }

186
Gearsetter/GearsetterPlugin.cs
View File

@ -12,13 +12,10 @@ using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Game; using FFXIVClientStructs.FFXIV.Client.Game;
using FFXIVClientStructs.FFXIV.Client.Game.UI; using FFXIVClientStructs.FFXIV.Client.Game.UI;
using FFXIVClientStructs.FFXIV.Client.UI.Misc; using FFXIVClientStructs.FFXIV.Client.UI.Misc;
using Gearsetter.External;
using Gearsetter.GameData; using Gearsetter.GameData;
using Gearsetter.Model; using Gearsetter.Model;
using Gearsetter.Windows; using Gearsetter.Windows;
using LLib.GameData; using Lumina.Excel.GeneratedSheets;
using LLib.Gear;
using Lumina.Excel.Sheets;
using GrandCompany = FFXIVClientStructs.FFXIV.Client.UI.Agent.GrandCompany; using GrandCompany = FFXIVClientStructs.FFXIV.Client.UI.Agent.GrandCompany;
using InventoryItem = FFXIVClientStructs.FFXIV.Client.Game.InventoryItem; using InventoryItem = FFXIVClientStructs.FFXIV.Client.Game.InventoryItem;
@ -34,12 +31,11 @@ public sealed class GearsetterPlugin : IDalamudPlugin
private readonly IDataManager _dataManager; private readonly IDataManager _dataManager;
private readonly IPluginLog _pluginLog; private readonly IPluginLog _pluginLog;
private readonly IClientState _clientState; private readonly IClientState _clientState;
private readonly GearsetterIpc _gearsetterIpc;
private readonly Configuration _configuration; private readonly Configuration _configuration;
private readonly GearStatsCalculator _gearStatsCalculator;
private readonly GameDataHolder _gameDataHolder; private readonly GameDataHolder _gameDataHolder;
private readonly EquipmentBrowserWindow _equipmentBrowserWindow; private readonly EquipmentBrowserWindow _equipmentBrowserWindow;
private readonly ConfigWindow _configWindow; private readonly ConfigWindow _configWindow;
private readonly IReadOnlyDictionary<byte, DalamudLinkPayload> _linkPayloads; private readonly IReadOnlyDictionary<byte, DalamudLinkPayload> _linkPayloads;
private readonly Dictionary<EClassJob, byte> _classJobToArrayIndex; private readonly Dictionary<EClassJob, byte> _classJobToArrayIndex;
@ -54,7 +50,6 @@ public sealed class GearsetterPlugin : IDalamudPlugin
_dataManager = dataManager; _dataManager = dataManager;
_pluginLog = pluginLog; _pluginLog = pluginLog;
_clientState = clientState; _clientState = clientState;
_gearsetterIpc = new GearsetterIpc(this, _pluginInterface, _pluginLog);
Configuration? configuration = (Configuration?)_pluginInterface.GetPluginConfig(); Configuration? configuration = (Configuration?)_pluginInterface.GetPluginConfig();
if (configuration == null) if (configuration == null)
@ -64,8 +59,7 @@ public sealed class GearsetterPlugin : IDalamudPlugin
} }
_configuration = configuration; _configuration = configuration;
_gearStatsCalculator = new GearStatsCalculator(dataManager); _gameDataHolder = new GameDataHolder(dataManager, _configuration);
_gameDataHolder = new GameDataHolder(dataManager, _configuration, _gearStatsCalculator);
_equipmentBrowserWindow = new EquipmentBrowserWindow(this, _gameDataHolder, _clientState, _chatGui); _equipmentBrowserWindow = new EquipmentBrowserWindow(this, _gameDataHolder, _clientState, _chatGui);
_windowSystem.AddWindow(_equipmentBrowserWindow); _windowSystem.AddWindow(_equipmentBrowserWindow);
_configWindow = new ConfigWindow(_pluginInterface, _configuration); _configWindow = new ConfigWindow(_pluginInterface, _configuration);
@ -86,7 +80,7 @@ public sealed class GearsetterPlugin : IDalamudPlugin
_pluginInterface.UiBuilder.OpenMainUi += _equipmentBrowserWindow.Toggle; _pluginInterface.UiBuilder.OpenMainUi += _equipmentBrowserWindow.Toggle;
_pluginInterface.UiBuilder.OpenConfigUi += _configWindow.Toggle; _pluginInterface.UiBuilder.OpenConfigUi += _configWindow.Toggle;
_classJobToArrayIndex = dataManager.GetExcelSheet<ClassJob>() _classJobToArrayIndex = dataManager.GetExcelSheet<ClassJob>()!
.Where(x => x.RowId > 0 && Enum.IsDefined(typeof(EClassJob), x.RowId)) .Where(x => x.RowId > 0 && Enum.IsDefined(typeof(EClassJob), x.RowId))
.ToDictionary(x => (EClassJob)x.RowId, x => (byte)x.ExpArrayIndex); .ToDictionary(x => (EClassJob)x.RowId, x => (byte)x.ExpArrayIndex);
} }
@ -145,7 +139,7 @@ public sealed class GearsetterPlugin : IDalamudPlugin
var gearset = gearsetModule->GetGearset(i); var gearset = gearsetModule->GetGearset(i);
if (gearset != null && gearset->Flags.HasFlag(RaptureGearsetModule.GearsetFlag.Exists)) if (gearset != null && gearset->Flags.HasFlag(RaptureGearsetModule.GearsetFlag.Exists))
{ {
if (onlyCurrentJob && gearset->ClassJob != _clientState.LocalPlayer!.ClassJob.RowId) if (onlyCurrentJob && gearset->ClassJob != _clientState.LocalPlayer!.ClassJob.Id)
continue; continue;
var gearsetData = PrepareGearset(gearset); var gearsetData = PrepareGearset(gearset);
@ -178,60 +172,39 @@ public sealed class GearsetterPlugin : IDalamudPlugin
name.Contains("Bozja", StringComparison.OrdinalIgnoreCase)) name.Contains("Bozja", StringComparison.OrdinalIgnoreCase))
return null; return null;
return new GearsetData(_dataManager, _gearStatsCalculator, gearset, name); return new GearsetData(_dataManager, gearset, name);
} }
internal unsafe List<RecommendedItemChange> GetRecommendedUpgrades(RaptureGearsetModule.GearsetEntry* gearset, private bool HandleGearset(GearsetData gearset,
byte? level = null) Dictionary<(uint ItemId, bool Hq), List<MateriaStats>> inventoryItems, byte? level)
{ {
GearsetData gearsetData = new GearsetData(_dataManager, _gearStatsCalculator, gearset, GetGearsetName(gearset)); List<SeString> Handle(string label, EquipmentItem?[] gearsetItems,
Dictionary<(uint ItemId, bool Hq), List<EquipmentStats>> inventoryItems = GetAllInventoryItems();
return GetRecommendedUpgrades(gearsetData, inventoryItems, level);
}
private List<RecommendedItemChange> GetRecommendedUpgrades(GearsetData gearset,
Dictionary<(uint ItemId, bool Hql), List<EquipmentStats>> inventoryItems, byte? level)
{
List<RecommendedItemChange> Handle(string label,
(EquipmentItem?, RaptureGearsetModule.GearsetItemIndex)[] gearsetItems,
EEquipSlotCategory category) EEquipSlotCategory category)
{ {
return HandleGearsetItem(label, gearset, gearsetItems, inventoryItems, category, level); return HandleGearsetItem(label, gearset, gearsetItems, inventoryItems, category, level);
} }
List<List<RecommendedItemChange>> upgrades = new() List<List<SeString>> upgrades = new()
{ {
Handle("Main Hand", [(gearset.MainHand, RaptureGearsetModule.GearsetItemIndex.MainHand)], Handle("Main Hand", [gearset.MainHand], EEquipSlotCategory.None),
EEquipSlotCategory.None),
HandleOffHand(gearset, inventoryItems, level), HandleOffHand(gearset, inventoryItems, level),
Handle("Head", [(gearset.Head, RaptureGearsetModule.GearsetItemIndex.Head)], EEquipSlotCategory.Head), Handle("Head", [gearset.Head], EEquipSlotCategory.Head),
Handle("Body", [(gearset.Body, RaptureGearsetModule.GearsetItemIndex.Body)], EEquipSlotCategory.Body), Handle("Body", [gearset.Body], EEquipSlotCategory.Body),
Handle("Hands", [(gearset.Hands, RaptureGearsetModule.GearsetItemIndex.Hands)], EEquipSlotCategory.Hands), Handle("Hands", [gearset.Hands], EEquipSlotCategory.Hands),
Handle("Legs", [(gearset.Legs, RaptureGearsetModule.GearsetItemIndex.Legs)], EEquipSlotCategory.Legs), Handle("Legs", [gearset.Legs], EEquipSlotCategory.Legs),
Handle("Feet", [(gearset.Feet, RaptureGearsetModule.GearsetItemIndex.Feet)], EEquipSlotCategory.Feet), Handle("Feet", [gearset.Feet], EEquipSlotCategory.Feet),
Handle("Ears", [(gearset.Ears, RaptureGearsetModule.GearsetItemIndex.Ears)], EEquipSlotCategory.Ears), Handle("Ears", [gearset.Ears], EEquipSlotCategory.Ears),
Handle("Neck", [(gearset.Neck, RaptureGearsetModule.GearsetItemIndex.Neck)], EEquipSlotCategory.Neck), Handle("Neck", [gearset.Neck], EEquipSlotCategory.Neck),
Handle("Wrists", [(gearset.Wrists, RaptureGearsetModule.GearsetItemIndex.Wrists)], Handle("Wrists", [gearset.Wrists], EEquipSlotCategory.Wrists),
EEquipSlotCategory.Wrists),
Handle("Rings", Handle("Rings",
[ [gearset.RingLeft, gearset.RingRight],
(gearset.RingLeft, RaptureGearsetModule.GearsetItemIndex.RingLeft),
(gearset.RingRight, RaptureGearsetModule.GearsetItemIndex.RingRight)
],
EEquipSlotCategory.Rings), EEquipSlotCategory.Rings),
}; };
return upgrades.SelectMany(x => x).ToList(); List<SeString> flatUpgrades = upgrades.SelectMany(x => x).ToList();
} if (flatUpgrades.Count == 0)
private bool HandleGearset(GearsetData gearset,
Dictionary<(uint ItemId, bool Hq), List<EquipmentStats>> inventoryItems, byte? level)
{
List<RecommendedItemChange> upgrades = GetRecommendedUpgrades(gearset, inventoryItems, level);
if (upgrades.Count == 0)
return false; return false;
_chatGui.Print( _chatGui.Print(
@ -246,8 +219,8 @@ public sealed class GearsetterPlugin : IDalamudPlugin
.AddText(level != null ? $" at {level}" : "") .AddText(level != null ? $" at {level}" : "")
.Build()); .Build());
foreach (var upgrade in upgrades) foreach (var upgrade in flatUpgrades)
_chatGui.Print(new SeString(new TextPayload(" - ")).Append(upgrade.Text)); _chatGui.Print(new SeString(new TextPayload(" - ")).Append(upgrade));
return true; return true;
} }
@ -259,43 +232,41 @@ public sealed class GearsetterPlugin : IDalamudPlugin
private unsafe string GetGearsetName(RaptureGearsetModule.GearsetEntry* gearset) private unsafe string GetGearsetName(RaptureGearsetModule.GearsetEntry* gearset)
=> gearset->NameString.Split((char)0)[0]; => gearset->NameString.Split((char)0)[0];
private List<RecommendedItemChange> HandleGearsetItem(string label, GearsetData gearset, private List<SeString> HandleGearsetItem(string label, GearsetData gearset,
(EquipmentItem? Item, RaptureGearsetModule.GearsetItemIndex Slot)[] gearsetItems, EquipmentItem?[] gearsetItems,
Dictionary<(uint ItemId, bool Hq), List<EquipmentStats>> inventoryItems, Dictionary<(uint ItemId, bool Hq), List<MateriaStats>> inventoryItems,
EEquipSlotCategory equipSlotCategory, byte? level) EEquipSlotCategory equipSlotCategory, byte? level)
{ {
EClassJob classJob = gearset.ClassJob; EClassJob classJob = gearset.ClassJob;
List<RaptureGearsetModule.GearsetItemIndex> availableGearsetSlots = gearsetItems.Select(x => x.Slot).ToList();
var itemLists = _gameDataHolder.GetItemLists(classJob); var itemLists = _gameDataHolder.GetItemLists(classJob);
if (equipSlotCategory == EEquipSlotCategory.None && gearsetItems.Any(x => x.Item != null)) if (equipSlotCategory == EEquipSlotCategory.None && gearsetItems.Any(x => x != null))
{ {
var firstEquippedItem = gearsetItems.First(x => x.Item != null); var firstEquippedItem = gearsetItems.First(x => x != null);
equipSlotCategory = firstEquippedItem.Item!.EquipSlotCategory; equipSlotCategory = firstEquippedItem!.EquipSlotCategory;
} }
if (equipSlotCategory == EEquipSlotCategory.None) if (equipSlotCategory == EEquipSlotCategory.None)
{ {
_pluginLog.Warning("Unable to find item to determine equip slot category"); _pluginLog.Warning($"Unable to find item to determine equip slot category");
return []; return new List<SeString>();
} }
(BaseItem? Item, RaptureGearsetModule.GearsetItemIndex Slot)[] currentItems = gearsetItems BaseItem?[] currentItems = gearsetItems
.Select(x => .Select(x =>
{ {
if (x.Item == null) if (x == null)
return (null, x.Slot); return null;
var baseItem = itemLists return itemLists
.SelectMany(y => y.Items.Where(z => x.Item.ItemId == z.ItemId && x.Item.Hq == z.Hq)) .SelectMany(y => y.Items.Where(z => x.ItemId == z.ItemId && x.Hq == z.Hq))
.FirstOrDefault(); .FirstOrDefault();
return (baseItem, x.Slot);
}) })
.ToArray(); .ToArray();
var availableList = _gameDataHolder.GetItemList(classJob, equipSlotCategory); var availableList = _gameDataHolder.GetItemList(classJob, equipSlotCategory);
if (availableList == null) if (availableList == null)
return []; return new List<SeString>();
if (level == null) if (level == null)
level = GetLevel(classJob); level = GetLevel(classJob);
@ -310,29 +281,18 @@ public sealed class GearsetterPlugin : IDalamudPlugin
.Take(gearsetItems.Length) .Take(gearsetItems.Length)
.ToList(); .ToList();
//_pluginLog.Debug( //_pluginLog.Debug(
// $"{equipSlotCategory}: {string.Join(" ", currentItems.Select(x => $"{x.Item}, {x.Slot}"))}"); // $"{equipSlotCategory}: {string.Join(" ", currentItems.Select(x => $"{x?.ItemId}|{x?.Hq}"))}");
foreach (var currentItem in currentItems) foreach (var currentItem in currentItems)
{ {
var foundIndex = bestItems.FindIndex(x => var foundIndex = bestItems.FindIndex(x =>
currentItem.Item != null && currentItem.Item.ItemId == x.ItemId && currentItem.Item.Hq == x.Hq); currentItem != null && currentItem.ItemId == x.ItemId && currentItem.Hq == x.Hq);
if (foundIndex >= 0) if (foundIndex >= 0)
{
bestItems.RemoveAt(foundIndex); bestItems.RemoveAt(foundIndex);
availableGearsetSlots.Remove(currentItem.Slot);
}
} }
return bestItems return bestItems
.Select(x => .Select(x => new SeString(new TextPayload($"{label}: "))
{ .Append(SeString.CreateItemLink(x.ItemId, x.Hq))).ToList();
var slot = availableGearsetSlots[0];
availableGearsetSlots.RemoveAt(0);
return ToItemRecommendation(x, slot,
new SeString(new TextPayload($"{label}: "))
.Append(SeString.CreateItemLink(x.ItemId, x.Hq)));
})
.ToList();
} }
finally finally
{ {
@ -340,20 +300,20 @@ public sealed class GearsetterPlugin : IDalamudPlugin
} }
} }
private List<RecommendedItemChange> HandleOffHand(GearsetData gearset,
Dictionary<(uint ItemId, bool Hq), List<EquipmentStats>> inventoryItems, byte? level) private unsafe List<SeString> HandleOffHand(GearsetData gearset,
Dictionary<(uint ItemId, bool Hq), List<MateriaStats>> inventoryItems, byte? level)
{ {
var mainHand = gearset.MainHand; var mainHand = gearset.MainHand;
if (mainHand == null) if (mainHand == null)
return []; return new List<SeString>();
// if it's a twohanded weapon, ignore it // if it's a twohanded weapon, ignore it
EEquipSlotCategory equipSlotCategory = mainHand.EquipSlotCategory; EEquipSlotCategory equipSlotCategory = mainHand.EquipSlotCategory;
if (equipSlotCategory != EEquipSlotCategory.OneHandedMainHand) if (equipSlotCategory != EEquipSlotCategory.OneHandedMainHand)
return []; return new List<SeString>();
return HandleGearsetItem("Off Hand", gearset, return HandleGearsetItem("Off Hand", gearset, [gearset.OffHand],
[(gearset.OffHand, RaptureGearsetModule.GearsetItemIndex.OffHand)],
inventoryItems, inventoryItems,
EEquipSlotCategory.Shield, level); EEquipSlotCategory.Shield, level);
} }
@ -361,35 +321,9 @@ public sealed class GearsetterPlugin : IDalamudPlugin
private unsafe void ChangeGearset(uint commandId, SeString seString) private unsafe void ChangeGearset(uint commandId, SeString seString)
=> RaptureGearsetModule.Instance()->EquipGearset((byte)commandId); => RaptureGearsetModule.Instance()->EquipGearset((byte)commandId);
internal unsafe Dictionary<(uint ItemId, bool Hq), List<MateriaStats>> GetAllInventoryItems()
private unsafe RecommendedItemChange ToItemRecommendation(BaseItem baseItem,
RaptureGearsetModule.GearsetItemIndex targetSlot, SeString text)
{ {
InventoryManager* inventoryManager = InventoryManager.Instance(); Dictionary<(uint, bool), List<MateriaStats>> inventoryItems = new();
foreach (var inventoryType in _gameDataHolder.DefaultInventoryTypes)
{
var container = inventoryManager->GetInventoryContainer(inventoryType);
for (int i = 0; i < container->Size; ++i)
{
var item = container->GetInventorySlot(i);
if (item != null && item->ItemId == baseItem.ItemId &&
item->Flags.HasFlag(InventoryItem.ItemFlags.HighQuality) == baseItem.Hq)
{
EquipmentStats expectedMateriaStats = baseItem.Stats;
EquipmentStats actualMateriaStats = FetchMateriaStats(item);
if (expectedMateriaStats == actualMateriaStats)
return new RecommendedItemChange(item->ItemId, inventoryType, i, targetSlot, text);
}
}
}
return new RecommendedItemChange(baseItem.ItemId, null, null, targetSlot, text);
}
internal unsafe Dictionary<(uint ItemId, bool Hq), List<EquipmentStats>> GetAllInventoryItems()
{
Dictionary<(uint, bool), List<EquipmentStats>> inventoryItems = new();
InventoryManager* inventoryManager = InventoryManager.Instance(); InventoryManager* inventoryManager = InventoryManager.Instance();
foreach (var inventoryType in _gameDataHolder.DefaultInventoryTypes) foreach (var inventoryType in _gameDataHolder.DefaultInventoryTypes)
{ {
@ -402,11 +336,23 @@ public sealed class GearsetterPlugin : IDalamudPlugin
var key = (item->ItemId, item->Flags.HasFlag(InventoryItem.ItemFlags.HighQuality)); var key = (item->ItemId, item->Flags.HasFlag(InventoryItem.ItemFlags.HighQuality));
if (!inventoryItems.TryGetValue(key, out var list)) if (!inventoryItems.TryGetValue(key, out var list))
{ {
list = new List<EquipmentStats>(); list = new List<MateriaStats>();
inventoryItems[key] = list; inventoryItems[key] = list;
} }
list.Add(FetchMateriaStats(item)); // FIXME item->GetMateriaCount is broken on API 10, so this seems to be somewhat slow
List<(MateriaStat, byte)> materias = new();
for (int slot = 0; slot < 5; ++slot)
{
var materiaId = item->Materia[slot];
if (materiaId == 0)
break;
if (_gameDataHolder.Materias.TryGetValue(materiaId, out MateriaStat? value))
materias.Add((value, item->MateriaGrades[slot]));
}
list.Add(new MateriaStats(materias));
} }
} }
} }
@ -414,9 +360,6 @@ public sealed class GearsetterPlugin : IDalamudPlugin
return inventoryItems; return inventoryItems;
} }
private unsafe EquipmentStats FetchMateriaStats(InventoryItem* item)
=> _gearStatsCalculator.CalculateGearStats(item);
internal unsafe byte GetLevel(EClassJob classJob) internal unsafe byte GetLevel(EClassJob classJob)
{ {
var playerState = PlayerState.Instance(); var playerState = PlayerState.Instance();
@ -435,6 +378,5 @@ public sealed class GearsetterPlugin : IDalamudPlugin
_pluginInterface.RemoveChatLinkHandler(); _pluginInterface.RemoveChatLinkHandler();
_commandManager.RemoveHandler("/gbrowser"); _commandManager.RemoveHandler("/gbrowser");
_commandManager.RemoveHandler("/gup"); _commandManager.RemoveHandler("/gup");
_gearsetterIpc.Dispose();
} }
} }

27
Gearsetter/Model/BaseItem.cs
View File

@ -1,12 +1,9 @@
using System.Linq; using Gearsetter.GameData;
using Gearsetter.GameData; using Lumina.Excel.GeneratedSheets;
using LLib.GameData;
using LLib.Gear;
using Lumina.Excel.Sheets;
namespace Gearsetter.Model; namespace Gearsetter.Model;
internal abstract record BaseItem(Item Item, bool Hq, EquipmentStats Stats) internal abstract record BaseItem(Item Item, bool Hq, MateriaStats? MateriaStats = null)
{ {
public Item Item { get; } = Item; public Item Item { get; } = Item;
public uint ItemId { get; } = Item.RowId; public uint ItemId { get; } = Item.RowId;
@ -14,12 +11,12 @@ internal abstract record BaseItem(Item Item, bool Hq, EquipmentStats Stats)
public bool CanBeHq { get; } = Item.CanBeHq; public bool CanBeHq { get; } = Item.CanBeHq;
public string Name { get; } = Item.Name.ToString(); public string Name { get; } = Item.Name.ToString();
public byte Level { get; } = Item.LevelEquip; public byte Level { get; } = Item.LevelEquip;
public uint ItemLevel { get; } = Item.LevelItem.RowId; public uint ItemLevel { get; } = Item.LevelItem.Row;
public byte Rarity { get; } = Item.Rarity; public byte Rarity { get; } = Item.Rarity;
public EEquipSlotCategory EquipSlotCategory { get; } = (EEquipSlotCategory)Item.EquipSlotCategory.RowId; public EEquipSlotCategory EquipSlotCategory { get; } = (EEquipSlotCategory)Item.EquipSlotCategory.Row;
public uint ItemUiCategory { get; } = Item.ItemUICategory.RowId; public uint ItemUiCategory { get; } = Item.ItemUICategory.Row;
public abstract EClassJob ClassJob { get; init; } public abstract EClassJob ClassJob { get; init; }
public EquipmentStats Stats { get; } = Stats; public EquipmentStats Stats { get; } = new(Item, Hq, MateriaStats);
public int PrimaryStat { get; init; } = -1; public int PrimaryStat { get; init; } = -1;
@ -37,7 +34,15 @@ internal abstract record BaseItem(Item Item, bool Hq, EquipmentStats Stats)
} }
public bool HasAnyStat(params EBaseParam[] substats) public bool HasAnyStat(params EBaseParam[] substats)
=> substats.Any(x => Stats.Has(x)); {
foreach (EBaseParam substat in substats)
{
if (Stats.Get(substat) > 0)
return true;
}
return false;
}
public bool IsCombatRelicWithoutSubstats() public bool IsCombatRelicWithoutSubstats()
{ {

7
Gearsetter/Model/EquipmentItem.cs
View File

@ -1,10 +1,9 @@
using LLib.GameData; using Gearsetter.GameData;
using LLib.Gear; using Lumina.Excel.GeneratedSheets;
using Lumina.Excel.Sheets;
namespace Gearsetter.Model; namespace Gearsetter.Model;
internal sealed record EquipmentItem(Item Item, bool Hq, EquipmentStats Stats) : BaseItem(Item, Hq, Stats) internal sealed record EquipmentItem(Item Item, bool Hq) : BaseItem(Item, Hq)
{ {
public override EClassJob ClassJob { get; init; } = EClassJob.Adventurer; public override EClassJob ClassJob { get; init; } = EClassJob.Adventurer;
} }

55
Gearsetter/Model/EquipmentStats.cs
View File

@ -1,5 +1,58 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using LLib.Gear; using Gearsetter.GameData;
using Lumina.Excel.GeneratedSheets;
namespace Gearsetter.Model; namespace Gearsetter.Model;
internal sealed class EquipmentStats
{
private readonly Dictionary<EBaseParam, short> _equipmentValues;
private readonly Dictionary<EBaseParam, short> _materiaValues;
public EquipmentStats(Item item, bool hq, MateriaStats? materiaStats)
{
_equipmentValues = item.UnkData59.Where(x => x.BaseParam > 0)
.ToDictionary(x => (EBaseParam)x.BaseParam, x => x.BaseParamValue);
if (hq)
{
foreach (var hqstat in item.UnkData73.Select(x =>
((EBaseParam)x.BaseParamSpecial, x.BaseParamValueSpecial)))
{
if (_equipmentValues.TryGetValue(hqstat.Item1, out var stat))
_equipmentValues[hqstat.Item1] = (short)(stat + hqstat.BaseParamValueSpecial);
else
_equipmentValues[hqstat.Item1] = hqstat.BaseParamValueSpecial;
}
}
_materiaValues = new();
if (materiaStats != null)
{
foreach (var materiaStat in materiaStats.Values)
{
if (_materiaValues.TryGetValue(materiaStat.Key, out var stat))
_materiaValues[materiaStat.Key] = (short)(stat + materiaStat.Value);
else
_materiaValues[materiaStat.Key] = materiaStat.Value;
}
}
}
public short Get(EBaseParam param)
{
return (short)(GetEquipment(param) + GetMateria(param));
}
public short GetEquipment(EBaseParam param)
{
_equipmentValues.TryGetValue(param, out short v);
return v;
}
public short GetMateria(EBaseParam param)
{
_materiaValues.TryGetValue(param, out short v);
return v;
}
}

48
Gearsetter/Model/GearsetData.cs
View File

@ -1,43 +1,41 @@
using Dalamud.Plugin.Services; using System.Collections.Generic;
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.UI.Misc; using FFXIVClientStructs.FFXIV.Client.UI.Misc;
using LLib.GameData; using Gearsetter.GameData;
using LLib.Gear; using Lumina.Excel.GeneratedSheets;
using Lumina.Excel.Sheets;
namespace Gearsetter.Model; namespace Gearsetter.Model;
internal sealed class GearsetData internal sealed class GearsetData
{ {
public unsafe GearsetData(IDataManager dataManager, GearStatsCalculator gearStatsCalculator, public unsafe GearsetData(IDataManager dataManager, RaptureGearsetModule.GearsetEntry* gearset, string name)
RaptureGearsetModule.GearsetEntry* gearset, string name)
{ {
Id = gearset->Id; Id = gearset->Id;
ClassJob = (EClassJob)gearset->ClassJob; ClassJob = (EClassJob)gearset->ClassJob;
Name = name; Name = name;
MainHand = GetItem(dataManager, gearStatsCalculator, gearset, RaptureGearsetModule.GearsetItemIndex.MainHand); MainHand = GetItem(dataManager, gearset, RaptureGearsetModule.GearsetItemIndex.MainHand);
OffHand = GetItem(dataManager, gearStatsCalculator, gearset, RaptureGearsetModule.GearsetItemIndex.OffHand); OffHand = GetItem(dataManager, gearset, RaptureGearsetModule.GearsetItemIndex.OffHand);
Head = GetItem(dataManager, gearStatsCalculator, gearset, RaptureGearsetModule.GearsetItemIndex.Head); Head = GetItem(dataManager, gearset, RaptureGearsetModule.GearsetItemIndex.Head);
Body = GetItem(dataManager, gearStatsCalculator, gearset, RaptureGearsetModule.GearsetItemIndex.Body); Body = GetItem(dataManager, gearset, RaptureGearsetModule.GearsetItemIndex.Body);
Hands = GetItem(dataManager, gearStatsCalculator, gearset, RaptureGearsetModule.GearsetItemIndex.Hands); Hands = GetItem(dataManager, gearset, RaptureGearsetModule.GearsetItemIndex.Hands);
Legs = GetItem(dataManager, gearStatsCalculator, gearset, RaptureGearsetModule.GearsetItemIndex.Legs); Legs = GetItem(dataManager, gearset, RaptureGearsetModule.GearsetItemIndex.Legs);
Feet = GetItem(dataManager, gearStatsCalculator, gearset, RaptureGearsetModule.GearsetItemIndex.Feet); Feet = GetItem(dataManager, gearset, RaptureGearsetModule.GearsetItemIndex.Feet);
Ears = GetItem(dataManager, gearStatsCalculator, gearset, RaptureGearsetModule.GearsetItemIndex.Ears); Ears = GetItem(dataManager, gearset, RaptureGearsetModule.GearsetItemIndex.Ears);
Neck = GetItem(dataManager, gearStatsCalculator, gearset, RaptureGearsetModule.GearsetItemIndex.Neck); Neck = GetItem(dataManager, gearset, RaptureGearsetModule.GearsetItemIndex.Neck);
Wrists = GetItem(dataManager, gearStatsCalculator, gearset, RaptureGearsetModule.GearsetItemIndex.Wrists); Wrists = GetItem(dataManager, gearset, RaptureGearsetModule.GearsetItemIndex.Wrists);
RingLeft = GetItem(dataManager, gearStatsCalculator, gearset, RaptureGearsetModule.GearsetItemIndex.RingLeft); RingLeft = GetItem(dataManager, gearset, RaptureGearsetModule.GearsetItemIndex.RingLeft);
RingRight = GetItem(dataManager, gearStatsCalculator, gearset, RaptureGearsetModule.GearsetItemIndex.RingRight); RingRight = GetItem(dataManager, gearset, RaptureGearsetModule.GearsetItemIndex.RingRight);
} }
private static unsafe EquipmentItem? GetItem(IDataManager dataManager, GearStatsCalculator gearStatsCalculator, private static unsafe EquipmentItem? GetItem(IDataManager dataManager, RaptureGearsetModule.GearsetEntry* gearset,
RaptureGearsetModule.GearsetEntry* gearset, RaptureGearsetModule.GearsetItemIndex index) RaptureGearsetModule.GearsetItemIndex index)
{ {
var gearsetItem = gearset->GetItem(index); var gearsetItem = gearset->GetItem(index);
if (gearsetItem.ItemId == 0) if (gearsetItem.ItemId == 0)
return null; return null;
var item = dataManager.GetExcelSheet<Item>().GetRow(gearsetItem.ItemId % 1_000_000); var item = dataManager.GetExcelSheet<Item>()!.GetRow(gearsetItem.ItemId % 1_000_000)!;
bool hq = gearsetItem.ItemId > 1_000_000; return new EquipmentItem(item, gearsetItem.ItemId > 1_000_000);
return new EquipmentItem(item, hq, gearStatsCalculator.CalculateGearStats(item, hq, []));
} }
public byte Id { get; } public byte Id { get; }
@ -50,8 +48,8 @@ internal sealed class GearsetData
public EquipmentItem? Hands { get; } public EquipmentItem? Hands { get; }
public EquipmentItem? Legs { get; } public EquipmentItem? Legs { get; }
public EquipmentItem? Feet { get; } public EquipmentItem? Feet { get; }
public EquipmentItem? Ears { get; } public EquipmentItem? Ears { get; set; }
public EquipmentItem? Neck { get; } public EquipmentItem? Neck { get; set; }
public EquipmentItem? Wrists { get; } public EquipmentItem? Wrists { get; }
public EquipmentItem? RingLeft { get; } public EquipmentItem? RingLeft { get; }
public EquipmentItem? RingRight { get; } public EquipmentItem? RingRight { get; }

9
Gearsetter/Model/InventoryItem.cs
View File

@ -1,10 +1,9 @@
using LLib.GameData; using Gearsetter.GameData;
using LLib.Gear; using Lumina.Excel.GeneratedSheets;
using Lumina.Excel.Sheets;
namespace Gearsetter.Model; namespace Gearsetter.Model;
internal sealed record InventoryItem(Item Item, bool Hq, EquipmentStats Stats, EClassJob ClassJob) internal sealed record InventoryItem(Item Item, bool Hq, MateriaStats MateriaStats, EClassJob ClassJob)
: BaseItem(Item, Hq, Stats) : BaseItem(Item, Hq, MateriaStats)
{ {
} }

73
Gearsetter/Model/ItemList.cs
View File

@ -3,8 +3,6 @@ using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Linq; using System.Linq;
using Gearsetter.GameData; using Gearsetter.GameData;
using LLib.GameData;
using LLib.Gear;
namespace Gearsetter.Model; namespace Gearsetter.Model;
@ -12,11 +10,10 @@ internal sealed class ItemList
{ {
private static readonly ReadOnlyDictionary<uint, byte> PreferredItems = new Dictionary<uint, byte>() private static readonly ReadOnlyDictionary<uint, byte> PreferredItems = new Dictionary<uint, byte>()
{ {
{ 16039, 50 },
{ 24589, 70 },
{ 33648, 80 },
{ 41081, 90 }, { 41081, 90 },
{ 44410, 60 }, { 33648, 80 },
{ 24589, 70 },
{ 16039, 50 }
}.AsReadOnly(); }.AsReadOnly();
public required EClassJob ClassJob { get; init; } public required EClassJob ClassJob { get; init; }
@ -24,13 +21,32 @@ internal sealed class ItemList
public required uint ItemUiCategory { get; init; } public required uint ItemUiCategory { get; init; }
public required List<BaseItem> Items { get; set; } public required List<BaseItem> Items { get; set; }
public EBaseParam PrimaryStat { get; set; } public EBaseParam PrimaryStat { get; set; }
public IReadOnlyList<EBaseParam> SubstatPriorities { get; private set; } = new List<EBaseParam>(); public IReadOnlyList<EBaseParam> SubstatPriorities { get; set; } = new List<EBaseParam>();
public void Sort() public void Sort()
{ {
Items = Items var preferredItems = Items
.Where(x => PreferredItems.ContainsKey(x.ItemId))
// don't show azeyma's earring for lv90 blue mage
.Where(x => x.ItemId != 41081 || ClassJob != EClassJob.BlueMage)
.ToList();
var defaultItems = Items
.Except(preferredItems)
.OrderDescending(new ItemComparer(SubstatPriorities)) .OrderDescending(new ItemComparer(SubstatPriorities))
.ToList(); .ToList();
// insert the preferred items
foreach (BaseItem preferredItem in preferredItems)
{
int level = PreferredItems[preferredItem.ItemId];
int index = defaultItems.FindIndex(x => x.Level < level);
if (index >= 0)
defaultItems.Insert(index, preferredItem);
else
defaultItems.Add(preferredItem);
}
Items = defaultItems;
} }
public void UpdateStats(Dictionary<EClassJob, EBaseParam> primaryStats, Configuration configuration) public void UpdateStats(Dictionary<EClassJob, EBaseParam> primaryStats, Configuration configuration)
@ -64,7 +80,7 @@ internal sealed class ItemList
} }
} }
public void ApplyFromInventory(Dictionary<(uint ItemId, bool Hq), List<EquipmentStats>> inventoryItems, public void ApplyFromInventory(Dictionary<(uint ItemId, bool Hq), List<MateriaStats>> inventoryItems,
bool includeWithoutMateria) bool includeWithoutMateria)
{ {
foreach (var inventoryItem in inventoryItems) foreach (var inventoryItem in inventoryItems)
@ -74,11 +90,11 @@ internal sealed class ItemList
if (basicItem == null) if (basicItem == null)
continue; continue;
foreach (var inventoryStats in inventoryItem.Value) foreach (var materias in inventoryItem.Value)
{ {
if (includeWithoutMateria || inventoryStats.HasMateria()) if (includeWithoutMateria || materias.Values.Count > 0)
Items.Add( Items.Add(
new InventoryItem(basicItem.Item, basicItem.Hq, inventoryStats, basicItem.ClassJob) new InventoryItem(basicItem.Item, basicItem.Hq, materias, basicItem.ClassJob)
{ {
PrimaryStat = basicItem.Stats.Get(PrimaryStat) PrimaryStat = basicItem.Stats.Get(PrimaryStat)
}); });
@ -106,11 +122,6 @@ internal sealed class ItemList
if (damageA != damageB) if (damageA != damageB)
return damageA.CompareTo(damageB); return damageA.CompareTo(damageB);
bool hasPriorityA = TryGetPreferredItemPriority(a, b, out byte priorityA);
bool hasPriorityB = TryGetPreferredItemPriority(b, a, out byte priorityB);
if ((hasPriorityA || hasPriorityB) && priorityA != priorityB)
return priorityA.CompareTo(priorityB);
// gear: primary stat wins // gear: primary stat wins
// //
// we pretend every gear item has at least 1 primary stat to ensure weathered items are sorted last(ish), // we pretend every gear item has at least 1 primary stat to ensure weathered items are sorted last(ish),
@ -173,33 +184,5 @@ internal sealed class ItemList
// fallback // fallback
return string.CompareOrdinal(a.Name, b.Name); return string.CompareOrdinal(a.Name, b.Name);
} }
private static bool TryGetPreferredItemPriority(BaseItem self, BaseItem other, out byte priority)
{
if (PreferredItems.TryGetValue(self.ItemId, out byte levelSelf))
{
// both items are preferred, sort by level only
if (PreferredItems.TryGetValue(other.ItemId, out byte _))
{
priority = levelSelf;
return true;
}
// if they're the same level, place the preferred item last
if (levelSelf == other.Level)
{
priority = (byte)(levelSelf - 1);
return true;
}
priority = levelSelf;
return true;
}
else
{
priority = self.Level;
return false;
}
}
} }
} }

11
Gearsetter/Model/MateriaStat.cs Normal file
View File

@ -0,0 +1,11 @@
using System.Collections.Generic;
using System.Linq;
using Gearsetter.GameData;
namespace Gearsetter.Model;
internal sealed class MateriaStat(EBaseParam baseParam, short[] values)
{
public EBaseParam BaseParam { get; } = baseParam;
public List<short> Values { get; } = values.ToList();
}

49
Gearsetter/Model/MateriaStats.cs Normal file
View File

@ -0,0 +1,49 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Gearsetter.GameData;
namespace Gearsetter.Model;
internal sealed class MateriaStats
{
private readonly List<(EBaseParam, short)> _list;
public MateriaStats(IEnumerable<(MateriaStat Stat, byte Grade)> materias)
{
foreach (var materia in materias)
{
if (Values.TryGetValue(materia.Stat.BaseParam, out short value))
Values[materia.Stat.BaseParam] = (short)(value + materia.Stat.Values[materia.Grade]);
else
Values[materia.Stat.BaseParam] = materia.Stat.Values[materia.Grade];
++Count;
}
_list = Enum.GetValues<EBaseParam>()
.Select(x => (x, Values.GetValueOrDefault(x, (short)0)))
.Where(x => x.Item2 > 0)
.ToList();
}
public Dictionary<EBaseParam, short> Values { get; } = new();
public byte Count { get; }
public override bool Equals(object? obj)
{
if (obj is not MateriaStats other)
return false;
return _list == other._list;
}
public override int GetHashCode()
{
int hash = 19;
hash = hash * 31 + Count;
foreach (var item in _list)
hash = hash * 31 + item.GetHashCode();
return hash;
}
}

12
Gearsetter/Model/RecommendedItemChange.cs
View File

@ -1,12 +0,0 @@
using Dalamud.Game.Text.SeStringHandling;
using FFXIVClientStructs.FFXIV.Client.Game;
using FFXIVClientStructs.FFXIV.Client.UI.Misc;
namespace Gearsetter.Model;
internal sealed record RecommendedItemChange(
uint ItemId,
InventoryType? SourceInventory,
int? SourceInventorySlot,
RaptureGearsetModule.GearsetItemIndex TargetSlot,
SeString Text);

21
Gearsetter/Windows/EquipmentBrowserWindow.cs
View File

@ -10,8 +10,6 @@ using Dalamud.Plugin.Services;
using Gearsetter.GameData; using Gearsetter.GameData;
using Gearsetter.Model; using Gearsetter.Model;
using ImGuiNET; using ImGuiNET;
using LLib.GameData;
using LLib.Gear;
using LLib.ImGui; using LLib.ImGui;
namespace Gearsetter.Windows; namespace Gearsetter.Windows;
@ -63,7 +61,7 @@ internal sealed class EquipmentBrowserWindow : LWindow
public override void OnOpen() public override void OnOpen()
{ {
if (_clientState.LocalPlayer != null) if (_clientState.LocalPlayer != null)
_selectedClassJob = ((EClassJob)_clientState.LocalPlayer.ClassJob.RowId).AsJob(); _selectedClassJob = ((EClassJob)_clientState.LocalPlayer.ClassJob.Id).AsJob();
UpdateEquipmentCategories(); UpdateEquipmentCategories();
} }
@ -112,7 +110,7 @@ internal sealed class EquipmentBrowserWindow : LWindow
ImGui.SameLine(); ImGui.SameLine();
ImGui.Checkbox("Hide normal quality items", ref _hideNormalQualityItems); ImGui.Checkbox("Hide normal quality items", ref _hideNormalQualityItems);
Dictionary<(uint ItemId, bool Hq), List<EquipmentStats>> ownedItems = _plugin.GetAllInventoryItems(); Dictionary<(uint ItemId, bool Hq), List<MateriaStats>> ownedItems = _plugin.GetAllInventoryItems();
try try
{ {
itemList.ApplyFromInventory(ownedItems, _onlyShowOwnedItems); itemList.ApplyFromInventory(ownedItems, _onlyShowOwnedItems);
@ -138,14 +136,13 @@ internal sealed class EquipmentBrowserWindow : LWindow
if (includeDamage) if (includeDamage)
ImGui.TableSetupColumn("Damage", ImGuiTableColumnFlags.WidthFixed, 50); ImGui.TableSetupColumn("Damage", ImGuiTableColumnFlags.WidthFixed, 50);
foreach (var substat in itemList.SubstatPriorities) foreach (var substat in itemList.SubstatPriorities)
ImGui.TableSetupColumn(_dataHolder.StatNames.GetValueOrDefault(substat, substat.ToString()), ImGui.TableSetupColumn(_dataHolder.StatNames[substat], ImGuiTableColumnFlags.WidthFixed, 50);
ImGuiTableColumnFlags.WidthFixed, 50);
ImGui.TableHeadersRow(); ImGui.TableHeadersRow();
ImGui.PushStyleColor(ImGuiCol.HeaderHovered, hoverColor); ImGui.PushStyleColor(ImGuiCol.HeaderHovered, hoverColor);
foreach (var item in itemList.Items.DistinctBy(x => new foreach (var item in itemList.Items.DistinctBy(x => new
{ x.ItemId, x.Hq, Stats = x.Stats.GetHashCode() })) { x.ItemId, x.Hq, Materia = x.MateriaStats?.GetHashCode() }))
{ {
if (item is not InventoryItem) if (item is not InventoryItem)
{ {
@ -175,9 +172,9 @@ internal sealed class EquipmentBrowserWindow : LWindow
string name = item.Name; string name = item.Name;
if (item.Hq) if (item.Hq)
name += $" {SeIconChar.HighQuality.ToIconString()}"; name += $" {SeIconChar.HighQuality.ToIconString()}";
if (item is InventoryItem { Stats.MateriaCount: > 0 } inventoryItem) if (item is InventoryItem { MateriaStats: not null } inventoryItem)
name += name +=
$" {string.Join("", Enumerable.Repeat(SeIconChar.Circle.ToIconString(), inventoryItem.Stats.MateriaCount))}"; $" {string.Join("", Enumerable.Repeat(SeIconChar.Circle.ToIconString(), inventoryItem.MateriaStats!.Count))}";
if (color != null) if (color != null)
ImGui.PushStyleColor(ImGuiCol.Text, color.Value); ImGui.PushStyleColor(ImGuiCol.Text, color.Value);
@ -223,12 +220,6 @@ internal sealed class EquipmentBrowserWindow : LWindow
ImGui.Text(string.Create(CultureInfo.InvariantCulture, $"{estat}")); ImGui.Text(string.Create(CultureInfo.InvariantCulture, $"{estat}"));
else else
ImGui.Text(string.Create(CultureInfo.InvariantCulture, $"{estat} +{mstat}")); ImGui.Text(string.Create(CultureInfo.InvariantCulture, $"{estat} +{mstat}"));
if (item.Stats.IsOvercapped(substat))
{
ImGui.SameLine();
ImGui.Text(SeIconChar.Debuff.ToIconString());
}
} }
} }
} }

8
Gearsetter/packages.lock.json
View File

@ -4,9 +4,9 @@
"net8.0-windows7.0": { "net8.0-windows7.0": {
"DalamudPackager": { "DalamudPackager": {
"type": "Direct", "type": "Direct",
"requested": "[11.0.0, )", "requested": "[2.1.13, )",
"resolved": "11.0.0", "resolved": "2.1.13",
"contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA==" "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
}, },
"DotNet.ReproducibleBuilds": { "DotNet.ReproducibleBuilds": {
"type": "Direct", "type": "Direct",
@ -79,7 +79,7 @@
"llib": { "llib": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"DalamudPackager": "[11.0.0, )" "DalamudPackager": "[2.1.13, )"
} }
} }
} }

2
LLib

@ -1 +1 @@
Subproject commit 3176f6b736a4f310f1fc793c6a9d74ae8ce0b916 Subproject commit 7027d291efbbff6a55944dd521d3907210ddecbe