Compare commits

..

2 Commits
v1.1 ... master

2 changed files with 20 additions and 4 deletions

View File

@ -25,6 +25,20 @@ internal sealed class DropboxQueue : IDisposable
InventoryType.Inventory4, InventoryType.Inventory4,
InventoryType.Crystals, InventoryType.Crystals,
InventoryType.Currency, InventoryType.Currency,
InventoryType.ArmoryMainHand,
InventoryType.ArmoryOffHand,
InventoryType.ArmoryHead,
InventoryType.ArmoryBody,
InventoryType.ArmoryHands,
InventoryType.ArmoryLegs,
InventoryType.ArmoryFeets,
InventoryType.ArmoryEar,
InventoryType.ArmoryNeck,
InventoryType.ArmoryWrist,
InventoryType.ArmoryRings,
]; ];
private readonly ICommandManager _commandManager; private readonly ICommandManager _commandManager;
@ -105,7 +119,9 @@ internal sealed class DropboxQueue : IDisposable
var missingItems = parsedItems var missingItems = parsedItems
.Select(item => item with .Select(item => item with
{ {
Needed = item.Needed - inventoryManger->GetItemCountInContainer(item.ItemId, InventoryType.Crystals) Needed = item.Needed - DefaultInventoryTypes.Sum(y =>
inventoryManger->GetItemCountInContainer(item.ItemId, y) +
inventoryManger->GetItemCountInContainer(item.ItemId, y, true))
}) })
.Where(x => x.Needed > 0) .Where(x => x.Needed > 0)
.ToList(); .ToList();
@ -251,8 +267,8 @@ internal sealed class DropboxQueue : IDisposable
private readonly DalamudReflector _reflector; private readonly DalamudReflector _reflector;
private readonly IPluginLog _pluginLog; private readonly IPluginLog _pluginLog;
private readonly ICallGateSubscriber<object> _beginTradingQueue; private readonly ICallGateSubscriber<object> _beginTradingQueue;
private readonly ICallGateSubscriber<uint,bool,int> _getItemQuantity; private readonly ICallGateSubscriber<uint, bool, int> _getItemQuantity;
private readonly ICallGateSubscriber<uint,bool,int, object> _setItemQuantity; private readonly ICallGateSubscriber<uint, bool, int, object> _setItemQuantity;
public DropboxApi(IDalamudPluginInterface pluginInterface, DalamudReflector reflector, IPluginLog pluginLog) public DropboxApi(IDalamudPluginInterface pluginInterface, DalamudReflector reflector, IPluginLog pluginLog)
{ {

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.1</Version> <Version>1.2</Version>
<OutputPath>dist</OutputPath> <OutputPath>dist</OutputPath>
</PropertyGroup> </PropertyGroup>