Add 3 daily Omicron w/ gathering and interactions in Elysion

diff --git a/GatheringPaths/6.x - Endwalker/Elysion/316__MIN.json b/GatheringPaths/6.x - Endwalker/Elysion/316__MIN.json
index 53d696f2776f6cf83cfc4f4114595fc74d5f7654..9857d2b75f65665c7167a75b9bdfa5ff76ee6cf7 100644 (file)
--- a/GatheringPaths/6.x - Endwalker/Elysion/316__MIN.json
+++ b/GatheringPaths/6.x - Endwalker/Elysion/316__MIN.json
@@ -2,6 +2,24 @@
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
   "Steps": [
+    {
+      "DataId": 2013074,
+      "Position": {
+        "X": 304.3412,
+        "Y": 483.48206,
+        "Z": 143.11438
+      },
+      "TerritoryId": 960,
+      "InteractionType": "Interact",
+      "TargetTerritoryId": 1073,
+      "SkipConditions": {
+        "StepIf": {
+          "InTerritory": [
+            1073
+          ]
+        }
+      }
+    },
     {
       "TerritoryId": 1073,
       "InteractionType": "None"

diff --git a/GatheringPaths/6.x - Endwalker/Elysion/317__MIN.json b/GatheringPaths/6.x - Endwalker/Elysion/317__MIN.json
index a5a183288dc0d0c1259a4b7620ee5eb2a48f77ee..2b3650194128426dd68a55892307295fbf00443a 100644 (file)
--- a/GatheringPaths/6.x - Endwalker/Elysion/317__MIN.json
+++ b/GatheringPaths/6.x - Endwalker/Elysion/317__MIN.json
@@ -2,6 +2,24 @@
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
   "Steps": [
+    {
+      "DataId": 2013074,
+      "Position": {
+        "X": 304.3412,
+        "Y": 483.48206,
+        "Z": 143.11438
+      },
+      "TerritoryId": 960,
+      "InteractionType": "Interact",
+      "TargetTerritoryId": 1073,
+      "SkipConditions": {
+        "StepIf": {
+          "InTerritory": [
+            1073
+          ]
+        }
+      }
+    },
     {
       "TerritoryId": 1073,
       "InteractionType": "None"

diff --git a/GatheringPaths/6.x - Endwalker/Elysion/322__MIN.json b/GatheringPaths/6.x - Endwalker/Elysion/322__MIN.json
index 28eafc16717450ae97143ca24a569023e47e1091..9bb275197f5c2afffd5c448911bd8ac3b38d75d4 100644 (file)
--- a/GatheringPaths/6.x - Endwalker/Elysion/322__MIN.json
+++ b/GatheringPaths/6.x - Endwalker/Elysion/322__MIN.json
@@ -2,6 +2,24 @@
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
   "Steps": [
+    {
+      "DataId": 2013074,
+      "Position": {
+        "X": 304.3412,
+        "Y": 483.48206,
+        "Z": 143.11438
+      },
+      "TerritoryId": 960,
+      "InteractionType": "Interact",
+      "TargetTerritoryId": 1073,
+      "SkipConditions": {
+        "StepIf": {
+          "InTerritory": [
+            1073
+          ]
+        }
+      }
+    },
     {
       "TerritoryId": 1073,
       "InteractionType": "None"

diff --git a/GatheringPaths/6.x - Endwalker/Elysion/336__MIN.json b/GatheringPaths/6.x - Endwalker/Elysion/336__MIN.json
index 29fd7e14e94c535d936a4fc59fa70ede15530c59..881cd8cb1084884dd768605bdbd51d0b8b3a21cb 100644 (file)
--- a/GatheringPaths/6.x - Endwalker/Elysion/336__MIN.json
+++ b/GatheringPaths/6.x - Endwalker/Elysion/336__MIN.json
@@ -2,6 +2,24 @@
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
   "Steps": [
+    {
+      "DataId": 2013074,
+      "Position": {
+        "X": 304.3412,
+        "Y": 483.48206,
+        "Z": 143.11438
+      },
+      "TerritoryId": 960,
+      "InteractionType": "Interact",
+      "TargetTerritoryId": 1073,
+      "SkipConditions": {
+        "StepIf": {
+          "InTerritory": [
+            1073
+          ]
+        }
+      }
+    },
     {
       "TerritoryId": 1073,
       "InteractionType": "None"

diff --git a/GatheringPaths/6.x - Endwalker/Elysion/393__BTN.json b/GatheringPaths/6.x - Endwalker/Elysion/393__BTN.json
index f5b800cf59f46ed9458b44be084f36b06226b79b..4b953cc4cfe7cc168e3cdf56ad2e4d23ed605bba 100644 (file)
--- a/GatheringPaths/6.x - Endwalker/Elysion/393__BTN.json
+++ b/GatheringPaths/6.x - Endwalker/Elysion/393__BTN.json
@@ -2,6 +2,24 @@
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
   "Steps": [
+    {
+      "DataId": 2013074,
+      "Position": {
+        "X": 304.3412,
+        "Y": 483.48206,
+        "Z": 143.11438
+      },
+      "TerritoryId": 960,
+      "InteractionType": "Interact",
+      "TargetTerritoryId": 1073,
+      "SkipConditions": {
+        "StepIf": {
+          "InTerritory": [
+            1073
+          ]
+        }
+      }
+    },
     {
       "TerritoryId": 1073,
       "InteractionType": "None"

diff --git a/GatheringPaths/6.x - Endwalker/Elysion/394__BTN.json b/GatheringPaths/6.x - Endwalker/Elysion/394__BTN.json
index 647326f06ba87895c4b6f52baac3017bbb707e0b..4337ffecbe6342c2c4f2d8f33d16698faed12e0e 100644 (file)
--- a/GatheringPaths/6.x - Endwalker/Elysion/394__BTN.json
+++ b/GatheringPaths/6.x - Endwalker/Elysion/394__BTN.json
@@ -2,6 +2,24 @@
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
   "Steps": [
+    {
+      "DataId": 2013074,
+      "Position": {
+        "X": 304.3412,
+        "Y": 483.48206,
+        "Z": 143.11438
+      },
+      "TerritoryId": 960,
+      "InteractionType": "Interact",
+      "TargetTerritoryId": 1073,
+      "SkipConditions": {
+        "StepIf": {
+          "InTerritory": [
+            1073
+          ]
+        }
+      }
+    },
     {
       "TerritoryId": 1073,
       "InteractionType": "None"

diff --git a/GatheringPaths/6.x - Endwalker/Elysion/398__BTN.json b/GatheringPaths/6.x - Endwalker/Elysion/398__BTN.json
index a53db43501a5eee83dab18e0b56baf78bf03cb23..e86149d020b111df9d9810431d18b0a3758217fa 100644 (file)
--- a/GatheringPaths/6.x - Endwalker/Elysion/398__BTN.json
+++ b/GatheringPaths/6.x - Endwalker/Elysion/398__BTN.json
@@ -2,6 +2,24 @@
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
   "Steps": [
+    {
+      "DataId": 2013074,
+      "Position": {
+        "X": 304.3412,
+        "Y": 483.48206,
+        "Z": 143.11438
+      },
+      "TerritoryId": 960,
+      "InteractionType": "Interact",
+      "TargetTerritoryId": 1073,
+      "SkipConditions": {
+        "StepIf": {
+          "InTerritory": [
+            1073
+          ]
+        }
+      }
+    },
     {
       "TerritoryId": 1073,
       "InteractionType": "None"

diff --git a/GatheringPaths/6.x - Endwalker/Elysion/399__BTN.json b/GatheringPaths/6.x - Endwalker/Elysion/399__BTN.json
index 5953cde4b14acb498b0c0c0ae4164fbf9c600d9a..3c579960e2f24c3f1bbf1dc35979d16afe91ad93 100644 (file)
--- a/GatheringPaths/6.x - Endwalker/Elysion/399__BTN.json
+++ b/GatheringPaths/6.x - Endwalker/Elysion/399__BTN.json
@@ -2,6 +2,24 @@
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
   "Steps": [
+    {
+      "DataId": 2013074,
+      "Position": {
+        "X": 304.3412,
+        "Y": 483.48206,
+        "Z": 143.11438
+      },
+      "TerritoryId": 960,
+      "InteractionType": "Interact",
+      "TargetTerritoryId": 1073,
+      "SkipConditions": {
+        "StepIf": {
+          "InTerritory": [
+            1073
+          ]
+        }
+      }
+    },
     {
       "TerritoryId": 1073,
       "InteractionType": "None"

diff --git a/GatheringPaths/6.x - Endwalker/Ultima Thule/906__MIN.json b/GatheringPaths/6.x - Endwalker/Ultima Thule/906__MIN.json
new file mode 100644 (file)
index 0000000..1aed646
--- /dev/null
+++ b/GatheringPaths/6.x - Endwalker/Ultima Thule/906__MIN.json
@@ -0,0 +1,63 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
+  "Author": "liza",
+  "Steps": [
+    {
+      "TerritoryId": 960,
+      "InteractionType": "None",
+      "AetheryteShortcut": "Ultima Thule - Abode of the Ea"
+    }
+  ],
+  "Groups": [
+    {
+      "Nodes": [
+        {
+          "DataId": 34369,
+          "Locations": [
+            {
+              "Position": {
+                "X": -381.6697,
+                "Y": 246.9727,
+                "Z": -221.478
+              },
+              "MinimumAngle": 0,
+              "MaximumAngle": 225
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "Nodes": [
+        {
+          "DataId": 34367,
+          "Locations": [
+            {
+              "Position": {
+                "X": -384.7752,
+                "Y": 246.2142,
+                "Z": -220.8562
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "Nodes": [
+        {
+          "DataId": 34368,
+          "Locations": [
+            {
+              "Position": {
+                "X": -396.0184,
+                "Y": 245.9229,
+                "Z": -236.488
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

diff --git a/GatheringPaths/6.x - Endwalker/Ultima Thule/908__BTN.json b/GatheringPaths/6.x - Endwalker/Ultima Thule/908__BTN.json
new file mode 100644 (file)
index 0000000..35d3d56
--- /dev/null
+++ b/GatheringPaths/6.x - Endwalker/Ultima Thule/908__BTN.json
@@ -0,0 +1,67 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
+  "Author": "liza",
+  "Steps": [
+    {
+      "TerritoryId": 960,
+      "InteractionType": "None",
+      "AetheryteShortcut": "Ultima Thule - Abode of the Ea"
+    }
+  ],
+  "Groups": [
+    {
+      "Nodes": [
+        {
+          "DataId": 34375,
+          "Locations": [
+            {
+              "Position": {
+                "X": -408.5904,
+                "Y": 259.0197,
+                "Z": -361.8408
+              },
+              "MinimumAngle": -120,
+              "MaximumAngle": 60
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "Nodes": [
+        {
+          "DataId": 34374,
+          "Locations": [
+            {
+              "Position": {
+                "X": -410.1218,
+                "Y": 261.0269,
+                "Z": -364.9317
+              },
+              "MinimumAngle": -120,
+              "MaximumAngle": 35
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "Nodes": [
+        {
+          "DataId": 34373,
+          "Locations": [
+            {
+              "Position": {
+                "X": -421.3381,
+                "Y": 263.4496,
+                "Z": -366.897
+              },
+              "MinimumAngle": -105,
+              "MaximumAngle": 50
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPathGenerator/RoslynShortcuts.cs b/QuestPathGenerator/RoslynShortcuts.cs
index 82b9ecbabb7b3cc24db1fb1a119851e198c66416..940e243e00fd7455744c1c1eb4365e8584d1952a 100644 (file)
--- a/QuestPathGenerator/RoslynShortcuts.cs
+++ b/QuestPathGenerator/RoslynShortcuts.cs
@@ -398,8 +398,8 @@ public static class RoslynShortcuts
                                     Assignment(nameof(GatheredItem.Collectability), gatheredItem.Collectability,
                                             emptyItem.Collectability)
                                         .AsSyntaxNodeOrToken(),
-                                    Assignment(nameof(GatheredItem.ClassJob), gatheredItem.ClassJob,
-                                            emptyItem.ClassJob)
+                                    Assignment(nameof(GatheredItem.QuestAcceptedAsClass), gatheredItem.QuestAcceptedAsClass,
+                                            emptyItem.QuestAcceptedAsClass)
                                         .AsSyntaxNodeOrToken()))));
             }
             else if (value is GatheringNodeGroup nodeGroup)

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4607_Signs of the Past.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4607_Signs of the Past.json
new file mode 100644 (file)
index 0000000..e53d9af
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4607_Signs of the Past.json
@@ -0,0 +1,79 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "TerritoryId": 960,
+          "InteractionType": "None",
+          "RequiredGatheredItems": [
+            {
+              "QuestAcceptedAsClass": "Miner",
+              "ItemId": 38281,
+              "ItemCount": 3
+            },
+            {
+              "QuestAcceptedAsClass": "Botanist",
+              "ItemId": 38305,
+              "ItemCount": 3
+            }
+          ]
+        },
+        {
+          "DataId": 1044042,
+          "Position": {
+            "X": 507.0725,
+            "Y": 436.99997,
+            "Z": 340.07776
+          },
+          "TerritoryId": 960,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Ultima Thule - Base Omicron"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 2013072,
+          "Position": {
+            "X": 456.65674,
+            "Y": 438.04077,
+            "Z": 310.2312
+          },
+          "TerritoryId": 960,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 960
+        },
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4608_Coffee Talk.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4608_Coffee Talk.json
new file mode 100644 (file)
index 0000000..5faa936
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4608_Coffee Talk.json
@@ -0,0 +1,105 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 2013074,
+          "Position": {
+            "X": 304.3412,
+            "Y": 483.48206,
+            "Z": 143.11438
+          },
+          "TerritoryId": 960,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 1073
+        },
+        {
+          "DataId": 1044043,
+          "Position": {
+            "X": -7.1260376,
+            "Y": 498.9474,
+            "Z": -5.416992
+          },
+          "TerritoryId": 1073,
+          "InteractionType": "Say",
+          "ChatMessage": {
+            "Key": "TEXT_BANOMI102_04608_SAYTODO_000_050"
+          },
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
+        },
+        {
+          "DataId": 1044044,
+          "Position": {
+            "X": 11.215393,
+            "Y": 499.7763,
+            "Z": -23.239563
+          },
+          "TerritoryId": 1073,
+          "InteractionType": "Say",
+          "ChatMessage": {
+            "Key": "TEXT_BANOMI102_04608_SAYTODO_000_050"
+          },
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043421,
+          "Position": {
+            "X": 2.4261475,
+            "Y": 499.87805,
+            "Z": 46.036377
+          },
+          "TerritoryId": 1073,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 960
+        },
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

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
new file mode 100644 (file)
index 0000000..193b59b
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4609_Well Below Standard.json
@@ -0,0 +1,61 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 2013072,
+          "Position": {
+            "X": 456.65674,
+            "Y": 438.04077,
+            "Z": 310.2312
+          },
+          "TerritoryId": 960,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 960,
+          "RequiredGatheredItems": [
+            {
+              "QuestAcceptedAsClass": "Miner",
+              "ItemId": 38282,
+              "ItemCount": 3
+            },
+            {
+              "QuestAcceptedAsClass": "Botanist",
+              "ItemId": 38306,
+              "ItemCount": 3
+            }
+          ],
+          "AetheryteShortcut": "Ultima Thule - Base Omicron"
+        },
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4610_A Brewing Reputation.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4610_A Brewing Reputation.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4610_A Brewing Reputation.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4611_Grounds for Improvement.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4611_Grounds for Improvement.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4611_Grounds for Improvement.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4612_A Fertile Blend.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4612_A Fertile Blend.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4612_A Fertile Blend.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4613_The Hunger Pangs.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4613_The Hunger Pangs.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4613_The Hunger Pangs.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4614_The Robot and the Sea.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4614_The Robot and the Sea.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4614_The Robot and the Sea.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4615_Using Their Heads.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4615_Using Their Heads.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4615_Using Their Heads.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4616_Working Up a Thirst.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4616_Working Up a Thirst.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4616_Working Up a Thirst.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4617_I'll Fish It Myself.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4617_I'll Fish It Myself.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4617_I'll Fish It Myself.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4618_Sold Out.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4618_Sold Out.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4618_Sold Out.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4619_A Grebuloff Out of Water.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4619_A Grebuloff Out of Water.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4619_A Grebuloff Out of Water.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4620_A Taste of the Sea.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4620_A Taste of the Sea.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4620_A Taste of the Sea.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4621_It's Electric!.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4621_It's Electric!.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4621_It's Electric!.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4622_Ea Epicurious.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4622_Ea Epicurious.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4622_Ea Epicurious.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4623_I, Omicron.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4623_I, Omicron.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4623_I, Omicron.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4624_Guardians of the Galaxy.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4624_Guardians of the Galaxy.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4624_Guardians of the Galaxy.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4625_Corporeal Hand to Proverbial Mouth.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4625_Corporeal Hand to Proverbial Mouth.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4625_Corporeal Hand to Proverbial Mouth.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4626_Mush for Miw Miisv.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4626_Mush for Miw Miisv.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4626_Mush for Miw Miisv.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4627_Corporeal Comforts.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4627_Corporeal Comforts.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4627_Corporeal Comforts.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4628_Remote Debugging.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4628_Remote Debugging.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4628_Remote Debugging.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4629_A Light in the Dark.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4629_A Light in the Dark.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4629_A Light in the Dark.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4630_Reclaiming the Taste of Home.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4630_Reclaiming the Taste of Home.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4630_Reclaiming the Taste of Home.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4631_Not Forgotten.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4631_Not Forgotten.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4631_Not Forgotten.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4632_Checking for Cavities.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4632_Checking for Cavities.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4632_Checking for Cavities.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4633_Brainstorm.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4633_Brainstorm.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4633_Brainstorm.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4634_The Lost World.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4634_The Lost World.json
new file mode 100644 (file)
index 0000000..368803c
--- /dev/null
+++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4634_The Lost World.json
@@ -0,0 +1,37 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "Disabled": true,
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1043417,
+          "Position": {
+            "X": 314.9004,
+            "Y": 481.99442,
+            "Z": 148.11926
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json
index 122c64068d996d8479892de1a2a4f5ca9acf564e..18beaa47180c844766d4c7bdbf6c967f23557a2b 100644 (file)
--- a/QuestPaths/quest-v1.json
+++ b/QuestPaths/quest-v1.json
@@ -380,6 +380,13 @@
                 "type": "number",
                 "minimum": 0,
                 "maximum": 1000
+              },
+              "QuestAcceptedAsClass": {
+                "type": "string",
+                "enum": [
+                  "Miner",
+                  "Botanist"
+                ]
               }
             },
             "required": [

diff --git a/Questionable.Model/Questing/Converter/ClassJobConverter.cs b/Questionable.Model/Questing/Converter/ClassJobConverter.cs
new file mode 100644 (file)
index 0000000..4beb8e9
--- /dev/null
+++ b/Questionable.Model/Questing/Converter/ClassJobConverter.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Questionable.Model.Questing.Converter;
+
+internal sealed class ClassJobConverter : JsonConverter<uint>
+{
+    public override uint Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType != JsonTokenType.String)
+            throw new JsonException();
+
+        return reader.GetString() switch
+        {
+            "Miner" => 16,
+            "Botanist" => 17,
+            _ => throw new JsonException("Unsupported value for classjob"),
+        };
+    }
+
+    public override void Write(Utf8JsonWriter writer, uint value, JsonSerializerOptions options)
+    {
+        throw new NotImplementedException();
+    }
+}

diff --git a/Questionable.Model/Questing/GatheredItem.cs b/Questionable.Model/Questing/GatheredItem.cs
index 5f98aa591b46203df3b101af7608309fcca8cd29..8d2239ff292848990902171fe20517399b921411 100644 (file)
--- a/Questionable.Model/Questing/GatheredItem.cs
+++ b/Questionable.Model/Questing/GatheredItem.cs
@@ -1,4 +1,7 @@
-namespace Questionable.Model.Questing;
+using System.Text.Json.Serialization;
+using Questionable.Model.Questing.Converter;
+
+namespace Questionable.Model.Questing;
 
 public sealed class GatheredItem
 {
@@ -10,5 +13,6 @@ public sealed class GatheredItem
     /// <summary>
     /// Either miner or botanist; null if it is irrelevant (prefers current class/job, then any unlocked ones).
     /// </summary>
-    public uint? ClassJob { get; set; }
+    [JsonConverter(typeof(ClassJobConverter))]
+    public uint? QuestAcceptedAsClass { get; set; }
 }

diff --git a/Questionable/Controller/ContextMenuController.cs b/Questionable/Controller/ContextMenuController.cs
index 3f65d097abee36e0843dc0229617cdc7d1829006..f8441e637f38ad0f0eeca0fd46f6b555edd0f2d4 100644 (file)
--- a/Questionable/Controller/ContextMenuController.cs
+++ b/Questionable/Controller/ContextMenuController.cs
@@ -142,7 +142,7 @@ internal sealed class ContextMenuController : IDisposable
                     ItemId = itemId,
                     ItemCount = quantity,
                     Collectability = collectability,
-                    ClassJob = (uint)classJob,
+                    QuestAcceptedAsClass = (uint)classJob,
                 }
             ];
             _questController.SetGatheringQuest(quest);

diff --git a/Questionable/Controller/GameUiController.cs b/Questionable/Controller/GameUiController.cs
index d9e6e2549bcee3033eaf3adfec7203c127822c93..cbc312a3f427dec7cd68c44f12bbfef478538c64 100644 (file)
--- a/Questionable/Controller/GameUiController.cs
+++ b/Questionable/Controller/GameUiController.cs
@@ -13,6 +13,7 @@ using FFXIVClientStructs.FFXIV.Client.UI;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using LLib;
+using LLib.GameData;
 using LLib.GameUI;
 using Lumina.Excel.GeneratedSheets;
 using Microsoft.Extensions.Logging;
@@ -21,6 +22,7 @@ using Questionable.Data;
 using Questionable.Functions;
 using Questionable.Model;
 using Questionable.Model.Common;
+using Questionable.Model.Gathering;
 using Questionable.Model.Questing;
 using AethernetShortcut = Questionable.Controller.Steps.Shared.AethernetShortcut;
 using Quest = Questionable.Model.Quest;
@@ -36,11 +38,14 @@ internal sealed class GameUiController : IDisposable
     private readonly AetheryteFunctions _aetheryteFunctions;
     private readonly ExcelFunctions _excelFunctions;
     private readonly QuestController _questController;
+    private readonly GatheringData _gatheringData;
+    private readonly GatheringPointRegistry _gatheringPointRegistry;
     private readonly QuestRegistry _questRegistry;
     private readonly QuestData _questData;
     private readonly IGameGui _gameGui;
     private readonly ITargetManager _targetManager;
     private readonly IFramework _framework;
+    private readonly IClientState _clientState;
     private readonly ILogger<GameUiController> _logger;
     private readonly Regex _returnRegex;
 
@@ -53,12 +58,15 @@ internal sealed class GameUiController : IDisposable
         AetheryteFunctions aetheryteFunctions,
         ExcelFunctions excelFunctions,
         QuestController questController,
+        GatheringData gatheringData,
+        GatheringPointRegistry gatheringPointRegistry,
         QuestRegistry questRegistry,
         QuestData questData,
         IGameGui gameGui,
         ITargetManager targetManager,
         IFramework framework,
         IPluginLog pluginLog,
+        IClientState clientState,
         ILogger<GameUiController> logger)
     {
         _addonLifecycle = addonLifecycle;
@@ -67,11 +75,14 @@ internal sealed class GameUiController : IDisposable
         _aetheryteFunctions = aetheryteFunctions;
         _excelFunctions = excelFunctions;
         _questController = questController;
+        _gatheringData = gatheringData;
+        _gatheringPointRegistry = gatheringPointRegistry;
         _questRegistry = questRegistry;
         _questData = questData;
         _gameGui = gameGui;
         _targetManager = targetManager;
         _framework = framework;
+        _clientState = clientState;
         _logger = logger;
 
         _returnRegex = _dataManager.GetExcelSheet<Addon>()!.GetRow(196)!.GetRegex(addon => addon.Text, pluginLog)!;
@@ -593,6 +604,7 @@ internal sealed class GameUiController : IDisposable
     private unsafe bool HandleTravelYesNo(AddonSelectYesno* addonSelectYesno,
         QuestController.QuestProgress currentQuest, string actualPrompt)
     {
+        _logger.LogInformation("TravelYesNo");
         if (_aetheryteFunctions.ReturnRequestedAt >= DateTime.Now.AddSeconds(-2) && _returnRegex.IsMatch(actualPrompt))
         {
             _logger.LogInformation("Automatically confirming return...");
@@ -633,6 +645,29 @@ internal sealed class GameUiController : IDisposable
                 step.TerritoryId,
                 step.TargetTerritoryId);
 
+        if (step != null && (step.TerritoryId != _clientState.TerritoryType || step.TargetTerritoryId == null) &&
+            step.RequiredGatheredItems.Count > 0)
+        {
+            if (_gatheringData.TryGetGatheringPointId(step.RequiredGatheredItems[0].ItemId,
+                    (EClassJob?)_clientState.LocalPlayer?.ClassJob.Id ?? EClassJob.Adventurer,
+                    out GatheringPointId? gatheringPointId) &&
+                _gatheringPointRegistry.TryGetGatheringPoint(gatheringPointId, out GatheringRoot? root))
+            {
+                foreach (var gatheringStep in root.Steps)
+                {
+                    if (gatheringStep.TerritoryId == _clientState.TerritoryType &&
+                        gatheringStep.TargetTerritoryId != null)
+                    {
+                        _logger.LogTrace(
+                            "FindTargetTerritoryFromQuestStep (gathering): {CurrentTerritory}, {TargetTerritory}",
+                            gatheringStep.TerritoryId,
+                            gatheringStep.TargetTerritoryId);
+                        return gatheringStep.TargetTerritoryId;
+                    }
+                }
+            }
+        }
+
         if (step == null || step.TargetTerritoryId == null)
         {
             _logger.LogTrace("FindTargetTerritoryFromQuestStep: Checking previous step...");

diff --git a/Questionable/Controller/GatheringController.cs b/Questionable/Controller/GatheringController.cs
index aeb837d9662259cc5d469552d3738affd39fd4ee..e8ceccc3e7d80a5a132c07072554451e0eceb760 100644 (file)
--- a/Questionable/Controller/GatheringController.cs
+++ b/Questionable/Controller/GatheringController.cs
@@ -269,7 +269,7 @@ internal sealed unsafe class GatheringController : MiniTaskController<GatheringC
         }
     }
 
-    private sealed class CurrentRequest
+    internal sealed class CurrentRequest
     {
         public required GatheringRequest Data { get; init; }
         public required GatheringRoot Root { get; init; }

diff --git a/Questionable/Controller/Steps/Shared/GatheringRequiredItems.cs b/Questionable/Controller/Steps/Shared/GatheringRequiredItems.cs
index f9af944ddc417b5631f66d30ca2c64810f484d24..a58c288e871f293c1579952f4a68a57e169a14fa 100644 (file)
--- a/Questionable/Controller/Steps/Shared/GatheringRequiredItems.cs
+++ b/Questionable/Controller/Steps/Shared/GatheringRequiredItems.cs
@@ -3,12 +3,14 @@ using System.Collections.Generic;
 using System.Linq;
 using Dalamud.Game.Text;
 using Dalamud.Plugin.Services;
+using FFXIVClientStructs.FFXIV.Application.Network.WorkDefinitions;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using LLib.GameData;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Questionable.Controller.Steps.Common;
 using Questionable.Data;
+using Questionable.Functions;
 using Questionable.Model;
 using Questionable.Model.Gathering;
 using Questionable.Model.Questing;
@@ -32,8 +34,12 @@ internal static class GatheringRequiredItems
             {
                 EClassJob currentClassJob = (EClassJob)clientState.LocalPlayer!.ClassJob.Id;
                 EClassJob classJob = currentClassJob;
-                if (requiredGatheredItems.ClassJob != null)
-                    classJob = (EClassJob)requiredGatheredItems.ClassJob.Value;
+                if (requiredGatheredItems.QuestAcceptedAsClass != null)
+                {
+                    classJob = (EClassJob)requiredGatheredItems.QuestAcceptedAsClass.Value;
+                    if (!IsClassJobQuestWasAcceptedWith(quest.Id, classJob))
+                        continue;
+                }
 
                 if (!gatheringData.TryGetGatheringPointId(requiredGatheredItems.ItemId, classJob,
                         out GatheringPointId? gatheringPointId))
@@ -79,6 +85,18 @@ internal static class GatheringRequiredItems
             }
         }
 
+        private unsafe bool IsClassJobQuestWasAcceptedWith(ElementId questId, EClassJob expectedClassJob)
+        {
+            if (questId is not QuestId)
+                return true;
+
+            QuestWork* questWork = QuestManager.Instance()->GetQuestById(questId.Value);
+            if (questWork->AcceptClassJob != 0)
+                return (EClassJob)questWork->AcceptClassJob == expectedClassJob;
+
+            return true;
+        }
+
         private unsafe bool HasRequiredItems(GatheredItem requiredGatheredItems)
         {
             InventoryManager* inventoryManager = InventoryManager.Instance();

diff --git a/Questionable/Model/QuestProgressInfo.cs b/Questionable/Model/QuestProgressInfo.cs
index 9d918e2fcd9a8e3a6eb0bc826d10aa2a8afecd37..94d79d3418566f31244b1a5f130e5aa1d526a6e4 100644 (file)
--- a/Questionable/Model/QuestProgressInfo.cs
+++ b/Questionable/Model/QuestProgressInfo.cs
@@ -33,7 +33,7 @@ internal sealed class QuestProgressInfo
         // Last enemy → increase sequence, reset variable to 0
         // 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()}";
+        _asString = $"QW: {vars.Trim()}, {(EClassJob)questWork.AcceptClassJob}";
     }
 
     public QuestProgressInfo(LeveWork leveWork)