liza/ARDiscard
liza/ARDiscard
1
0
Fork 2
Code Issues 1 Pull Requests Releases 38 Activity

Add logging in relevant places, rework error logic

Browse Source
This commit is contained in:
Liza 2023-09-09 20:30:08 +02:00
parent 9d0dc9bdd7
commit ac9de53c7f
Signed by: liza
GPG Key ID: 7199F8D727D55F67
3 changed files with 50 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ARDiscard/ARDiscard.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework> <TargetFramework>net7.0-windows</TargetFramework>
<Version>1.2</Version> <Version>1.3</Version>
<LangVersion>11.0</LangVersion> <LangVersion>11.0</LangVersion>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

58
ARDiscard/AutoDiscardPlogon.cs
View File

@ -84,35 +84,66 @@ public class AutoDiscardPlogon : IDalamudPlugin
private unsafe void DiscardNextItem(bool finishRetainerAction) private unsafe void DiscardNextItem(bool finishRetainerAction)
{ {
PluginLog.Information($"DiscardNextItem (retainer = {finishRetainerAction})");
InventoryItem* nextItem = _inventoryUtils.GetNextItemToDiscard(); InventoryItem* nextItem = _inventoryUtils.GetNextItemToDiscard();
if (nextItem == null) if (nextItem == null)
{ {
PluginLog.Information($"No item to discard found");
if (finishRetainerAction) if (finishRetainerAction)
_autoRetainerApi.FinishPostProcess(); _autoRetainerApi.FinishPostProcess();
else else
_chatGui.Print("Done discarding."); _chatGui.Print("Done discarding.");
return;
} }
else
{
var (inventoryType, slot) = (nextItem->Container, nextItem->Slot); var (inventoryType, slot) = (nextItem->Container, nextItem->Slot);
//_chatGui.Print($"Discarding {nextItem->ItemID}, {nextItem->Container}, {nextItem->Slot}."); PluginLog.Information(
$"Discarding itemId {nextItem->ItemID} in slot {nextItem->Slot} of container {nextItem->Container}.");
_inventoryUtils.Discard(nextItem); _inventoryUtils.Discard(nextItem);
_taskManager.DelayNext(5);
_taskManager.Enqueue(ConfirmDiscardItem);
_taskManager.DelayNext(20); _taskManager.DelayNext(20);
_taskManager.Enqueue(() => ContinueAfterDiscard(finishRetainerAction, inventoryType, slot)); _taskManager.Enqueue(() => ConfirmDiscardItem(finishRetainerAction, inventoryType, slot));
}
} }
private unsafe void ConfirmDiscardItem() private unsafe void ConfirmDiscardItem(bool finishRetainerAction, InventoryType inventoryType, short slot)
{ {
var addon = GetDiscardAddon(); var addon = GetDiscardAddon();
if (addon != null) if (addon != null)
{ {
PluginLog.Information("Addon is visible, clicking 'yes'");
((AddonSelectYesno*)addon)->YesButton->AtkComponentBase.SetEnabledState(true); ((AddonSelectYesno*)addon)->YesButton->AtkComponentBase.SetEnabledState(true);
ClickSelectYesNo.Using((nint)addon).Yes(); ClickSelectYesNo.Using((nint)addon).Yes();
_taskManager.DelayNext(20);
_taskManager.Enqueue(() => ContinueAfterDiscard(finishRetainerAction, inventoryType, slot));
}
else
{
InventoryItem* nextItem = _inventoryUtils.GetNextItemToDiscard();
if (nextItem == null)
{
PluginLog.Information("Addon is not visible, but next item is also no longer set");
if (finishRetainerAction)
_autoRetainerApi.FinishPostProcess();
else
_chatGui.Print("Done discarding.");
}
else if (nextItem->Container == inventoryType && nextItem->Slot == slot)
{
PluginLog.Information(
$"Addon is not (yet) visible, still trying to discard item in slot {slot} in inventory {inventoryType}");
_taskManager.DelayNext(100);
_taskManager.Enqueue(() => ConfirmDiscardItem(finishRetainerAction, inventoryType, slot));
}
else
{
PluginLog.Information(
$"Addon is not (yet) visible, but slot or inventory type changed, retrying from start");
_taskManager.DelayNext(100);
_taskManager.Enqueue(() => DiscardNextItem(finishRetainerAction));
}
} }
} }
@ -121,20 +152,21 @@ public class AutoDiscardPlogon : IDalamudPlugin
InventoryItem* nextItem = _inventoryUtils.GetNextItemToDiscard(); InventoryItem* nextItem = _inventoryUtils.GetNextItemToDiscard();
if (nextItem == null) if (nextItem == null)
{ {
PluginLog.Information($"Continuing after discard: no next item (retainer = {finishRetainerAction})");
if (finishRetainerAction) if (finishRetainerAction)
_autoRetainerApi.FinishPostProcess(); _autoRetainerApi.FinishPostProcess();
else else
_chatGui.Print("Done discarding."); _chatGui.Print("Done discarding.");
return;
} }
else if (nextItem->Container == inventoryType && nextItem->Slot == slot)
if (nextItem->Container == inventoryType && nextItem->Slot == slot)
{ {
PluginLog.Information($"ContinueAfterDiscard: Waiting for server response");
_taskManager.DelayNext(20); _taskManager.DelayNext(20);
_taskManager.Enqueue(() => ContinueAfterDiscard(finishRetainerAction, inventoryType, slot)); _taskManager.Enqueue(() => ContinueAfterDiscard(finishRetainerAction, inventoryType, slot));
} }
else else
{ {
PluginLog.Information($"ContinueAfterDiscard: Discovered different item to discard");
_taskManager.EnqueueImmediate(() => DiscardNextItem(finishRetainerAction)); _taskManager.EnqueueImmediate(() => DiscardNextItem(finishRetainerAction));
} }
} }
@ -159,11 +191,11 @@ public class AutoDiscardPlogon : IDalamudPlugin
{ {
var addon = (AtkUnitBase*)Svc.GameGui.GetAddonByName("SelectYesno", i); var addon = (AtkUnitBase*)Svc.GameGui.GetAddonByName("SelectYesno", i);
if (addon == null) return null; if (addon == null) return null;
if (addon->IsVisible) if (addon->IsVisible && addon->UldManager.LoadedState == AtkLoadState.Loaded)
{ {
var textNode = addon->UldManager.NodeList[15]->GetAsAtkTextNode(); var textNode = addon->UldManager.NodeList[15]->GetAsAtkTextNode();
var text = MemoryHelper.ReadSeString(&textNode->NodeText).ExtractText(); var text = MemoryHelper.ReadSeString(&textNode->NodeText).ExtractText();
PluginLog.Information($"TEt → {text}"); PluginLog.Information($"YesNo prompt: {text}");
if (text.StartsWith("Discard")) if (text.StartsWith("Discard"))
{ {
return addon; return addon;