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

Compare commits

base: liza:master
Branches Tags
liza:master
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.2
Branches Tags
liza:master
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.2" have entirely different histories.
master ... v1.2

5 changed files with 36 additions and 62 deletions
Show Stats Expand all files Collapse all files

4
Gearsetter.IpcTest/GearsetterIpcTestPlugin.cs
View File

@ -27,7 +27,7 @@ public class GearsetterIpcTestPlugin : IDalamudPlugin
{ {
int currentGearsetIndex = RaptureGearsetModule.Instance()->CurrentGearsetIndex; int currentGearsetIndex = RaptureGearsetModule.Instance()->CurrentGearsetIndex;
var recommendations = _pluginInterface var recommendations = _pluginInterface
.GetIpcSubscriber<byte, List<(uint ItemId, InventoryType? SourceInventory, byte? SourceInventorySlot, RaptureGearsetModule.GearsetItemIndex TargetSlot)>>( .GetIpcSubscriber<byte, List<(uint ItemId, InventoryType? SourceInventory, byte? SourceInventorySlot)>>(
"Gearsetter.GetRecommendationsForGearset").InvokeFunc((byte)currentGearsetIndex); "Gearsetter.GetRecommendationsForGearset").InvokeFunc((byte)currentGearsetIndex);
if (recommendations.Count == 0) if (recommendations.Count == 0)
_chatGui.Print($"No recommendations for gearset #{currentGearsetIndex}."); _chatGui.Print($"No recommendations for gearset #{currentGearsetIndex}.");
@ -35,7 +35,7 @@ public class GearsetterIpcTestPlugin : IDalamudPlugin
{ {
foreach (var recommendation in recommendations) foreach (var recommendation in recommendations)
_chatGui.Print( _chatGui.Print(
$"Recommendation: Equip item {recommendation.ItemId} from {recommendation.SourceInventory} (slot {recommendation.SourceInventorySlot}) as {recommendation.TargetSlot}"); $"Recommendation: Equip item {recommendation.ItemId} from {recommendation.SourceInventory} (slot {recommendation.SourceInventorySlot})");
} }
} }

13
Gearsetter/External/GearsetterIpc.cs vendored
View File

@ -17,8 +17,7 @@ internal sealed class GearsetterIpc : IDisposable
private readonly IPluginLog _pluginLog; private readonly IPluginLog _pluginLog;
private readonly ICallGateProvider<byte, private readonly ICallGateProvider<byte,
List<(uint ItemId, InventoryType? SourceInventory, int? SourceInventorySlot, List<(uint ItemId, InventoryType? SourceInventory, int? SourceInventorySlot)>>
RaptureGearsetModule.GearsetItemIndex TargetSlot)>>
_getRecommendationsForGearset; _getRecommendationsForGearset;
public GearsetterIpc(GearsetterPlugin plugin, IDalamudPluginInterface pluginInterface, IPluginLog pluginLog) public GearsetterIpc(GearsetterPlugin plugin, IDalamudPluginInterface pluginInterface, IPluginLog pluginLog)
@ -26,15 +25,11 @@ internal sealed class GearsetterIpc : IDisposable
_plugin = plugin; _plugin = plugin;
_pluginLog = pluginLog; _pluginLog = pluginLog;
_getRecommendationsForGearset = _getRecommendationsForGearset =
pluginInterface pluginInterface.GetIpcProvider<byte, List<(uint, InventoryType?, int?)>>(IpcGetRecommendationsForGearset);
.GetIpcProvider<byte,
List<(uint, InventoryType?, int?, RaptureGearsetModule.GearsetItemIndex TargetSlot)>>(
IpcGetRecommendationsForGearset);
_getRecommendationsForGearset.RegisterFunc(GetRecommendationsForGearset); _getRecommendationsForGearset.RegisterFunc(GetRecommendationsForGearset);
} }
private unsafe List<(uint ItemId, InventoryType? SourceInventory, int? SourceInventorySlot, private unsafe List<(uint ItemId, InventoryType? SourceInventory, int? SourceInventorySlot)>
RaptureGearsetModule.GearsetItemIndex TargetSlot)>
GetRecommendationsForGearset(byte gearsetId) GetRecommendationsForGearset(byte gearsetId)
{ {
if (gearsetId > 100) if (gearsetId > 100)
@ -53,7 +48,7 @@ internal sealed class GearsetterIpc : IDisposable
_pluginLog.Verbose($"Checking for gearset upgrades for gearset {gearset->Id}."); _pluginLog.Verbose($"Checking for gearset upgrades for gearset {gearset->Id}.");
return _plugin.GetRecommendedUpgrades(gearset) return _plugin.GetRecommendedUpgrades(gearset)
.Select(x => (x.ItemId, x.SourceInventory, x.SourceInventorySlot, x.TargetSlot)) .Select(x => (x.ItemId, x.SourceInventory, x.SourceInventorySlot))
.ToList(); .ToList();
} }

2
Gearsetter/Gearsetter.csproj
View File

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

75
Gearsetter/GearsetterPlugin.cs
View File

@ -189,8 +189,7 @@ public sealed class GearsetterPlugin : IDalamudPlugin
private List<RecommendedItemChange> GetRecommendedUpgrades(GearsetData gearset, private List<RecommendedItemChange> GetRecommendedUpgrades(GearsetData gearset,
Dictionary<(uint ItemId, bool Hql), List<MateriaStats>> inventoryItems, byte? level) Dictionary<(uint ItemId, bool Hql), List<MateriaStats>> inventoryItems, byte? level)
{ {
List<RecommendedItemChange> Handle(string label, List<RecommendedItemChange> Handle(string label, EquipmentItem?[] gearsetItems,
(EquipmentItem?, RaptureGearsetModule.GearsetItemIndex)[] gearsetItems,
EEquipSlotCategory category) EEquipSlotCategory category)
{ {
return HandleGearsetItem(label, gearset, gearsetItems, inventoryItems, category, level); return HandleGearsetItem(label, gearset, gearsetItems, inventoryItems, category, level);
@ -198,25 +197,20 @@ public sealed class GearsetterPlugin : IDalamudPlugin
List<List<RecommendedItemChange>> upgrades = new() List<List<RecommendedItemChange>> 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),
}; };
@ -257,18 +251,17 @@ public sealed class GearsetterPlugin : IDalamudPlugin
=> gearset->NameString.Split((char)0)[0]; => gearset->NameString.Split((char)0)[0];
private List<RecommendedItemChange> HandleGearsetItem(string label, GearsetData gearset, private List<RecommendedItemChange> HandleGearsetItem(string label, GearsetData gearset,
(EquipmentItem? Item, RaptureGearsetModule.GearsetItemIndex Slot)[] gearsetItems, EquipmentItem?[] gearsetItems,
Dictionary<(uint ItemId, bool Hq), List<MateriaStats>> 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)
@ -277,16 +270,15 @@ public sealed class GearsetterPlugin : IDalamudPlugin
return []; return [];
} }
(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();
@ -307,28 +299,19 @@ 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 => ToItemRecommendation(x,
{
var slot = availableGearsetSlots[0];
availableGearsetSlots.RemoveAt(0);
return ToItemRecommendation(x, slot,
new SeString(new TextPayload($"{label}: ")) new SeString(new TextPayload($"{label}: "))
.Append(SeString.CreateItemLink(x.ItemId, x.Hq))); .Append(SeString.CreateItemLink(x.ItemId, x.Hq))))
})
.ToList(); .ToList();
} }
finally finally
@ -349,8 +332,7 @@ public sealed class GearsetterPlugin : IDalamudPlugin
if (equipSlotCategory != EEquipSlotCategory.OneHandedMainHand) if (equipSlotCategory != EEquipSlotCategory.OneHandedMainHand)
return []; return [];
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);
} }
@ -359,8 +341,7 @@ public sealed class GearsetterPlugin : IDalamudPlugin
=> RaptureGearsetModule.Instance()->EquipGearset((byte)commandId); => RaptureGearsetModule.Instance()->EquipGearset((byte)commandId);
private unsafe RecommendedItemChange ToItemRecommendation(BaseItem baseItem, private unsafe RecommendedItemChange ToItemRecommendation(BaseItem baseItem, SeString text)
RaptureGearsetModule.GearsetItemIndex targetSlot, SeString text)
{ {
InventoryManager* inventoryManager = InventoryManager.Instance(); InventoryManager* inventoryManager = InventoryManager.Instance();
foreach (var inventoryType in _gameDataHolder.DefaultInventoryTypes) foreach (var inventoryType in _gameDataHolder.DefaultInventoryTypes)
@ -376,12 +357,12 @@ public sealed class GearsetterPlugin : IDalamudPlugin
MateriaStats actualMateriaStats = FetchMateriaStats(item); MateriaStats actualMateriaStats = FetchMateriaStats(item);
if (expectedMateriaStats == actualMateriaStats) if (expectedMateriaStats == actualMateriaStats)
return new RecommendedItemChange(item->ItemId, inventoryType, i, targetSlot, text); return new RecommendedItemChange(item->ItemId, inventoryType, i, text);
} }
} }
} }
return new RecommendedItemChange(baseItem.ItemId, null, null, targetSlot, text); return new RecommendedItemChange(baseItem.ItemId, null, null, text);
} }
internal unsafe Dictionary<(uint ItemId, bool Hq), List<MateriaStats>> GetAllInventoryItems() internal unsafe Dictionary<(uint ItemId, bool Hq), List<MateriaStats>> GetAllInventoryItems()

2
Gearsetter/Model/RecommendedItemChange.cs
View File

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