diff --git a/Directory.Build.targets b/Directory.Build.targets index cfa9441e..729f81b6 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,5 @@ - 4.15 + 4.16 diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/5188_Picking Up the Torch.json b/QuestPaths/7.x - Dawntrail/Role Quests/5188_Picking Up the Torch.json new file mode 100644 index 00000000..d8d59f15 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Role Quests/5188_Picking Up the Torch.json @@ -0,0 +1,161 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1050871, + "Position": { + "X": -51.895935, + "Y": -17.97287, + "Z": 182.7268 + }, + "TerritoryId": 1185, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Tuliyollal", + "AethernetShortcut": [ + "[Tuliyollal] Aetheryte Plaza", + "[Tuliyollal] The For'ard Cabins" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1001657, + "Position": { + "X": 94.80432, + "Y": 7.9804688, + "Z": -34.042908 + }, + "TerritoryId": 131, + "InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Sapphire Avenue Exchange" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 1006440, + "Position": { + "X": 140.3982, + "Y": 4, + "Z": -54.154297 + }, + "TerritoryId": 131, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1051655, + "Position": { + "X": 137.74304, + "Y": 4, + "Z": 5.9662476 + }, + "TerritoryId": 131, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 146.12386, + "Y": 4, + "Z": -23.562449 + }, + "StopDistance": 0.5, + "TerritoryId": 131, + "InteractionType": "Emote", + "Emote": "angry" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1051656, + "Position": { + "X": 56.443115, + "Y": 10, + "Z": 5.935669 + }, + "TerritoryId": 131, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 2012114, + "Position": { + "X": 0, + "Y": 1.15, + "Z": 10.23451 + }, + "TerritoryId": 1255, + "InteractionType": "Interact", + "TargetTerritoryId": 131, + "SkipConditions": { + "StepIf": { + "InTerritory": [ + 131 + ] + } + } + }, + { + "DataId": 1051656, + "Position": { + "X": 56.443115, + "Y": 10, + "Z": 5.935669 + }, + "StopDistance": 7, + "TerritoryId": 131, + "InteractionType": "CompleteQuest", + "NextQuestId": 5189 + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/5189_Imposing Views.json b/QuestPaths/7.x - Dawntrail/Role Quests/5189_Imposing Views.json new file mode 100644 index 00000000..17c2bf46 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Role Quests/5189_Imposing Views.json @@ -0,0 +1,129 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1051656, + "Position": { + "X": 56.443115, + "Y": 10, + "Z": 5.935669 + }, + "StopDistance": 7, + "TerritoryId": 131, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2014419, + "Position": { + "X": -158.86176, + "Y": 7.4921875, + "Z": 493.88867 + }, + "TerritoryId": 146, + "InteractionType": "Interact", + "AetheryteShortcut": "Southern Thanalan - Forgotten Springs", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1051661, + "Position": { + "X": 1.7852783, + "Y": 19.026453, + "Z": 581.62805 + }, + "StopDistance": 5, + "TerritoryId": 146, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_KINGBZ002_05189_Q1_000_000", + "Answer": "TEXT_KINGBZ002_05189_A1_000_001" + } + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1051663, + "Position": { + "X": 51.68225, + "Y": 0.7631253, + "Z": 711.57385 + }, + "TerritoryId": 146, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 18178 + ], + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1051663, + "Position": { + "X": 51.68225, + "Y": 0.7631253, + "Z": 711.57385 + }, + "TerritoryId": 146, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1051668, + "Position": { + "X": 170.42798, + "Y": 15.943722, + "Z": 897.94763 + }, + "TerritoryId": 146, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1051668, + "Position": { + "X": 170.42798, + "Y": 15.943722, + "Z": 897.94763 + }, + "TerritoryId": 146, + "InteractionType": "CompleteQuest", + "NextQuestId": 5190 + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/5190_Enforcing Freedom.json b/QuestPaths/7.x - Dawntrail/Role Quests/5190_Enforcing Freedom.json new file mode 100644 index 00000000..6f05c439 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Role Quests/5190_Enforcing Freedom.json @@ -0,0 +1,175 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1051668, + "Position": { + "X": 170.42798, + "Y": 15.943722, + "Z": 897.94763 + }, + "TerritoryId": 146, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1050871, + "Position": { + "X": -51.895935, + "Y": -17.97287, + "Z": 182.7268 + }, + "TerritoryId": 1185, + "InteractionType": "Interact", + "AetheryteShortcut": "Tuliyollal", + "AethernetShortcut": [ + "[Tuliyollal] Aetheryte Plaza", + "[Tuliyollal] The For'ard Cabins" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1051670, + "Position": { + "X": -15.976257, + "Y": -19.928413, + "Z": 224.90259 + }, + "TerritoryId": 1185, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1051675, + "Position": { + "X": 358.23608, + "Y": 5.957184, + "Z": 428.36658 + }, + "StopDistance": 1, + "TerritoryId": 1190, + "InteractionType": "Interact", + "AetheryteShortcut": "Shaaloani - Hhusatahwi", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "Position": { + "X": 363.81656, + "Y": 5.9295864, + "Z": 435.17932 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo" + }, + { + "DataId": 1051677, + "Position": { + "X": 371.4198, + "Y": 5.95728, + "Z": 425.4978 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1051677, + "Position": { + "X": 371.4198, + "Y": 5.95728, + "Z": 425.4978 + }, + "TerritoryId": 1190, + "InteractionType": "Emote", + "Emote": "unbound" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1051682, + "Position": { + "X": 387.5028, + "Y": -0.60167974, + "Z": 426.99304 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "Position": { + "X": 425.24307, + "Y": 0.7699772, + "Z": 473.79095 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 1051684, + "Position": { + "X": 426.04712, + "Y": 0.7461932, + "Z": 472.3125 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1050871, + "Position": { + "X": -51.895935, + "Y": -17.97287, + "Z": 182.7268 + }, + "TerritoryId": 1185, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Tuliyollal", + "AethernetShortcut": [ + "[Tuliyollal] Aetheryte Plaza", + "[Tuliyollal] The For'ard Cabins" + ], + "NextQuestId": 5191 + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/5191_Bar the Passage.json b/QuestPaths/7.x - Dawntrail/Role Quests/5191_Bar the Passage.json new file mode 100644 index 00000000..ac9a8790 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Role Quests/5191_Bar the Passage.json @@ -0,0 +1,182 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1050871, + "Position": { + "X": -51.895935, + "Y": -17.97287, + "Z": 182.7268 + }, + "TerritoryId": 1185, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1051689, + "Position": { + "X": 273.33484, + "Y": 15.999998, + "Z": 740.6576 + }, + "TerritoryId": 1190, + "InteractionType": "SinglePlayerDuty", + "AethernetShortcut": [ + "[Tuliyollal] The For'ard Cabins", + "[Tuliyollal] Xak Tural Skygate (Shaaloani)" + ] + } + ] + }, + { + "Sequence": 2 + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1051691, + "Position": { + "X": 273.85364, + "Y": 15.999996, + "Z": 738.2771 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1050871, + "Position": { + "X": -51.895935, + "Y": -17.97287, + "Z": 182.7268 + }, + "TerritoryId": 1185, + "InteractionType": "Interact", + "AetheryteShortcut": "Tuliyollal", + "AethernetShortcut": [ + "[Tuliyollal] Aetheryte Plaza", + "[Tuliyollal] The For'ard Cabins" + ] + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1051672, + "Position": { + "X": -14.816589, + "Y": -19.881973, + "Z": 223.3158 + }, + "TerritoryId": 1185, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1051673, + "Position": { + "X": -15.243774, + "Y": -19.762682, + "Z": 221.72876 + }, + "StopDistance": 5, + "TerritoryId": 1185, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1051670, + "Position": { + "X": -15.976257, + "Y": -19.928413, + "Z": 224.90259 + }, + "StopDistance": 5, + "TerritoryId": 1185, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 8, + "Steps": [ + { + "DataId": 1051671, + "Position": { + "X": -17.95996, + "Y": -19.784014, + "Z": 224.17017 + }, + "StopDistance": 5, + "TerritoryId": 1185, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 9, + "Steps": [ + { + "DataId": 1051674, + "Position": { + "X": -16.617126, + "Y": -19.752277, + "Z": 222.64429 + }, + "TerritoryId": 1185, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": -44.643284, + "Y": -17.972864, + "Z": 203.87883 + }, + "TerritoryId": 1185, + "InteractionType": "WalkTo" + }, + { + "DataId": 1046521, + "Position": { + "X": -46.616333, + "Y": -17.97287, + "Z": 180.3158 + }, + "StopDistance": 5, + "TerritoryId": 1185, + "InteractionType": "CompleteQuest", + "DisableNavmesh": true + } + ] + } + ] +} diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 1902572a..0ca8c368 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -866,7 +866,9 @@ "mogdance", "salute", "laugh", - "greeting" + "greeting", + "angry", + "unbound" ] } } diff --git a/Questionable.Model/Questing/Converter/EmoteConverter.cs b/Questionable.Model/Questing/Converter/EmoteConverter.cs index bdfe5581..576a77e5 100644 --- a/Questionable.Model/Questing/Converter/EmoteConverter.cs +++ b/Questionable.Model/Questing/Converter/EmoteConverter.cs @@ -7,6 +7,7 @@ public sealed class EmoteConverter() : EnumConverter(Values) { private static readonly Dictionary Values = new() { + { EEmote.Angry, "angry" }, { EEmote.Bow, "bow" }, { EEmote.Cheer, "cheer" }, { EEmote.Clap, "clap" }, @@ -45,5 +46,6 @@ public sealed class EmoteConverter() : EnumConverter(Values) { EEmote.Box, "box" }, { EEmote.Greeting, "greeting" }, { EEmote.Uchiwasshoi, "uchiwasshoi" }, + { EEmote.Unbound, "unbound" }, }; } diff --git a/Questionable.Model/Questing/EEmote.cs b/Questionable.Model/Questing/EEmote.cs index 78e7b650..7855bd15 100644 --- a/Questionable.Model/Questing/EEmote.cs +++ b/Questionable.Model/Questing/EEmote.cs @@ -8,6 +8,7 @@ public enum EEmote { None = 0, + Angry = 2, Bow = 5, Cheer = 6, Clap = 7, @@ -45,6 +46,7 @@ public enum EEmote Respect = 140, Box = 166, Greeting = 172, - Uchiwasshoi = 278 + Uchiwasshoi = 278, + Unbound = 282, } diff --git a/Questionable/Data/QuestData.cs b/Questionable/Data/QuestData.cs index 65225863..f84edb95 100644 --- a/Questionable/Data/QuestData.cs +++ b/Questionable/Data/QuestData.cs @@ -189,6 +189,12 @@ internal sealed class QuestData AddPreviousQuest(new QuestId(3833), new QuestId(spearfishing)); */ + // Shadow Walk with Me + AddPreviousQuest(new QuestId(3629), new QuestId(3248)); + AddPreviousQuest(new QuestId(3629), new QuestId(3272)); + AddPreviousQuest(new QuestId(3629), new QuestId(3278)); + AddPreviousQuest(new QuestId(3629), new QuestId(3628)); + // The Hero's Journey AddPreviousQuest(new QuestId(3986), new QuestId(2115)); AddPreviousQuest(new QuestId(3986), new QuestId(2116)); @@ -197,6 +203,11 @@ internal sealed class QuestData AddPreviousQuest(new QuestId(3986), new QuestId(2395)); AddPreviousQuest(new QuestId(3986), new QuestId(3985)); + // Picking up the Torch has half the quests in the sheets(??) + AddPreviousQuest(new QuestId(5188), new QuestId(4841)); + AddPreviousQuest(new QuestId(5188), new QuestId(4847)); + AddPreviousQuest(new QuestId(5188), new QuestId(4959)); + // initial city quests are side quests // unclear if 470 can be started as the required quest isn't available anymore ushort[] limsaSideQuests =