From e40084ada1a220cd306b7d336448e8a55426a55d Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 27 Jul 2024 15:39:47 +0200 Subject: [PATCH] Replace SkipIf logic --- QuestPathGenerator/QuestSourceGenerator.cs | 2 +- QuestPathGenerator/RoslynShortcuts.cs | 77 +++++++++++++++ .../SCH/1098_The Last Remnants.json | 8 +- .../SCH/1101_For Your Fellow Man.json | 8 +- .../WAR/1050_Embracing the Beast.json | 8 +- .../WAR/1052_Looking the Part.json | 16 +-- .../WAR/1053_Proof Is the Pudding.json | 8 +- .../Shared/685_For Coin and Country.json | 8 +- .../3856_We Come in Peace.json | 16 +-- .../709_Sylphic Studies.json | 8 +- .../710_First Impressions.json | 8 +- .../3857_Dance Dance Diplomacy.json | 8 +- .../A1-East Shroud/3858_Forest Friend.json | 8 +- .../A1-East Shroud/715_First Contact.json | 8 +- .../719_Presence of the Enemy.json | 8 +- .../724_Brotherly Love.json | 8 +- .../725_Spirited Away.json | 8 +- .../3862_Nouveau Riche.json | 8 +- .../514_Into the Beast's Maw.json | 8 +- .../738_Sylphish Concerns.json | 8 +- .../743_A Simple Gift.json | 8 +- .../744_Believe in Your Sylph.json | 8 +- .../746_Back from the Wood.json | 8 +- .../748_Highbridge Times.json | 8 +- .../756_Where There Is Smoke.json | 8 +- .../757_On to Little Ala Mhigo.json | 8 +- .../761_Tea for Three.json | 8 +- .../762_Foot in the Door.json | 8 +- .../765_Killing Him Softly.json | 8 +- .../774_Helping Horn.json | 8 +- .../775_He Ain't Heavy.json | 8 +- .../776_Come Highly Recommended.json | 8 +- ...777_The Bear and the Young'uns' Cares.json | 8 +- .../778_Wilred Wants You.json | 8 +- .../782_Big Trouble in Little Ala Mhigo.json | 8 +- .../783_Back to Square One.json | 8 +- .../786_Seeing Eye to Winged Eye.json | 8 +- .../787_Rock of Rancor.json | 8 +- .../799_Power of Deduction.json | 8 +- .../800_Secret of the White Lily.json | 8 +- .../3865_Trial by Turtle.json | 8 +- .../B0-Company of Heroes/812_Nix That.json | 8 +- .../814_A Modest Proposal.json | 8 +- .../821_The Perfect Prey.json | 8 +- .../822_When the Worm Turns.json | 8 +- .../831_There and Back Again.json | 8 +- ..._What Do You Mean You Forgot the Wine.json | 8 +- .../832_The Things We Do for Cheese.json | 8 +- .../840_An Offer You Can Refuse.json | 8 +- .../843_It Won't Work.json | 8 +- .../845_Give a Man a Drink.json | 8 +- .../846_That Weight.json | 8 +- .../848_Battle Scars.json | 8 +- .../850_It Was a Very Good Year.json | 8 +- .../855_In the Company of Heroes.json | 8 +- .../856_As You Wish.json | 8 +- .../MSQ-2/B4-Titan/857_Lord of Crags.json | 8 +- .../3867_You Can't Take It with You.json | 8 +- .../517_All Good Things.json | 8 +- .../B5-Western Thanalan/518_Eyes on Me.json | 8 +- .../876_Bringing out the Dead.json | 8 +- .../878_Bury Me Not on the Lone Prairie.json | 8 +- .../883_He Who Waited Behind.json | 8 +- .../884_Cold Reception.json | 8 +- .../897_The Talk of Coerthas.json | 8 +- .../910_Road to Redemption.json | 8 +- .../911_Following the Evidence.json | 8 +- .../912_In the Eyes of Gods and Men.json | 8 +- ...68_The Final Flight of the Enterprise.json | 8 +- .../3869_The Best Inventions.json | 8 +- .../924_Ye of Little Faith.json | 8 +- .../927_Factual Folklore.json | 8 +- .../938_Influencing Inquisitors.json | 8 +- .../939_By the Lights of Ishgard.json | 8 +- .../940_Blood for Blood.json | 8 +- .../941_The Heretic among Us.json | 8 +- .../952_In Pursuit of the Past.json | 8 +- .../955_Sealed With Science.json | 8 +- .../956_With the Utmost Care.json | 8 +- .../959_A Promising Prospect.json | 8 +- .../960_It's Probably Not Pirates.json | 8 +- .../961_Representing the Representative.json | 8 +- .../962_The Reluctant Researcher.json | 8 +- .../3870_The Curious Case of Giggity.json | 8 +- .../C6-Mor Dhona/1004_Fool Me Twice.json | 8 +- .../3872_Hearts on Fire.json | 8 +- .../3873_Rock the Castrum.json | 8 +- .../4522_The Ultimate Weapon.json | 8 +- .../E1-2.1/1175_The Price of Principles.json | 8 +- .../E1-2.1/1189_Hail to the King, Kupo.json | 8 +- .../1191_On the Properties of Primals.json | 8 +- .../MSQ-2/E1-2.1/3875_All Things in Time.json | 8 +- .../E1-2.1/3877_It's Possibly a Primal.json | 8 +- .../MSQ-2/E2-2.2/1346_A Final Temptation.json | 8 +- .../E2-2.2/1347_The Mother of Exiles.json | 8 +- .../MSQ-2/E2-2.2/1352_Why We Adventure.json | 8 +- .../MSQ-2/E2-2.2/1361_Lord of the Whorl.json | 8 +- .../1362_When Yugiri Met the Fraternity.json | 8 +- .../E2-2.2/1363_Through the Maelstrom.json | 8 +- .../MSQ-2/E2-2.2/3881_Yugiri's Game.json | 8 +- .../MSQ-2/E2-2.2/3882_All Due Respect.json | 8 +- .../MSQ-2/E3-2.3/1443_Desperate Times.json | 8 +- .../MSQ-2/E3-2.3/1446_Revolution.json | 8 +- .../MSQ-2/E3-2.3/1447_Stories We Tell.json | 8 +- .../1453_What Little Gods Are Made Of.json | 16 +-- .../E3-2.3/1459_When the Cold Sets In.json | 8 +- .../E3-2.3/1460_Brave New Companions.json | 16 +-- .../MSQ-2/E3-2.3/3883_Shock and Awe.json | 8 +- .../MSQ-2/E3-2.3/3884_Reap the Whirlwind.json | 8 +- .../E3-2.3/3885_Levin an Impression.json | 8 +- .../MSQ-2/E4-2.4/3886_Chasing Ivy.json | 8 +- .../E4-2.4/3887_In Flagrante Delicto.json | 8 +- .../MSQ-2/E4-2.4/53_Back and Fourth.json | 8 +- .../E4-2.4/57_The Intercession of Saints.json | 8 +- .../MSQ-2/E4-2.4/62_Strength in Unity.json | 8 +- .../MSQ-2/E4-2.4/87_Eyes Unclouded.json | 8 +- .../E4-2.4/89_Let Us Cling Together.json | 8 +- .../MSQ-2/E5-2.5/364_Bait and Switch.json | 8 +- .../MSQ-2/E5-2.5/369_An Uninvited Ascian.json | 8 +- .../E6-2.55/418_An Allied Perspective.json | 8 +- .../MSQ-2/E6-2.55/424_The Least among Us.json | 8 +- .../MSQ-2/E6-2.55/428_Before the Dawn.json | 8 +- .../Raid Quests/1200_Sanding It Down.json | 8 +- .../1201_A Performance for the Ages.json | 8 +- .../1202_Labyrinth of the Ancients.json | 8 +- .../Raid Quests/1203_For Prosperity.json | 8 +- .../Raid Quests/1474_Syrcus Tower.json | 8 +- .../Raid Quests/1709_Legacy of Allag.json | 8 +- .../494_The World of Darkness.json | 8 +- .../Raid Quests/495_The Light of Hope.json | 8 +- .../1797_The Hunter Becomes the Kweh.json | 8 +- .../1802_A Lesson in Humility.json | 8 +- .../1582_The Better Half.json | 8 +- .../1584_Work in Progress.json | 8 +- .../1587_Reconnaissance Lost.json | 8 +- .../1591_An Indispensable Ally.json | 8 +- .../1596_A Reward Long in Coming.json | 8 +- .../Hunts/2119_Let the Clan Hunt Begin.json | 8 +- .../Unlocks/Hunts/2121_Top Marks.json | 8 +- .../Hunts/2122_Elite and Dangerous.json | 8 +- .../Misc/2107_Sights of the North.json | 8 +- .../Misc/2118_A Striking Opportunity.json | 8 +- .../2936_One-star Veteran Clan Hunt.json | 8 +- .../2937_Two-star Veteran Clan Hunt.json | 8 +- .../2938_Three-star Veteran Clan Hunt.json | 8 +- .../Hunts/2939_Elite Veteran Clan Hunt.json | 8 +- .../2940_Another Striking Opportunity.json | 8 +- .../3280_City of the First.json | 8 +- .../B-Il Mheg/3305_The Oracle of Light.json | 96 +++++++++++------- .../MSQ/C-Rak'tika/3323_A Little Faith.json | 16 +-- .../MSQ/C-Rak'tika/3324_Into the Dark.json | 8 +- .../MSQ/C-Rak'tika/3326_A Helping Hand.json | 8 +- .../MSQ/C-Rak'tika/3336_Mi Casa, Toupasa.json | 8 +- .../MSQ/H-5.2/3767_Deep Designs.json | 8 +- .../3692_The Aesthetician of Il Mheg.json | 8 +- .../Hunts/3598_Two Nuts Too Nutty.json | 8 +- .../3599_How Do You Like Three Nuts.json | 8 +- .../Unlocks/Hunts/3600_Too Many Nutters.json | 8 +- ...3601_Yet Another Striking Opportunity.json | 8 +- .../B-Garlemald/4384_Tracks in the Snow.json | 8 +- .../4405_Back to Old Tricks.json | 8 +- .../G-UltimaThule/4452_Unto the Heavens.json | 8 +- .../MSQ/H-6.1/4528_Friends for the Road.json | 8 +- .../MSQ/H-6.1/4533_Restricted Reading.json | 24 +++-- .../MSQ/K-6.4/4736_Going Haam.json | 8 +- .../MSQ/K-6.4/4737_Like Fear to Flame.json | 8 +- .../MSQ/K-6.4/4739_Bonds of Trust.json | 8 +- .../MSQ/K-6.4/4740_Lunar Rendezvous.json | 16 +-- .../MSQ/K-6.4/4743_The Dark Throne.json | 16 +-- .../Thavnair/4492_The Yedlihmad Hunt.json | 8 +- .../Allied/4788_A Dream Worth Chasing.json | 8 +- .../Dailies/4554_Missing Rider.json | 8 +- .../Dailies/4555_Flowers for Sanduruva.json | 24 +++-- .../Hunts/4176_The Hunt for Specimens.json | 8 +- ...4177_That Specimen Came from the Moon.json | 8 +- .../Hunts/4178_A Hunt for the Ages.json | 8 +- .../Unlocks/Hunts/4179_Perfect Specimens.json | 8 +- .../Unlocks/Misc/4173_A Place to Train.json | 8 +- .../VPR/4849_Fangs of the Viper.json | 70 +++++++++---- .../4850_Viper in the Vidraal's Shadow.json | 8 +- .../4860_A New World to Explore.json | 8 +- .../4948_Through the Gate of Gold.json | 16 +-- .../Healer/4824_In the Sting of Things.json | 8 +- .../4825_Causing Problems on Purpose.json | 8 +- .../Healer/4826_Living among the Deadly.json | 8 +- .../4827_Taste of a Toxin Paradise.json | 8 +- .../Healer/4828_Downed by the River.json | 8 +- .../Healer/4829_An Antidote for Anarchy.json | 8 +- .../Magical Ranged/4845_Floundering Fame.json | 8 +- .../Magical Ranged/4846_Behind the Helm.json | 8 +- .../Melee/4830_The Hunter and the Hunted.json | 16 +-- .../Melee/4831_A Sea of Blood.json | 8 +- .../Role Quests/Melee/4832_Who's Who.json | 16 +-- .../Role Quests/Melee/4833_Cornered Prey.json | 8 +- .../Melee/4834_Impostor Syndrome.json | 16 +-- .../Role Quests/Melee/4835_A Hunter True.json | 16 +-- .../4836_To Steal a Steelhog.json | 8 +- .../Physical Ranged/4837_Bandits Abound.json | 8 +- .../Kozama'uka/5061_Molting Season.json | 8 +- .../Side Quests/Kozama'uka/5068_Dry Run.json | 8 +- .../Kozama'uka/5075_Water Colors.json | 8 +- .../5175_The Canals of History.json | 8 +- .../Shaaloani/5132_Death by Popoto.json | 8 +- .../Shaaloani/5142_Back on Stage.json | 24 +++-- .../Shaaloani/5143_A Family's Worth.json | 8 +- .../Shaaloani/5148_Dig for Victory.json | 8 +- .../Urqopacha/5037_A Sordid Situation.json | 8 +- .../5040_Too Much of a Good Thing.json | 8 +- .../Dungeons/5013_It Belongs in a Museum.json | 8 +- ...4_Something Stray in the Neighborhood.json | 8 +- .../Unlocks/Misc/5005_Trial by Spire.json | 8 +- QuestPaths/quest-v1.json | 99 ++++++++++++++++--- .../Converter/LockedSkipConditionConverter.cs | 12 +++ .../V1/Converter/SkipConditionConverter.cs | 13 +-- Questionable.Model/V1/EExtraSkipCondition.cs | 11 +++ Questionable.Model/V1/ELockedSkipCondition.cs | 11 +++ Questionable.Model/V1/ESkipCondition.cs | 20 ---- Questionable.Model/V1/QuestStep.cs | 6 +- .../V1/SkipAetheryteCondition.cs | 7 ++ Questionable.Model/V1/SkipConditions.cs | 7 ++ Questionable.Model/V1/SkipItemConditions.cs | 6 ++ Questionable.Model/V1/SkipStepConditions.cs | 26 +++++ .../Steps/Shared/AetheryteShortcut.cs | 39 ++++---- .../Controller/Steps/Shared/SkipCondition.cs | 25 +++-- 224 files changed, 1514 insertions(+), 813 deletions(-) create mode 100644 Questionable.Model/V1/Converter/LockedSkipConditionConverter.cs create mode 100644 Questionable.Model/V1/EExtraSkipCondition.cs create mode 100644 Questionable.Model/V1/ELockedSkipCondition.cs delete mode 100644 Questionable.Model/V1/ESkipCondition.cs create mode 100644 Questionable.Model/V1/SkipAetheryteCondition.cs create mode 100644 Questionable.Model/V1/SkipConditions.cs create mode 100644 Questionable.Model/V1/SkipItemConditions.cs create mode 100644 Questionable.Model/V1/SkipStepConditions.cs diff --git a/QuestPathGenerator/QuestSourceGenerator.cs b/QuestPathGenerator/QuestSourceGenerator.cs index 2e2d753..47d311f 100644 --- a/QuestPathGenerator/QuestSourceGenerator.cs +++ b/QuestPathGenerator/QuestSourceGenerator.cs @@ -357,7 +357,7 @@ public class QuestSourceGenerator : ISourceGenerator Assignment(nameof(QuestStep.ContentFinderConditionId), step.ContentFinderConditionId, emptyStep.ContentFinderConditionId) .AsSyntaxNodeOrToken(), - AssignmentList(nameof(QuestStep.SkipIf), step.SkipIf) + Assignment(nameof(QuestStep.SkipConditions), step.SkipConditions, emptyStep.SkipConditions) .AsSyntaxNodeOrToken(), AssignmentList(nameof(QuestStep.RequiredQuestVariables), step.RequiredQuestVariables) diff --git a/QuestPathGenerator/RoslynShortcuts.cs b/QuestPathGenerator/RoslynShortcuts.cs index c584e81..c843c87 100644 --- a/QuestPathGenerator/RoslynShortcuts.cs +++ b/QuestPathGenerator/RoslynShortcuts.cs @@ -223,6 +223,83 @@ public static class RoslynShortcuts SyntaxNodeList(list.Select(x => ExpressionElement( LiteralValue(x)).AsSyntaxNodeOrToken()).ToArray()))); } + else if (value is SkipConditions skipConditions) + { + var emptySkip = new SkipConditions(); + return ObjectCreationExpression( + IdentifierName(nameof(SkipConditions))) + .WithInitializer( + InitializerExpression( + SyntaxKind.ObjectInitializerExpression, + SeparatedList( + SyntaxNodeList( + Assignment(nameof(SkipConditions.StepIf), skipConditions.StepIf, emptySkip.StepIf) + .AsSyntaxNodeOrToken(), + Assignment(nameof(SkipConditions.AetheryteShortcutIf), + skipConditions.AetheryteShortcutIf, emptySkip.AetheryteShortcutIf) + .AsSyntaxNodeOrToken())))); + } + else if (value is SkipStepConditions skipStepConditions) + { + var emptyStep = new SkipStepConditions(); + return ObjectCreationExpression( + IdentifierName(nameof(SkipStepConditions))) + .WithInitializer( + InitializerExpression( + SyntaxKind.ObjectInitializerExpression, + SeparatedList( + SyntaxNodeList( + Assignment(nameof(SkipStepConditions.Never), skipStepConditions.Never, + emptyStep.Never) + .AsSyntaxNodeOrToken(), + Assignment(nameof(SkipStepConditions.Flying), skipStepConditions.Flying, + emptyStep.Flying) + .AsSyntaxNodeOrToken(), + Assignment(nameof(SkipStepConditions.Chocobo), skipStepConditions.Chocobo, + emptyStep.Chocobo) + .AsSyntaxNodeOrToken(), + Assignment(nameof(SkipStepConditions.NotTargetable), + skipStepConditions.NotTargetable, emptyStep.NotTargetable) + .AsSyntaxNodeOrToken(), + AssignmentList(nameof(SkipStepConditions.InTerritory), + skipStepConditions.InTerritory).AsSyntaxNodeOrToken(), + AssignmentList(nameof(SkipStepConditions.NotInTerritory), + skipStepConditions.NotInTerritory).AsSyntaxNodeOrToken(), + Assignment(nameof(SkipStepConditions.Item), skipStepConditions.Item, emptyStep.Item) + .AsSyntaxNodeOrToken(), + Assignment(nameof(SkipStepConditions.ExtraCondition), + skipStepConditions.ExtraCondition, emptyStep.ExtraCondition) + .AsSyntaxNodeOrToken())))); + } + else if (value is SkipItemConditions skipItemCondition) + { + var emptyItem = new SkipItemConditions(); + return ObjectCreationExpression( + IdentifierName(nameof(SkipItemConditions))) + .WithInitializer( + InitializerExpression( + SyntaxKind.ObjectInitializerExpression, + SeparatedList( + SyntaxNodeList( + Assignment(nameof(SkipItemConditions.NotInInventory), + skipItemCondition.NotInInventory, + emptyItem.NotInInventory))))); + } + else if (value is SkipAetheryteCondition skipAetheryteCondition) + { + var emptyAetheryte = new SkipAetheryteCondition(); + return ObjectCreationExpression( + IdentifierName(nameof(SkipAetheryteCondition))) + .WithInitializer( + InitializerExpression( + SyntaxKind.ObjectInitializerExpression, + SeparatedList( + SyntaxNodeList( + Assignment(nameof(SkipAetheryteCondition.Never), skipAetheryteCondition.Never, + emptyAetheryte.Never), + Assignment(nameof(SkipAetheryteCondition.InSameTerritory), + skipAetheryteCondition.InSameTerritory, emptyAetheryte.InSameTerritory))))); + } else if (value is null) return LiteralExpression(SyntaxKind.NullLiteralExpression); } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1098_The Last Remnants.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1098_The Last Remnants.json index 7452255..9ba37d4 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1098_The Last Remnants.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1098_The Last Remnants.json @@ -34,9 +34,11 @@ "TerritoryId": 180, "InteractionType": "WalkTo", "AetheryteShortcut": "Outer La Noscea - Camp Overlook", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ], + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + }, "CompletionQuestVariablesFlags": [ null, null, diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1101_For Your Fellow Man.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1101_For Your Fellow Man.json index 54b1aec..b52d04b 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1101_For Your Fellow Man.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1101_For Your Fellow Man.json @@ -128,9 +128,11 @@ null, -32 ], - "SkipIf": [ - "FlyingUnlocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } }, { "DataId": 1007842, 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 0b79a70..0a93deb 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 @@ -35,9 +35,11 @@ "TerritoryId": 146, "InteractionType": "Interact", "AetheryteShortcut": "Southern Thanalan - Forgotten Springs", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ], + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + }, "CompletionQuestVariablesFlags": [ null, null, 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 index c4cc661..6dcb2e1 100644 --- 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 @@ -37,9 +37,11 @@ -128 ], "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ], + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + }, "Fly": true }, { @@ -95,9 +97,11 @@ ], "AetheryteShortcut": "South Shroud - Camp Tranquil", "Fly": true, - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ], + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + }, "Comment": "TODO Verify enemy id" }, { 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 index ac1a792..44bf6fa 100644 --- 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 @@ -43,9 +43,11 @@ } ], "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } }, { "DataId": 2002312, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/685_For Coin and Country.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/685_For Coin and Country.json index 5f7461d..7a9e8da 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/685_For Coin and Country.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/685_For Coin and Country.json @@ -15,9 +15,11 @@ "TerritoryId": 130, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Ul'dah", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A0-Gridania to East Shroud/3856_We Come in Peace.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A0-Gridania to East Shroud/3856_We Come in Peace.json index 7b44cae..0d97069 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A0-Gridania to East Shroud/3856_We Come in Peace.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A0-Gridania to East Shroud/3856_We Come in Peace.json @@ -15,9 +15,11 @@ "TerritoryId": 132, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Gridania", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, @@ -33,9 +35,11 @@ "TerritoryId": 132, "InteractionType": "UseItem", "ItemId": 6001, - "SkipIf": [ - "ChocoboUnlocked" - ], + "SkipConditions": { + "StepIf": { + "Chocobo": "Unlocked" + } + }, "Comment": "Use Chocobo whistle (if not yet unlocked)" }, { diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A0-Gridania to East Shroud/709_Sylphic Studies.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A0-Gridania to East Shroud/709_Sylphic Studies.json index b1db1bd..3035431 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A0-Gridania to East Shroud/709_Sylphic Studies.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A0-Gridania to East Shroud/709_Sylphic Studies.json @@ -16,9 +16,11 @@ "TerritoryId": 152, "InteractionType": "AcceptQuest", "AetheryteShortcut": "East Shroud - Hawthorne Hut", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A0-Gridania to East Shroud/710_First Impressions.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A0-Gridania to East Shroud/710_First Impressions.json index dba42d6..1eec0b6 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A0-Gridania to East Shroud/710_First Impressions.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A0-Gridania to East Shroud/710_First Impressions.json @@ -15,9 +15,11 @@ "TerritoryId": 152, "InteractionType": "AcceptQuest", "AetheryteShortcut": "East Shroud - Hawthorne Hut", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A1-East Shroud/3857_Dance Dance Diplomacy.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A1-East Shroud/3857_Dance Dance Diplomacy.json index 7cf1635..742a907 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A1-East Shroud/3857_Dance Dance Diplomacy.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A1-East Shroud/3857_Dance Dance Diplomacy.json @@ -15,9 +15,11 @@ "TerritoryId": 152, "InteractionType": "AcceptQuest", "AetheryteShortcut": "East Shroud - Hawthorne Hut", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A1-East Shroud/3858_Forest Friend.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A1-East Shroud/3858_Forest Friend.json index 7f14dae..3d130a3 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A1-East Shroud/3858_Forest Friend.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A1-East Shroud/3858_Forest Friend.json @@ -16,9 +16,11 @@ "TerritoryId": 152, "InteractionType": "AcceptQuest", "AetheryteShortcut": "East Shroud - Hawthorne Hut", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A1-East Shroud/715_First Contact.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A1-East Shroud/715_First Contact.json index c3f915f..c9a4a7c 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A1-East Shroud/715_First Contact.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A1-East Shroud/715_First Contact.json @@ -15,9 +15,11 @@ "TerritoryId": 152, "InteractionType": "AcceptQuest", "AetheryteShortcut": "East Shroud - Hawthorne Hut", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A1-East Shroud/719_Presence of the Enemy.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A1-East Shroud/719_Presence of the Enemy.json index 4cba4f9..a9d3be6 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A1-East Shroud/719_Presence of the Enemy.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A1-East Shroud/719_Presence of the Enemy.json @@ -15,9 +15,11 @@ "TerritoryId": 152, "InteractionType": "AcceptQuest", "AetheryteShortcut": "East Shroud - Hawthorne Hut", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A2-East Shroud to South Shroud/724_Brotherly Love.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A2-East Shroud to South Shroud/724_Brotherly Love.json index 2c06d1a..fc825bb 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A2-East Shroud to South Shroud/724_Brotherly Love.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A2-East Shroud to South Shroud/724_Brotherly Love.json @@ -15,9 +15,11 @@ "TerritoryId": 152, "InteractionType": "AcceptQuest", "AetheryteShortcut": "East Shroud - Hawthorne Hut", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A2-East Shroud to South Shroud/725_Spirited Away.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A2-East Shroud to South Shroud/725_Spirited Away.json index 29f4513..866b4f4 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A2-East Shroud to South Shroud/725_Spirited Away.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A2-East Shroud to South Shroud/725_Spirited Away.json @@ -15,9 +15,11 @@ "TerritoryId": 152, "InteractionType": "AcceptQuest", "AetheryteShortcut": "East Shroud - Hawthorne Hut", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/3862_Nouveau Riche.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/3862_Nouveau Riche.json index 926d8dd..1cd7a8b 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/3862_Nouveau Riche.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/3862_Nouveau Riche.json @@ -15,9 +15,11 @@ "TerritoryId": 153, "InteractionType": "AcceptQuest", "AetheryteShortcut": "South Shroud - Quarrymill", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/514_Into the Beast's Maw.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/514_Into the Beast's Maw.json index b41e994..4fea783 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/514_Into the Beast's Maw.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/514_Into the Beast's Maw.json @@ -18,9 +18,11 @@ "TerritoryId": 153, "InteractionType": "AcceptQuest", "AetheryteShortcut": "South Shroud - Quarrymill", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/738_Sylphish Concerns.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/738_Sylphish Concerns.json index 717e96f..d9c6877 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/738_Sylphish Concerns.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/738_Sylphish Concerns.json @@ -15,9 +15,11 @@ "TerritoryId": 153, "InteractionType": "AcceptQuest", "AetheryteShortcut": "South Shroud - Quarrymill", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/743_A Simple Gift.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/743_A Simple Gift.json index 52ecce3..9796285 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/743_A Simple Gift.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/743_A Simple Gift.json @@ -15,9 +15,11 @@ "TerritoryId": 153, "InteractionType": "AcceptQuest", "AetheryteShortcut": "South Shroud - Quarrymill", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/744_Believe in Your Sylph.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/744_Believe in Your Sylph.json index b9df804..5548198 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/744_Believe in Your Sylph.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/744_Believe in Your Sylph.json @@ -15,9 +15,11 @@ "TerritoryId": 152, "InteractionType": "AcceptQuest", "AetheryteShortcut": "East Shroud - Hawthorne Hut", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/746_Back from the Wood.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/746_Back from the Wood.json index e8e08e6..b574699 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/746_Back from the Wood.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/746_Back from the Wood.json @@ -15,9 +15,11 @@ "TerritoryId": 132, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Gridania", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/748_Highbridge Times.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/748_Highbridge Times.json index b9cfb3a..96feca9 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/748_Highbridge Times.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A4-Back from the Woods/748_Highbridge Times.json @@ -15,9 +15,11 @@ "TerritoryId": 145, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern Thanalan - Camp Drybone", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/756_Where There Is Smoke.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/756_Where There Is Smoke.json index b8a80d8..1ff6f27 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/756_Where There Is Smoke.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/756_Where There Is Smoke.json @@ -15,9 +15,11 @@ "TerritoryId": 145, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern Thanalan - Camp Drybone", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/757_On to Little Ala Mhigo.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/757_On to Little Ala Mhigo.json index 34f3562..dc0aa69 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/757_On to Little Ala Mhigo.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/757_On to Little Ala Mhigo.json @@ -15,9 +15,11 @@ "TerritoryId": 145, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern Thanalan - Camp Drybone", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/761_Tea for Three.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/761_Tea for Three.json index b3cef51..f83be30 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/761_Tea for Three.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/761_Tea for Three.json @@ -15,9 +15,11 @@ "TerritoryId": 146, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/762_Foot in the Door.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/762_Foot in the Door.json index 03d46fb..7682f73 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/762_Foot in the Door.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A5-Southern Thanalan, Little Ala Mhigo/762_Foot in the Door.json @@ -15,9 +15,11 @@ "TerritoryId": 146, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A6-South Shroud, Quarrymill/765_Killing Him Softly.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A6-South Shroud, Quarrymill/765_Killing Him Softly.json index 97d02ba..084745c 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A6-South Shroud, Quarrymill/765_Killing Him Softly.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A6-South Shroud, Quarrymill/765_Killing Him Softly.json @@ -15,9 +15,11 @@ "TerritoryId": 153, "InteractionType": "AcceptQuest", "AetheryteShortcut": "South Shroud - Quarrymill", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/774_Helping Horn.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/774_Helping Horn.json index b49a097..c5cd8f3 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/774_Helping Horn.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/774_Helping Horn.json @@ -15,9 +15,11 @@ "TerritoryId": 153, "InteractionType": "AcceptQuest", "AetheryteShortcut": "South Shroud - Quarrymill", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/775_He Ain't Heavy.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/775_He Ain't Heavy.json index 5b2aef2..f62b489 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/775_He Ain't Heavy.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/775_He Ain't Heavy.json @@ -15,9 +15,11 @@ "TerritoryId": 153, "InteractionType": "AcceptQuest", "AetheryteShortcut": "South Shroud - Quarrymill", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/776_Come Highly Recommended.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/776_Come Highly Recommended.json index 4f116ec..e3c2276 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/776_Come Highly Recommended.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/776_Come Highly Recommended.json @@ -15,9 +15,11 @@ "TerritoryId": 153, "InteractionType": "AcceptQuest", "AetheryteShortcut": "South Shroud - Quarrymill", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/777_The Bear and the Young'uns' Cares.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/777_The Bear and the Young'uns' Cares.json index 2a242f2..4136df4 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/777_The Bear and the Young'uns' Cares.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/777_The Bear and the Young'uns' Cares.json @@ -15,9 +15,11 @@ "TerritoryId": 146, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/778_Wilred Wants You.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/778_Wilred Wants You.json index a6920c7..341bb2e 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/778_Wilred Wants You.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/778_Wilred Wants You.json @@ -15,9 +15,11 @@ "TerritoryId": 146, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/782_Big Trouble in Little Ala Mhigo.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/782_Big Trouble in Little Ala Mhigo.json index fce1189..d42dd2a 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/782_Big Trouble in Little Ala Mhigo.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/782_Big Trouble in Little Ala Mhigo.json @@ -15,9 +15,11 @@ "TerritoryId": 146, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/783_Back to Square One.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/783_Back to Square One.json index 8bebbf2..32b3b63 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/783_Back to Square One.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A7-Southern Thanalan, Big Trouble in Little Ala Mhigo/783_Back to Square One.json @@ -15,9 +15,11 @@ "TerritoryId": 146, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/786_Seeing Eye to Winged Eye.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/786_Seeing Eye to Winged Eye.json index d73ddf1..3fb27a7 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/786_Seeing Eye to Winged Eye.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/786_Seeing Eye to Winged Eye.json @@ -16,9 +16,11 @@ "TerritoryId": 154, "InteractionType": "AcceptQuest", "AetheryteShortcut": "North Shroud - Fallgourd Float", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, 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 d8cf3f4..3618c40 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 @@ -15,9 +15,11 @@ "TerritoryId": 154, "InteractionType": "AcceptQuest", "AetheryteShortcut": "North Shroud - Fallgourd Float", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/799_Power of Deduction.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/799_Power of Deduction.json index 1f15bd2..be710c5 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/799_Power of Deduction.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/799_Power of Deduction.json @@ -16,9 +16,11 @@ "TerritoryId": 154, "InteractionType": "AcceptQuest", "AetheryteShortcut": "North Shroud - Fallgourd Float", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/800_Secret of the White Lily.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/800_Secret of the White Lily.json index d50b7b3..0baa498 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/800_Secret of the White Lily.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/800_Secret of the White Lily.json @@ -15,9 +15,11 @@ "TerritoryId": 154, "InteractionType": "AcceptQuest", "AetheryteShortcut": "North Shroud - Fallgourd Float", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, 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 5976773..db68c5c 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 @@ -15,9 +15,11 @@ "TerritoryId": 153, "InteractionType": "AcceptQuest", "AetheryteShortcut": "South Shroud - Camp Tranquil", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/812_Nix That.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/812_Nix That.json index 4a51980..6423472 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/812_Nix That.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/812_Nix That.json @@ -15,9 +15,11 @@ "TerritoryId": 137, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern La Noscea - Costa Del Sol", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/814_A Modest Proposal.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/814_A Modest Proposal.json index 614c154..e509008 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/814_A Modest Proposal.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/814_A Modest Proposal.json @@ -15,9 +15,11 @@ "TerritoryId": 137, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern La Noscea - Costa Del Sol", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B1-Forgotten Springs/821_The Perfect Prey.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B1-Forgotten Springs/821_The Perfect Prey.json index b54f6c9..072c605 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B1-Forgotten Springs/821_The Perfect Prey.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B1-Forgotten Springs/821_The Perfect Prey.json @@ -15,9 +15,11 @@ "TerritoryId": 146, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Southern Thanalan - Forgotten Springs", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, 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 896fe3b..4f955a1 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 @@ -15,9 +15,11 @@ "TerritoryId": 146, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Southern Thanalan - Forgotten Springs", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B1-Forgotten Springs/831_There and Back Again.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B1-Forgotten Springs/831_There and Back Again.json index 318b8fd..142efd5 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B1-Forgotten Springs/831_There and Back Again.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B1-Forgotten Springs/831_There and Back Again.json @@ -15,9 +15,11 @@ "TerritoryId": 146, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Southern Thanalan - Forgotten Springs", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/3866_What Do You Mean You Forgot the Wine.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/3866_What Do You Mean You Forgot the Wine.json index c5e7323..24bb904 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/3866_What Do You Mean You Forgot the Wine.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/3866_What Do You Mean You Forgot the Wine.json @@ -15,9 +15,11 @@ "TerritoryId": 137, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern La Noscea - Costa Del Sol", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/832_The Things We Do for Cheese.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/832_The Things We Do for Cheese.json index 6b5f0eb..b853bf2 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/832_The Things We Do for Cheese.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/832_The Things We Do for Cheese.json @@ -18,9 +18,11 @@ "TerritoryId": 137, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern La Noscea - Costa Del Sol", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/840_An Offer You Can Refuse.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/840_An Offer You Can Refuse.json index 2e04cfe..38adbcc 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/840_An Offer You Can Refuse.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/840_An Offer You Can Refuse.json @@ -15,9 +15,11 @@ "TerritoryId": 137, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern La Noscea - Wineport", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/843_It Won't Work.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/843_It Won't Work.json index 235e612..6774dd1 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/843_It Won't Work.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/843_It Won't Work.json @@ -15,9 +15,11 @@ "TerritoryId": 137, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern La Noscea - Wineport", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/845_Give a Man a Drink.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/845_Give a Man a Drink.json index 1423aa4..6206721 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/845_Give a Man a Drink.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/845_Give a Man a Drink.json @@ -15,9 +15,11 @@ "TerritoryId": 137, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern La Noscea - Wineport", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/846_That Weight.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/846_That Weight.json index 21d4ea6..b869ffb 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/846_That Weight.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/846_That Weight.json @@ -15,9 +15,11 @@ "TerritoryId": 137, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern La Noscea - Wineport", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, 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 b0cd12b..f34cc00 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 @@ -15,9 +15,11 @@ "TerritoryId": 137, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern La Noscea - Wineport", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/850_It Was a Very Good Year.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/850_It Was a Very Good Year.json index af1fad6..ee6e02b 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/850_It Was a Very Good Year.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/850_It Was a Very Good Year.json @@ -15,9 +15,11 @@ "TerritoryId": 137, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern La Noscea - Wineport", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/855_In the Company of Heroes.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/855_In the Company of Heroes.json index 61e1bf7..e1ca14a 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/855_In the Company of Heroes.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/855_In the Company of Heroes.json @@ -15,9 +15,11 @@ "TerritoryId": 137, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern La Noscea - Costa Del Sol", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/856_As You Wish.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/856_As You Wish.json index 258f06b..8679e75 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/856_As You Wish.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/856_As You Wish.json @@ -15,9 +15,11 @@ "TerritoryId": 137, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern La Noscea - Costa Del Sol", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B4-Titan/857_Lord of Crags.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B4-Titan/857_Lord of Crags.json index 44b0819..18022a0 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B4-Titan/857_Lord of Crags.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B4-Titan/857_Lord of Crags.json @@ -19,9 +19,11 @@ "TerritoryId": 139, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/3867_You Can't Take It with You.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/3867_You Can't Take It with You.json index 06ef6de..822d100 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/3867_You Can't Take It with You.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/3867_You Can't Take It with You.json @@ -16,9 +16,11 @@ "TerritoryId": 145, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern Thanalan - Camp Drybone", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/517_All Good Things.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/517_All Good Things.json index 2bbb1c0..7e119c9 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/517_All Good Things.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/517_All Good Things.json @@ -15,9 +15,11 @@ "TerritoryId": 139, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/518_Eyes on Me.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/518_Eyes on Me.json index ae326fa..63af9a6 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/518_Eyes on Me.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/518_Eyes on Me.json @@ -15,9 +15,11 @@ "TerritoryId": 145, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern Thanalan - Camp Drybone", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, 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 10ba4a8..41be92d 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 @@ -15,9 +15,11 @@ "TerritoryId": 145, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern Thanalan - Camp Drybone", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/878_Bury Me Not on the Lone Prairie.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/878_Bury Me Not on the Lone Prairie.json index cd7eca4..1a33adf 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/878_Bury Me Not on the Lone Prairie.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/878_Bury Me Not on the Lone Prairie.json @@ -15,9 +15,11 @@ "TerritoryId": 145, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern Thanalan - Camp Drybone", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B6-Coerthas Central Highlands, Camp Dragonhead/883_He Who Waited Behind.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B6-Coerthas Central Highlands, Camp Dragonhead/883_He Who Waited Behind.json index f3e11ec..dca9160 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B6-Coerthas Central Highlands, Camp Dragonhead/883_He Who Waited Behind.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B6-Coerthas Central Highlands, Camp Dragonhead/883_He Who Waited Behind.json @@ -15,9 +15,11 @@ "TerritoryId": 145, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern Thanalan - Camp Drybone", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B6-Coerthas Central Highlands, Camp Dragonhead/884_Cold Reception.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B6-Coerthas Central Highlands, Camp Dragonhead/884_Cold Reception.json index e4e9241..6275bef 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B6-Coerthas Central Highlands, Camp Dragonhead/884_Cold Reception.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B6-Coerthas Central Highlands, Camp Dragonhead/884_Cold Reception.json @@ -15,9 +15,11 @@ "TerritoryId": 154, "InteractionType": "AcceptQuest", "AetheryteShortcut": "North Shroud - Fallgourd Float", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B7-Coerthas Central Highlands, Camp Dragonhead/897_The Talk of Coerthas.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B7-Coerthas Central Highlands, Camp Dragonhead/897_The Talk of Coerthas.json index 57e09c0..968fd08 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B7-Coerthas Central Highlands, Camp Dragonhead/897_The Talk of Coerthas.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B7-Coerthas Central Highlands, Camp Dragonhead/897_The Talk of Coerthas.json @@ -15,9 +15,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B8-Coerthas Central Highlands, Inquistor/910_Road to Redemption.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B8-Coerthas Central Highlands, Inquistor/910_Road to Redemption.json index bc15627..571b212 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B8-Coerthas Central Highlands, Inquistor/910_Road to Redemption.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B8-Coerthas Central Highlands, Inquistor/910_Road to Redemption.json @@ -15,9 +15,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B8-Coerthas Central Highlands, Inquistor/911_Following the Evidence.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B8-Coerthas Central Highlands, Inquistor/911_Following the Evidence.json index 330c88c..a6d48fa 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B8-Coerthas Central Highlands, Inquistor/911_Following the Evidence.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B8-Coerthas Central Highlands, Inquistor/911_Following the Evidence.json @@ -15,9 +15,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B8-Coerthas Central Highlands, Inquistor/912_In the Eyes of Gods and Men.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B8-Coerthas Central Highlands, Inquistor/912_In the Eyes of Gods and Men.json index 904388d..2b7960f 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B8-Coerthas Central Highlands, Inquistor/912_In the Eyes of Gods and Men.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B8-Coerthas Central Highlands, Inquistor/912_In the Eyes of Gods and Men.json @@ -15,9 +15,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/3868_The Final Flight of the Enterprise.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/3868_The Final Flight of the Enterprise.json index a6ca470..2aadfe2 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/3868_The Final Flight of the Enterprise.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/3868_The Final Flight of the Enterprise.json @@ -15,9 +15,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/3869_The Best Inventions.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/3869_The Best Inventions.json index 2f57d45..f737def 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/3869_The Best Inventions.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/3869_The Best Inventions.json @@ -15,9 +15,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/924_Ye of Little Faith.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/924_Ye of Little Faith.json index 76e3c5a..e356242 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/924_Ye of Little Faith.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/924_Ye of Little Faith.json @@ -15,9 +15,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/927_Factual Folklore.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/927_Factual Folklore.json index d795e39..dd1cf6b 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/927_Factual Folklore.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B9-Coerthas Central Highlands, Whitebrim Front/927_Factual Folklore.json @@ -15,9 +15,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ], + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + }, "Mount": true } ] diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C0-Coerthas Central Highlands, Whitebrim Front/938_Influencing Inquisitors.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C0-Coerthas Central Highlands, Whitebrim Front/938_Influencing Inquisitors.json index 009f5f0..48df2cb 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C0-Coerthas Central Highlands, Whitebrim Front/938_Influencing Inquisitors.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C0-Coerthas Central Highlands, Whitebrim Front/938_Influencing Inquisitors.json @@ -15,9 +15,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C0-Coerthas Central Highlands, Whitebrim Front/939_By the Lights of Ishgard.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C0-Coerthas Central Highlands, Whitebrim Front/939_By the Lights of Ishgard.json index 0043c8f..45eed95 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C0-Coerthas Central Highlands, Whitebrim Front/939_By the Lights of Ishgard.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C0-Coerthas Central Highlands, Whitebrim Front/939_By the Lights of Ishgard.json @@ -15,9 +15,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C0-Coerthas Central Highlands, Whitebrim Front/940_Blood for Blood.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C0-Coerthas Central Highlands, Whitebrim Front/940_Blood for Blood.json index 7ab52b1..a30e13e 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C0-Coerthas Central Highlands, Whitebrim Front/940_Blood for Blood.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C0-Coerthas Central Highlands, Whitebrim Front/940_Blood for Blood.json @@ -15,9 +15,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C0-Coerthas Central Highlands, Whitebrim Front/941_The Heretic among Us.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C0-Coerthas Central Highlands, Whitebrim Front/941_The Heretic among Us.json index 404ea92..f5f8e31 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C0-Coerthas Central Highlands, Whitebrim Front/941_The Heretic among Us.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C0-Coerthas Central Highlands, Whitebrim Front/941_The Heretic among Us.json @@ -15,9 +15,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/952_In Pursuit of the Past.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/952_In Pursuit of the Past.json index 2ac677b..9589c73 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/952_In Pursuit of the Past.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/952_In Pursuit of the Past.json @@ -18,9 +18,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/955_Sealed With Science.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/955_Sealed With Science.json index 1dc697e..b72760c 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/955_Sealed With Science.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/955_Sealed With Science.json @@ -15,9 +15,11 @@ "TerritoryId": 145, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern Thanalan - Camp Drybone", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/956_With the Utmost Care.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/956_With the Utmost Care.json index ab02157..265821b 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/956_With the Utmost Care.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/956_With the Utmost Care.json @@ -15,9 +15,11 @@ "TerritoryId": 145, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern Thanalan - Camp Drybone", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/959_A Promising Prospect.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/959_A Promising Prospect.json index 7c2192f..e0157f2 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/959_A Promising Prospect.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/959_A Promising Prospect.json @@ -15,9 +15,11 @@ "TerritoryId": 145, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern Thanalan - Camp Drybone", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C2-Western La Noscea, Isles of Umbra/960_It's Probably Not Pirates.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C2-Western La Noscea, Isles of Umbra/960_It's Probably Not Pirates.json index 18790ea..6400f28 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C2-Western La Noscea, Isles of Umbra/960_It's Probably Not Pirates.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C2-Western La Noscea, Isles of Umbra/960_It's Probably Not Pirates.json @@ -15,9 +15,11 @@ "TerritoryId": 138, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Western La Noscea - Aleport", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C2-Western La Noscea, Isles of Umbra/961_Representing the Representative.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C2-Western La Noscea, Isles of Umbra/961_Representing the Representative.json index f51b523..2e634b1 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C2-Western La Noscea, Isles of Umbra/961_Representing the Representative.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C2-Western La Noscea, Isles of Umbra/961_Representing the Representative.json @@ -15,9 +15,11 @@ "TerritoryId": 138, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Western La Noscea - Aleport", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C2-Western La Noscea, Isles of Umbra/962_The Reluctant Researcher.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C2-Western La Noscea, Isles of Umbra/962_The Reluctant Researcher.json index 0e69ad1..13880bc 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C2-Western La Noscea, Isles of Umbra/962_The Reluctant Researcher.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C2-Western La Noscea, Isles of Umbra/962_The Reluctant Researcher.json @@ -15,9 +15,11 @@ "TerritoryId": 138, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Western La Noscea - Aleport", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C3-Garuda/3870_The Curious Case of Giggity.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C3-Garuda/3870_The Curious Case of Giggity.json index 00df3d3..bc36738 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C3-Garuda/3870_The Curious Case of Giggity.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C3-Garuda/3870_The Curious Case of Giggity.json @@ -15,9 +15,11 @@ "TerritoryId": 138, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Western La Noscea - Aleport", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C6-Mor Dhona/1004_Fool Me Twice.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C6-Mor Dhona/1004_Fool Me Twice.json index 6dc4470..e5e5810 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C6-Mor Dhona/1004_Fool Me Twice.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C6-Mor Dhona/1004_Fool Me Twice.json @@ -16,9 +16,11 @@ "TerritoryId": 156, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Mor Dhona", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/3872_Hearts on Fire.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/3872_Hearts on Fire.json index c0edc0c..7b3415f 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/3872_Hearts on Fire.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/3872_Hearts on Fire.json @@ -15,9 +15,11 @@ "TerritoryId": 147, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Northern Thanalan - Camp Bluefog", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/3873_Rock the Castrum.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/3873_Rock the Castrum.json index 8080ffa..41ac933 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/3873_Rock the Castrum.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/3873_Rock the Castrum.json @@ -19,9 +19,11 @@ "TerritoryId": 147, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Northern Thanalan - Ceruleum Processing Plant", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4522_The Ultimate Weapon.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4522_The Ultimate Weapon.json index 0b6329f..2af9883 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4522_The Ultimate Weapon.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4522_The Ultimate Weapon.json @@ -20,9 +20,11 @@ "TerritoryId": 147, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Northern Thanalan - Ceruleum Processing Plant", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/1175_The Price of Principles.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/1175_The Price of Principles.json index e6ba421..399eab3 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/1175_The Price of Principles.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/1175_The Price of Principles.json @@ -41,9 +41,11 @@ "TerritoryId": 212, "InteractionType": "Interact", "TargetTerritoryId": 212, - "SkipIf": [ - "WakingSandsMainArea" - ] + "SkipConditions": { + "StepIf": { + "ExtraCondition": "WakingSandsMainArea" + } + } }, { "DataId": 1007533, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/1189_Hail to the King, Kupo.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/1189_Hail to the King, Kupo.json index 72a47db..4a165af 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/1189_Hail to the King, Kupo.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/1189_Hail to the King, Kupo.json @@ -15,9 +15,11 @@ "TerritoryId": 132, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Gridania", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/1191_On the Properties of Primals.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/1191_On the Properties of Primals.json index c41a290..763aae8 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/1191_On the Properties of Primals.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/1191_On the Properties of Primals.json @@ -15,9 +15,11 @@ "TerritoryId": 153, "InteractionType": "AcceptQuest", "AetheryteShortcut": "South Shroud - Camp Tranquil", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/3875_All Things in Time.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/3875_All Things in Time.json index 65c4ea2..b2097e5 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/3875_All Things in Time.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/3875_All Things in Time.json @@ -15,9 +15,11 @@ "TerritoryId": 137, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern La Noscea - Wineport", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/3877_It's Possibly a Primal.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/3877_It's Possibly a Primal.json index dbdcbc6..863baaf 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/3877_It's Possibly a Primal.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/3877_It's Possibly a Primal.json @@ -15,9 +15,11 @@ "TerritoryId": 156, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Mor Dhona", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1346_A Final Temptation.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1346_A Final Temptation.json index ce5fbf2..da6e4d8 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1346_A Final Temptation.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1346_A Final Temptation.json @@ -15,9 +15,11 @@ "TerritoryId": 140, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Western Thanalan - Horizon", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1347_The Mother of Exiles.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1347_The Mother of Exiles.json index 5063678..5cff9b7 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1347_The Mother of Exiles.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1347_The Mother of Exiles.json @@ -16,9 +16,11 @@ "TerritoryId": 140, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Western Thanalan - Horizon", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1352_Why We Adventure.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1352_Why We Adventure.json index 782aa0f..34734b2 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1352_Why We Adventure.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1352_Why We Adventure.json @@ -15,9 +15,11 @@ "TerritoryId": 140, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Western Thanalan - Horizon", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1361_Lord of the Whorl.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1361_Lord of the Whorl.json index d8b2116..c7120ca 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1361_Lord of the Whorl.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1361_Lord of the Whorl.json @@ -18,9 +18,11 @@ "TerritoryId": 135, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Lower La Noscea - Moraby Drydocks", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1362_When Yugiri Met the Fraternity.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1362_When Yugiri Met the Fraternity.json index 87f3d6d..684fc8a 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1362_When Yugiri Met the Fraternity.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1362_When Yugiri Met the Fraternity.json @@ -15,9 +15,11 @@ "TerritoryId": 129, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Limsa Lominsa", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1363_Through the Maelstrom.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1363_Through the Maelstrom.json index 653b0ee..ce66f36 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1363_Through the Maelstrom.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1363_Through the Maelstrom.json @@ -16,9 +16,11 @@ "TerritoryId": 129, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Limsa Lominsa", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/3881_Yugiri's Game.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/3881_Yugiri's Game.json index b82db23..4afa2ba 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/3881_Yugiri's Game.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/3881_Yugiri's Game.json @@ -15,9 +15,11 @@ "TerritoryId": 130, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Ul'dah", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/3882_All Due Respect.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/3882_All Due Respect.json index 28e3abb..df001f7 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/3882_All Due Respect.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/3882_All Due Respect.json @@ -15,9 +15,11 @@ "TerritoryId": 130, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Ul'dah", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1443_Desperate Times.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1443_Desperate Times.json index 274e6f8..37cf5d0 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1443_Desperate Times.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1443_Desperate Times.json @@ -15,9 +15,11 @@ "TerritoryId": 130, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Ul'dah", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1446_Revolution.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1446_Revolution.json index 6e596a2..db5d3e5 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1446_Revolution.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1446_Revolution.json @@ -15,9 +15,11 @@ "TerritoryId": 130, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Ul'dah", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1447_Stories We Tell.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1447_Stories We Tell.json index 8afc3d9..14c8289 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1447_Stories We Tell.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1447_Stories We Tell.json @@ -31,9 +31,11 @@ "InteractionType": "Interact", "TargetTerritoryId": 351, "AetheryteShortcut": "Mor Dhona", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } }, { "DataId": 2002878, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1453_What Little Gods Are Made Of.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1453_What Little Gods Are Made Of.json index 16683e4..feff459 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1453_What Little Gods Are Made Of.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1453_What Little Gods Are Made Of.json @@ -15,9 +15,11 @@ "TerritoryId": 152, "InteractionType": "AcceptQuest", "AetheryteShortcut": "East Shroud - Hawthorne Hut", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, @@ -81,9 +83,11 @@ "InteractionType": "Interact", "TargetTerritoryId": 351, "AetheryteShortcut": "Mor Dhona", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } }, { "DataId": 2002878, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1459_When the Cold Sets In.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1459_When the Cold Sets In.json index ec46ac9..7fbb0af 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1459_When the Cold Sets In.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1459_When the Cold Sets In.json @@ -15,9 +15,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1460_Brave New Companions.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1460_Brave New Companions.json index c8c9b67..0da1b85 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1460_Brave New Companions.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1460_Brave New Companions.json @@ -15,9 +15,11 @@ "TerritoryId": 156, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Mor Dhona", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, @@ -35,9 +37,11 @@ "InteractionType": "Interact", "TargetTerritoryId": 351, "AetheryteShortcut": "Mor Dhona", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } }, { "DataId": 1008997, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/3883_Shock and Awe.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/3883_Shock and Awe.json index 3550efb..3601251 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/3883_Shock and Awe.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/3883_Shock and Awe.json @@ -15,9 +15,11 @@ "TerritoryId": 141, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Central Thanalan - Black Brush Station", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/3884_Reap the Whirlwind.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/3884_Reap the Whirlwind.json index bc3caaf..4defd11 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/3884_Reap the Whirlwind.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/3884_Reap the Whirlwind.json @@ -15,9 +15,11 @@ "TerritoryId": 141, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Central Thanalan - Black Brush Station", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/3885_Levin an Impression.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/3885_Levin an Impression.json index 7377371..8a968e5 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/3885_Levin an Impression.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/3885_Levin an Impression.json @@ -18,9 +18,11 @@ "TerritoryId": 152, "InteractionType": "AcceptQuest", "AetheryteShortcut": "East Shroud - Hawthorne Hut", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/3886_Chasing Ivy.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/3886_Chasing Ivy.json index 094449b..599ecf1 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/3886_Chasing Ivy.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/3886_Chasing Ivy.json @@ -15,9 +15,11 @@ "TerritoryId": 132, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Gridania", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/3887_In Flagrante Delicto.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/3887_In Flagrante Delicto.json index 754d365..f05c5bb 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/3887_In Flagrante Delicto.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/3887_In Flagrante Delicto.json @@ -15,9 +15,11 @@ "TerritoryId": 132, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Gridania", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/53_Back and Fourth.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/53_Back and Fourth.json index f572193..d022238 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/53_Back and Fourth.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/53_Back and Fourth.json @@ -15,9 +15,11 @@ "TerritoryId": 130, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Ul'dah", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/57_The Intercession of Saints.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/57_The Intercession of Saints.json index 907649b..59de321 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/57_The Intercession of Saints.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/57_The Intercession of Saints.json @@ -16,9 +16,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/62_Strength in Unity.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/62_Strength in Unity.json index eedd5ab..c72b22d 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/62_Strength in Unity.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/62_Strength in Unity.json @@ -15,9 +15,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/87_Eyes Unclouded.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/87_Eyes Unclouded.json index 5066ae3..688cf0f 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/87_Eyes Unclouded.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/87_Eyes Unclouded.json @@ -15,9 +15,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/89_Let Us Cling Together.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/89_Let Us Cling Together.json index 2a6511b..a991be4 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/89_Let Us Cling Together.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/89_Let Us Cling Together.json @@ -15,9 +15,11 @@ "TerritoryId": 147, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Northern Thanalan - Ceruleum Processing Plant", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E5-2.5/364_Bait and Switch.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E5-2.5/364_Bait and Switch.json index 5e5957e..9cb55e6 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E5-2.5/364_Bait and Switch.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E5-2.5/364_Bait and Switch.json @@ -15,9 +15,11 @@ "TerritoryId": 145, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Eastern Thanalan - Camp Drybone", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E5-2.5/369_An Uninvited Ascian.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E5-2.5/369_An Uninvited Ascian.json index a40a2b5..602aa86 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E5-2.5/369_An Uninvited Ascian.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E5-2.5/369_An Uninvited Ascian.json @@ -15,9 +15,11 @@ "TerritoryId": 147, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Northern Thanalan - Ceruleum Processing Plant", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E6-2.55/418_An Allied Perspective.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E6-2.55/418_An Allied Perspective.json index 48a405d..467d0cf 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E6-2.55/418_An Allied Perspective.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E6-2.55/418_An Allied Perspective.json @@ -15,9 +15,11 @@ "TerritoryId": 156, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Mor Dhona", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E6-2.55/424_The Least among Us.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E6-2.55/424_The Least among Us.json index 288a604..a44dbc1 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E6-2.55/424_The Least among Us.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E6-2.55/424_The Least among Us.json @@ -15,9 +15,11 @@ "TerritoryId": 153, "InteractionType": "AcceptQuest", "AetheryteShortcut": "South Shroud - Camp Tranquil", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E6-2.55/428_Before the Dawn.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E6-2.55/428_Before the Dawn.json index 17e2a69..0068546 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E6-2.55/428_Before the Dawn.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E6-2.55/428_Before the Dawn.json @@ -15,9 +15,11 @@ "TerritoryId": 155, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/Raid Quests/1200_Sanding It Down.json b/QuestPaths/2.x - A Realm Reborn/Raid Quests/1200_Sanding It Down.json index 761c448..c84e6ff 100644 --- a/QuestPaths/2.x - A Realm Reborn/Raid Quests/1200_Sanding It Down.json +++ b/QuestPaths/2.x - A Realm Reborn/Raid Quests/1200_Sanding It Down.json @@ -15,9 +15,11 @@ "TerritoryId": 156, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Mor Dhona", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ], + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + }, "$": "0 0 0 0 0 0 -> 0 1 0 0 0 0" } ] diff --git a/QuestPaths/2.x - A Realm Reborn/Raid Quests/1201_A Performance for the Ages.json b/QuestPaths/2.x - A Realm Reborn/Raid Quests/1201_A Performance for the Ages.json index 6a92a36..dbd5736 100644 --- a/QuestPaths/2.x - A Realm Reborn/Raid Quests/1201_A Performance for the Ages.json +++ b/QuestPaths/2.x - A Realm Reborn/Raid Quests/1201_A Performance for the Ages.json @@ -15,9 +15,11 @@ "TerritoryId": 156, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Mor Dhona", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/Raid Quests/1202_Labyrinth of the Ancients.json b/QuestPaths/2.x - A Realm Reborn/Raid Quests/1202_Labyrinth of the Ancients.json index f8d648b..d10b748 100644 --- a/QuestPaths/2.x - A Realm Reborn/Raid Quests/1202_Labyrinth of the Ancients.json +++ b/QuestPaths/2.x - A Realm Reborn/Raid Quests/1202_Labyrinth of the Ancients.json @@ -15,9 +15,11 @@ "TerritoryId": 156, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Mor Dhona", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/Raid Quests/1203_For Prosperity.json b/QuestPaths/2.x - A Realm Reborn/Raid Quests/1203_For Prosperity.json index e23ed83..a6ecd47 100644 --- a/QuestPaths/2.x - A Realm Reborn/Raid Quests/1203_For Prosperity.json +++ b/QuestPaths/2.x - A Realm Reborn/Raid Quests/1203_For Prosperity.json @@ -15,9 +15,11 @@ "TerritoryId": 156, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Mor Dhona", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/Raid Quests/1474_Syrcus Tower.json b/QuestPaths/2.x - A Realm Reborn/Raid Quests/1474_Syrcus Tower.json index 0c518bf..5106db1 100644 --- a/QuestPaths/2.x - A Realm Reborn/Raid Quests/1474_Syrcus Tower.json +++ b/QuestPaths/2.x - A Realm Reborn/Raid Quests/1474_Syrcus Tower.json @@ -15,9 +15,11 @@ "TerritoryId": 156, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Mor Dhona", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/Raid Quests/1709_Legacy of Allag.json b/QuestPaths/2.x - A Realm Reborn/Raid Quests/1709_Legacy of Allag.json index ea29c55..f9ed54c 100644 --- a/QuestPaths/2.x - A Realm Reborn/Raid Quests/1709_Legacy of Allag.json +++ b/QuestPaths/2.x - A Realm Reborn/Raid Quests/1709_Legacy of Allag.json @@ -15,9 +15,11 @@ "TerritoryId": 156, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Mor Dhona", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/Raid Quests/494_The World of Darkness.json b/QuestPaths/2.x - A Realm Reborn/Raid Quests/494_The World of Darkness.json index e00c948..915f310 100644 --- a/QuestPaths/2.x - A Realm Reborn/Raid Quests/494_The World of Darkness.json +++ b/QuestPaths/2.x - A Realm Reborn/Raid Quests/494_The World of Darkness.json @@ -18,9 +18,11 @@ "TerritoryId": 156, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Mor Dhona", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/Raid Quests/495_The Light of Hope.json b/QuestPaths/2.x - A Realm Reborn/Raid Quests/495_The Light of Hope.json index d8e4173..7f0fe2a 100644 --- a/QuestPaths/2.x - A Realm Reborn/Raid Quests/495_The Light of Hope.json +++ b/QuestPaths/2.x - A Realm Reborn/Raid Quests/495_The Light of Hope.json @@ -15,9 +15,11 @@ "TerritoryId": 156, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Mor Dhona", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1797_The Hunter Becomes the Kweh.json b/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1797_The Hunter Becomes the Kweh.json index 6be2378..1b6676b 100644 --- a/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1797_The Hunter Becomes the Kweh.json +++ b/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1797_The Hunter Becomes the Kweh.json @@ -15,9 +15,11 @@ "TerritoryId": 398, "InteractionType": "AcceptQuest", "AetheryteShortcut": "The Dravanian Forelands - Tailfeather", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1802_A Lesson in Humility.json b/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1802_A Lesson in Humility.json index 4447166..a199e17 100644 --- a/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1802_A Lesson in Humility.json +++ b/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1802_A Lesson in Humility.json @@ -15,9 +15,11 @@ "TerritoryId": 398, "InteractionType": "AcceptQuest", "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1582_The Better Half.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1582_The Better Half.json index e3788ef..7a2e5f3 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1582_The Better Half.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1582_The Better Half.json @@ -15,9 +15,11 @@ "TerritoryId": 418, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Ishgard", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1584_Work in Progress.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1584_Work in Progress.json index 72e3da2..031a692 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1584_Work in Progress.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1584_Work in Progress.json @@ -15,9 +15,11 @@ "TerritoryId": 397, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1587_Reconnaissance Lost.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1587_Reconnaissance Lost.json index 06dc2ac..0a26c2d 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1587_Reconnaissance Lost.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1587_Reconnaissance Lost.json @@ -15,9 +15,11 @@ "TerritoryId": 397, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1591_An Indispensable Ally.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1591_An Indispensable Ally.json index 499f715..9579160 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1591_An Indispensable Ally.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1591_An Indispensable Ally.json @@ -15,9 +15,11 @@ "TerritoryId": 401, "InteractionType": "AcceptQuest", "AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1596_A Reward Long in Coming.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1596_A Reward Long in Coming.json index 9cbe287..2a7ee7c 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1596_A Reward Long in Coming.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1596_A Reward Long in Coming.json @@ -15,9 +15,11 @@ "TerritoryId": 401, "InteractionType": "AcceptQuest", "AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2119_Let the Clan Hunt Begin.json b/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2119_Let the Clan Hunt Begin.json index 904b361..72326cf 100644 --- a/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2119_Let the Clan Hunt Begin.json +++ b/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2119_Let the Clan Hunt Begin.json @@ -19,9 +19,11 @@ "[Ishgard] Aetheryte Plaza", "[Ishgard] The Forgotten Knight" ], - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2121_Top Marks.json b/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2121_Top Marks.json index 6018bb4..a86b04b 100644 --- a/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2121_Top Marks.json +++ b/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2121_Top Marks.json @@ -15,9 +15,11 @@ "TerritoryId": 478, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Idyllshire", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2122_Elite and Dangerous.json b/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2122_Elite and Dangerous.json index e369584..cab08e7 100644 --- a/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2122_Elite and Dangerous.json +++ b/QuestPaths/3.x - Heavensward/Unlocks/Hunts/2122_Elite and Dangerous.json @@ -16,9 +16,11 @@ "TerritoryId": 418, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Ishgard", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/3.x - Heavensward/Unlocks/Misc/2107_Sights of the North.json b/QuestPaths/3.x - Heavensward/Unlocks/Misc/2107_Sights of the North.json index 2ed2f61..763ef00 100644 --- a/QuestPaths/3.x - Heavensward/Unlocks/Misc/2107_Sights of the North.json +++ b/QuestPaths/3.x - Heavensward/Unlocks/Misc/2107_Sights of the North.json @@ -15,9 +15,11 @@ "TerritoryId": 398, "InteractionType": "AcceptQuest", "AetheryteShortcut": "The Dravanian Forelands - Tailfeather", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] } diff --git a/QuestPaths/3.x - Heavensward/Unlocks/Misc/2118_A Striking Opportunity.json b/QuestPaths/3.x - Heavensward/Unlocks/Misc/2118_A Striking Opportunity.json index 529a27f..92c8a3e 100644 --- a/QuestPaths/3.x - Heavensward/Unlocks/Misc/2118_A Striking Opportunity.json +++ b/QuestPaths/3.x - Heavensward/Unlocks/Misc/2118_A Striking Opportunity.json @@ -15,9 +15,11 @@ "TerritoryId": 478, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Idyllshire", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2936_One-star Veteran Clan Hunt.json b/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2936_One-star Veteran Clan Hunt.json index b02c7ba..609af62 100644 --- a/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2936_One-star Veteran Clan Hunt.json +++ b/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2936_One-star Veteran Clan Hunt.json @@ -16,9 +16,11 @@ "TerritoryId": 628, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Kugane", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2937_Two-star Veteran Clan Hunt.json b/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2937_Two-star Veteran Clan Hunt.json index cad84f5..c086de8 100644 --- a/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2937_Two-star Veteran Clan Hunt.json +++ b/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2937_Two-star Veteran Clan Hunt.json @@ -16,9 +16,11 @@ "TerritoryId": 628, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Kugane", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2938_Three-star Veteran Clan Hunt.json b/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2938_Three-star Veteran Clan Hunt.json index 973bf72..a83077f 100644 --- a/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2938_Three-star Veteran Clan Hunt.json +++ b/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2938_Three-star Veteran Clan Hunt.json @@ -16,9 +16,11 @@ "TerritoryId": 628, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Kugane", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2939_Elite Veteran Clan Hunt.json b/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2939_Elite Veteran Clan Hunt.json index 13f6013..7098d7b 100644 --- a/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2939_Elite Veteran Clan Hunt.json +++ b/QuestPaths/4.x - Stormblood/Unlocks/Hunts/2939_Elite Veteran Clan Hunt.json @@ -16,9 +16,11 @@ "TerritoryId": 628, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Kugane", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/4.x - Stormblood/Unlocks/Misc/2940_Another Striking Opportunity.json b/QuestPaths/4.x - Stormblood/Unlocks/Misc/2940_Another Striking Opportunity.json index 4f9a7d1..768e7a3 100644 --- a/QuestPaths/4.x - Stormblood/Unlocks/Misc/2940_Another Striking Opportunity.json +++ b/QuestPaths/4.x - Stormblood/Unlocks/Misc/2940_Another Striking Opportunity.json @@ -15,9 +15,11 @@ "TerritoryId": 635, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Rhalgr's Reach", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/A1-Crystarium 1/3280_City of the First.json b/QuestPaths/5.x - Shadowbringers/MSQ/A1-Crystarium 1/3280_City of the First.json index 09bf99b..e9cd9b8 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/A1-Crystarium 1/3280_City of the First.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/A1-Crystarium 1/3280_City of the First.json @@ -25,9 +25,11 @@ "TerritoryId": 819, "InteractionType": "AttuneAetheryte", "Aetheryte": "Crystarium", - "SkipIf": [ - "Never" - ] + "SkipConditions": { + "StepIf": { + "Never": true + } + } } ] }, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3305_The Oracle of Light.json b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3305_The Oracle of Light.json index 0fdf1c0..8c3baec 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3305_The Oracle of Light.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3305_The Oracle of Light.json @@ -169,9 +169,11 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingUnlocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + }, "Comment": "Tower Bottom" }, { @@ -182,9 +184,11 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingUnlocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + }, "DisableNavmesh": true, "Comment": "Tower Bottom Platform 1" }, @@ -196,9 +200,11 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingUnlocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + }, "Comment": "Wooden Skywalk Bottom" }, { @@ -209,9 +215,11 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingUnlocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + }, "DisableNavmesh": true, "Comment": "Wooden Skywalk Platform 1" }, @@ -223,9 +231,11 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingUnlocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + }, "DisableNavmesh": true, "Comment": "Wooden Skywalk Platform 2" }, @@ -237,9 +247,11 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingUnlocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + }, "DisableNavmesh": true, "Comment": "Wooden Skywalk Platform 3" }, @@ -251,9 +263,11 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingUnlocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + }, "DisableNavmesh": true, "Comment": "Wooden Skywalk Platform 4" }, @@ -265,9 +279,11 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingUnlocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + }, "DisableNavmesh": true, "Comment": "Wooden Skywalk Top" }, @@ -279,9 +295,11 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingUnlocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + }, "DisableNavmesh": true }, { @@ -292,9 +310,11 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingUnlocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } }, { "Position": { @@ -304,9 +324,11 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingUnlocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + }, "DisableNavmesh": true }, { @@ -317,9 +339,11 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingLocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } }, { "DataId": 1028955, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3323_A Little Faith.json b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3323_A Little Faith.json index c59a411..a3b9dc6 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3323_A Little Faith.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3323_A Little Faith.json @@ -15,9 +15,11 @@ "TerritoryId": 813, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Lakeland - Fort Jobb", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, @@ -32,9 +34,11 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingUnlocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } }, { "Position": { diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3324_Into the Dark.json b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3324_Into the Dark.json index 5ae60ff..fbf2d4c 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3324_Into the Dark.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3324_Into the Dark.json @@ -28,9 +28,11 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingUnlocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } }, { "DataId": 1028303, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3326_A Helping Hand.json b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3326_A Helping Hand.json index ef2dad3..607377e 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3326_A Helping Hand.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3326_A Helping Hand.json @@ -16,9 +16,11 @@ "TerritoryId": 817, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Rak'tika - Slitherbough", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3336_Mi Casa, Toupasa.json b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3336_Mi Casa, Toupasa.json index 10c1a77..5408770 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3336_Mi Casa, Toupasa.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3336_Mi Casa, Toupasa.json @@ -98,9 +98,11 @@ "TerritoryId": 817, "InteractionType": "Interact", "Comment": "Retry point", - "SkipIf": [ - "NotTargetable" - ] + "SkipConditions": { + "StepIf": { + "NotTargetable": true + } + } }, { "Position": { diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3767_Deep Designs.json b/QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3767_Deep Designs.json index 339e406..ba1d3b1 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3767_Deep Designs.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3767_Deep Designs.json @@ -45,9 +45,11 @@ "TerritoryId": 818, "InteractionType": "WalkTo", "Fly": true, - "SkipIf": [ - "FlyingLocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } }, { "Position": { diff --git a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3692_The Aesthetician of Il Mheg.json b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3692_The Aesthetician of Il Mheg.json index 825a206..0b9e190 100644 --- a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3692_The Aesthetician of Il Mheg.json +++ b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3692_The Aesthetician of Il Mheg.json @@ -29,9 +29,11 @@ "TerritoryId": 816, "InteractionType": "WalkTo", "Fly": true, - "SkipIf": [ - "FlyingLocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } }, { "DataId": 2010860, diff --git a/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3598_Two Nuts Too Nutty.json b/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3598_Two Nuts Too Nutty.json index 72a72d6..62b323f 100644 --- a/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3598_Two Nuts Too Nutty.json +++ b/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3598_Two Nuts Too Nutty.json @@ -16,9 +16,11 @@ "TerritoryId": 819, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Crystarium", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3599_How Do You Like Three Nuts.json b/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3599_How Do You Like Three Nuts.json index 8d6f74a..be34db4 100644 --- a/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3599_How Do You Like Three Nuts.json +++ b/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3599_How Do You Like Three Nuts.json @@ -16,9 +16,11 @@ "TerritoryId": 819, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Crystarium", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3600_Too Many Nutters.json b/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3600_Too Many Nutters.json index 58ee4ae..434f9fd 100644 --- a/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3600_Too Many Nutters.json +++ b/QuestPaths/5.x - Shadowbringers/Unlocks/Hunts/3600_Too Many Nutters.json @@ -16,9 +16,11 @@ "TerritoryId": 819, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Crystarium", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/5.x - Shadowbringers/Unlocks/Misc/3601_Yet Another Striking Opportunity.json b/QuestPaths/5.x - Shadowbringers/Unlocks/Misc/3601_Yet Another Striking Opportunity.json index 0fdd7e3..b54ef98 100644 --- a/QuestPaths/5.x - Shadowbringers/Unlocks/Misc/3601_Yet Another Striking Opportunity.json +++ b/QuestPaths/5.x - Shadowbringers/Unlocks/Misc/3601_Yet Another Striking Opportunity.json @@ -19,9 +19,11 @@ "[Eulmore] Aetheryte Plaza", "[Eulmore] Nightsoil Pots" ], - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4384_Tracks in the Snow.json b/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4384_Tracks in the Snow.json index d34980d..1bcbd2e 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4384_Tracks in the Snow.json +++ b/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4384_Tracks in the Snow.json @@ -161,9 +161,11 @@ }, "TerritoryId": 958, "InteractionType": "Interact", - "SkipIf": [ - "NotTargetable" - ], + "SkipConditions": { + "StepIf": { + "NotTargetable": true + } + }, "DialogueChoices": [ { "Type": "YesNo", diff --git a/QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4405_Back to Old Tricks.json b/QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4405_Back to Old Tricks.json index 7fbe25e..3a6a002 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4405_Back to Old Tricks.json +++ b/QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4405_Back to Old Tricks.json @@ -62,9 +62,11 @@ }, "TerritoryId": 959, "InteractionType": "Interact", - "SkipIf": [ - "NotTargetable" - ], + "SkipConditions": { + "StepIf": { + "NotTargetable": true + } + }, "DialogueChoices": [ { "Type": "YesNo", diff --git a/QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4452_Unto the Heavens.json b/QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4452_Unto the Heavens.json index ccf4e90..10961ff 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4452_Unto the Heavens.json +++ b/QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4452_Unto the Heavens.json @@ -31,9 +31,11 @@ "TerritoryId": 956, "InteractionType": "Interact", "AetheryteShortcut": "Labyrinthos - Aporia", - "SkipIf": [ - "FlyingUnlocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + }, "TargetTerritoryId": 956 }, { diff --git a/QuestPaths/6.x - Endwalker/MSQ/H-6.1/4528_Friends for the Road.json b/QuestPaths/6.x - Endwalker/MSQ/H-6.1/4528_Friends for the Road.json index 9a81369..4af63ca 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/H-6.1/4528_Friends for the Road.json +++ b/QuestPaths/6.x - Endwalker/MSQ/H-6.1/4528_Friends for the Road.json @@ -80,9 +80,11 @@ "InteractionType": "Interact", "AetheryteShortcut": "Labyrinthos - Aporia", "TargetTerritoryId": 956, - "SkipIf": [ - "FlyingUnlocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } }, { "Position": { diff --git a/QuestPaths/6.x - Endwalker/MSQ/H-6.1/4533_Restricted Reading.json b/QuestPaths/6.x - Endwalker/MSQ/H-6.1/4533_Restricted Reading.json index 797957b..e3b201a 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/H-6.1/4533_Restricted Reading.json +++ b/QuestPaths/6.x - Endwalker/MSQ/H-6.1/4533_Restricted Reading.json @@ -112,9 +112,11 @@ "InteractionType": "WalkTo", "AetheryteShortcut": "Thavnair - Palaka's Stand", "Fly": true, - "SkipIf": [ - "FlyingLocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } }, { "DataId": 2012847, @@ -126,9 +128,11 @@ "TerritoryId": 957, "InteractionType": "Interact", "Mount": false, - "SkipIf": [ - "FlyingLocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } }, { "DataId": 2012847, @@ -139,9 +143,11 @@ }, "TerritoryId": 957, "InteractionType": "Interact", - "SkipIf": [ - "FlyingUnlocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } } ] }, diff --git a/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4736_Going Haam.json b/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4736_Going Haam.json index 8754872..7a4cf1d 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4736_Going Haam.json +++ b/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4736_Going Haam.json @@ -105,9 +105,11 @@ "TerritoryId": 956, "InteractionType": "WalkTo", "AetheryteShortcut": "Labyrinthos - Sharlayan Hamlet", - "SkipIf": [ - "FlyingUnlocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + }, "Mount": true }, { diff --git a/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4737_Like Fear to Flame.json b/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4737_Like Fear to Flame.json index 89c89fd..2cc6b50 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4737_Like Fear to Flame.json +++ b/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4737_Like Fear to Flame.json @@ -157,9 +157,11 @@ }, "TerritoryId": 958, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingLocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } }, { "DataId": 1045430, diff --git a/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json b/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json index 6f11e25..be460df 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json +++ b/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json @@ -29,9 +29,11 @@ }, "TerritoryId": 958, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingUnlocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } }, { "Position": { diff --git a/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4740_Lunar Rendezvous.json b/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4740_Lunar Rendezvous.json index 4a03d0d..ed65cf9 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4740_Lunar Rendezvous.json +++ b/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4740_Lunar Rendezvous.json @@ -65,9 +65,11 @@ "InteractionType": "Interact", "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", "TargetTerritoryId": 959, - "SkipIf": [ - "FlyingUnlocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } }, { "Position": { @@ -78,9 +80,11 @@ "StopDistance": 1, "TerritoryId": 959, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingLocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + }, "Fly": true }, { diff --git a/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4743_The Dark Throne.json b/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4743_The Dark Throne.json index 483b958..54a33f5 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4743_The Dark Throne.json +++ b/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4743_The Dark Throne.json @@ -32,9 +32,11 @@ "InteractionType": "Interact", "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", "TargetTerritoryId": 959, - "SkipIf": [ - "FlyingUnlocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } }, { "Position": { @@ -45,9 +47,11 @@ "StopDistance": 1, "TerritoryId": 959, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingLocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + }, "Fly": true }, { diff --git a/QuestPaths/6.x - Endwalker/Side Quests/Thavnair/4492_The Yedlihmad Hunt.json b/QuestPaths/6.x - Endwalker/Side Quests/Thavnair/4492_The Yedlihmad Hunt.json index 4320f8c..51e31d2 100644 --- a/QuestPaths/6.x - Endwalker/Side Quests/Thavnair/4492_The Yedlihmad Hunt.json +++ b/QuestPaths/6.x - Endwalker/Side Quests/Thavnair/4492_The Yedlihmad Hunt.json @@ -55,9 +55,11 @@ }, "TerritoryId": 957, "InteractionType": "Interact", - "SkipIf": [ - "NotTargetable" - ], + "SkipConditions": { + "StepIf": { + "NotTargetable": true + } + }, "DialogueChoices": [ { "Type": "YesNo", diff --git a/QuestPaths/6.x - Endwalker/Tribal/Allied/4788_A Dream Worth Chasing.json b/QuestPaths/6.x - Endwalker/Tribal/Allied/4788_A Dream Worth Chasing.json index 1bf5c98..79f6c07 100644 --- a/QuestPaths/6.x - Endwalker/Tribal/Allied/4788_A Dream Worth Chasing.json +++ b/QuestPaths/6.x - Endwalker/Tribal/Allied/4788_A Dream Worth Chasing.json @@ -16,9 +16,11 @@ "TerritoryId": 957, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Thavnair - Yedlihmad", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4554_Missing Rider.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4554_Missing Rider.json index f8bcd66..ea257be 100644 --- a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4554_Missing Rider.json +++ b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4554_Missing Rider.json @@ -62,9 +62,11 @@ }, "TerritoryId": 957, "InteractionType": "Interact", - "SkipIf": [ - "NotTargetable" - ] + "SkipConditions": { + "StepIf": { + "NotTargetable": true + } + } }, { "Position": { diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4555_Flowers for Sanduruva.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4555_Flowers for Sanduruva.json index 4ae4a42..3a9ba22 100644 --- a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4555_Flowers for Sanduruva.json +++ b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4555_Flowers for Sanduruva.json @@ -29,9 +29,11 @@ }, "TerritoryId": 957, "InteractionType": "Interact", - "SkipIf": [ - "FlyingUnlocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + }, "DialogueChoices": [ { "Type": "YesNo", @@ -116,9 +118,11 @@ "Yes": true } ], - "SkipIf": [ - "FlyingUnlocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } }, { "Position": { @@ -128,9 +132,11 @@ }, "TerritoryId": 957, "InteractionType": "WalkTo", - "SkipIf": [ - "FlyingUnlocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } }, { "DataId": 1042301, diff --git a/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4176_The Hunt for Specimens.json b/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4176_The Hunt for Specimens.json index de6b7fc..162fbb0 100644 --- a/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4176_The Hunt for Specimens.json +++ b/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4176_The Hunt for Specimens.json @@ -15,9 +15,11 @@ "TerritoryId": 962, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Old Sharlayan", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4177_That Specimen Came from the Moon.json b/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4177_That Specimen Came from the Moon.json index 50230cb..e334f41 100644 --- a/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4177_That Specimen Came from the Moon.json +++ b/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4177_That Specimen Came from the Moon.json @@ -16,9 +16,11 @@ "TerritoryId": 962, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Old Sharlayan", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4178_A Hunt for the Ages.json b/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4178_A Hunt for the Ages.json index b9d97a0..bfdc27e 100644 --- a/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4178_A Hunt for the Ages.json +++ b/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4178_A Hunt for the Ages.json @@ -16,9 +16,11 @@ "TerritoryId": 962, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Old Sharlayan", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4179_Perfect Specimens.json b/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4179_Perfect Specimens.json index 7d3408b..78d9c49 100644 --- a/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4179_Perfect Specimens.json +++ b/QuestPaths/6.x - Endwalker/Unlocks/Hunts/4179_Perfect Specimens.json @@ -16,9 +16,11 @@ "TerritoryId": 962, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Old Sharlayan", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/6.x - Endwalker/Unlocks/Misc/4173_A Place to Train.json b/QuestPaths/6.x - Endwalker/Unlocks/Misc/4173_A Place to Train.json index c6fd8e7..edfdffe 100644 --- a/QuestPaths/6.x - Endwalker/Unlocks/Misc/4173_A Place to Train.json +++ b/QuestPaths/6.x - Endwalker/Unlocks/Misc/4173_A Place to Train.json @@ -15,9 +15,11 @@ "TerritoryId": 963, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Radz-at-Han", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/7.x - Dawntrail/Class Quests/VPR/4849_Fangs of the Viper.json b/QuestPaths/7.x - Dawntrail/Class Quests/VPR/4849_Fangs of the Viper.json index a79c216..3c13830 100644 --- a/QuestPaths/7.x - Dawntrail/Class Quests/VPR/4849_Fangs of the Viper.json +++ b/QuestPaths/7.x - Dawntrail/Class Quests/VPR/4849_Fangs of the Viper.json @@ -17,9 +17,13 @@ "TerritoryId": 131, "InteractionType": "UseItem", "ItemId": 43537, - "SkipIf": [ - "ItemNotInInventory" - ] + "SkipConditions": { + "StepIf": { + "Item": { + "NotInInventory": true + } + } + } }, { "Position": { @@ -30,9 +34,13 @@ "TerritoryId": 131, "InteractionType": "EquipItem", "ItemId": 41808, - "SkipIf": [ - "ItemNotInInventory" - ], + "SkipConditions": { + "StepIf": { + "Item": { + "NotInInventory": true + } + } + }, "$": "This should probably call /equiprecommended if it exists" }, { @@ -44,9 +52,13 @@ "TerritoryId": 131, "InteractionType": "EquipItem", "ItemId": 43178, - "SkipIf": [ - "ItemNotInInventory" - ] + "SkipConditions": { + "StepIf": { + "Item": { + "NotInInventory": true + } + } + } }, { "Position": { @@ -57,9 +69,13 @@ "TerritoryId": 131, "InteractionType": "EquipItem", "ItemId": 43179, - "SkipIf": [ - "ItemNotInInventory" - ] + "SkipConditions": { + "StepIf": { + "Item": { + "NotInInventory": true + } + } + } }, { "Position": { @@ -70,9 +86,13 @@ "TerritoryId": 131, "InteractionType": "EquipItem", "ItemId": 43180, - "SkipIf": [ - "ItemNotInInventory" - ] + "SkipConditions": { + "StepIf": { + "Item": { + "NotInInventory": true + } + } + } }, { "Position": { @@ -83,9 +103,13 @@ "TerritoryId": 131, "InteractionType": "EquipItem", "ItemId": 43181, - "SkipIf": [ - "ItemNotInInventory" - ] + "SkipConditions": { + "StepIf": { + "Item": { + "NotInInventory": true + } + } + } }, { "Position": { @@ -96,9 +120,13 @@ "TerritoryId": 131, "InteractionType": "EquipItem", "ItemId": 43182, - "SkipIf": [ - "ItemNotInInventory" - ] + "SkipConditions": { + "StepIf": { + "Item": { + "NotInInventory": true + } + } + } }, { "DataId": 1046337, diff --git a/QuestPaths/7.x - Dawntrail/Class Quests/VPR/4850_Viper in the Vidraal's Shadow.json b/QuestPaths/7.x - Dawntrail/Class Quests/VPR/4850_Viper in the Vidraal's Shadow.json index 3d84dc5..0abdfe5 100644 --- a/QuestPaths/7.x - Dawntrail/Class Quests/VPR/4850_Viper in the Vidraal's Shadow.json +++ b/QuestPaths/7.x - Dawntrail/Class Quests/VPR/4850_Viper in the Vidraal's Shadow.json @@ -22,9 +22,11 @@ "Answer": "TEXT_KINGBB111_04850_A2_000_100" } ], - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/7.x - Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4860_A New World to Explore.json b/QuestPaths/7.x - Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4860_A New World to Explore.json index f313b88..476652c 100644 --- a/QuestPaths/7.x - Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4860_A New World to Explore.json +++ b/QuestPaths/7.x - Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4860_A New World to Explore.json @@ -16,9 +16,11 @@ "TerritoryId": 962, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Old Sharlayan", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4948_Through the Gate of Gold.json b/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4948_Through the Gate of Gold.json index 580d5e4..f3fc93d 100644 --- a/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4948_Through the Gate of Gold.json +++ b/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4948_Through the Gate of Gold.json @@ -40,9 +40,11 @@ "Yes": true } ], - "SkipIf": [ - "FlyingUnlocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } }, { "Position": { @@ -53,9 +55,11 @@ "TerritoryId": 1189, "InteractionType": "WalkTo", "Fly": true, - "SkipIf": [ - "FlyingLocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } }, { "DataId": 1047813, diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4824_In the Sting of Things.json b/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4824_In the Sting of Things.json index 90cd1f2..56e2764 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4824_In the Sting of Things.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4824_In the Sting of Things.json @@ -15,9 +15,11 @@ "TerritoryId": 1185, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Tuliyollal", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4825_Causing Problems on Purpose.json b/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4825_Causing Problems on Purpose.json index 5aff388..d789b45 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4825_Causing Problems on Purpose.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4825_Causing Problems on Purpose.json @@ -15,9 +15,11 @@ "TerritoryId": 129, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Limsa Lominsa", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4826_Living among the Deadly.json b/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4826_Living among the Deadly.json index 3d3cf76..87c09c7 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4826_Living among the Deadly.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4826_Living among the Deadly.json @@ -15,9 +15,11 @@ "TerritoryId": 129, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Limsa Lominsa", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4827_Taste of a Toxin Paradise.json b/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4827_Taste of a Toxin Paradise.json index 84a2754..8d0acb5 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4827_Taste of a Toxin Paradise.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4827_Taste of a Toxin Paradise.json @@ -15,9 +15,11 @@ "TerritoryId": 129, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Limsa Lominsa", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4828_Downed by the River.json b/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4828_Downed by the River.json index 472ff3f..871a4ce 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4828_Downed by the River.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4828_Downed by the River.json @@ -15,9 +15,11 @@ "TerritoryId": 129, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Limsa Lominsa", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4829_An Antidote for Anarchy.json b/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4829_An Antidote for Anarchy.json index 218ca4f..3fe3379 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4829_An Antidote for Anarchy.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Healer/4829_An Antidote for Anarchy.json @@ -15,9 +15,11 @@ "TerritoryId": 129, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Limsa Lominsa", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Magical Ranged/4845_Floundering Fame.json b/QuestPaths/7.x - Dawntrail/Role Quests/Magical Ranged/4845_Floundering Fame.json index e10ed25..cbe6d95 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Magical Ranged/4845_Floundering Fame.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Magical Ranged/4845_Floundering Fame.json @@ -167,9 +167,11 @@ "TerritoryId": 957, "InteractionType": "Interact", "Fly": true, - "SkipIf": [ - "NotTargetable" - ], + "SkipConditions": { + "StepIf": { + "NotTargetable": true + } + }, "DialogueChoices": [ { "Type": "YesNo", diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Magical Ranged/4846_Behind the Helm.json b/QuestPaths/7.x - Dawntrail/Role Quests/Magical Ranged/4846_Behind the Helm.json index 72d675f..9b581e9 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Magical Ranged/4846_Behind the Helm.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Magical Ranged/4846_Behind the Helm.json @@ -49,9 +49,11 @@ "TerritoryId": 1190, "InteractionType": "WalkTo", "AetheryteShortcut": "Shaaloani - Mehwahhetsoan", - "SkipIf": [ - "FlyingUnlocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } }, { "Position": { diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4830_The Hunter and the Hunted.json b/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4830_The Hunter and the Hunted.json index 3c78725..ee01538 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4830_The Hunter and the Hunted.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4830_The Hunter and the Hunted.json @@ -15,9 +15,11 @@ "TerritoryId": 1185, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Tuliyollal", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, @@ -38,9 +40,11 @@ "[Kugane] Aetheryte Plaza", "[Kugane] Shiokaze Hostelry" ], - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ], + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + }, "CompletionQuestVariablesFlags": [ null, null, diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4831_A Sea of Blood.json b/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4831_A Sea of Blood.json index c7ec8c0..9bb72bc 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4831_A Sea of Blood.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4831_A Sea of Blood.json @@ -15,9 +15,11 @@ "TerritoryId": 628, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Kugane", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ], + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + }, "DialogueChoices": [ { "Type": "List", diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4832_Who's Who.json b/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4832_Who's Who.json index 012c7af..529aeb7 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4832_Who's Who.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4832_Who's Who.json @@ -15,9 +15,11 @@ "TerritoryId": 628, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Kugane", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, @@ -34,9 +36,11 @@ "TerritoryId": 614, "InteractionType": "Interact", "AetheryteShortcut": "Yanxia - Namai", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ], + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + }, "CompletionQuestVariablesFlags": [ null, null, diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4833_Cornered Prey.json b/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4833_Cornered Prey.json index a3d6a02..b5589cd 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4833_Cornered Prey.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4833_Cornered Prey.json @@ -15,9 +15,11 @@ "TerritoryId": 628, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Kugane", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4834_Impostor Syndrome.json b/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4834_Impostor Syndrome.json index 932796c..ef0aafb 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4834_Impostor Syndrome.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4834_Impostor Syndrome.json @@ -15,9 +15,11 @@ "TerritoryId": 628, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Kugane", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, @@ -118,9 +120,11 @@ "[Kugane] Aetheryte Plaza", "[Kugane] Kogane Dori Markets" ], - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4835_A Hunter True.json b/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4835_A Hunter True.json index ab18679..564cd4b 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4835_A Hunter True.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Melee/4835_A Hunter True.json @@ -15,9 +15,11 @@ "TerritoryId": 628, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Kugane", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, @@ -34,9 +36,11 @@ "TerritoryId": 622, "InteractionType": "Interact", "AetheryteShortcut": "Azim Steppe - Reunion", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ], + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + }, "CompletionQuestVariablesFlags": [ null, null, diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4836_To Steal a Steelhog.json b/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4836_To Steal a Steelhog.json index 271a0f2..6adf040 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4836_To Steal a Steelhog.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4836_To Steal a Steelhog.json @@ -15,9 +15,11 @@ "TerritoryId": 1185, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Tuliyollal", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4837_Bandits Abound.json b/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4837_Bandits Abound.json index 77585ce..077736f 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4837_Bandits Abound.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4837_Bandits Abound.json @@ -15,9 +15,11 @@ "TerritoryId": 635, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Rhalgr's Reach", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Kozama'uka/5061_Molting Season.json b/QuestPaths/7.x - Dawntrail/Side Quests/Kozama'uka/5061_Molting Season.json index 7df87c7..96db24b 100644 --- a/QuestPaths/7.x - Dawntrail/Side Quests/Kozama'uka/5061_Molting Season.json +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Kozama'uka/5061_Molting Season.json @@ -29,9 +29,11 @@ "TerritoryId": 1188, "InteractionType": "WalkTo", "Mount": true, - "SkipIf": [ - "FlyingLocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } }, { "DataId": 2014195, diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Kozama'uka/5068_Dry Run.json b/QuestPaths/7.x - Dawntrail/Side Quests/Kozama'uka/5068_Dry Run.json index 4dd516b..8c85c1d 100644 --- a/QuestPaths/7.x - Dawntrail/Side Quests/Kozama'uka/5068_Dry Run.json +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Kozama'uka/5068_Dry Run.json @@ -45,9 +45,11 @@ "TerritoryId": 1188, "InteractionType": "WalkTo", "Fly": true, - "SkipIf": [ - "FlyingLocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } }, { "DataId": 2014173, diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Kozama'uka/5075_Water Colors.json b/QuestPaths/7.x - Dawntrail/Side Quests/Kozama'uka/5075_Water Colors.json index 8567f95..4d81d88 100644 --- a/QuestPaths/7.x - Dawntrail/Side Quests/Kozama'uka/5075_Water Colors.json +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Kozama'uka/5075_Water Colors.json @@ -29,9 +29,11 @@ "TerritoryId": 1188, "InteractionType": "WalkTo", "Fly": true, - "SkipIf": [ - "FlyingLocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + }, "CompletionQuestVariablesFlags": [ null, null, diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Living Memory/5175_The Canals of History.json b/QuestPaths/7.x - Dawntrail/Side Quests/Living Memory/5175_The Canals of History.json index cd54c76..92ac227 100644 --- a/QuestPaths/7.x - Dawntrail/Side Quests/Living Memory/5175_The Canals of History.json +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Living Memory/5175_The Canals of History.json @@ -29,9 +29,11 @@ "TerritoryId": 1192, "InteractionType": "WalkTo", "Fly": true, - "SkipIf": [ - "FlyingLocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + }, "CompletionQuestVariablesFlags": [ null, null, diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5132_Death by Popoto.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5132_Death by Popoto.json index 664856e..c16f3f0 100644 --- a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5132_Death by Popoto.json +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5132_Death by Popoto.json @@ -29,9 +29,11 @@ "TerritoryId": 1190, "InteractionType": "WalkTo", "Fly": true, - "SkipIf": [ - "FlyingLocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + }, "CompletionQuestVariablesFlags": [ null, null, diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5142_Back on Stage.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5142_Back on Stage.json index e32f82a..92cf0fa 100644 --- a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5142_Back on Stage.json +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5142_Back on Stage.json @@ -54,9 +54,11 @@ null, -64 ], - "SkipIf": [ - "FlyingLocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } }, { "DataId": 1051297, @@ -95,9 +97,11 @@ null, -128 ], - "SkipIf": [ - "FlyingLocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + }, "$": "Shaaloani Saloon Balcony" }, { @@ -135,9 +139,11 @@ null, -32 ], - "SkipIf": [ - "FlyingLocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + }, "$": "Shaaloani Saloon Balcony" }, { diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5143_A Family's Worth.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5143_A Family's Worth.json index b8eb3e4..7c05b26 100644 --- a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5143_A Family's Worth.json +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5143_A Family's Worth.json @@ -29,9 +29,11 @@ "TerritoryId": 1190, "InteractionType": "WalkTo", "Fly": true, - "SkipIf": [ - "FlyingLocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } }, { "DataId": 1051283, diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5148_Dig for Victory.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5148_Dig for Victory.json index 3c520de..d764508 100644 --- a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5148_Dig for Victory.json +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5148_Dig for Victory.json @@ -134,9 +134,11 @@ null, -128 ], - "SkipIf": [ - "FlyingLocked" - ], + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + }, "$": "Shaaloani Saloon Balcony" }, { diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Urqopacha/5037_A Sordid Situation.json b/QuestPaths/7.x - Dawntrail/Side Quests/Urqopacha/5037_A Sordid Situation.json index fd04088..eef670c 100644 --- a/QuestPaths/7.x - Dawntrail/Side Quests/Urqopacha/5037_A Sordid Situation.json +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Urqopacha/5037_A Sordid Situation.json @@ -117,9 +117,11 @@ "TerritoryId": 1187, "InteractionType": "WalkTo", "Fly": true, - "SkipIf": [ - "FlyingLocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } }, { "DataId": 1048666, diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Urqopacha/5040_Too Much of a Good Thing.json b/QuestPaths/7.x - Dawntrail/Side Quests/Urqopacha/5040_Too Much of a Good Thing.json index a3e5c4d..3ab31f3 100644 --- a/QuestPaths/7.x - Dawntrail/Side Quests/Urqopacha/5040_Too Much of a Good Thing.json +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Urqopacha/5040_Too Much of a Good Thing.json @@ -15,9 +15,11 @@ "TerritoryId": 1187, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Urqopacha - Wachunpelo", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5013_It Belongs in a Museum.json b/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5013_It Belongs in a Museum.json index 6e1bf33..4ae11c8 100644 --- a/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5013_It Belongs in a Museum.json +++ b/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5013_It Belongs in a Museum.json @@ -57,9 +57,11 @@ "TerritoryId": 1190, "InteractionType": "Interact", "AetheryteShortcut": "Shaaloani - Mehwahhetsoan", - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5014_Something Stray in the Neighborhood.json b/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5014_Something Stray in the Neighborhood.json index 2705806..891a474 100644 --- a/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5014_Something Stray in the Neighborhood.json +++ b/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5014_Something Stray in the Neighborhood.json @@ -48,9 +48,11 @@ "TerritoryId": 1192, "InteractionType": "Interact", "TargetTerritoryId": 1192, - "SkipIf": [ - "FlyingUnlocked" - ] + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } }, { "DataId": 1051443, diff --git a/QuestPaths/7.x - Dawntrail/Unlocks/Misc/5005_Trial by Spire.json b/QuestPaths/7.x - Dawntrail/Unlocks/Misc/5005_Trial by Spire.json index 387226f..04f2fbb 100644 --- a/QuestPaths/7.x - Dawntrail/Unlocks/Misc/5005_Trial by Spire.json +++ b/QuestPaths/7.x - Dawntrail/Unlocks/Misc/5005_Trial by Spire.json @@ -19,9 +19,11 @@ "[Solution Nine] Aetheryte Plaza", "[Solution Nine] True Vue" ], - "SkipIf": [ - "AetheryteShortcutIfInSameTerritory" - ] + "SkipConditions": { + "AetheryteShortcutIf": { + "NotInSameTerritory": true + } + } } ] }, diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index fd2f91a..e6622f2 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -152,7 +152,7 @@ "null" ] }, - "AetheryteShortcut": { + "AetheryteShortcutIf": { "description": "The Aetheryte to teleport to (before moving)", "$ref": "#/$defs/Aetheryte" }, @@ -174,21 +174,88 @@ "exclusiveMinimum": 0 }, "SkipIf": { - "type": "array", - "items": { - "type": "string", - "enum": [ - "Never", - "FlyingLocked", - "FlyingUnlocked", - "DifferentTerritory", - "ChocoboUnlocked", - "AetheryteShortcutIfInSameTerritory", - "NotTargetable", - "ItemNotInInventory", - "WakingSandsMainArea" - ] - } + "type": "null", + "deprecationMessage": "Please use SkipConditions instead" + }, + "SkipConditions": { + "type": "object", + "properties": { + "StepIf": { + "type": "object", + "properties": { + "Never": { + "type": "boolean" + }, + "Flying": { + "type": "string", + "enum": [ + "Locked", + "Unlocked" + ] + }, + "Chocobo": { + "type": "string", + "enum": [ + "Locked", + "Unlocked" + ] + }, + "NotTargetable": { + "type": "boolean" + }, + "InTerritory": { + "type": "array", + "items": { + "type": "integer" + } + }, + "NotInTerritory": { + "type": "array", + "items": { + "type": "integer" + } + }, + "Item": { + "type": "object", + "properties": { + "NotInInventory": { + "type": "boolean" + } + } + }, + "QuestsAccepted": { + "type": "array", + "items": { + "type": "number" + } + }, + "QuestsCompleted": { + "type": "array", + "items": { + "type": "number" + } + }, + "ExtraCondition": { + "type": "string", + "enum": [ + "WakingSandsMainArea" + ] + } + } + }, + "AetheryteShortcutIf": { + "type": "object", + "properties": { + "Never": { + "type": "boolean" + }, + "InSameTerritory": { + "type": "boolean" + } + } + } + }, + "additionalProperties": false }, "CompletionQuestVariablesFlags": { "$ref": "#/$defs/CompletionFlags" diff --git a/Questionable.Model/V1/Converter/LockedSkipConditionConverter.cs b/Questionable.Model/V1/Converter/LockedSkipConditionConverter.cs new file mode 100644 index 0000000..5d53058 --- /dev/null +++ b/Questionable.Model/V1/Converter/LockedSkipConditionConverter.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; + +namespace Questionable.Model.V1.Converter; + +public sealed class LockedSkipConditionConverter() : EnumConverter(Values) +{ + private static readonly Dictionary Values = new() + { + { ELockedSkipCondition.Locked, "Locked" }, + { ELockedSkipCondition.Unlocked, "Unlocked" }, + }; +} diff --git a/Questionable.Model/V1/Converter/SkipConditionConverter.cs b/Questionable.Model/V1/Converter/SkipConditionConverter.cs index 7e7b780..f4b4e6f 100644 --- a/Questionable.Model/V1/Converter/SkipConditionConverter.cs +++ b/Questionable.Model/V1/Converter/SkipConditionConverter.cs @@ -2,17 +2,10 @@ namespace Questionable.Model.V1.Converter; -public sealed class SkipConditionConverter() : EnumConverter(Values) +public sealed class SkipConditionConverter() : EnumConverter(Values) { - private static readonly Dictionary Values = new() + private static readonly Dictionary Values = new() { - { ESkipCondition.Never, "Never" }, - { ESkipCondition.FlyingLocked, "FlyingLocked" }, - { ESkipCondition.FlyingUnlocked, "FlyingUnlocked" }, - { ESkipCondition.ChocoboUnlocked, "ChocoboUnlocked" }, - { ESkipCondition.AetheryteShortcutIfInSameTerritory, "AetheryteShortcutIfInSameTerritory" }, - { ESkipCondition.NotTargetable, "NotTargetable" }, - { ESkipCondition.ItemNotInInventory, "ItemNotInInventory" }, - { ESkipCondition.WakingSandsMainArea, "WakingSandsMainArea" }, + { EExtraSkipCondition.WakingSandsMainArea, "WakingSandsMainArea" }, }; } diff --git a/Questionable.Model/V1/EExtraSkipCondition.cs b/Questionable.Model/V1/EExtraSkipCondition.cs new file mode 100644 index 0000000..227bf0f --- /dev/null +++ b/Questionable.Model/V1/EExtraSkipCondition.cs @@ -0,0 +1,11 @@ +using System.Text.Json.Serialization; +using Questionable.Model.V1.Converter; + +namespace Questionable.Model.V1; + +[JsonConverter(typeof(SkipConditionConverter))] +public enum EExtraSkipCondition +{ + None, + WakingSandsMainArea, +} diff --git a/Questionable.Model/V1/ELockedSkipCondition.cs b/Questionable.Model/V1/ELockedSkipCondition.cs new file mode 100644 index 0000000..2863c26 --- /dev/null +++ b/Questionable.Model/V1/ELockedSkipCondition.cs @@ -0,0 +1,11 @@ +using System.Text.Json.Serialization; +using Questionable.Model.V1.Converter; + +namespace Questionable.Model.V1; + +[JsonConverter(typeof(LockedSkipConditionConverter))] +public enum ELockedSkipCondition +{ + Locked, + Unlocked, +} diff --git a/Questionable.Model/V1/ESkipCondition.cs b/Questionable.Model/V1/ESkipCondition.cs deleted file mode 100644 index 8c76699..0000000 --- a/Questionable.Model/V1/ESkipCondition.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Text.Json.Serialization; -using Questionable.Model.V1.Converter; - -namespace Questionable.Model.V1; - -[JsonConverter(typeof(SkipConditionConverter))] -public enum ESkipCondition -{ - None, - Never, - FlyingLocked, - FlyingUnlocked, - ChocoboUnlocked, - AetheryteShortcutIfInSameTerritory, - NotTargetable, - ItemNotInInventory, - - // TODO: This is an indication the whole skip bit should be optimized/parameterized to some extent - WakingSandsMainArea, -} diff --git a/Questionable.Model/V1/QuestStep.cs b/Questionable.Model/V1/QuestStep.cs index 3ecb8f3..37d4a0d 100644 --- a/Questionable.Model/V1/QuestStep.cs +++ b/Questionable.Model/V1/QuestStep.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; +using System.Collections.Generic; using System.Numerics; using System.Text.Json.Serialization; using Questionable.Model.V1.Converter; @@ -63,8 +61,8 @@ public sealed class QuestStep public JumpDestination? JumpDestination { get; set; } public uint? ContentFinderConditionId { get; set; } + public SkipConditions? SkipConditions { get; set; } - public IList SkipIf { get; set; } = new List(); public List?> RequiredQuestVariables { get; set; } = new(); public IList CompletionQuestVariablesFlags { get; set; } = new List(); public IList DialogueChoices { get; set; } = new List(); diff --git a/Questionable.Model/V1/SkipAetheryteCondition.cs b/Questionable.Model/V1/SkipAetheryteCondition.cs new file mode 100644 index 0000000..86d0a1c --- /dev/null +++ b/Questionable.Model/V1/SkipAetheryteCondition.cs @@ -0,0 +1,7 @@ +namespace Questionable.Model.V1; + +public sealed class SkipAetheryteCondition +{ + public bool Never { get; set; } + public bool InSameTerritory { get; set; } +} diff --git a/Questionable.Model/V1/SkipConditions.cs b/Questionable.Model/V1/SkipConditions.cs new file mode 100644 index 0000000..19b73f4 --- /dev/null +++ b/Questionable.Model/V1/SkipConditions.cs @@ -0,0 +1,7 @@ +namespace Questionable.Model.V1; + +public sealed class SkipConditions +{ + public SkipStepConditions? StepIf { get; set; } + public SkipAetheryteCondition? AetheryteShortcutIf { get; set; } +} diff --git a/Questionable.Model/V1/SkipItemConditions.cs b/Questionable.Model/V1/SkipItemConditions.cs new file mode 100644 index 0000000..9154dcd --- /dev/null +++ b/Questionable.Model/V1/SkipItemConditions.cs @@ -0,0 +1,6 @@ +namespace Questionable.Model.V1; + +public sealed class SkipItemConditions +{ + public bool NotInInventory { get; set; } +} diff --git a/Questionable.Model/V1/SkipStepConditions.cs b/Questionable.Model/V1/SkipStepConditions.cs new file mode 100644 index 0000000..97222eb --- /dev/null +++ b/Questionable.Model/V1/SkipStepConditions.cs @@ -0,0 +1,26 @@ +using System.Collections.Generic; + +namespace Questionable.Model.V1; + +public sealed class SkipStepConditions +{ + public bool Never { get; set; } + public ELockedSkipCondition? Flying { get; set; } + public ELockedSkipCondition? Chocobo { get; set; } + public bool NotTargetable { get; set; } + public List InTerritory { get; set; } = new(); + public List NotInTerritory { get; set; } = new(); + public SkipItemConditions? Item { get; set; } + + // TODO not implemented + public List QuestsAccepted { get; set; } = new(); + + // TODO not implemented + public List QuestsCompleted { get; set; } = new(); + public EExtraSkipCondition? ExtraCondition { get; set; } + + public bool HasSkipConditions() + { + return Never || Flying != null || Chocobo != null || InTerritory.Count > 0 || NotInTerritory.Count > 0 || Item != null; + } +} diff --git a/Questionable/Controller/Steps/Shared/AetheryteShortcut.cs b/Questionable/Controller/Steps/Shared/AetheryteShortcut.cs index f897fe6..413dd37 100644 --- a/Questionable/Controller/Steps/Shared/AetheryteShortcut.cs +++ b/Questionable/Controller/Steps/Shared/AetheryteShortcut.cs @@ -68,26 +68,31 @@ internal static class AetheryteShortcut ushort territoryType = clientState.TerritoryType; if (Step != null && ExpectedTerritoryId == territoryType) { - if (Step.SkipIf.Contains(ESkipCondition.AetheryteShortcutIfInSameTerritory)) + var skipConditions = Step.SkipConditions?.AetheryteShortcutIf ?? new(); + if (!skipConditions.Never) { - logger.LogInformation("Skipping aetheryte teleport due to SkipIf"); - return false; - } + if (skipConditions is { InSameTerritory: true }) + { + logger.LogInformation("Skipping aetheryte teleport due to SkipCondition"); + return false; + } - Vector3 pos = clientState.LocalPlayer!.Position; - if (Step.Position != null && (pos - Step.Position.Value).Length() < Step.CalculateActualStopDistance()) - { - logger.LogInformation("Skipping aetheryte teleport, we're near the target"); - return false; - } + Vector3 pos = clientState.LocalPlayer!.Position; + if (Step.Position != null && + (pos - Step.Position.Value).Length() < Step.CalculateActualStopDistance()) + { + logger.LogInformation("Skipping aetheryte teleport, we're near the target"); + return false; + } - if (aetheryteData.CalculateDistance(pos, territoryType, TargetAetheryte) < 20 || - (Step.AethernetShortcut != null && - (aetheryteData.CalculateDistance(pos, territoryType, Step.AethernetShortcut.From) < 20 || - aetheryteData.CalculateDistance(pos, territoryType, Step.AethernetShortcut.To) < 20))) - { - logger.LogInformation("Skipping aetheryte teleport"); - return false; + if (aetheryteData.CalculateDistance(pos, territoryType, TargetAetheryte) < 20 || + (Step.AethernetShortcut != null && + (aetheryteData.CalculateDistance(pos, territoryType, Step.AethernetShortcut.From) < 20 || + aetheryteData.CalculateDistance(pos, territoryType, Step.AethernetShortcut.To) < 20))) + { + logger.LogInformation("Skipping aetheryte teleport"); + return false; + } } } diff --git a/Questionable/Controller/Steps/Shared/SkipCondition.cs b/Questionable/Controller/Steps/Shared/SkipCondition.cs index 256cf70..04f338a 100644 --- a/Questionable/Controller/Steps/Shared/SkipCondition.cs +++ b/Questionable/Controller/Steps/Shared/SkipCondition.cs @@ -21,12 +21,11 @@ internal static class SkipCondition { public ITask? CreateTask(Quest quest, QuestSequence sequence, QuestStep step) { - if (step.SkipIf.Contains(ESkipCondition.Never)) + var skipConditions = step.SkipConditions?.StepIf; + if (skipConditions == null || skipConditions.Never) return null; - var relevantConditions = - step.SkipIf.Where(x => x != ESkipCondition.AetheryteShortcutIfInSameTerritory).ToList(); - if (relevantConditions.Count == 0 && + if (skipConditions.HasSkipConditions() && step.CompletionQuestVariablesFlags.Count == 0 && step.RequiredQuestVariables.Count == 0 && step.PickUpQuestId == null && @@ -34,7 +33,7 @@ internal static class SkipCondition return null; return serviceProvider.GetRequiredService() - .With(step, relevantConditions, quest.QuestId); + .With(step, skipConditions, quest.QuestId); } } @@ -44,10 +43,10 @@ internal static class SkipCondition IClientState clientState) : ITask { public QuestStep Step { get; set; } = null!; - public List SkipConditions { get; set; } = null!; + public SkipStepConditions SkipConditions { get; set; } = null!; public ushort QuestId { get; set; } - public ITask With(QuestStep step, List skipConditions, ushort questId) + public ITask With(QuestStep step, SkipStepConditions skipConditions, ushort questId) { Step = step; SkipConditions = skipConditions; @@ -59,28 +58,28 @@ internal static class SkipCondition { logger.LogInformation("Checking skip conditions; {ConfiguredConditions}", string.Join(",", SkipConditions)); - if (SkipConditions.Contains(ESkipCondition.FlyingUnlocked) && + if (SkipConditions.Flying == ELockedSkipCondition.Unlocked && gameFunctions.IsFlyingUnlocked(Step.TerritoryId)) { logger.LogInformation("Skipping step, as flying is unlocked"); return true; } - if (SkipConditions.Contains(ESkipCondition.FlyingLocked) && + if (SkipConditions.Flying == ELockedSkipCondition.Locked && !gameFunctions.IsFlyingUnlocked(Step.TerritoryId)) { logger.LogInformation("Skipping step, as flying is locked"); return true; } - if (SkipConditions.Contains(ESkipCondition.ChocoboUnlocked) && + if (SkipConditions.Chocobo == ELockedSkipCondition.Unlocked && PlayerState.Instance()->IsMountUnlocked(1)) { logger.LogInformation("Skipping step, as chocobo is unlocked"); return true; } - if (SkipConditions.Contains(ESkipCondition.NotTargetable) && + if (SkipConditions.NotTargetable && Step is { DataId: not null }) { IGameObject? gameObject = gameFunctions.FindObjectByDataId(Step.DataId.Value); @@ -99,7 +98,7 @@ internal static class SkipCondition } } - if (SkipConditions.Contains(ESkipCondition.ItemNotInInventory) && Step is { ItemId: not null }) + if (SkipConditions.Item is { NotInInventory: true } && Step is { ItemId: not null }) { InventoryManager* inventoryManager = InventoryManager.Instance(); if (inventoryManager->GetInventoryItemCount(Step.ItemId.Value) == 0) @@ -145,7 +144,7 @@ internal static class SkipCondition } } - if (Step.SkipIf.Contains(ESkipCondition.WakingSandsMainArea)) + if (SkipConditions.ExtraCondition == EExtraSkipCondition.WakingSandsMainArea) { var position = clientState.LocalPlayer!.Position; if (position.X < 24)