Remove outdated gathering leve stuff

diff --git a/GatheringPaths/7.x - Dawntrail/Yak T'el/970.md b/GatheringPaths/7.x - Dawntrail/Yak T'el/970.md
deleted file mode 100644 (file)
index ce25e50..0000000
--- a/GatheringPaths/7.x - Dawntrail/Yak T'el/970.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# GatheringLeve 131336
-
-```
-Seed  | id  route |  34721 34722 34723 34724 34725 34726 
-41636 | [3]  741  |          x           x     x     x
-41637 | [2]  740  |    x           x     x     x
-41638 | [1]  739  |    x     x           x           x
-
-30140                  x           x     x     x
-30139 |                x     x           x     x
-30138 |                x           x     x           x
-30137 | [3]  741  |          x           x     x     x
-30136 | [2]  740  |    x           x     x     x
-30135 | [1]  739  |    x     x           x           x
-30134 | [0]  738  |    x           x     x           x
-
-49211 | [0]
-```
-
-```
-seq: 0 → running
-seq: 254 → done/prompting for return
-```

diff --git a/Questionable/Controller/GameUi/InteractionUiController.cs b/Questionable/Controller/GameUi/InteractionUiController.cs
index f3e3820..1c4a408 100644 (file)
--- a/Questionable/Controller/GameUi/InteractionUiController.cs
+++ b/Questionable/Controller/GameUi/InteractionUiController.cs
@@ -9,7 +9,6 @@ using Dalamud.Game.ClientState.Objects;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game.Event;
 using FFXIVClientStructs.FFXIV.Client.Game.InstanceContent;
-using FFXIVClientStructs.FFXIV.Client.Game.UI;
 using FFXIVClientStructs.FFXIV.Client.UI;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using LLib;
@@ -548,17 +547,6 @@ internal sealed class InteractionUiController : IDisposable
             return;
         }
 
-        var director = UIState.Instance()->DirectorTodo.Director;
-        if (director != null &&
-            director->Info.EventId.ContentId == EventHandlerContent.GatheringLeveDirector &&
-            director->Sequence == 254)
-        {
-            // just close the dialogue for 'do you want to return to next settlement', should prolly be different for
-            // ARR territories
-            addonSelectYesno->AtkUnitBase.FireCallbackInt(1);
-            return;
-        }
-
         var currentQuest = _questController.StartedQuest;
         if (currentQuest != null && CheckQuestYesNo(addonSelectYesno, currentQuest, actualPrompt, checkAllSteps))
             return;

diff --git a/Questionable/Controller/GatheringController.cs b/Questionable/Controller/GatheringController.cs
index b9248b0..3c8d10c 100644 (file)
--- a/Questionable/Controller/GatheringController.cs
+++ b/Questionable/Controller/GatheringController.cs
@@ -9,8 +9,6 @@ using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game;
-using FFXIVClientStructs.FFXIV.Client.Game.Event;
-using FFXIVClientStructs.FFXIV.Client.Game.UI;
 using LLib;
 using Lumina.Excel.Sheets;
 using Microsoft.Extensions.Logging;
@@ -18,7 +16,6 @@ using Questionable.Controller.Steps;
 using Questionable.Controller.Steps.Gathering;
 using Questionable.Controller.Steps.Interactions;
 using Questionable.Controller.Steps.Movement;
-using Questionable.Controller.Steps.Shared;
 using Questionable.External;
 using Questionable.Functions;
 using Questionable.Model.Gathering;
@@ -136,15 +133,6 @@ internal sealed unsafe class GatheringController : MiniTaskController<GatheringC
         if (!_taskQueue.AllTasksComplete)
             return;
 
-        var director = UIState.Instance()->DirectorTodo.Director;
-        if (director != null && director->Info.EventId.ContentId == EventHandlerContent.GatheringLeveDirector)
-        {
-            if (director->Sequence == 254)
-                return;
-
-            _taskQueue.Enqueue(new WaitAtEnd.WaitDelay());
-        }
-
         GatheringNode? currentNode = FindNextTargetableNodeAndUpdateIndex(_currentRequest);
         if (currentNode == null)
             return;