diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3044_A Sluggish Endeavor.json b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3044_A Sluggish Endeavor.json index 13709727..80bf5056 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3044_A Sluggish Endeavor.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3044_A Sluggish Endeavor.json @@ -35,7 +35,8 @@ 8578, 8579, 8580 - ] + ], + "Fly": true } ] }, diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3049_Snack between Meals.json b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3049_Snack between Meals.json index 2ff0c260..c255515b 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3049_Snack between Meals.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3049_Snack between Meals.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "liza", - "Disabled": true, + "Author": "plogon_enjoyer", "QuestSequence": [ { "Sequence": 0, @@ -22,7 +21,48 @@ { "Sequence": 1, "Steps": [ - + { + "DataId": 2009337, + "Position": { + "X": 94.95691, + "Y": 49.05774, + "Z": 575.2803 + }, + "TerritoryId": 612, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [8584], + "RequiredQuestVariables": [null, null, [1, 2], null, null, null], + "Fly": true + }, + { + "DataId": 2009338, + "Position": { + "X": 180.07166, + "Y": 47.470703, + "Z": 546.1051 + }, + "TerritoryId": 612, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [8584], + "RequiredQuestVariables": [null, null, [3, 17], null, null, null], + "Fly": true + }, + { + "DataId": 2009339, + "Position": { + "X": 291.21838, + "Y": 47.501343, + "Z": 496.75732 + }, + "TerritoryId": 612, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [8584], + "RequiredQuestVariables": [null, null, [18, 19], null, null, null], + "Fly": true + } ] }, { diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3049_Snack between Meals.md b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3049_Snack between Meals.md new file mode 100644 index 00000000..995b6b9b --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3049_Snack between Meals.md @@ -0,0 +1,6 @@ +``` +0 0 x 0 0 0 | + 1 2009337 -> 2009338 + 2 2009337 -> 2009339 + 3 2009338 -> 2009339 +``` diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3051_Criminal Crossings.json b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3051_Criminal Crossings.json index 2283a975..e4901bb9 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3051_Criminal Crossings.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3051_Criminal Crossings.json @@ -12,15 +12,40 @@ "Y": 56.113926, "Z": 236.25537 }, - "StopDistance": 7, "TerritoryId": 612, - "InteractionType": "AcceptQuest" + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Fringes - Peering Stones", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } } ] }, { "Sequence": 1, "Steps": [ + { + "DataId": 1025120, + "Position": { + "X": -333.66907, + "Y": 43.042835, + "Z": -22.201904 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "RequiredQuestVariables": [null, null, null, [2, 4], null, null], + "Fly": true, + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_BANANA402_03051_Q1_000_000", + "Answer": "TEXT_BANANA402_03051_A1_000_001" + } + ] + }, { "DataId": 1025062, "Position": { @@ -30,6 +55,7 @@ }, "TerritoryId": 612, "InteractionType": "Combat", + "RequiredQuestVariables": [null, null, null, [1, 3, 5], null, null], "Fly": true, "DialogueChoices": [ { @@ -41,6 +67,25 @@ "EnemySpawnType": "AfterInteraction", "KillEnemyDataIds": [8587] }, + { + "DataId": 1025119, + "Position": { + "X": -488.18192, + "Y": 81.128265, + "Z": -191.33289 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "RequiredQuestVariables": [null, null, null, [1, 2, 5], null, null], + "Fly": true, + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_BANANA402_03051_Q1_000_000", + "Answer": "TEXT_BANANA402_03051_A1_000_001" + } + ] + }, { "DataId": 1025061, "Position": { @@ -50,11 +95,7 @@ }, "TerritoryId": 612, "InteractionType": "Combat", - "SkipConditions": { - "StepIf": { - "NotTargetable": true - } - }, + "RequiredQuestVariables": [null, null, null, [3, 4], null, null], "Fly": true, "DialogueChoices": [ { @@ -64,32 +105,28 @@ } ], "EnemySpawnType": "AfterInteraction", - "KillEnemyDataIds": [8586], - "$": "This NPC will become an enemy" + "KillEnemyDataIds": [8586] }, { - "DataId": 1025119, + "DataId": 1025060, "Position": { - "X": -488.18192, - "Y": 81.128265, - "Z": -191.33289 + "X": -572.9916, + "Y": 112.44218, + "Z": -229.32788 }, "TerritoryId": 612, - "InteractionType": "Interact", - "SkipConditions": { - "StepIf": { - "NotTargetable": true - } - }, + "InteractionType": "Combat", + "RequiredQuestVariables": [null, null, null, [2, 4], null, null], "Fly": true, "DialogueChoices": [ { "Type": "List", "Prompt": "TEXT_BANANA402_03051_Q1_000_000", - "Answer": "TEXT_BANANA402_03051_A1_000_001" + "Answer": "TEXT_BANANA402_03051_A1_000_002" } ], - "$": "This NPC will not become an enemy" + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [8585] }, { "DataId": 1025118, @@ -100,6 +137,7 @@ }, "TerritoryId": 612, "InteractionType": "Interact", + "RequiredQuestVariables": [null, null, null, [1, 3, 5], null, null], "Fly": true, "DialogueChoices": [ { @@ -122,6 +160,7 @@ }, "TerritoryId": 612, "InteractionType": "WalkTo", + "AetheryteShortcut": "Fringes - Peering Stones", "Fly": true }, { diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3051_Criminal Crossings.md b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3051_Criminal Crossings.md new file mode 100644 index 00000000..6834de92 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3051_Criminal Crossings.md @@ -0,0 +1,8 @@ +``` +0 0 0 x 0 0 | + 1 1025062 -> 1025119 -> 1025118 + 2 1025120 -> 1025119 -> 1025060 + 3 1025062 -> 1025061 -> 1025118 + 4 1025120 -> 1025061 -> 1025060 + 5 1025062 -> 1025119 -> 1025118 +``` diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3052_When Feathers Fly.json b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3052_When Feathers Fly.json index 85e5f32c..70330fb8 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3052_When Feathers Fly.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3052_When Feathers Fly.json @@ -21,6 +21,32 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1025066, + "Position": { + "X": -155.90149, + "Y": 66.2623, + "Z": -366.93372 + }, + "TerritoryId": 612, + "InteractionType": "Emote", + "Emote": "rally", + "Fly": true, + "RequiredQuestVariables": [null, null, [16], null, null, null] + }, + { + "DataId": 1025064, + "Position": { + "X": 185.62585, + "Y": 68.93902, + "Z": -372.15234 + }, + "TerritoryId": 612, + "InteractionType": "Emote", + "RequiredQuestVariables": [null, [1, 17], null, null, null, null], + "Emote": "soothe", + "Fly": true + }, { "DataId": 1025063, "Position": { @@ -30,6 +56,7 @@ }, "TerritoryId": 612, "InteractionType": "Emote", + "RequiredQuestVariables": [null, [2, 18], null, null, null, null], "Emote": "soothe", "Fly": true }, @@ -42,6 +69,7 @@ }, "TerritoryId": 612, "InteractionType": "Emote", + "RequiredQuestVariables": [null, null, [32], null, null, null], "Emote": "rally", "Fly": true } @@ -58,6 +86,7 @@ }, "TerritoryId": 612, "InteractionType": "WalkTo", + "AetheryteShortcut": "Fringes - Peering Stones", "Fly": true }, { diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3052_When Feathers Fly.md b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3052_When Feathers Fly.md new file mode 100644 index 00000000..8b0ba9fb --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3052_When Feathers Fly.md @@ -0,0 +1,7 @@ +``` +0 0 x x 0 0 | 1025063 1025064 1025065 1025066 + 1 16 x x + 2 16 x x + 1 32 x x + 2 32 x x +``` diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3053_Sparring Lesson.json b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3053_Sparring Lesson.json index 2ff0c260..6ce1349f 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3053_Sparring Lesson.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3053_Sparring Lesson.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "liza", - "Disabled": true, + "Author": "plogon_enjoyer", "QuestSequence": [ { "Sequence": 0, @@ -22,7 +21,34 @@ { "Sequence": 1, "Steps": [ - + { + "DataId": 1025067, + "Position": { + "X": 39.04773, + "Y": 43.373318, + "Z": -221.9425 + }, + "TerritoryId": 612, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [8588], + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1025247, + "Position": { + "X": 41.45874, + "Y": 42.875717, + "Z": -218.28033 + }, + "TerritoryId": 612, + "InteractionType": "Interact" + } ] }, { diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Story/3038_Chance of Gales.json b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Story/3038_Chance of Gales.json new file mode 100644 index 00000000..c51e7201 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Story/3038_Chance of Gales.json @@ -0,0 +1,194 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024771, + "Position": { + "X": 12.008789, + "Y": 55.97821, + "Z": 237.96448 + }, + "TerritoryId": 612, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024903, + "Position": { + "X": 111.31445, + "Y": 39.096542, + "Z": 296.34546 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1021591, + "Position": { + "X": -277.82104, + "Y": 258.90652, + "Z": 782.77246 + }, + "TerritoryId": 620, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Peaks - Ala Ghiri" + }, + { + "DataId": 1020871, + "Position": { + "X": -237.90344, + "Y": 257.71973, + "Z": 741.5731 + }, + "TerritoryId": 620, + "InteractionType": "Interact", + "Fly": true + }, + { + "DataId": 1021587, + "Position": { + "X": -210.68134, + "Y": 257.8064, + "Z": 767.4829 + }, + "TerritoryId": 620, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1024906, + "Position": { + "X": -239.12415, + "Y": 258.90652, + "Z": 782.62 + }, + "TerritoryId": 620, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1024908, + "Position": { + "X": -238.91058, + "Y": 266.39832, + "Z": 508.14062 + }, + "TerritoryId": 620, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1024911, + "Position": { + "X": 10.971252, + "Y": 55.943913, + "Z": 239.88696 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Fringes - Peering Stones" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1024912, + "Position": { + "X": -92.27136, + "Y": 50.00444, + "Z": 186.29736 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "Position": { + "X": -212.2359, + "Y": 43.672523, + "Z": -133.15985 + }, + "TerritoryId": 612, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 2009281, + "Position": { + "X": -209.79633, + "Y": 42.70996, + "Z": -153.85675 + }, + "TerritoryId": 612, + "InteractionType": "Action", + "Action": "Trample", + "Land": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 5.853586, + "Y": 55.943962, + "Z": 237.26181 + }, + "TerritoryId": 612, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 1024911, + "Position": { + "X": 10.971252, + "Y": 55.943913, + "Z": 239.88696 + }, + "TerritoryId": 612, + "InteractionType": "CompleteQuest", + "Mount": false + } + ] + } + ] +} diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 634b0e0f..316e0c97 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -872,6 +872,7 @@ "Aspected Benefic", "Buffet (Sanuwa)", "Buffet (Griffin)", + "Trample", "Fumigate", "Siphon Snout", "Cannonfire", diff --git a/Questionable.Model/Questing/Converter/ActionConverter.cs b/Questionable.Model/Questing/Converter/ActionConverter.cs index 598386f2..b393a3f3 100644 --- a/Questionable.Model/Questing/Converter/ActionConverter.cs +++ b/Questionable.Model/Questing/Converter/ActionConverter.cs @@ -16,6 +16,7 @@ public sealed class ActionConverter() : EnumConverter(Values) { EAction.AspectedBenefic, "Aspected Benefic" }, { EAction.BuffetSanuwa, "Buffet (Sanuwa)" }, { EAction.BuffetGriffin, "Buffet (Griffin)" }, + { EAction.Trample, "Trample" }, { EAction.Fumigate, "Fumigate" }, { EAction.SiphonSnout, "Siphon Snout" }, { EAction.Cannonfire, "Cannonfire" }, diff --git a/Questionable.Model/Questing/EAction.cs b/Questionable.Model/Questing/EAction.cs index 7a1cb4b1..5463ca0d 100644 --- a/Questionable.Model/Questing/EAction.cs +++ b/Questionable.Model/Questing/EAction.cs @@ -15,6 +15,7 @@ public enum EAction AspectedBenefic = 3595, BuffetSanuwa = 4931, BuffetGriffin = 4583, + Trample = 4585, Fumigate = 5872, MagitekPulse = 8624, MagitekThunder = 8625, @@ -51,6 +52,7 @@ public static class EActionExtensions return action is EAction.BuffetSanuwa or EAction.BuffetGriffin + or EAction.Trample or EAction.Fumigate or EAction.SiphonSnout or EAction.Cannonfire