From 98484319627d98af798028cab6be428690e10266 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Fri, 12 Jul 2024 21:18:53 +0200 Subject: [PATCH] Reorganize namespaces; fix steps with 'fly: true' not mounting if close to target --- Questionable/Controller/QuestController.cs | 2 +- .../{BaseTasks => Common}/AbstractDelayedTask.cs | 2 +- .../Steps/{BaseTasks => Common}/MountTask.cs | 2 +- .../Steps/{BaseTasks => Common}/NextQuest.cs | 2 +- .../Steps/{BaseTasks => Common}/UnmountTask.cs | 2 +- .../{BaseTasks => Common}/WaitConditionTask.cs | 2 +- .../{InteractionFactory => Interactions}/Action.cs | 4 ++-- .../AetherCurrent.cs | 2 +- .../AethernetShard.cs | 2 +- .../Aetheryte.cs | 2 +- .../{InteractionFactory => Interactions}/Combat.cs | 4 ++-- .../{InteractionFactory => Interactions}/Duty.cs | 2 +- .../{InteractionFactory => Interactions}/Emote.cs | 4 ++-- .../EquipItem.cs | 4 ++-- .../Interact.cs | 4 ++-- .../{InteractionFactory => Interactions}/Jump.cs | 4 ++-- .../{InteractionFactory => Interactions}/Say.cs | 4 ++-- .../SinglePlayerDuty.cs | 2 +- .../{InteractionFactory => Interactions}/UseItem.cs | 4 ++-- .../{BaseFactory => Shared}/AethernetShortcut.cs | 2 +- .../{BaseFactory => Shared}/AetheryteShortcut.cs | 4 ++-- .../Steps/{BaseFactory => Shared}/Move.cs | 13 ++++++++++--- .../Steps/{BaseFactory => Shared}/SkipCondition.cs | 2 +- .../Steps/{BaseFactory => Shared}/StepDisabled.cs | 2 +- .../Steps/{BaseFactory => Shared}/WaitAtEnd.cs | 4 ++-- .../Steps/{BaseFactory => Shared}/WaitAtStart.cs | 4 ++-- Questionable/Questionable.json | 2 +- Questionable/QuestionablePlugin.cs | 8 ++++---- Questionable/Windows/DebugOverlay.cs | 6 +++++- Questionable/Windows/QuestWindow.cs | 4 ++-- 30 files changed, 58 insertions(+), 47 deletions(-) rename Questionable/Controller/Steps/{BaseTasks => Common}/AbstractDelayedTask.cs (93%) rename Questionable/Controller/Steps/{BaseTasks => Common}/MountTask.cs (98%) rename Questionable/Controller/Steps/{BaseTasks => Common}/NextQuest.cs (97%) rename Questionable/Controller/Steps/{BaseTasks => Common}/UnmountTask.cs (96%) rename Questionable/Controller/Steps/{BaseTasks => Common}/WaitConditionTask.cs (91%) rename Questionable/Controller/Steps/{InteractionFactory => Interactions}/Action.cs (96%) rename Questionable/Controller/Steps/{InteractionFactory => Interactions}/AetherCurrent.cs (97%) rename Questionable/Controller/Steps/{InteractionFactory => Interactions}/AethernetShard.cs (96%) rename Questionable/Controller/Steps/{InteractionFactory => Interactions}/Aetheryte.cs (96%) rename Questionable/Controller/Steps/{InteractionFactory => Interactions}/Combat.cs (94%) rename Questionable/Controller/Steps/{InteractionFactory => Interactions}/Duty.cs (96%) rename Questionable/Controller/Steps/{InteractionFactory => Interactions}/Emote.cs (95%) rename Questionable/Controller/Steps/{InteractionFactory => Interactions}/EquipItem.cs (98%) rename Questionable/Controller/Steps/{InteractionFactory => Interactions}/Interact.cs (97%) rename Questionable/Controller/Steps/{InteractionFactory => Interactions}/Jump.cs (96%) rename Questionable/Controller/Steps/{InteractionFactory => Interactions}/Say.cs (93%) rename Questionable/Controller/Steps/{InteractionFactory => Interactions}/SinglePlayerDuty.cs (97%) rename Questionable/Controller/Steps/{InteractionFactory => Interactions}/UseItem.cs (98%) rename Questionable/Controller/Steps/{BaseFactory => Shared}/AethernetShortcut.cs (99%) rename Questionable/Controller/Steps/{BaseFactory => Shared}/AetheryteShortcut.cs (97%) rename Questionable/Controller/Steps/{BaseFactory => Shared}/Move.cs (92%) rename Questionable/Controller/Steps/{BaseFactory => Shared}/SkipCondition.cs (98%) rename Questionable/Controller/Steps/{BaseFactory => Shared}/StepDisabled.cs (94%) rename Questionable/Controller/Steps/{BaseFactory => Shared}/WaitAtEnd.cs (99%) rename Questionable/Controller/Steps/{BaseFactory => Shared}/WaitAtStart.cs (90%) diff --git a/Questionable/Controller/QuestController.cs b/Questionable/Controller/QuestController.cs index e00ab5d3..00ba0a5e 100644 --- a/Questionable/Controller/QuestController.cs +++ b/Questionable/Controller/QuestController.cs @@ -5,7 +5,7 @@ using Dalamud.Game.ClientState.Keys; using Dalamud.Plugin.Services; using Microsoft.Extensions.Logging; using Questionable.Controller.Steps; -using Questionable.Controller.Steps.BaseFactory; +using Questionable.Controller.Steps.Shared; using Questionable.External; using Questionable.Model; using Questionable.Model.V1; diff --git a/Questionable/Controller/Steps/BaseTasks/AbstractDelayedTask.cs b/Questionable/Controller/Steps/Common/AbstractDelayedTask.cs similarity index 93% rename from Questionable/Controller/Steps/BaseTasks/AbstractDelayedTask.cs rename to Questionable/Controller/Steps/Common/AbstractDelayedTask.cs index ed1e8506..e5a3b102 100644 --- a/Questionable/Controller/Steps/BaseTasks/AbstractDelayedTask.cs +++ b/Questionable/Controller/Steps/Common/AbstractDelayedTask.cs @@ -1,6 +1,6 @@ using System; -namespace Questionable.Controller.Steps.BaseTasks; +namespace Questionable.Controller.Steps.Common; internal abstract class AbstractDelayedTask : ITask { diff --git a/Questionable/Controller/Steps/BaseTasks/MountTask.cs b/Questionable/Controller/Steps/Common/MountTask.cs similarity index 98% rename from Questionable/Controller/Steps/BaseTasks/MountTask.cs rename to Questionable/Controller/Steps/Common/MountTask.cs index e600aac9..15585a2f 100644 --- a/Questionable/Controller/Steps/BaseTasks/MountTask.cs +++ b/Questionable/Controller/Steps/Common/MountTask.cs @@ -5,7 +5,7 @@ using Dalamud.Plugin.Services; using Microsoft.Extensions.Logging; using Questionable.Data; -namespace Questionable.Controller.Steps.BaseTasks; +namespace Questionable.Controller.Steps.Common; internal sealed class MountTask( GameFunctions gameFunctions, diff --git a/Questionable/Controller/Steps/BaseTasks/NextQuest.cs b/Questionable/Controller/Steps/Common/NextQuest.cs similarity index 97% rename from Questionable/Controller/Steps/BaseTasks/NextQuest.cs rename to Questionable/Controller/Steps/Common/NextQuest.cs index c03f5a06..32d0f113 100644 --- a/Questionable/Controller/Steps/BaseTasks/NextQuest.cs +++ b/Questionable/Controller/Steps/Common/NextQuest.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.BaseTasks; +namespace Questionable.Controller.Steps.Common; internal static class NextQuest { diff --git a/Questionable/Controller/Steps/BaseTasks/UnmountTask.cs b/Questionable/Controller/Steps/Common/UnmountTask.cs similarity index 96% rename from Questionable/Controller/Steps/BaseTasks/UnmountTask.cs rename to Questionable/Controller/Steps/Common/UnmountTask.cs index 54be937a..ad369585 100644 --- a/Questionable/Controller/Steps/BaseTasks/UnmountTask.cs +++ b/Questionable/Controller/Steps/Common/UnmountTask.cs @@ -3,7 +3,7 @@ using Dalamud.Game.ClientState.Conditions; using Dalamud.Plugin.Services; using Microsoft.Extensions.Logging; -namespace Questionable.Controller.Steps.BaseTasks; +namespace Questionable.Controller.Steps.Common; internal sealed class UnmountTask(ICondition condition, ILogger logger, GameFunctions gameFunctions) : ITask diff --git a/Questionable/Controller/Steps/BaseTasks/WaitConditionTask.cs b/Questionable/Controller/Steps/Common/WaitConditionTask.cs similarity index 91% rename from Questionable/Controller/Steps/BaseTasks/WaitConditionTask.cs rename to Questionable/Controller/Steps/Common/WaitConditionTask.cs index 17565464..762904ff 100644 --- a/Questionable/Controller/Steps/BaseTasks/WaitConditionTask.cs +++ b/Questionable/Controller/Steps/Common/WaitConditionTask.cs @@ -1,6 +1,6 @@ using System; -namespace Questionable.Controller.Steps.BaseTasks; +namespace Questionable.Controller.Steps.Common; internal sealed class WaitConditionTask(Func predicate, string description) : ITask { diff --git a/Questionable/Controller/Steps/InteractionFactory/Action.cs b/Questionable/Controller/Steps/Interactions/Action.cs similarity index 96% rename from Questionable/Controller/Steps/InteractionFactory/Action.cs rename to Questionable/Controller/Steps/Interactions/Action.cs index a94f7063..75a40b3e 100644 --- a/Questionable/Controller/Steps/InteractionFactory/Action.cs +++ b/Questionable/Controller/Steps/Interactions/Action.cs @@ -5,11 +5,11 @@ using Dalamud.Game.ClientState.Objects.Types; using FFXIVClientStructs.FFXIV.Client.Game; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Questionable.Controller.Steps.BaseTasks; +using Questionable.Controller.Steps.Common; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.InteractionFactory; +namespace Questionable.Controller.Steps.Interactions; internal static class Action { diff --git a/Questionable/Controller/Steps/InteractionFactory/AetherCurrent.cs b/Questionable/Controller/Steps/Interactions/AetherCurrent.cs similarity index 97% rename from Questionable/Controller/Steps/InteractionFactory/AetherCurrent.cs rename to Questionable/Controller/Steps/Interactions/AetherCurrent.cs index 6be7eb85..82b13d27 100644 --- a/Questionable/Controller/Steps/InteractionFactory/AetherCurrent.cs +++ b/Questionable/Controller/Steps/Interactions/AetherCurrent.cs @@ -6,7 +6,7 @@ using Questionable.Data; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.InteractionFactory; +namespace Questionable.Controller.Steps.Interactions; internal static class AetherCurrent { diff --git a/Questionable/Controller/Steps/InteractionFactory/AethernetShard.cs b/Questionable/Controller/Steps/Interactions/AethernetShard.cs similarity index 96% rename from Questionable/Controller/Steps/InteractionFactory/AethernetShard.cs rename to Questionable/Controller/Steps/Interactions/AethernetShard.cs index 18976151..059a2c34 100644 --- a/Questionable/Controller/Steps/InteractionFactory/AethernetShard.cs +++ b/Questionable/Controller/Steps/Interactions/AethernetShard.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.InteractionFactory; +namespace Questionable.Controller.Steps.Interactions; internal static class AethernetShard { diff --git a/Questionable/Controller/Steps/InteractionFactory/Aetheryte.cs b/Questionable/Controller/Steps/Interactions/Aetheryte.cs similarity index 96% rename from Questionable/Controller/Steps/InteractionFactory/Aetheryte.cs rename to Questionable/Controller/Steps/Interactions/Aetheryte.cs index 8f59a3d3..6babf233 100644 --- a/Questionable/Controller/Steps/InteractionFactory/Aetheryte.cs +++ b/Questionable/Controller/Steps/Interactions/Aetheryte.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.InteractionFactory; +namespace Questionable.Controller.Steps.Interactions; internal static class Aetheryte { diff --git a/Questionable/Controller/Steps/InteractionFactory/Combat.cs b/Questionable/Controller/Steps/Interactions/Combat.cs similarity index 94% rename from Questionable/Controller/Steps/InteractionFactory/Combat.cs rename to Questionable/Controller/Steps/Interactions/Combat.cs index b9ebcc75..5a868bc9 100644 --- a/Questionable/Controller/Steps/InteractionFactory/Combat.cs +++ b/Questionable/Controller/Steps/Interactions/Combat.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using Microsoft.Extensions.DependencyInjection; -using Questionable.Controller.Steps.BaseTasks; +using Questionable.Controller.Steps.Common; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.InteractionFactory; +namespace Questionable.Controller.Steps.Interactions; internal static class Combat { diff --git a/Questionable/Controller/Steps/InteractionFactory/Duty.cs b/Questionable/Controller/Steps/Interactions/Duty.cs similarity index 96% rename from Questionable/Controller/Steps/InteractionFactory/Duty.cs rename to Questionable/Controller/Steps/Interactions/Duty.cs index 9a57f4f3..a7de058c 100644 --- a/Questionable/Controller/Steps/InteractionFactory/Duty.cs +++ b/Questionable/Controller/Steps/Interactions/Duty.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.InteractionFactory; +namespace Questionable.Controller.Steps.Interactions; internal static class Duty { diff --git a/Questionable/Controller/Steps/InteractionFactory/Emote.cs b/Questionable/Controller/Steps/Interactions/Emote.cs similarity index 95% rename from Questionable/Controller/Steps/InteractionFactory/Emote.cs rename to Questionable/Controller/Steps/Interactions/Emote.cs index a8dee7b8..44478475 100644 --- a/Questionable/Controller/Steps/InteractionFactory/Emote.cs +++ b/Questionable/Controller/Steps/Interactions/Emote.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using Microsoft.Extensions.DependencyInjection; -using Questionable.Controller.Steps.BaseTasks; +using Questionable.Controller.Steps.Common; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.InteractionFactory; +namespace Questionable.Controller.Steps.Interactions; internal static class Emote { diff --git a/Questionable/Controller/Steps/InteractionFactory/EquipItem.cs b/Questionable/Controller/Steps/Interactions/EquipItem.cs similarity index 98% rename from Questionable/Controller/Steps/InteractionFactory/EquipItem.cs rename to Questionable/Controller/Steps/Interactions/EquipItem.cs index 22e339eb..65147b68 100644 --- a/Questionable/Controller/Steps/InteractionFactory/EquipItem.cs +++ b/Questionable/Controller/Steps/Interactions/EquipItem.cs @@ -6,11 +6,11 @@ using FFXIVClientStructs.FFXIV.Client.Game; using Lumina.Excel.GeneratedSheets; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Questionable.Controller.Steps.BaseTasks; +using Questionable.Controller.Steps.Common; using Questionable.Model.V1; using Quest = Questionable.Model.Quest; -namespace Questionable.Controller.Steps.InteractionFactory; +namespace Questionable.Controller.Steps.Interactions; internal static class EquipItem { diff --git a/Questionable/Controller/Steps/InteractionFactory/Interact.cs b/Questionable/Controller/Steps/Interactions/Interact.cs similarity index 97% rename from Questionable/Controller/Steps/InteractionFactory/Interact.cs rename to Questionable/Controller/Steps/Interactions/Interact.cs index ea55513e..f49394de 100644 --- a/Questionable/Controller/Steps/InteractionFactory/Interact.cs +++ b/Questionable/Controller/Steps/Interactions/Interact.cs @@ -6,11 +6,11 @@ using Dalamud.Game.ClientState.Objects.Types; using Dalamud.Plugin.Services; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Questionable.Controller.Steps.BaseFactory; +using Questionable.Controller.Steps.Shared; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.InteractionFactory; +namespace Questionable.Controller.Steps.Interactions; internal static class Interact { diff --git a/Questionable/Controller/Steps/InteractionFactory/Jump.cs b/Questionable/Controller/Steps/Interactions/Jump.cs similarity index 96% rename from Questionable/Controller/Steps/InteractionFactory/Jump.cs rename to Questionable/Controller/Steps/Interactions/Jump.cs index da029acd..8c5c9a8e 100644 --- a/Questionable/Controller/Steps/InteractionFactory/Jump.cs +++ b/Questionable/Controller/Steps/Interactions/Jump.cs @@ -2,11 +2,11 @@ using Dalamud.Plugin.Services; using FFXIVClientStructs.FFXIV.Client.Game; using Microsoft.Extensions.DependencyInjection; -using Questionable.Controller.Steps.BaseTasks; +using Questionable.Controller.Steps.Common; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.InteractionFactory; +namespace Questionable.Controller.Steps.Interactions; internal static class Jump { diff --git a/Questionable/Controller/Steps/InteractionFactory/Say.cs b/Questionable/Controller/Steps/Interactions/Say.cs similarity index 93% rename from Questionable/Controller/Steps/InteractionFactory/Say.cs rename to Questionable/Controller/Steps/Interactions/Say.cs index 37722525..c833badc 100644 --- a/Questionable/Controller/Steps/InteractionFactory/Say.cs +++ b/Questionable/Controller/Steps/Interactions/Say.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using Microsoft.Extensions.DependencyInjection; -using Questionable.Controller.Steps.BaseTasks; +using Questionable.Controller.Steps.Common; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.InteractionFactory; +namespace Questionable.Controller.Steps.Interactions; internal static class Say { diff --git a/Questionable/Controller/Steps/InteractionFactory/SinglePlayerDuty.cs b/Questionable/Controller/Steps/Interactions/SinglePlayerDuty.cs similarity index 97% rename from Questionable/Controller/Steps/InteractionFactory/SinglePlayerDuty.cs rename to Questionable/Controller/Steps/Interactions/SinglePlayerDuty.cs index d80be1f8..f7d5172a 100644 --- a/Questionable/Controller/Steps/InteractionFactory/SinglePlayerDuty.cs +++ b/Questionable/Controller/Steps/Interactions/SinglePlayerDuty.cs @@ -6,7 +6,7 @@ using Questionable.External; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.InteractionFactory; +namespace Questionable.Controller.Steps.Interactions; internal static class SinglePlayerDuty { diff --git a/Questionable/Controller/Steps/InteractionFactory/UseItem.cs b/Questionable/Controller/Steps/Interactions/UseItem.cs similarity index 98% rename from Questionable/Controller/Steps/InteractionFactory/UseItem.cs rename to Questionable/Controller/Steps/Interactions/UseItem.cs index 2f752b1a..05dbd72e 100644 --- a/Questionable/Controller/Steps/InteractionFactory/UseItem.cs +++ b/Questionable/Controller/Steps/Interactions/UseItem.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using FFXIVClientStructs.FFXIV.Client.Game; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Questionable.Controller.Steps.BaseTasks; +using Questionable.Controller.Steps.Common; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.InteractionFactory; +namespace Questionable.Controller.Steps.Interactions; internal static class UseItem { diff --git a/Questionable/Controller/Steps/BaseFactory/AethernetShortcut.cs b/Questionable/Controller/Steps/Shared/AethernetShortcut.cs similarity index 99% rename from Questionable/Controller/Steps/BaseFactory/AethernetShortcut.cs rename to Questionable/Controller/Steps/Shared/AethernetShortcut.cs index 5bcd6349..7e06068f 100644 --- a/Questionable/Controller/Steps/BaseFactory/AethernetShortcut.cs +++ b/Questionable/Controller/Steps/Shared/AethernetShortcut.cs @@ -11,7 +11,7 @@ using Questionable.Model; using Questionable.Model.V1; using Questionable.Model.V1.Converter; -namespace Questionable.Controller.Steps.BaseFactory; +namespace Questionable.Controller.Steps.Shared; internal static class AethernetShortcut { diff --git a/Questionable/Controller/Steps/BaseFactory/AetheryteShortcut.cs b/Questionable/Controller/Steps/Shared/AetheryteShortcut.cs similarity index 97% rename from Questionable/Controller/Steps/BaseFactory/AetheryteShortcut.cs rename to Questionable/Controller/Steps/Shared/AetheryteShortcut.cs index 3542c888..e1fb0f20 100644 --- a/Questionable/Controller/Steps/BaseFactory/AetheryteShortcut.cs +++ b/Questionable/Controller/Steps/Shared/AetheryteShortcut.cs @@ -4,12 +4,12 @@ using System.Numerics; using Dalamud.Plugin.Services; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Questionable.Controller.Steps.BaseTasks; +using Questionable.Controller.Steps.Common; using Questionable.Data; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.BaseFactory; +namespace Questionable.Controller.Steps.Shared; internal static class AetheryteShortcut { diff --git a/Questionable/Controller/Steps/BaseFactory/Move.cs b/Questionable/Controller/Steps/Shared/Move.cs similarity index 92% rename from Questionable/Controller/Steps/BaseFactory/Move.cs rename to Questionable/Controller/Steps/Shared/Move.cs index 6633c484..91812a38 100644 --- a/Questionable/Controller/Steps/BaseFactory/Move.cs +++ b/Questionable/Controller/Steps/Shared/Move.cs @@ -6,12 +6,12 @@ using Dalamud.Game.ClientState.Objects.Types; using Dalamud.Plugin.Services; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Questionable.Controller.Steps.BaseTasks; +using Questionable.Controller.Steps.Common; using Questionable.Data; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.BaseFactory; +namespace Questionable.Controller.Steps.Shared; internal static class Move { @@ -82,8 +82,15 @@ internal static class Move if (!Step.DisableNavmesh) { if (Step.Mount == null) + { + MountTask.EMountIf mountIf = + actualDistance > distance && Step.Fly == true && + gameFunctions.IsFlyingUnlocked(Step.TerritoryId) + ? MountTask.EMountIf.Always + : MountTask.EMountIf.AwayFromPosition; yield return serviceProvider.GetRequiredService() - .With(Step.TerritoryId, MountTask.EMountIf.AwayFromPosition, Destination); + .With(Step.TerritoryId, mountIf, Destination); + } if (actualDistance > distance) { diff --git a/Questionable/Controller/Steps/BaseFactory/SkipCondition.cs b/Questionable/Controller/Steps/Shared/SkipCondition.cs similarity index 98% rename from Questionable/Controller/Steps/BaseFactory/SkipCondition.cs rename to Questionable/Controller/Steps/Shared/SkipCondition.cs index d31f46e6..30feca43 100644 --- a/Questionable/Controller/Steps/BaseFactory/SkipCondition.cs +++ b/Questionable/Controller/Steps/Shared/SkipCondition.cs @@ -11,7 +11,7 @@ using Microsoft.Extensions.Logging; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.BaseFactory; +namespace Questionable.Controller.Steps.Shared; internal static class SkipCondition { diff --git a/Questionable/Controller/Steps/BaseFactory/StepDisabled.cs b/Questionable/Controller/Steps/Shared/StepDisabled.cs similarity index 94% rename from Questionable/Controller/Steps/BaseFactory/StepDisabled.cs rename to Questionable/Controller/Steps/Shared/StepDisabled.cs index ecb367b2..16bb8365 100644 --- a/Questionable/Controller/Steps/BaseFactory/StepDisabled.cs +++ b/Questionable/Controller/Steps/Shared/StepDisabled.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.BaseFactory; +namespace Questionable.Controller.Steps.Shared; internal static class StepDisabled { diff --git a/Questionable/Controller/Steps/BaseFactory/WaitAtEnd.cs b/Questionable/Controller/Steps/Shared/WaitAtEnd.cs similarity index 99% rename from Questionable/Controller/Steps/BaseFactory/WaitAtEnd.cs rename to Questionable/Controller/Steps/Shared/WaitAtEnd.cs index 1147458b..8ac78820 100644 --- a/Questionable/Controller/Steps/BaseFactory/WaitAtEnd.cs +++ b/Questionable/Controller/Steps/Shared/WaitAtEnd.cs @@ -8,12 +8,12 @@ using Dalamud.Plugin.Services; using FFXIVClientStructs.FFXIV.Application.Network.WorkDefinitions; using FFXIVClientStructs.FFXIV.Client.Game; using Microsoft.Extensions.DependencyInjection; -using Questionable.Controller.Steps.BaseTasks; +using Questionable.Controller.Steps.Common; using Questionable.Data; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.BaseFactory; +namespace Questionable.Controller.Steps.Shared; internal static class WaitAtEnd { diff --git a/Questionable/Controller/Steps/BaseFactory/WaitAtStart.cs b/Questionable/Controller/Steps/Shared/WaitAtStart.cs similarity index 90% rename from Questionable/Controller/Steps/BaseFactory/WaitAtStart.cs rename to Questionable/Controller/Steps/Shared/WaitAtStart.cs index 5da57f6b..4a1f411e 100644 --- a/Questionable/Controller/Steps/BaseFactory/WaitAtStart.cs +++ b/Questionable/Controller/Steps/Shared/WaitAtStart.cs @@ -1,10 +1,10 @@ using System; using Microsoft.Extensions.DependencyInjection; -using Questionable.Controller.Steps.BaseTasks; +using Questionable.Controller.Steps.Common; using Questionable.Model; using Questionable.Model.V1; -namespace Questionable.Controller.Steps.BaseFactory; +namespace Questionable.Controller.Steps.Shared; internal static class WaitAtStart { diff --git a/Questionable/Questionable.json b/Questionable/Questionable.json index 6975eaeb..356c0962 100644 --- a/Questionable/Questionable.json +++ b/Questionable/Questionable.json @@ -2,7 +2,7 @@ "Name": "Questionable", "Author": "Liza Carvelli", "Punchline": "A tiny quest helper plugin.", - "Description": "A tiny quest helper plugin.", + "Description": "A tiny little quest helper plugin, which does quests for you automatically where possible. Uses navmesh to automatically walk to all quest waypoints, and tries to automatically complete all steps along the way (excluding dungeons, single player duties and combat).\n\nNot all quests are supported, check the discord or git repository for an up-to-date list.\n\nRequired Plugins: vnavmesh, TextAdvance, Lifestream", "Tags": [ "quests", "msq" diff --git a/Questionable/QuestionablePlugin.cs b/Questionable/QuestionablePlugin.cs index 2fe468df..df02a582 100644 --- a/Questionable/QuestionablePlugin.cs +++ b/Questionable/QuestionablePlugin.cs @@ -11,13 +11,13 @@ using Microsoft.Extensions.Logging; using Questionable.Controller; using Questionable.Controller.NavigationOverrides; using Questionable.Controller.Steps; -using Questionable.Controller.Steps.BaseFactory; -using Questionable.Controller.Steps.BaseTasks; -using Questionable.Controller.Steps.InteractionFactory; +using Questionable.Controller.Steps.Shared; +using Questionable.Controller.Steps.Common; +using Questionable.Controller.Steps.Interactions; using Questionable.Data; using Questionable.External; using Questionable.Windows; -using Action = Questionable.Controller.Steps.InteractionFactory.Action; +using Action = Questionable.Controller.Steps.Interactions.Action; namespace Questionable; diff --git a/Questionable/Windows/DebugOverlay.cs b/Questionable/Windows/DebugOverlay.cs index 902d247a..e778372d 100644 --- a/Questionable/Windows/DebugOverlay.cs +++ b/Questionable/Windows/DebugOverlay.cs @@ -41,7 +41,11 @@ internal sealed class DebugOverlay : Window public ushort? HighlightedQuest { get; set; } - public override bool DrawConditions() => _configuration.Advanced.DebugOverlay; + public override bool DrawConditions() + { + return _configuration.Advanced.DebugOverlay && _clientState is + { IsLoggedIn: true, LocalPlayer: not null, IsPvPExcludingDen: false }; + } public override void PreDraw() { diff --git a/Questionable/Windows/QuestWindow.cs b/Questionable/Windows/QuestWindow.cs index 0d868109..0f72fcab 100644 --- a/Questionable/Windows/QuestWindow.cs +++ b/Questionable/Windows/QuestWindow.cs @@ -19,7 +19,7 @@ using ImGuiNET; using LLib.ImGui; using Microsoft.Extensions.Logging; using Questionable.Controller; -using Questionable.Controller.Steps.BaseFactory; +using Questionable.Controller.Steps.Shared; using Questionable.Data; using Questionable.External; using Questionable.Model; @@ -96,7 +96,7 @@ internal sealed class QuestWindow : LWindow, IPersistableWindowConfig public override bool DrawConditions() { - if (!_clientState.IsLoggedIn || _clientState.LocalPlayer == null) + if (!_clientState.IsLoggedIn || _clientState.LocalPlayer == null || _clientState.IsPvPExcludingDen) return false; if (_configuration.General.HideInAllInstances && _territoryData.IsDutyInstance(_clientState.TerritoryType))