Merge pull request '[Qitari] last qitari daily quest' (#129) from pot0to/Questionable:master into master

Reviewed-on: liza/Questionable#129

QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3833_Qhoterl's Chronicles.json

@@ -1,7 +1,6 @@
-{
+{
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
-  "Author": "liza",
-  "Disabled": true,
+  "Author": "pot0to",
   "QuestSequence": [
     {
       "Sequence": 0,
@@ -9,9 +8,9 @@
         {
           "DataId": 1032643,
           "Position": {
-            "X": 787.0145,
-            "Y": -45.82774,
-            "Z": -218.555
+              "X": 787.0145,
+              "Y": -45.82774,
+              "Z": -218.555
           },
           "TerritoryId": 817,
           "InteractionType": "AcceptQuest"
@@ -22,26 +21,56 @@
       "Sequence": 255,
       "Steps": [
         {
+          "DataId": 33005,
           "Position": {
-            "X": 788.1569,
-            "Y": -45.82557,
-            "Z": -212.9306
+              "X": 214.7744,
+              "Y": -19.57758,
+              "Z": 623.6767
           },
           "TerritoryId": 817,
-          "InteractionType": "WalkTo",
-          "AetheryteShortcut": "Rak'tika - Fanow",
+          "InteractionType": "Gather",
+          "RequiredQuestAcceptedJob": [
+            "Miner"
+          ],
+          "ItemsToGather": [
+            {
+              "ItemId": 29537,
+              "ItemCount": 3
+            }
+          ],
+          "Fly": true
+        },
+        {
+          "DataId": 33020,
+          "Position": {
+              "X": 226.1767,
+              "Y": -20.10281,
+              "Z": 643.5543
+          },
+          "TerritoryId": 817,
+          "InteractionType": "Gather",
+          "RequiredQuestAcceptedJob": [
+            "Botanist"
+          ],
+          "ItemsToGather": [
+            {
+              "ItemId": 29563,
+              "ItemCount": 3
+            }
+          ],
           "Fly": true
         },
         {
           "DataId": 1032643,
           "Position": {
-            "X": 787.0145,
-            "Y": -45.82774,
-            "Z": -218.555
+              "X": 787.0145,
+              "Y": -45.82774,
+              "Z": -218.555
           },
-          "StopDistance": 7,
           "TerritoryId": 817,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Rak'tika - Fanow",
+          "Fly": true
         }
       ]
     }

Questionable/Configuration.cs

@@ -53,8 +53,6 @@ internal sealed class Configuration : IPluginConfiguration
     {
         public bool DebugOverlay { get; set; }
         public bool NeverFly { get; set; }
-
-        public bool NeverPortInSameZone { get; set; }
         public bool AdditionalStatusInformation { get; set; }
     }
 

Questionable/Controller/Steps/Shared/AethernetShortcut.cs

@@ -179,10 +179,12 @@ internal static class AethernetShortcut
                     }
                 }
             }
-            else
+            else if (clientState.TerritoryType == aetheryteData.TerritoryIds[Task.To])
                 logger.LogWarning(
-                    "Aethernet shortcut not unlocked (from: {FromAetheryte}, to: {ToAetheryte}), walking manually",
+                    "Aethernet shortcut not unlocked (from: {FromAetheryte}, to: {ToAetheryte}), skipping as we are already in the destination territory",
                     Task.From, Task.To);
+            else
+                throw new TaskException($"Aethernet shortcut not unlocked (from: {Task.From}, to: {Task.To})");
 
             return false;
         }

Questionable/Controller/Steps/Shared/AetheryteShortcut.cs

@@ -58,7 +58,6 @@ internal static class AetheryteShortcut
         IClientState clientState,
         IChatGui chatGui,
         ICondition condition,
-        Configuration configuration,
         AetheryteData aetheryteData) : TaskExecutor<Task>
     {
         private bool _teleported;
@@ -155,7 +154,7 @@ internal static class AetheryteShortcut
                 {
                     if (!skipConditions.Never)
                     {
-                        if (skipConditions is { InSameTerritory: true } || configuration.Advanced.NeverPortInSameZone)
+                        if (skipConditions is { InSameTerritory: true })
                         {
                             logger.LogInformation("Skipping aetheryte teleport due to SkipCondition (InSameTerritory)");
                             return true;

Questionable/External/TextAdvanceIpc.cs

@@ -22,13 +22,16 @@ internal sealed class TextAdvanceIpc : IDisposable
     private readonly string _pluginName;
     private readonly ExternalTerritoryConfig _externalTerritoryConfig = new();
 
-    public TextAdvanceIpc(IDalamudPluginInterface pluginInterface, IFramework framework, QuestController questController, Configuration configuration)
+    public TextAdvanceIpc(IDalamudPluginInterface pluginInterface, IFramework framework,
+        QuestController questController, Configuration configuration)
     {
         _framework = framework;
         _questController = questController;
         _configuration = configuration;
         _isInExternalControl = pluginInterface.GetIpcSubscriber<bool>("TextAdvance.IsInExternalControl");
-        _enableExternalControl = pluginInterface.GetIpcSubscriber<string, ExternalTerritoryConfig, bool>("TextAdvance.EnableExternalControl");
+        _enableExternalControl =
+            pluginInterface.GetIpcSubscriber<string, ExternalTerritoryConfig, bool>(
+                "TextAdvance.EnableExternalControl");
         _disableExternalControl = pluginInterface.GetIpcSubscriber<string, bool>("TextAdvance.DisableExternalControl");
         _pluginName = pluginInterface.InternalName;
         _framework.Update += OnUpdate;
@@ -37,7 +40,7 @@ internal sealed class TextAdvanceIpc : IDisposable
     public void Dispose()
     {
         _framework.Update -= OnUpdate;
-        if(_isExternalControlActivated)
+        if (_isExternalControlActivated)
         {
             _disableExternalControl.InvokeFunc(_pluginName);
         }
@@ -45,11 +48,13 @@ internal sealed class TextAdvanceIpc : IDisposable
 
     private void OnUpdate(IFramework framework)
     {
-        if(_configuration.General.ConfigureTextAdvance && _questController.IsRunning)
+        bool hasActiveQuest = _questController.IsRunning ||
+                              _questController.AutomationType != QuestController.EAutomationType.Manual;
+        if (_configuration.General.ConfigureTextAdvance && hasActiveQuest)
         {
-            if(!_isInExternalControl.InvokeFunc())
+            if (!_isInExternalControl.InvokeFunc())
             {
-                if(_enableExternalControl.InvokeFunc(_pluginName, _externalTerritoryConfig))
+                if (_enableExternalControl.InvokeFunc(_pluginName, _externalTerritoryConfig))
                 {
                     _isExternalControlActivated = true;
                 }
@@ -57,9 +62,9 @@ internal sealed class TextAdvanceIpc : IDisposable
         }
         else
         {
-            if(_isExternalControlActivated)
+            if (_isExternalControlActivated)
             {
-                if(_disableExternalControl.InvokeFunc(_pluginName) || !_isInExternalControl.InvokeFunc())
+                if (_disableExternalControl.InvokeFunc(_pluginName) || !_isInExternalControl.InvokeFunc())
                 {
                     _isExternalControlActivated = false;
                 }

Questionable/Windows/ConfigWindow.cs

@@ -452,13 +452,6 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig
             Save();
         }
 
-        bool neverPortInSameZone = this._configuration.Advanced.NeverPortInSameZone;
-        if (ImGui.Checkbox("Disable Aetheryte teleport in same zone", ref neverPortInSameZone))
-        {
-            _configuration.Advanced.NeverPortInSameZone = neverPortInSameZone;
-            Save();
-        }
-
         bool additionalStatusInformation = _configuration.Advanced.AdditionalStatusInformation;
         if (ImGui.Checkbox("Draw additional status information", ref additionalStatusInformation))
         {