Replace SkipIf logic

pull/14/head
Liza 2024-07-27 15:39:47 +02:00
parent b86d01bd6f
commit e40084ada1
Signed by: liza
GPG Key ID: 7199F8D727D55F67
224 changed files with 1514 additions and 813 deletions

View File

@ -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)

View File

@ -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<ExpressionSyntax>(
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<ExpressionSyntax>(
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<ExpressionSyntax>(
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<ExpressionSyntax>(
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);
}

View File

@ -34,9 +34,11 @@
"TerritoryId": 180,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Outer La Noscea - Camp Overlook",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
},
"CompletionQuestVariablesFlags": [
null,
null,

View File

@ -128,9 +128,11 @@
null,
-32
],
"SkipIf": [
"FlyingUnlocked"
]
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{
"DataId": 1007842,

View File

@ -35,9 +35,11 @@
"TerritoryId": 146,
"InteractionType": "Interact",
"AetheryteShortcut": "Southern Thanalan - Forgotten Springs",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
},
"CompletionQuestVariablesFlags": [
null,
null,

View File

@ -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"
},
{

View File

@ -43,9 +43,11 @@
}
],
"AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
},
{
"DataId": 2002312,

View File

@ -15,9 +15,11 @@
"TerritoryId": 130,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -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)"
},
{

View File

@ -16,9 +16,11 @@
"TerritoryId": 152,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "East Shroud - Hawthorne Hut",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 152,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "East Shroud - Hawthorne Hut",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 152,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "East Shroud - Hawthorne Hut",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -16,9 +16,11 @@
"TerritoryId": 152,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "East Shroud - Hawthorne Hut",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 152,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "East Shroud - Hawthorne Hut",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 152,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "East Shroud - Hawthorne Hut",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 152,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "East Shroud - Hawthorne Hut",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 152,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "East Shroud - Hawthorne Hut",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 153,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "South Shroud - Quarrymill",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -18,9 +18,11 @@
"TerritoryId": 153,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "South Shroud - Quarrymill",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 153,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "South Shroud - Quarrymill",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 153,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "South Shroud - Quarrymill",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 152,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "East Shroud - Hawthorne Hut",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 132,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Gridania",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 145,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 145,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 145,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 146,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 146,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 153,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "South Shroud - Quarrymill",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 153,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "South Shroud - Quarrymill",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 153,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "South Shroud - Quarrymill",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 153,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "South Shroud - Quarrymill",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 146,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 146,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 146,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 146,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -16,9 +16,11 @@
"TerritoryId": 154,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "North Shroud - Fallgourd Float",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 154,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "North Shroud - Fallgourd Float",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -16,9 +16,11 @@
"TerritoryId": 154,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "North Shroud - Fallgourd Float",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 154,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "North Shroud - Fallgourd Float",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 153,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "South Shroud - Camp Tranquil",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 137,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern La Noscea - Costa Del Sol",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 137,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern La Noscea - Costa Del Sol",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 146,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Southern Thanalan - Forgotten Springs",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 146,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Southern Thanalan - Forgotten Springs",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 146,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Southern Thanalan - Forgotten Springs",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 137,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern La Noscea - Costa Del Sol",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -18,9 +18,11 @@
"TerritoryId": 137,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern La Noscea - Costa Del Sol",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 137,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern La Noscea - Wineport",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 137,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern La Noscea - Wineport",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 137,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern La Noscea - Wineport",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 137,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern La Noscea - Wineport",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 137,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern La Noscea - Wineport",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 137,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern La Noscea - Wineport",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 137,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern La Noscea - Costa Del Sol",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 137,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern La Noscea - Costa Del Sol",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -19,9 +19,11 @@
"TerritoryId": 139,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -16,9 +16,11 @@
"TerritoryId": 145,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 139,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 145,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 145,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 145,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 145,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 154,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "North Shroud - Fallgourd Float",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 155,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 155,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 155,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 155,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 155,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 155,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 155,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 155,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
},
"Mount": true
}
]

View File

@ -15,9 +15,11 @@
"TerritoryId": 155,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 155,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 155,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 155,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -18,9 +18,11 @@
"TerritoryId": 155,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 145,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 145,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 145,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 138,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Western La Noscea - Aleport",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 138,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Western La Noscea - Aleport",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 138,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Western La Noscea - Aleport",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 138,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Western La Noscea - Aleport",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -16,9 +16,11 @@
"TerritoryId": 156,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Mor Dhona",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 147,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Northern Thanalan - Camp Bluefog",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -19,9 +19,11 @@
"TerritoryId": 147,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Northern Thanalan - Ceruleum Processing Plant",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -20,9 +20,11 @@
"TerritoryId": 147,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Northern Thanalan - Ceruleum Processing Plant",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -41,9 +41,11 @@
"TerritoryId": 212,
"InteractionType": "Interact",
"TargetTerritoryId": 212,
"SkipIf": [
"WakingSandsMainArea"
]
"SkipConditions": {
"StepIf": {
"ExtraCondition": "WakingSandsMainArea"
}
}
},
{
"DataId": 1007533,

View File

@ -15,9 +15,11 @@
"TerritoryId": 132,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Gridania",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 153,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "South Shroud - Camp Tranquil",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 137,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Eastern La Noscea - Wineport",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 156,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Mor Dhona",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 140,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Western Thanalan - Horizon",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -16,9 +16,11 @@
"TerritoryId": 140,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Western Thanalan - Horizon",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 140,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Western Thanalan - Horizon",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -18,9 +18,11 @@
"TerritoryId": 135,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Lower La Noscea - Moraby Drydocks",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 129,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Limsa Lominsa",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -16,9 +16,11 @@
"TerritoryId": 129,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Limsa Lominsa",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

View File

@ -15,9 +15,11 @@
"TerritoryId": 130,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"SkipIf": [
"AetheryteShortcutIfInSameTerritory"
]
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
}
}
}
]
},

Some files were not shown because too many files have changed in this diff Show More