Handle certain interaction interruptions
This commit is contained in:
parent
e3fee58bd0
commit
2389beb056
@ -27,6 +27,22 @@
|
|||||||
{
|
{
|
||||||
"Sequence": 1,
|
"Sequence": 1,
|
||||||
"Steps": [
|
"Steps": [
|
||||||
|
{
|
||||||
|
"Position": {
|
||||||
|
"X": 588.5607,
|
||||||
|
"Y": 437.99976,
|
||||||
|
"Z": 299.7425
|
||||||
|
},
|
||||||
|
"TerritoryId": 960,
|
||||||
|
"InteractionType": "Jump",
|
||||||
|
"JumpDestination": {
|
||||||
|
"Position": {
|
||||||
|
"X": 602.4677,
|
||||||
|
"Y": 438.6276,
|
||||||
|
"Z": 297.1612
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"Position": {
|
"Position": {
|
||||||
"X": 656.94653,
|
"X": 656.94653,
|
||||||
|
@ -811,7 +811,6 @@ internal sealed class QuestController : MiniTaskController<QuestController>, IDi
|
|||||||
|
|
||||||
private void OnErrorToast(ref SeString message, ref bool isHandled)
|
private void OnErrorToast(ref SeString message, ref bool isHandled)
|
||||||
{
|
{
|
||||||
_logger.LogWarning("XXX {A} → {B} XXX", _actionCanceledText, message.TextValue);
|
|
||||||
if (_taskQueue.CurrentTaskExecutor is IToastAware toastAware)
|
if (_taskQueue.CurrentTaskExecutor is IToastAware toastAware)
|
||||||
{
|
{
|
||||||
if (toastAware.OnErrorToast(message))
|
if (toastAware.OnErrorToast(message))
|
||||||
|
@ -30,6 +30,7 @@ internal static class NextQuest
|
|||||||
|
|
||||||
internal sealed record SetQuestTask(ElementId NextQuestId, ElementId CurrentQuestId) : ITask
|
internal sealed record SetQuestTask(ElementId NextQuestId, ElementId CurrentQuestId) : ITask
|
||||||
{
|
{
|
||||||
|
public bool ShouldRedoOnInterrupt() => true;
|
||||||
public override string ToString() => $"SetNextQuest({NextQuestId})";
|
public override string ToString() => $"SetNextQuest({NextQuestId})";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,6 +36,7 @@ internal static class AetherCurrent
|
|||||||
|
|
||||||
internal sealed record Attune(uint DataId, uint AetherCurrentId) : ITask
|
internal sealed record Attune(uint DataId, uint AetherCurrentId) : ITask
|
||||||
{
|
{
|
||||||
|
public bool ShouldRedoOnInterrupt() => true;
|
||||||
public override string ToString() => $"AttuneAetherCurrent({AetherCurrentId})";
|
public override string ToString() => $"AttuneAetherCurrent({AetherCurrentId})";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,6 +26,7 @@ internal static class AethernetShard
|
|||||||
|
|
||||||
internal sealed record Attune(EAetheryteLocation AetheryteLocation) : ITask
|
internal sealed record Attune(EAetheryteLocation AetheryteLocation) : ITask
|
||||||
{
|
{
|
||||||
|
public bool ShouldRedoOnInterrupt() => true;
|
||||||
public override string ToString() => $"AttuneAethernetShard({AetheryteLocation})";
|
public override string ToString() => $"AttuneAethernetShard({AetheryteLocation})";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,6 +24,7 @@ internal static class Aetheryte
|
|||||||
|
|
||||||
internal sealed record Attune(EAetheryteLocation AetheryteLocation) : ITask
|
internal sealed record Attune(EAetheryteLocation AetheryteLocation) : ITask
|
||||||
{
|
{
|
||||||
|
public bool ShouldRedoOnInterrupt() => true;
|
||||||
public override string ToString() => $"AttuneAetheryte({AetheryteLocation})";
|
public override string ToString() => $"AttuneAetheryte({AetheryteLocation})";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,6 +63,8 @@ internal static class Interact
|
|||||||
uint? PickUpItemId = null,
|
uint? PickUpItemId = null,
|
||||||
SkipStepConditions? SkipConditions = null) : ITask
|
SkipStepConditions? SkipConditions = null) : ITask
|
||||||
{
|
{
|
||||||
|
public bool ShouldRedoOnInterrupt() => true;
|
||||||
|
|
||||||
public override string ToString() => $"Interact({DataId})";
|
public override string ToString() => $"Interact({DataId})";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -143,6 +143,8 @@ internal static class WaitAtEnd
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool ShouldRedoOnInterrupt() => true;
|
||||||
|
|
||||||
public override string ToString() => $"Wait(seconds: {Delay.TotalSeconds})";
|
public override string ToString() => $"Wait(seconds: {Delay.TotalSeconds})";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user