liza/Questionable
liza/Questionable
2
1
Fork 19
Code Pull Requests 4 Releases 86 Activity

Check for enough inventory slots

Browse Source
This commit is contained in:
Liza 2024-08-05 18:12:01 +02:00
parent bb12299378
commit e186d34f0d
Signed by: liza
GPG Key ID: 7199F8D727D55F67
4 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Questionable/Controller/ContextMenuController.cs
View File

@ -108,6 +108,8 @@ internal sealed class ContextMenuController : IDisposable
lockedReasonn = $"{classJob} not unlocked"; lockedReasonn = $"{classJob} not unlocked";
else if (quantityToGather == 0) else if (quantityToGather == 0)
lockedReasonn = "No allowances"; lockedReasonn = "No allowances";
else if (quantityToGather > _gameFunctions.GetFreeInventorySlots())
lockedReasonn = "Inventory full";
else if (_gameFunctions.IsOccupied()) else if (_gameFunctions.IsOccupied())
lockedReasonn = "Can't be used while interacting"; lockedReasonn = "Can't be used while interacting";

5
Questionable/Controller/Steps/Gathering/DoGather.cs
View File

@ -4,12 +4,14 @@ using Dalamud.Game.ClientState.Conditions;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Component.GUI; using FFXIVClientStructs.FFXIV.Component.GUI;
using LLib.GameUI; using LLib.GameUI;
using Questionable.Functions;
using Questionable.Model.Gathering; using Questionable.Model.Gathering;
namespace Questionable.Controller.Steps.Gathering; namespace Questionable.Controller.Steps.Gathering;
internal sealed class DoGather( internal sealed class DoGather(
GatheringController gatheringController, GatheringController gatheringController,
GameFunctions gameFunctions,
IGameGui gameGui, IGameGui gameGui,
ICondition condition) : ITask ICondition condition) : ITask
{ {
@ -33,6 +35,9 @@ internal sealed class DoGather(
if (gatheringController.HasNodeDisappeared(_currentNode)) if (gatheringController.HasNodeDisappeared(_currentNode))
return ETaskResult.TaskComplete; return ETaskResult.TaskComplete;
if (gameFunctions.GetFreeInventorySlots() == 0)
throw new TaskException("Inventory full");
if (condition[ConditionFlag.Gathering]) if (condition[ConditionFlag.Gathering])
{ {
if (gameGui.TryGetAddonByName("GatheringMasterpiece", out AtkUnitBase* _)) if (gameGui.TryGetAddonByName("GatheringMasterpiece", out AtkUnitBase* _))

3
Questionable/Controller/Steps/Gathering/DoGatherCollectable.cs
View File

@ -52,6 +52,9 @@ internal sealed class DoGatherCollectable(
} }
} }
if (gameFunctions.GetFreeInventorySlots() == 0)
throw new TaskException("Inventory full");
NodeCondition? nodeCondition = GetNodeCondition(); NodeCondition? nodeCondition = GetNodeCondition();
if (nodeCondition == null) if (nodeCondition == null)
return ETaskResult.TaskComplete; return ETaskResult.TaskComplete;

26
Questionable/Functions/GameFunctions.cs
View File

@ -477,4 +477,30 @@ internal sealed unsafe class GameFunctions
LAddon.IsAddonReady(fade) && LAddon.IsAddonReady(fade) &&
fade->IsVisible; fade->IsVisible;
} }
public int GetFreeInventorySlots()
{
InventoryManager* inventoryManager = InventoryManager.Instance();
if (inventoryManager == null)
return 0;
int slots = 0;
for (InventoryType inventoryType = InventoryType.Inventory1;
inventoryType <= InventoryType.Inventory4;
++inventoryType)
{
InventoryContainer* inventoryContainer = inventoryManager->GetInventoryContainer(inventoryType);
if (inventoryContainer == null)
continue;
for (int i = 0; i < inventoryContainer->Size; ++i)
{
InventoryItem* item = inventoryContainer->GetInventorySlot(i);
if (item == null || item->ItemId == 0)
++slots;
}
}
return slots;
}
} }