liza/Questionable
liza/Questionable
2
1
Fork 26
Code Pull Requests 2 Releases 97 Activity

Add a delay to equipping recommended gear for specific instances where ilvl calculation would otherwise be off

Browse Source
This commit is contained in:
Liza 2025-01-24 20:30:58 +01:00
parent 2ebc4b5a0d
commit ffccd347bd
Signed by: liza
GPG Key ID: 2C41B84815CF6445
1 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Questionable/Controller/Steps/Interactions/EquipRecommended.cs
View File

@ -43,7 +43,8 @@ internal static class EquipRecommended
internal sealed unsafe class DoEquipRecommended(IClientState clientState, IChatGui chatGui, ICondition condition) internal sealed unsafe class DoEquipRecommended(IClientState clientState, IChatGui chatGui, ICondition condition)
: TaskExecutor<EquipTask> : TaskExecutor<EquipTask>
{ {
private bool _equipped; private bool _checkedOrTriggeredEquipmentUpdate;
private DateTime _continueAt = DateTime.MinValue;
protected override bool Start() protected override bool Start()
{ {
@ -60,44 +61,51 @@ internal static class EquipRecommended
if (recommendedEquipModule->IsUpdating) if (recommendedEquipModule->IsUpdating)
return ETaskResult.StillRunning; return ETaskResult.StillRunning;
if (!_equipped) if (!_checkedOrTriggeredEquipmentUpdate)
{ {
InventoryManager* inventoryManager = InventoryManager.Instance(); if (!IsAllRecommendeGearEquipped())
InventoryContainer* equippedItems =
inventoryManager->GetInventoryContainer(InventoryType.EquippedItems);
bool isAllEquipped = true;
foreach (var recommendedItemPtr in recommendedEquipModule->RecommendedItems)
{
var recommendedItem = recommendedItemPtr.Value;
if (recommendedItem == null || recommendedItem->ItemId == 0)
continue;
bool isEquipped = false;
for (int i = 0; i < equippedItems->Size; ++i)
{
var equippedItem = equippedItems->Items[i];
if (equippedItem.ItemId != 0 && equippedItem.ItemId == recommendedItem->ItemId)
{
isEquipped = true;
break;
}
}
if (!isEquipped)
isAllEquipped = false;
}
if (!isAllEquipped)
{ {
chatGui.Print("Equipping recommended gear.", CommandHandler.MessageTag, CommandHandler.TagColor); chatGui.Print("Equipping recommended gear.", CommandHandler.MessageTag, CommandHandler.TagColor);
recommendedEquipModule->EquipRecommendedGear(); recommendedEquipModule->EquipRecommendedGear();
_continueAt = DateTime.Now.AddSeconds(1);
} }
_equipped = true; _checkedOrTriggeredEquipmentUpdate = true;
return ETaskResult.StillRunning; return ETaskResult.StillRunning;
} }
return ETaskResult.TaskComplete; return DateTime.Now >= _continueAt ? ETaskResult.TaskComplete : ETaskResult.StillRunning;
}
private bool IsAllRecommendeGearEquipped()
{
var recommendedEquipModule = RecommendEquipModule.Instance();
InventoryManager* inventoryManager = InventoryManager.Instance();
InventoryContainer* equippedItems =
inventoryManager->GetInventoryContainer(InventoryType.EquippedItems);
bool isAllEquipped = true;
foreach (var recommendedItemPtr in recommendedEquipModule->RecommendedItems)
{
var recommendedItem = recommendedItemPtr.Value;
if (recommendedItem == null || recommendedItem->ItemId == 0)
continue;
bool isEquipped = false;
for (int i = 0; i < equippedItems->Size; ++i)
{
var equippedItem = equippedItems->Items[i];
if (equippedItem.ItemId != 0 && equippedItem.ItemId == recommendedItem->ItemId)
{
isEquipped = true;
break;
}
}
if (!isEquipped)
isAllEquipped = false;
}
return isAllEquipped;
} }
public override bool ShouldInterruptOnDamage() => true; public override bool ShouldInterruptOnDamage() => true;