From 8c621cc1c490afefe01a80d97dbbf0582214bf0f Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 21 Jul 2024 02:06:33 +0200 Subject: [PATCH] Minor quest updates --- .../WAR/1050_Embracing the Beast.json | 3 +- .../1051_Curious Gorge Goes to Wineport.json | 105 +++++++ .../WAR/1052_Looking the Part.json | 281 ++++++++++++++++++ .../WAR/1053_Proof Is the Pudding.json | 81 +++++ .../WAR/1054_How to Quit You.json | 21 ++ .../MSQ-2/1001_Drowning Out the Voices.json | 2 + ...very Little Thing She Does Is Magitek.json | 3 + .../MSQ-2/519_Lady of the Vortex.json | 2 +- .../MSQ-2/520_Reclamation.json | 2 +- .../MSQ-2/939_By the Lights of Ishgard.json | 20 -- .../MSQ-2/952_In Pursuit of the Past.json | 4 + .../961_Representing the Representative.json | 3 +- .../MSQ-2/967_History Repeating.json | 3 + .../MSQ-2/978_Casing the Castrum.json | 3 +- .../MSQ-2/981_Footprints in the Snow.json | 4 +- .../MSQ-2/982_Monumental Hopes.json | 3 +- QuestPaths/quest-v1.json | 32 +- .../MovementOverrideController.cs | 3 + 18 files changed, 542 insertions(+), 33 deletions(-) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1051_Curious Gorge Goes to Wineport.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1052_Looking the Part.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1053_Proof Is the Pudding.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1054_How to Quit You.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1050_Embracing the Beast.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1050_Embracing the Beast.json index d927f243..19b4c4c8 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1050_Embracing the Beast.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1050_Embracing the Beast.json @@ -115,7 +115,8 @@ }, "TerritoryId": 137, "InteractionType": "CompleteQuest", - "AetheryteShortcut": "Eastern La Noscea - Costa Del Sol" + "AetheryteShortcut": "Eastern La Noscea - Costa Del Sol", + "NextQuestId": 1050 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1051_Curious Gorge Goes to Wineport.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1051_Curious Gorge Goes to Wineport.json new file mode 100644 index 00000000..67329747 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1051_Curious Gorge Goes to Wineport.json @@ -0,0 +1,105 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006746, + "Position": { + "X": 460.65454, + "Y": 8.309061, + "Z": 74.47925 + }, + "TerritoryId": 137, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1006764, + "Position": { + "X": 9.689453, + "Y": 65.05541, + "Z": 46.37207 + }, + "TerritoryId": 137, + "InteractionType": "Interact", + "AetheryteShortcut": "Eastern La Noscea - Wineport" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2002307, + "Position": { + "X": 95.8114, + "Y": 74.143555, + "Z": -45.731323 + }, + "TerritoryId": 137, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 2, + 12 + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1006768, + "Position": { + "X": 9.689453, + "Y": 65.162186, + "Z": 44.99878 + }, + "TerritoryId": 137, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1006783, + "Position": { + "X": -11.490112, + "Y": 69.24614, + "Z": 30.289062 + }, + "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": 1052, + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1052_Looking the Part.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1052_Looking the Part.json new file mode 100644 index 00000000..6aa7fbfe --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1052_Looking the Part.json @@ -0,0 +1,281 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006746, + "Position": { + "X": 460.65454, + "Y": 8.309061, + "Z": 74.47925 + }, + "TerritoryId": 137, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -586.4241, + "Y": 236.18538, + "Z": 411.9264 + }, + "TerritoryId": 155, + "InteractionType": "WalkTo", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -128 + ], + "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", + "SkipIf": [ + "AetheryteShortcutIfInSameTerritory" + ], + "Fly": true + }, + { + "Position": { + "X": -608.9161, + "Y": 247.47685, + "Z": 420.84274 + }, + "TerritoryId": 155, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [ + 1918 + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -128 + ] + }, + { + "DataId": 2002308, + "Position": { + "X": -583.82544, + "Y": 234.97363, + "Z": 410.94055 + }, + "TerritoryId": 155, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "Position": { + "X": -52.048523, + "Y": 0.869751, + "Z": 359.39575 + }, + "TerritoryId": 153, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [ + 1919 + ], + "AetheryteShortcut": "South Shroud - Camp Tranquil", + "Fly": true, + "SkipIf": [ + "AetheryteShortcutIfInSameTerritory" + ], + "Comment": "TODO Verify enemy id" + }, + { + "DataId": 2002309, + "Position": { + "X": -52.048523, + "Y": 0.869751, + "Z": 359.39575 + }, + "TerritoryId": 153, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "TerritoryId": 153, + "InteractionType": "UseItem", + "ItemId": 30362, + "TargetTerritoryId": 140, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -32 + ] + }, + { + "Position": { + "X": -283.92462, + "Y": 15.060608, + "Z": -774.6853 + }, + "TerritoryId": 140, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [ + 1920 + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -32 + ] + }, + { + "DataId": 2002310, + "Position": { + "X": -283.92462, + "Y": 15.060608, + "Z": -774.6853 + }, + "TerritoryId": 140, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1006746, + "Position": { + "X": 460.65454, + "Y": 8.309061, + "Z": 74.47925 + }, + "TerritoryId": 137, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "TerritoryId": 137, + "InteractionType": "EquipItem", + "ItemId": 3684 + }, + { + "TerritoryId": 137, + "InteractionType": "EquipItem", + "ItemId": 3460 + }, + { + "TerritoryId": 137, + "InteractionType": "EquipItem", + "ItemId": 3891 + }, + { + "DataId": 1006746, + "Position": { + "X": 460.65454, + "Y": 8.309061, + "Z": 74.47925 + }, + "TerritoryId": 137, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2002311, + "Position": { + "X": -282.7345, + "Y": 33.798706, + "Z": 300.98413 + }, + "TerritoryId": 137, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "ComplexCombatData": [ + { + "DataId": 1921, + "CompletionQuestVariablesFlags": [ + 1, + null, + null, + null, + null, + null + ] + } + ], + "AetheryteShortcut": "Eastern La Noscea - Wineport", + "Fly": true + }, + { + "DataId": 2002311, + "Position": { + "X": -282.7345, + "Y": 33.798706, + "Z": 300.98413 + }, + "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": 1053, + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1053_Proof Is the Pudding.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1053_Proof Is the Pudding.json new file mode 100644 index 00000000..0375f7f5 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1053_Proof Is the Pudding.json @@ -0,0 +1,81 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006746, + "Position": { + "X": 460.65454, + "Y": 8.309061, + "Z": 74.47925 + }, + "TerritoryId": 137, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 573.56177, + "Y": 347.98422, + "Z": -760.73724 + }, + "TerritoryId": 155, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "ComplexCombatData": [ + { + "DataId": 1922, + "CompletionQuestVariablesFlags": [ + 1, + null, + null, + null, + null, + null + ] + } + ], + "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", + "SkipIf": [ + "AetheryteShortcutIfInSameTerritory" + ] + }, + { + "DataId": 2002312, + "Position": { + "X": 579.4918, + "Y": 347.79883, + "Z": -764.3702 + }, + "TerritoryId": 155, + "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/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 new file mode 100644 index 00000000..8201d94e --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1054_How to Quit You.json @@ -0,0 +1,21 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006746, + "Position": { + "X": 460.65454, + "Y": 8.309061, + "Z": 74.47925 + }, + "TerritoryId": 137, + "InteractionType": "AcceptQuest" + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/1001_Drowning Out the Voices.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/1001_Drowning Out the Voices.json index f01ae3e1..b0c19776 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/1001_Drowning Out the Voices.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/1001_Drowning Out the Voices.json @@ -31,6 +31,7 @@ "InteractionType": "Combat", "EnemySpawnType": "AfterItemUse", "ItemId": 2000766, + "GroundTarget": true, "KillEnemyDataIds": [ 46 ], @@ -131,6 +132,7 @@ "InteractionType": "Combat", "EnemySpawnType": "AfterItemUse", "ItemId": 2000766, + "GroundTarget": true, "KillEnemyDataIds": [ 46 ], diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/1005_Every Little Thing She Does Is Magitek.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/1005_Every Little Thing She Does Is Magitek.json index 6230ce25..21f94340 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/1005_Every Little Thing She Does Is Magitek.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/1005_Every Little Thing She Does Is Magitek.json @@ -1,6 +1,9 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "JerryWester", + "TerritoryBlacklist": [ + 309 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/519_Lady of the Vortex.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/519_Lady of the Vortex.json index 4a307bbe..9aea36c0 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/519_Lady of the Vortex.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/519_Lady of the Vortex.json @@ -52,7 +52,7 @@ "Y": 84, "Z": -3.768982 }, - "StopDistance": 5, + "StopDistance": 7, "TerritoryId": 130, "InteractionType": "CompleteQuest" } diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/520_Reclamation.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/520_Reclamation.json index 7c38913e..4a08e3b6 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/520_Reclamation.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/520_Reclamation.json @@ -12,7 +12,7 @@ "Y": 84, "Z": -3.768982 }, - "StopDistance": 5, + "StopDistance": 7, "TerritoryId": 130, "InteractionType": "AcceptQuest" } diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/939_By the Lights of Ishgard.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/939_By the Lights of Ishgard.json index 87d5c3c3..db6aab71 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/939_By the Lights of Ishgard.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/939_By the Lights of Ishgard.json @@ -42,16 +42,6 @@ "TerritoryId": 155, "InteractionType": "WalkTo" }, - { - "Position": { - "X": -476.1802, - "Y": 149.06573, - "Z": -304.7811 - }, - "TerritoryId": 155, - "InteractionType": "WalkTo", - "Comment": "Avoids part of the tail that is non-walkable" - }, { "DataId": 2002170, "Position": { @@ -96,16 +86,6 @@ { "Sequence": 255, "Steps": [ - { - "Position": { - "X": -476.1802, - "Y": 149.06573, - "Z": -304.7811 - }, - "TerritoryId": 155, - "InteractionType": "WalkTo", - "Comment": "Avoids part of the tail that is non-walkable" - }, { "DataId": 1006467, "Position": { diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/952_In Pursuit of the Past.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/952_In Pursuit of the Past.json index 7c95e065..fe650521 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/952_In Pursuit of the Past.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/952_In Pursuit of the Past.json @@ -1,6 +1,9 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "JerryWester", + "TerritoryBlacklist": [ + 1042 + ], "QuestSequence": [ { "Sequence": 0, @@ -71,6 +74,7 @@ "Y": -21.970922, "Z": 119.73743 }, + "StopDistance": 5, "TerritoryId": 132, "InteractionType": "CompleteQuest" } diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/961_Representing the Representative.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/961_Representing the Representative.json index 99d66e91..4712f274 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/961_Representing the Representative.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/961_Representing the Representative.json @@ -96,7 +96,8 @@ "Z": 320.81702 }, "TerritoryId": 138, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "Mount": true }, { "DataId": 1006497, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/967_History Repeating.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/967_History Repeating.json index d3870758..efeab75b 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/967_History Repeating.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/967_History Repeating.json @@ -1,6 +1,9 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "JerryWester", + "TerritoryBlacklist": [ + 330 + ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/978_Casing the Castrum.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/978_Casing the Castrum.json index 3ade2761..ec8e989c 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/978_Casing the Castrum.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/978_Casing the Castrum.json @@ -12,6 +12,7 @@ "Y": 1.2000015, "Z": 2.9144287 }, + "StopDistance": 7, "TerritoryId": 212, "InteractionType": "AcceptQuest" } @@ -34,4 +35,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/981_Footprints in the Snow.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/981_Footprints in the Snow.json index 1b6dd7bf..b8482e75 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/981_Footprints in the Snow.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/981_Footprints in the Snow.json @@ -111,8 +111,10 @@ "Y": 229.15173, "Z": 448.32532 }, + "StopDistance": 7, "TerritoryId": 155, - "InteractionType": "Interact" + "InteractionType": "Interact", + "DisableNavmesh": true } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/982_Monumental Hopes.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/982_Monumental Hopes.json index b24900bf..61f10785 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/982_Monumental Hopes.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/982_Monumental Hopes.json @@ -80,7 +80,8 @@ }, "TerritoryId": 155, "InteractionType": "WalkTo", - "Comment": "Enemies lose aggro around here" + "Comment": "Enemies lose aggro around here", + "Mount": false }, { "Position": { diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index da4f6ab0..6f00e483 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -11,7 +11,10 @@ }, "Author": { "description": "Author of the quest sequence", - "type": ["string", "array"], + "type": [ + "string", + "array" + ], "items": { "type": "string" } @@ -194,7 +197,10 @@ "minItems": 6, "maxItems": 6, "items": { - "type": ["array", "null"], + "type": [ + "array", + "null" + ], "items": { "type": [ "number", @@ -457,11 +463,25 @@ }, { "if": { - "properties": { - "InteractionType": { - "const": "UseItem" + "anyOf": [ + { + "properties": { + "InteractionType": { + "const": "UseItem" + } + } + }, + { + "properties": { + "InteractionType": { + "const": "Combat" + }, + "EnemySpawnType": { + "const": "AfterItemUse" + } + } } - } + ] }, "then": { "properties": { diff --git a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs index 610d5948..9cc646af 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)), + // coerthas central highlands + new BlacklistedPoint(155, new(-478.75f, 149.25f, -305.75f), new(-476.1802f, 149.06573f, -304.7811f)), + new BlacklistedPoint(1189, new(574f, -142.25f, 504.25f), new(574.44183f, -142.12766f, 507.60065f)), // heritage found: yyupye's halo (farm, npc: Mahuwsa)