From ff983859ebd02f9fae2f2043df4e9532c2581e7e Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 18 Aug 2024 02:13:33 +0200 Subject: [PATCH] Add gathering locatiosn + unlock for Margrat + Anden --- .../919_The Central Hills of Amber_MIN.json | 136 +++++++++++++++ .../Amh Araeng/922_Garik_BTN.json | 122 +++++++++++++ .../Il Mheg/918_Voeburtenburg_MIN.json | 134 ++++++++++++++ .../Il Mheg/921_Good Jenanna's Grace_BTN.json | 120 +++++++++++++ .../927_The Norvrandt Slope_BTN.json | 131 ++++++++++++++ .../928_The Norvrandt Slope_MIN.json | 136 +++++++++++++++ .../Elpis/824_Northerly Zephyrneus_MIN.json | 164 ++++++++++++++++++ .../Garlemald/843_Liminal Station IV_BTN.json | 139 +++++++++++++++ .../Anden/4715_That's So Anden.json | 53 ++++++ .../Margrat/4815_A Request of One's Own.json | 64 +++++++ .../MovementOverrideController.cs | 3 + Questionable/DalamudInitializer.cs | 6 +- 12 files changed, 1205 insertions(+), 3 deletions(-) create mode 100644 GatheringPaths/5.x - Shadowbringers/Amh Araeng/919_The Central Hills of Amber_MIN.json create mode 100644 GatheringPaths/5.x - Shadowbringers/Amh Araeng/922_Garik_BTN.json create mode 100644 GatheringPaths/5.x - Shadowbringers/Il Mheg/918_Voeburtenburg_MIN.json create mode 100644 GatheringPaths/5.x - Shadowbringers/Il Mheg/921_Good Jenanna's Grace_BTN.json create mode 100644 GatheringPaths/5.x - Shadowbringers/The Tempest/927_The Norvrandt Slope_BTN.json create mode 100644 GatheringPaths/5.x - Shadowbringers/The Tempest/928_The Norvrandt Slope_MIN.json create mode 100644 GatheringPaths/6.x - Endwalker/Elpis/824_Northerly Zephyrneus_MIN.json create mode 100644 GatheringPaths/6.x - Endwalker/Garlemald/843_Liminal Station IV_BTN.json create mode 100644 QuestPaths/6.x - Endwalker/Custom Deliveries/Anden/4715_That's So Anden.json create mode 100644 QuestPaths/6.x - Endwalker/Custom Deliveries/Margrat/4815_A Request of One's Own.json diff --git a/GatheringPaths/5.x - Shadowbringers/Amh Araeng/919_The Central Hills of Amber_MIN.json b/GatheringPaths/5.x - Shadowbringers/Amh Araeng/919_The Central Hills of Amber_MIN.json new file mode 100644 index 00000000..66c2817f --- /dev/null +++ b/GatheringPaths/5.x - Shadowbringers/Amh Araeng/919_The Central Hills of Amber_MIN.json @@ -0,0 +1,136 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "TerritoryId": 815, + "InteractionType": "None", + "AetheryteShortcut": "Amh Araeng - Twine" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 34411, + "Locations": [ + { + "Position": { + "X": -418.0731, + "Y": 16.25609, + "Z": -127.4739 + }, + "MinimumAngle": 240, + "MaximumAngle": 360 + } + ] + }, + { + "DataId": 34412, + "Locations": [ + { + "Position": { + "X": -436.8404, + "Y": 18.18649, + "Z": -121.9686 + }, + "MinimumAngle": -80, + "MaximumAngle": 75 + }, + { + "Position": { + "X": -412.7203, + "Y": 17.72583, + "Z": -144.2871 + }, + "MinimumAngle": -145, + "MaximumAngle": 5 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34409, + "Locations": [ + { + "Position": { + "X": -309.9351, + "Y": 22.43881, + "Z": -196.324 + }, + "MinimumAngle": -70, + "MaximumAngle": 60 + } + ] + }, + { + "DataId": 34410, + "Locations": [ + { + "Position": { + "X": -301.4662, + "Y": 22.08392, + "Z": -205.1306 + }, + "MinimumAngle": -145, + "MaximumAngle": -20 + }, + { + "Position": { + "X": -318.3467, + "Y": 23.1723, + "Z": -198.7676 + }, + "MinimumAngle": -45, + "MaximumAngle": 85 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34414, + "Locations": [ + { + "Position": { + "X": -229.6105, + "Y": 5.158276, + "Z": -103.3359 + }, + "MinimumAngle": -40, + "MaximumAngle": 170 + }, + { + "Position": { + "X": -247.2413, + "Y": 9.6758, + "Z": -128.0531 + }, + "MinimumAngle": 30, + "MaximumAngle": 125 + } + ] + }, + { + "DataId": 34413, + "Locations": [ + { + "Position": { + "X": -248.8988, + "Y": 7.998118, + "Z": -121.8732 + }, + "MinimumAngle": 0, + "MaximumAngle": 160 + } + ] + } + ] + } + ] +} diff --git a/GatheringPaths/5.x - Shadowbringers/Amh Araeng/922_Garik_BTN.json b/GatheringPaths/5.x - Shadowbringers/Amh Araeng/922_Garik_BTN.json new file mode 100644 index 00000000..eb20f72f --- /dev/null +++ b/GatheringPaths/5.x - Shadowbringers/Amh Araeng/922_Garik_BTN.json @@ -0,0 +1,122 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "TerritoryId": 815, + "InteractionType": "None", + "AetheryteShortcut": "Amh Araeng - Twine" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 34430, + "Locations": [ + { + "Position": { + "X": -449.9385, + "Y": -1.370689, + "Z": -409.258 + } + }, + { + "Position": { + "X": -445.7757, + "Y": -0.7637522, + "Z": -415.8121 + } + } + ] + }, + { + "DataId": 34429, + "Locations": [ + { + "Position": { + "X": -451.2528, + "Y": -1.577711, + "Z": -414.294 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34427, + "Locations": [ + { + "Position": { + "X": -346.0392, + "Y": 0.6433533, + "Z": -541.9421 + } + } + ] + }, + { + "DataId": 34428, + "Locations": [ + { + "Position": { + "X": -326.9622, + "Y": 1.097262, + "Z": -537.5435 + }, + "MinimumAngle": 0, + "MaximumAngle": 220 + }, + { + "Position": { + "X": -357.2281, + "Y": 0.4458784, + "Z": -513.3207 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34431, + "Locations": [ + { + "Position": { + "X": -441.0019, + "Y": -5.337227, + "Z": -636.1525 + } + } + ] + }, + { + "DataId": 34432, + "Locations": [ + { + "Position": { + "X": -464.1121, + "Y": -5.420424, + "Z": -649.8243 + } + }, + { + "Position": { + "X": -436.4872, + "Y": -5.205373, + "Z": -638.8244 + }, + "MinimumAngle": -95, + "MaximumAngle": 85 + } + ] + } + ] + } + ] +} diff --git a/GatheringPaths/5.x - Shadowbringers/Il Mheg/918_Voeburtenburg_MIN.json b/GatheringPaths/5.x - Shadowbringers/Il Mheg/918_Voeburtenburg_MIN.json new file mode 100644 index 00000000..20c02940 --- /dev/null +++ b/GatheringPaths/5.x - Shadowbringers/Il Mheg/918_Voeburtenburg_MIN.json @@ -0,0 +1,134 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "TerritoryId": 816, + "InteractionType": "None", + "AetheryteShortcut": "Il Mheg - Wolekdorf" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 34407, + "Locations": [ + { + "Position": { + "X": 398.7715, + "Y": 58.00708, + "Z": -535.3972 + }, + "MinimumAngle": 95, + "MaximumAngle": 225 + } + ] + }, + { + "DataId": 34408, + "Locations": [ + { + "Position": { + "X": 395.787, + "Y": 57.58823, + "Z": -532.1421 + }, + "MinimumAngle": 105, + "MaximumAngle": 180, + "MinimumDistance": 1.5, + "MaximumDistance": 3 + }, + { + "Position": { + "X": 403.3334, + "Y": 58.56588, + "Z": -533.6083 + }, + "MinimumAngle": 155, + "MaximumAngle": 325 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34405, + "Locations": [ + { + "Position": { + "X": 563.6605, + "Y": 96.62567, + "Z": -409.83 + }, + "MinimumAngle": 60, + "MaximumAngle": 205 + } + ] + }, + { + "DataId": 34406, + "Locations": [ + { + "Position": { + "X": 584.2038, + "Y": 97.61217, + "Z": -429.3185 + } + }, + { + "Position": { + "X": 541.3574, + "Y": 95.33327, + "Z": -385.5562 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34403, + "Locations": [ + { + "Position": { + "X": 569.0512, + "Y": 96.43839, + "Z": -571.2072 + }, + "MinimumAngle": 45, + "MaximumAngle": 190 + } + ] + }, + { + "DataId": 34404, + "Locations": [ + { + "Position": { + "X": 557.5918, + "Y": 92.0403, + "Z": -582.1814 + }, + "MinimumAngle": 70, + "MaximumAngle": 200 + }, + { + "Position": { + "X": 573.9432, + "Y": 96.50874, + "Z": -575.4167 + }, + "MinimumAngle": 85, + "MaximumAngle": 220 + } + ] + } + ] + } + ] +} diff --git a/GatheringPaths/5.x - Shadowbringers/Il Mheg/921_Good Jenanna's Grace_BTN.json b/GatheringPaths/5.x - Shadowbringers/Il Mheg/921_Good Jenanna's Grace_BTN.json new file mode 100644 index 00000000..da7b2b36 --- /dev/null +++ b/GatheringPaths/5.x - Shadowbringers/Il Mheg/921_Good Jenanna's Grace_BTN.json @@ -0,0 +1,120 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "TerritoryId": 816, + "InteractionType": "None", + "AetheryteShortcut": "Il Mheg - Wolekdorf" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 34422, + "Locations": [ + { + "Position": { + "X": -161.9915, + "Y": 60.04895, + "Z": -647.3901 + } + }, + { + "Position": { + "X": -179.2945, + "Y": 60.84981, + "Z": -630.9084 + } + } + ] + }, + { + "DataId": 34421, + "Locations": [ + { + "Position": { + "X": -182.311, + "Y": 60.81965, + "Z": -640.2197 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34423, + "Locations": [ + { + "Position": { + "X": -182.0749, + "Y": 60.70063, + "Z": -567.6271 + } + } + ] + }, + { + "DataId": 34424, + "Locations": [ + { + "Position": { + "X": -184.7115, + "Y": 59.23207, + "Z": -573.9592 + } + }, + { + "Position": { + "X": -171.0273, + "Y": 62.20385, + "Z": -576.3321 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34425, + "Locations": [ + { + "Position": { + "X": -333.3387, + "Y": 82.66466, + "Z": -505.7937 + } + } + ] + }, + { + "DataId": 34426, + "Locations": [ + { + "Position": { + "X": -333.0683, + "Y": 82.72758, + "Z": -501.5885 + }, + "MinimumAngle": 75, + "MaximumAngle": 265 + }, + { + "Position": { + "X": -349.0388, + "Y": 89.44427, + "Z": -512.492 + } + } + ] + } + ] + } + ] +} diff --git a/GatheringPaths/5.x - Shadowbringers/The Tempest/927_The Norvrandt Slope_BTN.json b/GatheringPaths/5.x - Shadowbringers/The Tempest/927_The Norvrandt Slope_BTN.json new file mode 100644 index 00000000..36a1044b --- /dev/null +++ b/GatheringPaths/5.x - Shadowbringers/The Tempest/927_The Norvrandt Slope_BTN.json @@ -0,0 +1,131 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "TerritoryId": 818, + "InteractionType": "None" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 34458, + "Locations": [ + { + "Position": { + "X": 44.00173, + "Y": 428.2346, + "Z": -656.6179 + }, + "MinimumAngle": -65, + "MaximumAngle": 10 + }, + { + "Position": { + "X": 16.55597, + "Y": 426.627, + "Z": -670.5577 + }, + "MinimumAngle": -25, + "MaximumAngle": 110 + } + ] + }, + { + "DataId": 34457, + "Locations": [ + { + "Position": { + "X": 37.23584, + "Y": 427.2601, + "Z": -653.0619 + }, + "MinimumAngle": 245, + "MaximumAngle": 335 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34461, + "Locations": [ + { + "Position": { + "X": -65.51347, + "Y": 400.3132, + "Z": -539.7745 + } + } + ] + }, + { + "DataId": 34462, + "Locations": [ + { + "Position": { + "X": -67.70384, + "Y": 400.7841, + "Z": -542.4638 + }, + "MinimumAngle": -85, + "MaximumAngle": 55 + }, + { + "Position": { + "X": -55.10947, + "Y": 399.0878, + "Z": -536.9024 + }, + "MinimumDistance": 1, + "MaximumDistance": 2.5 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34459, + "Locations": [ + { + "Position": { + "X": -216.086, + "Y": 426.8226, + "Z": -649.2361 + } + } + ] + }, + { + "DataId": 34460, + "Locations": [ + { + "Position": { + "X": -215.228, + "Y": 427.4708, + "Z": -653.9598 + }, + "MinimumAngle": -55, + "MaximumAngle": 135 + }, + { + "Position": { + "X": -201.5463, + "Y": 427.882, + "Z": -655.0467 + }, + "MinimumAngle": -70, + "MaximumAngle": 65 + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/GatheringPaths/5.x - Shadowbringers/The Tempest/928_The Norvrandt Slope_MIN.json b/GatheringPaths/5.x - Shadowbringers/The Tempest/928_The Norvrandt Slope_MIN.json new file mode 100644 index 00000000..c997ed25 --- /dev/null +++ b/GatheringPaths/5.x - Shadowbringers/The Tempest/928_The Norvrandt Slope_MIN.json @@ -0,0 +1,136 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "TerritoryId": 818, + "InteractionType": "None", + "AetheryteShortcut": "Tempest - Ondo Cups" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 34466, + "Locations": [ + { + "Position": { + "X": 403.2184, + "Y": 408.0598, + "Z": -755.5223 + }, + "MinimumAngle": 80, + "MaximumAngle": 190 + }, + { + "Position": { + "X": 438.6136, + "Y": 416.6389, + "Z": -758.985 + }, + "MinimumAngle": 110, + "MaximumAngle": 240 + } + ] + }, + { + "DataId": 34465, + "Locations": [ + { + "Position": { + "X": 415.5816, + "Y": 412.4482, + "Z": -758.7325 + }, + "MinimumAngle": 90, + "MaximumAngle": 195 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34463, + "Locations": [ + { + "Position": { + "X": 415.8845, + "Y": 431.2351, + "Z": -896.2997 + }, + "MinimumAngle": -65, + "MaximumAngle": 45 + } + ] + }, + { + "DataId": 34464, + "Locations": [ + { + "Position": { + "X": 400.7106, + "Y": 428.3826, + "Z": -893.9595 + }, + "MinimumAngle": -40, + "MaximumAngle": 50 + }, + { + "Position": { + "X": 431.8092, + "Y": 434.546, + "Z": -902.1445 + }, + "MinimumAngle": -95, + "MaximumAngle": 35 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34467, + "Locations": [ + { + "Position": { + "X": 284.0778, + "Y": 433.4644, + "Z": -916.6171 + }, + "MinimumAngle": -75, + "MaximumAngle": 30 + } + ] + }, + { + "DataId": 34468, + "Locations": [ + { + "Position": { + "X": 278.6176, + "Y": 428.9509, + "Z": -904.3234 + }, + "MinimumAngle": 220, + "MaximumAngle": 345 + }, + { + "Position": { + "X": 305.7502, + "Y": 432.027, + "Z": -912.7272 + }, + "MinimumAngle": -80, + "MaximumAngle": 40 + } + ] + } + ] + } + ] +} diff --git a/GatheringPaths/6.x - Endwalker/Elpis/824_Northerly Zephyrneus_MIN.json b/GatheringPaths/6.x - Endwalker/Elpis/824_Northerly Zephyrneus_MIN.json new file mode 100644 index 00000000..8655bdc8 --- /dev/null +++ b/GatheringPaths/6.x - Endwalker/Elpis/824_Northerly Zephyrneus_MIN.json @@ -0,0 +1,164 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "TerritoryId": 961, + "InteractionType": "None" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 33945, + "Locations": [ + { + "Position": { + "X": -478.091, + "Y": 136.505, + "Z": -144.7721 + }, + "MinimumAngle": 185, + "MaximumAngle": 360 + }, + { + "Position": { + "X": -472.7283, + "Y": 136.9691, + "Z": -153.0142 + }, + "MinimumAngle": -105, + "MaximumAngle": 20, + "MinimumDistance": 1.6, + "MaximumDistance": 3 + }, + { + "Position": { + "X": -457.2324, + "Y": 136.2298, + "Z": -153.2787 + }, + "MinimumAngle": 70, + "MaximumAngle": 195 + } + ] + }, + { + "DataId": 33944, + "Locations": [ + { + "Position": { + "X": -477.1867, + "Y": 137.1741, + "Z": -150.0524 + }, + "MinimumAngle": -95, + "MaximumAngle": 20 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 33946, + "Locations": [ + { + "Position": { + "X": -335.5337, + "Y": 148.5269, + "Z": -83.30743 + }, + "MinimumAngle": 140, + "MaximumAngle": 275 + } + ] + }, + { + "DataId": 33947, + "Locations": [ + { + "Position": { + "X": -333.4615, + "Y": 148.59, + "Z": -78.42037 + }, + "MinimumAngle": -160, + "MaximumAngle": -15 + }, + { + "Position": { + "X": -342.3078, + "Y": 145.4429, + "Z": -109.3348 + }, + "MinimumAngle": 210, + "MaximumAngle": 355 + }, + { + "Position": { + "X": -327.4102, + "Y": 143.6382, + "Z": -118.3601 + }, + "MinimumAngle": -30, + "MaximumAngle": 85 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 33942, + "Locations": [ + { + "Position": { + "X": -291.2093, + "Y": 136.4047, + "Z": -228.9244 + }, + "MinimumAngle": 120, + "MaximumAngle": 225 + } + ] + }, + { + "DataId": 33943, + "Locations": [ + { + "Position": { + "X": -343.5337, + "Y": 140.0085, + "Z": -243.2652 + }, + "MinimumAngle": 115, + "MaximumAngle": 255 + }, + { + "Position": { + "X": -337.3867, + "Y": 136.3985, + "Z": -237.7285 + }, + "MinimumAngle": -130, + "MaximumAngle": 10 + }, + { + "Position": { + "X": -304.9684, + "Y": 136.2381, + "Z": -229.2424 + }, + "MinimumAngle": 115, + "MaximumAngle": 240 + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/GatheringPaths/6.x - Endwalker/Garlemald/843_Liminal Station IV_BTN.json b/GatheringPaths/6.x - Endwalker/Garlemald/843_Liminal Station IV_BTN.json new file mode 100644 index 00000000..823f7c29 --- /dev/null +++ b/GatheringPaths/6.x - Endwalker/Garlemald/843_Liminal Station IV_BTN.json @@ -0,0 +1,139 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "TerritoryId": 958, + "InteractionType": "None", + "AetheryteShortcut": "Garlemald - Camp Broken Glass" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 34004, + "Locations": [ + { + "Position": { + "X": 121.8413, + "Y": -6.651628, + "Z": 246.5624 + } + }, + { + "Position": { + "X": 118.1294, + "Y": -6.603673, + "Z": 242.6448 + } + }, + { + "Position": { + "X": 104.2039, + "Y": -10.52542, + "Z": 266.5598 + } + } + ] + }, + { + "DataId": 34003, + "Locations": [ + { + "Position": { + "X": 98.86316, + "Y": -9.970013, + "Z": 257.6278 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34005, + "Locations": [ + { + "Position": { + "X": 215.6167, + "Y": 1.599456, + "Z": 144.3346 + } + } + ] + }, + { + "DataId": 34006, + "Locations": [ + { + "Position": { + "X": 215.9073, + "Y": 1.613284, + "Z": 136.584 + } + }, + { + "Position": { + "X": 191.0582, + "Y": 2.43164, + "Z": 147.7836 + } + }, + { + "Position": { + "X": 185.1617, + "Y": 2.402756, + "Z": 138.276 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34007, + "Locations": [ + { + "Position": { + "X": 264.295, + "Y": -11.52659, + "Z": 306.4464 + } + } + ] + }, + { + "DataId": 34008, + "Locations": [ + { + "Position": { + "X": 280.1551, + "Y": -11.53278, + "Z": 301.5915 + } + }, + { + "Position": { + "X": 257.884, + "Y": -12.02824, + "Z": 296.5428 + } + }, + { + "Position": { + "X": 271.8952, + "Y": -12.7945, + "Z": 320.4683 + } + } + ] + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Custom Deliveries/Anden/4715_That's So Anden.json b/QuestPaths/6.x - Endwalker/Custom Deliveries/Anden/4715_That's So Anden.json new file mode 100644 index 00000000..aaae0caf --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Custom Deliveries/Anden/4715_That's So Anden.json @@ -0,0 +1,53 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1044553, + "Position": { + "X": -96.910095, + "Y": 3.1843073, + "Z": 6.8207397 + }, + "TerritoryId": 819, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1044554, + "Position": { + "X": -241.68768, + "Y": 51.058994, + "Z": 620.8744 + }, + "TerritoryId": 816, + "InteractionType": "Interact", + "AetheryteShortcut": "Il Mheg - Lydha Lran", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1044558, + "Position": { + "X": -241.68768, + "Y": 51.058994, + "Z": 620.8744 + }, + "TerritoryId": 816, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Custom Deliveries/Margrat/4815_A Request of One's Own.json b/QuestPaths/6.x - Endwalker/Custom Deliveries/Margrat/4815_A Request of One's Own.json new file mode 100644 index 00000000..8be70921 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Custom Deliveries/Margrat/4815_A Request of One's Own.json @@ -0,0 +1,64 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1046399, + "Position": { + "X": 130.05261, + "Y": -16.077408, + "Z": 190.72253 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Old Sharlayan", + "AethernetShortcut": [ + "[Old Sharlayan] Aetheryte Plaza", + "[Old Sharlayan] Scholar's Harbor" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1046401, + "Position": { + "X": 92.27124, + "Y": -29.53, + "Z": -6.607239 + }, + "TerritoryId": 956, + "InteractionType": "Interact", + "AetheryteShortcut": "Labyrinthos - Sharlayan Hamlet", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1046403, + "Position": { + "X": -31.99823, + "Y": -31.53043, + "Z": -53.26935 + }, + "TerritoryId": 956, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs index 58b2921a..451c4bfc 100644 --- a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs +++ b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs @@ -70,6 +70,9 @@ internal sealed class MovementOverrideController // kholusia, random rocks new BlacklistedPoint(814, new(-324, 348.75f, -181.75f), new(-322.75076f, 347.0529f, -177.69328f), 3), + // labyrinthos, sharlayan hamlet aetheryte + new BlacklistedPoint(956, new(6.25f, -27.75f, -41.5f), new(5.0831127f, -28.213453f, -42.239136f)), + // yak t'el, rock near cenote jayunja new BlacklistedPoint(1189, new(-115.75f, -213.75f, 336.5f), new(-112.40265f, -215.01514f, 339.0067f), 2), diff --git a/Questionable/DalamudInitializer.cs b/Questionable/DalamudInitializer.cs index f510fb71..f743ac39 100644 --- a/Questionable/DalamudInitializer.cs +++ b/Questionable/DalamudInitializer.cs @@ -81,13 +81,13 @@ internal sealed class DalamudInitializer : IDisposable } private void OnToast(ref SeString message, ref ToastOptions options, ref bool isHandled) - => _logger.LogInformation("Normal Toast: {Message}", message); + => _logger.LogTrace("Normal Toast: {Message}", message); private void OnErrorToast(ref SeString message, ref bool isHandled) - => _logger.LogInformation("Error Toast: {Message}", message); + => _logger.LogTrace("Error Toast: {Message}", message); private void OnQuestToast(ref SeString message, ref QuestToastOptions options, ref bool isHandled) - => _logger.LogInformation("Quest Toast: {Message}", message); + => _logger.LogTrace("Quest Toast: {Message}", message); public void Dispose() {