From f7d7233ccdba9981316abd7d52cb99ffe69c4df9 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Fri, 9 Aug 2024 02:55:21 +0200 Subject: [PATCH] ARR path fixes --- .../7.x - Dawntrail/Yak T'el/970.md | 23 ++++++++ .../WAR/317_The Mountain That Strides.json | 3 +- .../3864_Ziz Is So Ridiculous.json | 8 ++- .../787_Rock of Rancor.json | 9 +++ .../801_Skeletons in Her Closet.json | 7 ++- .../3865_Trial by Turtle.json | 24 +++++++- .../809_Tales from the Tidus Slayer.json | 9 +++ .../811_The Lominsan Way.json | 1 - .../822_When the Worm Turns.json | 6 +- .../848_Battle Scars.json | 58 +++++++++++++------ .../876_Bringing out the Dead.json | 56 +++++++++++++++++- QuestPaths/Reusable Paths.md | 24 ++++++++ .../MovementOverrideController.cs | 3 + Questionable/Validation/QuestValidator.cs | 2 +- 14 files changed, 202 insertions(+), 31 deletions(-) diff --git a/GatheringPaths/7.x - Dawntrail/Yak T'el/970.md b/GatheringPaths/7.x - Dawntrail/Yak T'el/970.md index e69de29b..ce25e503 100644 --- a/GatheringPaths/7.x - Dawntrail/Yak T'el/970.md +++ b/GatheringPaths/7.x - Dawntrail/Yak T'el/970.md @@ -0,0 +1,23 @@ +# GatheringLeve 131336 + +``` +Seed | id route | 34721 34722 34723 34724 34725 34726 +41636 | [3] 741 | x x x x +41637 | [2] 740 | x x x x +41638 | [1] 739 | x x x x + +30140 x x x x +30139 | x x x x +30138 | x x x x +30137 | [3] 741 | x x x x +30136 | [2] 740 | x x x x +30135 | [1] 739 | x x x x +30134 | [0] 738 | x x x x + +49211 | [0] +``` + +``` +seq: 0 → running +seq: 254 → done/prompting for return +``` diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/317_The Mountain That Strides.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/317_The Mountain That Strides.json index b4751491..70514ec1 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/317_The Mountain That Strides.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/317_The Mountain That Strides.json @@ -82,7 +82,8 @@ "Z": 212.84802 }, "TerritoryId": 138, - "InteractionType": "Interact" + "InteractionType": "Interact", + "AetheryteShortcut": "Western La Noscea - Aleport" } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/3864_Ziz Is So Ridiculous.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/3864_Ziz Is So Ridiculous.json index f1cbf53a..910850e3 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/3864_Ziz Is So Ridiculous.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/3864_Ziz Is So Ridiculous.json @@ -12,6 +12,7 @@ "Y": -44.86564, "Z": 262.745 }, + "StopDistance": 5, "TerritoryId": 154, "InteractionType": "AcceptQuest" } @@ -44,8 +45,11 @@ "TerritoryId": 154, "InteractionType": "Combat", "EnemySpawnType": "OverworldEnemies", - "KillEnemyDataIds": [ - 179 + "ComplexCombatData": [ + { + "DataId": 179, + "MinimumKillCount": 3 + } ] } ] diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/787_Rock of Rancor.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/787_Rock of Rancor.json index 30ec3ce6..f5c52bb7 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/787_Rock of Rancor.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/787_Rock of Rancor.json @@ -26,6 +26,15 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": -25.058176, + "Y": -40.87435, + "Z": 233.34166 + }, + "TerritoryId": 154, + "InteractionType": "WalkTo" + }, { "Position": { "X": -195.16211, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/801_Skeletons in Her Closet.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/801_Skeletons in Her Closet.json index 3b9419d4..c3a02a0c 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/801_Skeletons in Her Closet.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/801_Skeletons in Her Closet.json @@ -30,7 +30,12 @@ "TerritoryId": 132, "InteractionType": "AcceptQuest", "PickUpQuestId": 802, - "AetheryteShortcut": "Gridania" + "AetheryteShortcut": "Gridania", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } }, { "DataId": 1000171, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/3865_Trial by Turtle.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/3865_Trial by Turtle.json index 137ffb4d..af38538f 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/3865_Trial by Turtle.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/3865_Trial by Turtle.json @@ -75,6 +75,26 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": -180.60515, + "Y": 17.857697, + "Z": -278.74887 + }, + "TerritoryId": 146, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo" + }, + { + "Position": { + "X": -183.61136, + "Y": 3.5857017, + "Z": -248.78667 + }, + "TerritoryId": 146, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, { "DataId": 1004596, "Position": { @@ -84,13 +104,11 @@ }, "TerritoryId": 146, "InteractionType": "Interact", - "TargetTerritoryId": 146, - "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo" + "TargetTerritoryId": 146 }, { "TerritoryId": 146, "InteractionType": "AttuneAetheryte", - "StopDistance": 5, "Aetheryte": "Southern Thanalan - Forgotten Springs" }, { diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/809_Tales from the Tidus Slayer.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/809_Tales from the Tidus Slayer.json index 9de0fe5b..1688e2da 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/809_Tales from the Tidus Slayer.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/809_Tales from the Tidus Slayer.json @@ -41,6 +41,15 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 674.84393, + "Y": 64.118355, + "Z": -203.85042 + }, + "TerritoryId": 135, + "InteractionType": "WalkTo" + }, { "DataId": 1006264, "Position": { diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/811_The Lominsan Way.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/811_The Lominsan Way.json index 25e59764..f6ebd61d 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/811_The Lominsan Way.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/811_The Lominsan Way.json @@ -58,7 +58,6 @@ { "TerritoryId": 137, "InteractionType": "AttuneAetheryte", - "StopDistance": 5, "Aetheryte": "Eastern La Noscea - Costa Del Sol" }, { diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B1-Forgotten Springs/822_When the Worm Turns.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B1-Forgotten Springs/822_When the Worm Turns.json index 22a884cc..a20e8e2a 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B1-Forgotten Springs/822_When the Worm Turns.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B1-Forgotten Springs/822_When the Worm Turns.json @@ -35,8 +35,10 @@ "TerritoryId": 146, "InteractionType": "Combat", "EnemySpawnType": "OverworldEnemies", - "KillEnemyDataIds": [ - 356 + "ComplexCombatData": [ + { + "DataId": 356 + } ] } ] diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/848_Battle Scars.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/848_Battle Scars.json index 52f4024e..0b849d79 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/848_Battle Scars.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/848_Battle Scars.json @@ -26,24 +26,6 @@ { "Sequence": 1, "Steps": [ - { - "DataId": 2002061, - "Position": { - "X": -248.40167, - "Y": 33.98181, - "Z": 299.39722 - }, - "TerritoryId": 137, - "InteractionType": "Interact", - "CompletionQuestVariablesFlags": [ - null, - null, - null, - null, - null, - 32 - ] - }, { "DataId": 2002059, "Position": { @@ -62,6 +44,45 @@ 128 ] }, + { + "DataId": 2002061, + "Position": { + "X": -248.40167, + "Y": 33.98181, + "Z": 299.39722 + }, + "TerritoryId": 137, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "Position": { + "X": -301.2062, + "Y": 35.646942, + "Z": 273.47797 + }, + "TerritoryId": 137, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + } + }, { "DataId": 2002060, "Position": { @@ -69,6 +90,7 @@ "Y": 33.89026, "Z": 276.53918 }, + "StopDistance": 4.5, "TerritoryId": 137, "InteractionType": "Interact", "CompletionQuestVariablesFlags": [ diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json index e5d5e206..8db84884 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json @@ -124,6 +124,16 @@ { "Sequence": 3, "Steps": [ + { + "Position": { + "X": -408.92343, + "Y": 23.167036, + "Z": -351.16223 + }, + "TerritoryId": 140, + "InteractionType": "WalkTo", + "$": "Vesper Bay Gate" + }, { "DataId": 1006362, "Position": { @@ -132,13 +142,38 @@ "Z": -353.6584 }, "TerritoryId": 140, - "InteractionType": "Interact" + "InteractionType": "Interact", + "DisableNavmesh": true } ] }, { "Sequence": 4, "Steps": [ + { + "Position": { + "X": -408.92343, + "Y": 23.167036, + "Z": -351.16223 + }, + "TerritoryId": 140, + "InteractionType": "WalkTo", + "$": "Vesper Bay Gate", + "DisableNavmesh": true, + "Mount": true, + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + 64, + null + ] + } + } + }, { "DataId": 1006344, "Position": { @@ -202,13 +237,30 @@ }, "TerritoryId": 140, "InteractionType": "Interact", - "Comment": "TODO QW" + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + 128, + null + ] } ] }, { "Sequence": 5, "Steps": [ + { + "Position": { + "X": -408.92343, + "Y": 23.167036, + "Z": -351.16223 + }, + "TerritoryId": 140, + "InteractionType": "WalkTo", + "$": "Vesper Bay Gate" + }, { "DataId": 1006362, "Position": { diff --git a/QuestPaths/Reusable Paths.md b/QuestPaths/Reusable Paths.md index 7bbfa2f5..fca80551 100644 --- a/QuestPaths/Reusable Paths.md +++ b/QuestPaths/Reusable Paths.md @@ -20,6 +20,30 @@ that can sometimes be found as valid paths. "$": "Ul'dah Aetheryte to Immortal Flames" } ``` + +## Western Thanalan + +Vesper Bay side of the gate: + +```json + { + "Position": { + "X": -408.92343, + "Y": 23.167036, + "Z": -351.16223 + }, + "TerritoryId": 140, + "InteractionType": "WalkTo", + "$": "Vesper Bay Gate" + } +``` + +Horizon side of the gate: + +```json + +``` + ## Mor Dhona ```json diff --git a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs index 56c0dabc..58b2921a 100644 --- a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs +++ b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs @@ -40,6 +40,9 @@ internal sealed class MovementOverrideController // lower la noscea - Moraby Drydocks aetheryte new BlacklistedArea(135, new(156.11499f, 15.518433f, 673.21277f), 0.5f, 5f), + // upper la noscea + new BlacklistedPoint(139, new(366, -2.5f, 95.5f), new(362.65973f, -3.4f, 96.6896f), 2), + // coerthas central highlands new BlacklistedPoint(155, new(-478.75f, 149.25f, -305.75f), new(-476.1802f, 149.06573f, -304.7811f)), diff --git a/Questionable/Validation/QuestValidator.cs b/Questionable/Validation/QuestValidator.cs index 137e62b4..44f952f3 100644 --- a/Questionable/Validation/QuestValidator.cs +++ b/Questionable/Validation/QuestValidator.cs @@ -53,7 +53,7 @@ internal sealed class QuestValidator { var level = issue.Severity == EIssueSeverity.Error ? LogLevel.Warning - : LogLevel.Information; + : LogLevel.Debug; _logger.Log(level, "Validation failed: {QuestId} ({QuestName}) / {QuestSequence} / {QuestStep} - {Description}", issue.ElementId, quest.Info.Name, issue.Sequence, issue.Step, issue.Description);