Explicitly specify territoryId in NearPosition

diff --git a/QuestPathGenerator/RoslynElements/SkipConditionsExtensions.cs b/QuestPathGenerator/RoslynElements/SkipConditionsExtensions.cs
index 6307020f3f1c88442408fe9b04e194a0ed7c5ef1..02084db16dd7c0262c95c9582ba2d4fc6897d22c 100644 (file)
--- a/QuestPathGenerator/RoslynElements/SkipConditionsExtensions.cs
+++ b/QuestPathGenerator/RoslynElements/SkipConditionsExtensions.cs
@@ -109,6 +109,9 @@ internal static class SkipConditionsExtensions
                                 .AsSyntaxNodeOrToken(),
                             Assignment(nameof(NearPositionCondition.MaximumDistance),
                                     nearPositionCondition.MaximumDistance, emptyCondition.MaximumDistance)
+                                .AsSyntaxNodeOrToken(),
+                            Assignment(nameof(NearPositionCondition.TerritoryId),
+                                    nearPositionCondition.TerritoryId, emptyCondition.TerritoryId)
                                 .AsSyntaxNodeOrToken()))));
     }
 

diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1080_Only You Can Prevent Forest Ire.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1080_Only You Can Prevent Forest Ire.json
index 729b4b3f002c2d3a1f6fbf038714b7598d50dcf6..7ebd65e2a755274ba9c0113fe0586ad5b6015388 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1080_Only You Can Prevent Forest Ire.json
+++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1080_Only You Can Prevent Forest Ire.json
@@ -35,7 +35,8 @@
                   "Y": 8.712891,\r
                   "Z": 281.69678\r
                 },\r
-                "MaximumDistance": 3\r
+                "MaximumDistance": 3,\r
+                "TerritoryId": 153\r
               }\r
             }\r
           }\r
@@ -150,7 +151,8 @@
                   "Y": 8.712891,\r
                   "Z": 281.69678\r
                 },\r
-                "MaximumDistance": 3\r
+                "MaximumDistance": 3,\r
+                "TerritoryId": 153\r
               }\r
             }\r
           }\r

diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1082_Following in His Footsteps.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1082_Following in His Footsteps.json
index 4be0c9dfd76cf0472c05d1f2820d0f5944802020..5b4cd8243903f3f33cd7fa7bac668e5f5a1eb773 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1082_Following in His Footsteps.json
+++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1082_Following in His Footsteps.json
@@ -35,7 +35,8 @@
                   "Y": 8.712891,\r
                   "Z": 281.69678\r
                 },\r
-                "MaximumDistance": 3\r
+                "MaximumDistance": 3,\r
+                "TerritoryId": 153\r
               }\r
             }\r
           }\r
@@ -202,7 +203,8 @@
                   "Y": 8.712891,\r
                   "Z": 281.69678\r
                 },\r
-                "MaximumDistance": 3\r
+                "MaximumDistance": 3,\r
+                "TerritoryId": 153\r
               }\r
             }\r
           }\r
@@ -293,7 +295,8 @@
                   "Y": 8.712891,\r
                   "Z": 281.69678\r
                 },\r
-                "MaximumDistance": 3\r
+                "MaximumDistance": 3,\r
+                "TerritoryId": 153\r
               }\r
             }\r
           }\r
@@ -409,7 +412,8 @@
                   "Y": 8.712891,\r
                   "Z": 281.69678\r
                 },\r
-                "MaximumDistance": 3\r
+                "MaximumDistance": 3,\r
+                "TerritoryId": 153\r
               }\r
             }\r
           }\r

diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1083_Yearn for the Urn.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1083_Yearn for the Urn.json
index c71f25c43f4815ac3c057b5ed5e3b872d639690f..af4380985f2be7c28c54f8f2b70a9ce4e113c85d 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1083_Yearn for the Urn.json
+++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1083_Yearn for the Urn.json
@@ -35,7 +35,8 @@
                   "Y": 8.712891,\r
                   "Z": 281.69678\r
                 },\r
-                "MaximumDistance": 3\r
+                "MaximumDistance": 3,\r
+                "TerritoryId": 153\r
               }\r
             }\r
           }\r
@@ -194,7 +195,8 @@
                   "Y": 8.712891,\r
                   "Z": 281.69678\r
                 },\r
-                "MaximumDistance": 3\r
+                "MaximumDistance": 3,\r
+                "TerritoryId": 153\r
               }\r
             }\r
           }\r

diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1084_Heart of the Forest.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1084_Heart of the Forest.json
index 727f168526a4f3fb837bc1e4eae238fc24b78f9e..77a1c6163e773a4eb07d76f408f938a9e9ed0edd 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1084_Heart of the Forest.json
+++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1084_Heart of the Forest.json
@@ -35,7 +35,8 @@
                   "Y": 8.712891,\r
                   "Z": 281.69678\r
                 },\r
-                "MaximumDistance": 3\r
+                "MaximumDistance": 3,\r
+                "TerritoryId": 153\r
               }\r
             }\r
           }\r
@@ -117,7 +118,8 @@
                   "Y": 8.712891,\r
                   "Z": 281.69678\r
                 },\r
-                "MaximumDistance": 3\r
+                "MaximumDistance": 3,\r
+                "TerritoryId": 153\r
               }\r
             }\r
           }\r

diff --git a/QuestPaths/3.x - Heavensward/Class Quests/WHM/1719_Taint Misbehaving.json b/QuestPaths/3.x - Heavensward/Class Quests/WHM/1719_Taint Misbehaving.json
index fe8075f0b4b63f2c546d45455258a455185a36d4..7843c2cf2afb3b456da1adfe7a9c6365f1c4b1b9 100644 (file)
--- a/QuestPaths/3.x - Heavensward/Class Quests/WHM/1719_Taint Misbehaving.json
+++ b/QuestPaths/3.x - Heavensward/Class Quests/WHM/1719_Taint Misbehaving.json
@@ -35,7 +35,8 @@
                   "Y": 8.712891,\r
                   "Z": 281.69678\r
                 },\r
-                "MaximumDistance": 3\r
+                "MaximumDistance": 3,\r
+                "TerritoryId": 153\r
               }\r
             }\r
           }\r

diff --git a/QuestPaths/3.x - Heavensward/Class Quests/WHM/1724_Trials of the Padjals.json b/QuestPaths/3.x - Heavensward/Class Quests/WHM/1724_Trials of the Padjals.json
index 637c7e44a8e0182383dec8ba8095dacdb872929a..a109c03cdb1b11a96cc3fc723c417cc2ac3b0564 100644 (file)
--- a/QuestPaths/3.x - Heavensward/Class Quests/WHM/1724_Trials of the Padjals.json
+++ b/QuestPaths/3.x - Heavensward/Class Quests/WHM/1724_Trials of the Padjals.json
@@ -56,7 +56,8 @@
                   "Y": 8.712891,\r
                   "Z": 281.69678\r
                 },\r
-                "MaximumDistance": 3\r
+                "MaximumDistance": 3,\r
+                "TerritoryId": 153\r
               }\r
             }\r
           }\r

diff --git a/QuestPaths/3.x - Heavensward/Class Quests/WHM/1725_Hands of Healing.json b/QuestPaths/3.x - Heavensward/Class Quests/WHM/1725_Hands of Healing.json
index 1a7b66ca51aeccaf9c25b7cbb9484ace2c4fae82..e5222cab505a1435f8c00e64558b6a964c6fdd4a 100644 (file)
--- a/QuestPaths/3.x - Heavensward/Class Quests/WHM/1725_Hands of Healing.json
+++ b/QuestPaths/3.x - Heavensward/Class Quests/WHM/1725_Hands of Healing.json
@@ -35,7 +35,8 @@
                   "Y": 8.712891,\r
                   "Z": 281.69678\r
                 },\r
-                "MaximumDistance": 3\r
+                "MaximumDistance": 3,\r
+                "TerritoryId": 153\r
               }\r
             }\r
           }\r
@@ -116,7 +117,8 @@
                   "Y": 8.712891,\r
                   "Z": 281.69678\r
                 },\r
-                "MaximumDistance": 3\r
+                "MaximumDistance": 3,\r
+                "TerritoryId": 153\r
               }\r
             }\r
           }\r
@@ -244,7 +246,8 @@
                   "Y": 8.712891,\r
                   "Z": 281.69678\r
                 },\r
-                "MaximumDistance": 3\r
+                "MaximumDistance": 3,\r
+                "TerritoryId": 153\r
               }\r
             }\r
           }\r

diff --git a/QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json b/QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json
index c4710dc444b92dc5c66bfbd46d034aa1ec3d995d..f3cb71d0a7627b8d6c6a41601d063d81aec802a2 100644 (file)
--- a/QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json
+++ b/QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json
@@ -13,7 +13,21 @@
             "Z": 403.3722
           },
           "TerritoryId": 622,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Azim Steppe - Reunion",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "NearPosition": {
+                "Position": {
+                  "X": 525.10876,
+                  "Y": -19.50681,
+                  "Z": 403.3722
+                },
+                "MaximumDistance": 100,
+                "TerritoryId": 622
+              }
+            }
+          }
         }
       ]
     },

diff --git a/QuestPaths/4.x - Stormblood/Class Quests/WHM/2414_Unease in East End.json b/QuestPaths/4.x - Stormblood/Class Quests/WHM/2414_Unease in East End.json
index 35041f7ac60579454b0442342b4a561c0b140462..c7385a023c3a71449c1d33a45af4545075077365 100644 (file)
--- a/QuestPaths/4.x - Stormblood/Class Quests/WHM/2414_Unease in East End.json
+++ b/QuestPaths/4.x - Stormblood/Class Quests/WHM/2414_Unease in East End.json
@@ -35,7 +35,8 @@
                   "Y": 8.712891,\r
                   "Z": 281.69678\r
                 },\r
-                "MaximumDistance": 3\r
+                "MaximumDistance": 3,\r
+                "TerritoryId": 153\r
               }\r
             }\r
           }\r

diff --git a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3624_A Voice from the Void.json b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3624_A Voice from the Void.json
index c2dced214349a8ad4ab2b88b377b974bedeeb23b..5d58303bd657e78366e23e85ad08cdfa846329b6 100644 (file)
--- a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3624_A Voice from the Void.json
+++ b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3624_A Voice from the Void.json
@@ -23,7 +23,8 @@
                   "Y": 7.1558266,
                   "Z": -249.1341
                 },
-                "MaximumDistance": 100
+                "MaximumDistance": 100,
+                "TerritoryId": 815
               }
             }
           }

diff --git a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3625_Echoes of the Past.json b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3625_Echoes of the Past.json
index 9b7b8ddee3977aff63110a0f3b1be1eb5196158c..2eeb073d753cc85a811da65b888d0fd15d9e3372 100644 (file)
--- a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3625_Echoes of the Past.json
+++ b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3625_Echoes of the Past.json
@@ -23,7 +23,8 @@
                   "Y": 7.1558266,
                   "Z": -249.1341
                 },
-                "MaximumDistance": 100
+                "MaximumDistance": 100,
+                "TerritoryId": 815
               }
             }
           }

diff --git a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3626_Nyelbert's Lament.json b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3626_Nyelbert's Lament.json
index 43368dbd52bc8953f15dfd40b37bd47ed1bb94cd..ca1f720b9cea068460d5b3fa71cbd529586e6f42 100644 (file)
--- a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3626_Nyelbert's Lament.json
+++ b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3626_Nyelbert's Lament.json
@@ -23,7 +23,8 @@
                   "Y": 7.1558266,
                   "Z": -249.1341
                 },
-                "MaximumDistance": 100
+                "MaximumDistance": 100,
+                "TerritoryId": 815
               }
             }
           }

diff --git a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3627_Taynor's Training Day.json b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3627_Taynor's Training Day.json
index 370c4fc1597e541581e2816d2baf02ac8b69cef1..45c3f6725c42bb94f95d3b7f04a2ea8b26c2cb4c 100644 (file)
--- a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3627_Taynor's Training Day.json
+++ b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3627_Taynor's Training Day.json
@@ -23,7 +23,8 @@
                   "Y": 7.1558266,
                   "Z": -249.1341
                 },
-                "MaximumDistance": 100
+                "MaximumDistance": 100,
+                "TerritoryId": 815
               }
             }
           }

diff --git a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3628_A Tearful Reunion.json b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3628_A Tearful Reunion.json
index 1895ba16459cc36da175f395e33d589786bf70e8..f5e70ecff821cf72e23b48927fec4fc84f1f4357 100644 (file)
--- a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3628_A Tearful Reunion.json
+++ b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3628_A Tearful Reunion.json
@@ -23,7 +23,8 @@
                   "Y": 7.1558266,
                   "Z": -249.1341
                 },
-                "MaximumDistance": 100
+                "MaximumDistance": 100,
+                "TerritoryId": 815
               }
             }
           }

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
index 1e9036a21e2a1f3b8dbe08769834afcf4edf89d3..8834ff367a350b84f2a9a69e62bcbd88bcbcc3f7 100644 (file)
--- 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
@@ -157,7 +157,8 @@
                   "Y": 437.5829,
                   "Z": 333.63843
                 },
-                "MaximumDistance": 100
+                "MaximumDistance": 100,
+                "TerritoryId": 960
               }
             }
           }

diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json
index 69b6c8548c3efd9bcebf165acdb539c929a33ba3..ad911e72430f0aa1bc35b3518e47fc251cbbc101 100644 (file)
--- a/QuestPaths/quest-v1.json
+++ b/QuestPaths/quest-v1.json
@@ -261,11 +261,15 @@
                     },
                     "MaximumDistance": {
                       "type": "number"
+                    },
+                    "TerritoryId": {
+                      "type": "number"
                     }
                   },
                   "required": [
                     "Position",
-                    "MaximumDistance"
+                    "MaximumDistance",
+                    "TerritoryId"
                   ],
                   "additionalProperties": false
                 },
@@ -323,11 +327,15 @@
                     },
                     "MaximumDistance": {
                       "type": "number"
+                    },
+                    "TerritoryId": {
+                      "type": "number"
                     }
                   },
                   "required": [
                     "Position",
-                    "MaximumDistance"
+                    "MaximumDistance",
+                    "TerritoryId"
                   ],
                   "additionalProperties": false
                 }

diff --git a/Questionable.Model/Questing/NearPositionCondition.cs b/Questionable.Model/Questing/NearPositionCondition.cs
index 7c5885edac62ca6a4787ec04a3cc57236dead054..ecfba871e5bf12dfc59f3437ef7d7c7650a6a757 100644 (file)
--- a/Questionable.Model/Questing/NearPositionCondition.cs
+++ b/Questionable.Model/Questing/NearPositionCondition.cs
@@ -9,4 +9,5 @@ public sealed class NearPositionCondition
     [JsonConverter(typeof(VectorConverter))]
     public Vector3 Position { get; set; }
     public float MaximumDistance { get; set; }
+    public ushort TerritoryId { get; set; }
 }

diff --git a/Questionable/Validation/Validators/ClassQuestShouldHaveShortcutValidator.cs b/Questionable/Validation/Validators/ClassQuestShouldHaveShortcutValidator.cs
new file mode 100644 (file)
index 0000000..405c8f8
--- /dev/null
+++ b/Questionable/Validation/Validators/ClassQuestShouldHaveShortcutValidator.cs
@@ -0,0 +1,6 @@
+namespace Questionable.Validation.Validators;
+
+public class ClassQuestShouldHaveShortcut
+{
+    
+}