Add some side quests

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4609_Well Below Standard.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4609_Well Below Standard.json
index 193b59b40517c86afb377fc60460b4c788b51eca..8f588d7613ceb53deefb3be30a3508cfe2628625 100644 (file)
--- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4609_Well Below Standard.json
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4609_Well Below Standard.json
@@ -1,7 +1,6 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
   "Author": "liza",
-  "Disabled": true,
   "QuestSequence": [
     {
       "Sequence": 0,

diff --git a/QuestPaths/6.x - Endwalker/Tataru's Grand Endeavor/4761_Aggressive Expansion.json b/QuestPaths/6.x - Endwalker/Tataru's Grand Endeavor/4761_Aggressive Expansion.json
new file mode 100644 (file)
index 0000000..c460f67
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Tataru's Grand Endeavor/4761_Aggressive Expansion.json
@@ -0,0 +1,125 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1042599,
+          "Position": {
+            "X": 31.998047,
+            "Y": 5.1499996,
+            "Z": -67.73486
+          },
+          "TerritoryId": 962,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Old Sharlayan",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1033637,
+          "Position": {
+            "X": -533.4402,
+            "Y": 8.187748,
+            "Z": -46.341675
+          },
+          "TerritoryId": 621,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Lochs - Porta Praetoria",
+          "Fly": true,
+          "TargetTerritoryId": 919
+        },
+        {
+          "DataId": 1033629,
+          "Position": {
+            "X": -0.3204956,
+            "Y": 41,
+            "Z": 17.56311
+          },
+          "TerritoryId": 919,
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKSA401_04761_Q2_000_000",
+              "Answer": "TEXT_AKTKSA401_04761_A2_000_002"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1045296,
+          "Position": {
+            "X": -1.1750488,
+            "Y": 41.01997,
+            "Z": 30.289062
+          },
+          "StopDistance": 7,
+          "TerritoryId": 919,
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKSA401_04761_Q5_000_000",
+              "Yes": true
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1045299,
+          "Position": {
+            "X": 84.73328,
+            "Y": 0,
+            "Z": 106.46216
+          },
+          "StopDistance": 7,
+          "TerritoryId": 991,
+          "InteractionType": "Instruction",
+          "Comment": "Really short sequence of the Christmas minigame",
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKSA401_04761_SYSTEM_100_076",
+              "Yes": true
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1033629,
+          "Position": {
+            "X": -0.3204956,
+            "Y": 41,
+            "Z": 17.56311
+          },
+          "StopDistance": 7,
+          "TerritoryId": 919,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Tataru's Grand Endeavor/4762_Forever in Our Hearts.json b/QuestPaths/6.x - Endwalker/Tataru's Grand Endeavor/4762_Forever in Our Hearts.json
new file mode 100644 (file)
index 0000000..a3ec4f5
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Tataru's Grand Endeavor/4762_Forever in Our Hearts.json
@@ -0,0 +1,141 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1033629,
+          "Position": {
+            "X": -0.3204956,
+            "Y": 41,
+            "Z": 17.56311
+          },
+          "StopDistance": 7,
+          "TerritoryId": 919,
+          "InteractionType": "AcceptQuest",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKSA402_04762_Q1_000_000",
+              "Answer": "TEXT_AKTKSA402_04762_A1_000_002"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1045301,
+          "Position": {
+            "X": -36.636963,
+            "Y": 41,
+            "Z": 57.66382
+          },
+          "TerritoryId": 919,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1045308,
+          "Position": {
+            "X": -18.35669,
+            "Y": 40.999996,
+            "Z": -17.898865
+          },
+          "TerritoryId": 919,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
+        },
+        {
+          "Position": {
+            "X": -15.634434,
+            "Y": 41,
+            "Z": 13.581184
+          },
+          "TerritoryId": 919,
+          "InteractionType": "WalkTo"
+        },
+        {
+          "DataId": 1033629,
+          "Position": {
+            "X": -0.3204956,
+            "Y": 41,
+            "Z": 17.56311
+          },
+          "TerritoryId": 919,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1045311,
+          "Position": {
+            "X": 57.78589,
+            "Y": 35,
+            "Z": 81.55945
+          },
+          "TerritoryId": 919,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1045614,
+          "Position": {
+            "X": 53.116577,
+            "Y": 34.999966,
+            "Z": 78.01941
+          },
+          "StopDistance": 7,
+          "TerritoryId": 919,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1042599,
+          "Position": {
+            "X": 31.998047,
+            "Y": 5.1499996,
+            "Z": -67.73486
+          },
+          "TerritoryId": 962,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Old Sharlayan"
+        }
+      ]
+    }
+  ]
+}

diff --git a/Questionable/Model/QuestProgressInfo.cs b/Questionable/Model/QuestProgressInfo.cs
index 1f0e046c8aab2e9d1ad39f97229ef16b67d541bc..5289b6260f7d7541cb77a64793acffb145486f0c 100644 (file)
--- a/Questionable/Model/QuestProgressInfo.cs
+++ b/Questionable/Model/QuestProgressInfo.cs
@@ -34,8 +34,9 @@ internal sealed class QuestProgressInfo
         // The order in which enemies are killed doesn't seem to matter.
         // If multiple waves spawn, this continues to count up (e.g. 1 enemy from wave 1, 2 enemies from wave 2, 1 from wave 3) would count to 3 then 0
         _asString = $"QW: {vars.Trim()}";
-        if (questWork.AcceptClassJob != 0)
-            _asString += $", {(EClassJob)questWork.AcceptClassJob}";
+
+        //if (questWork.AcceptClassJob != 0)
+        //    _asString += $", {(EClassJob)questWork.AcceptClassJob}";
     }
 
     public QuestProgressInfo(LeveWork leveWork)