From e105bacea7064e7189b59333d041cb693c9eaaf1 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 21 Jul 2024 09:07:31 +0200 Subject: [PATCH] Minor quest updates --- .../WAR/1054_How to Quit You.json | 50 +++++++++++++ .../MSQ-2/1037_A Hero in Need.json | 1 - .../MSQ-2/3872_Hearts on Fire.json | 1 - .../MSQ-2/3873_Rock the Castrum.json | 3 + .../MSQ-2/4521_Operation Archon.json | 3 + .../MSQ-2/4522_The Ultimate Weapon.json | 4 ++ .../1128_Shadows Uncast (Maelstrom).json | 70 +++++++++++++++++++ .../Unlocks/Dungeons/979_Fort of Fear.json | 36 ++++++++++ .../PvP/1104_A Pup No Longer (Maelstrom).json | 56 +++++++++++++++ .../MovementOverrideController.cs | 3 + 10 files changed, 225 insertions(+), 2 deletions(-) create mode 100644 QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1128_Shadows Uncast (Maelstrom).json create mode 100644 QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/979_Fort of Fear.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Unlocks/PvP/1104_A Pup No Longer (Maelstrom).json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1054_How to Quit You.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1054_How to Quit You.json index 8201d94e..8ccb2041 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1054_How to Quit You.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1054_How to Quit You.json @@ -16,6 +16,56 @@ "InteractionType": "AcceptQuest" } ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1006771, + "Position": { + "X": 89.829834, + "Y": 66.04188, + "Z": 18.753235 + }, + "TerritoryId": 137, + "InteractionType": "SinglePlayerDuty", + "AetheryteShortcut": "Eastern La Noscea - Wineport", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1006774, + "Position": { + "X": -11.367981, + "Y": 69.20081, + "Z": 30.258545 + }, + "TerritoryId": 137, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1006746, + "Position": { + "X": 460.65454, + "Y": 8.309061, + "Z": 74.47925 + }, + "TerritoryId": 137, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Eastern La Noscea - Costa Del Sol", + "NextQuestId": 1054, + "Fly": true + } + ] } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/1037_A Hero in Need.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/1037_A Hero in Need.json index d0e61fe9..23ba0ced 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/1037_A Hero in Need.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/1037_A Hero in Need.json @@ -33,7 +33,6 @@ }, { "TerritoryId": 147, - "StopDistance": 5, "InteractionType": "AttuneAetheryte", "Aetheryte": "Northern Thanalan - Camp Bluefog" }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/3872_Hearts on Fire.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/3872_Hearts on Fire.json index de3f260f..613bc6be 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/3872_Hearts on Fire.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/3872_Hearts on Fire.json @@ -26,7 +26,6 @@ "Steps": [ { "TerritoryId": 147, - "StopDistance": 5, "InteractionType": "AttuneAetheryte", "Aetheryte": "Northern Thanalan - Ceruleum Processing Plant" }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/3873_Rock the Castrum.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/3873_Rock the Castrum.json index 711d2b11..3089df5c 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/3873_Rock the Castrum.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/3873_Rock the Castrum.json @@ -1,6 +1,9 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "JerryWester", + "TerritoryBlacklist": [ + 1043 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/4521_Operation Archon.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/4521_Operation Archon.json index 5c2200ce..776b81ed 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/4521_Operation Archon.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/4521_Operation Archon.json @@ -1,6 +1,9 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "JerryWester", + "TerritoryBlacklist": [ + 1049 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/4522_The Ultimate Weapon.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/4522_The Ultimate Weapon.json index bb57fc22..0a9de151 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/4522_The Ultimate Weapon.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/4522_The Ultimate Weapon.json @@ -1,6 +1,10 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "JerryWester", + "TerritoryBlacklist": [ + 1044, + 1048 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1128_Shadows Uncast (Maelstrom).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1128_Shadows Uncast (Maelstrom).json new file mode 100644 index 00000000..232a84bf --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1128_Shadows Uncast (Maelstrom).json @@ -0,0 +1,70 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "TerritoryBlacklist": [ + 171 + ], + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1003281, + "Position": { + "X": 97.520386, + "Y": 40.248554, + "Z": 81.1322 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1006516, + "Position": { + "X": -82.68872, + "Y": 233.23743, + "Z": 317.1892 + }, + "TerritoryId": 155, + "InteractionType": "Interact", + "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 155, + "InteractionType": "Duty", + "ContentFinderConditionId": 13 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1003281, + "Position": { + "X": 97.520386, + "Y": 40.248554, + "Z": 81.1322 + }, + "TerritoryId": 128, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] The Aftcastle" + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/979_Fort of Fear.json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/979_Fort of Fear.json new file mode 100644 index 00000000..c815d1b6 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/979_Fort of Fear.json @@ -0,0 +1,36 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006382, + "Position": { + "X": 165.20935, + "Y": 222.99998, + "Z": 367.72717 + }, + "TerritoryId": 155, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1006516, + "Position": { + "X": -82.68872, + "Y": 233.23743, + "Z": 317.1892 + }, + "TerritoryId": 155, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/PvP/1104_A Pup No Longer (Maelstrom).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/PvP/1104_A Pup No Longer (Maelstrom).json new file mode 100644 index 00000000..51352849 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/PvP/1104_A Pup No Longer (Maelstrom).json @@ -0,0 +1,56 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1003281, + "Position": { + "X": 97.520386, + "Y": 40.248554, + "Z": 81.1322 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1002484, + "Position": { + "X": 270.71033, + "Y": 4.4031205, + "Z": 719.9968 + }, + "TerritoryId": 135, + "InteractionType": "Interact", + "TargetTerritoryId": 250, + "AetheryteShortcut": "Lower La Noscea - Moraby Drydocks", + "SkipIf": [ + "AetheryteShortcutIfInSameTerritory" + ] + }, + { + "TerritoryId": 250, + "InteractionType": "AttuneAetheryte", + "Aetheryte": "Wolves' Den Pier" + }, + { + "DataId": 1005184, + "Position": { + "X": 0.015197754, + "Y": 3.5836844, + "Z": -30.380737 + }, + "TerritoryId": 250, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs index 9cc646af..1a1a1669 100644 --- a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs +++ b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs @@ -23,6 +23,9 @@ internal sealed class MovementOverrideController // southern thanalan new BlacklistedPoint(146, new(-201.75f, 10.5f, -265.5f), new(-203.75235f, 10.130764f, -265.15314f)), + // lower la noscea - moraby drydocks aetheryte + new BlacklistedArea(135, new(156.11499f, 15.518433f, 673.21277f), 0.5f, 5f), + // coerthas central highlands new BlacklistedPoint(155, new(-478.75f, 149.25f, -305.75f), new(-476.1802f, 149.06573f, -304.7811f)),