sync with upstreaom #2

Open
goatzone wants to merge 581 commits from liza/Questionable:master into master
7 changed files with 98 additions and 7 deletions
Showing only changes of commit 752a8256c6 - Show all commits

View File

@ -71,7 +71,20 @@
"TerritoryId": 398,
"InteractionType": "WalkTo",
"Fly": true,
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
"SkipConditions": {
"AetheryteShortcutIf": {
"NearPosition": {
"Position": {
"X": 66.20886,
"Y": -49.2817,
"Z": -159.44159
},
"TerritoryId": 398,
"MaximumDistance": 30
}
}
}
},
{
"DataId": 1016803,

View File

@ -100,7 +100,20 @@
"TerritoryId": 398,
"InteractionType": "WalkTo",
"Fly": true,
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
"SkipConditions": {
"AetheryteShortcutIf": {
"NearPosition": {
"Position": {
"X": 66.20886,
"Y": -49.2817,
"Z": -159.44159
},
"TerritoryId": 398,
"MaximumDistance": 30
}
}
}
},
{
"DataId": 1016803,

View File

@ -100,7 +100,20 @@
"TerritoryId": 398,
"InteractionType": "WalkTo",
"Fly": true,
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
"SkipConditions": {
"AetheryteShortcutIf": {
"NearPosition": {
"Position": {
"X": 66.20886,
"Y": -49.2817,
"Z": -159.44159
},
"TerritoryId": 398,
"MaximumDistance": 30
}
}
}
},
{
"DataId": 1016803,

View File

@ -82,7 +82,20 @@
"TerritoryId": 398,
"InteractionType": "WalkTo",
"Fly": true,
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
"SkipConditions": {
"AetheryteShortcutIf": {
"NearPosition": {
"Position": {
"X": 66.20886,
"Y": -49.2817,
"Z": -159.44159
},
"TerritoryId": 398,
"MaximumDistance": 30
}
}
}
},
{
"DataId": 1016803,

View File

@ -155,7 +155,20 @@
"TerritoryId": 398,
"InteractionType": "WalkTo",
"Fly": true,
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
"SkipConditions": {
"AetheryteShortcutIf": {
"NearPosition": {
"Position": {
"X": 66.20886,
"Y": -49.2817,
"Z": -159.44159
},
"TerritoryId": 398,
"MaximumDistance": 30
}
}
}
},
{
"DataId": 1016803,

View File

@ -106,7 +106,20 @@
"TerritoryId": 398,
"InteractionType": "WalkTo",
"Fly": true,
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
"SkipConditions": {
"AetheryteShortcutIf": {
"NearPosition": {
"Position": {
"X": 66.20886,
"Y": -49.2817,
"Z": -159.44159
},
"TerritoryId": 398,
"MaximumDistance": 30
}
}
}
},
{
"DataId": 1016803,

View File

@ -82,7 +82,20 @@
"TerritoryId": 398,
"InteractionType": "WalkTo",
"Fly": true,
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
"SkipConditions": {
"AetheryteShortcutIf": {
"NearPosition": {
"Position": {
"X": 66.20886,
"Y": -49.2817,
"Z": -159.44159
},
"TerritoryId": 398,
"MaximumDistance": 30
}
}
}
},
{
"DataId": 1016803,