master #3

Open
cacahuetes wants to merge 653 commits from liza/Questionable:master into cacahuetes-ShB-Healer
4 changed files with 23 additions and 2 deletions
Showing only changes of commit 5d49096325 - Show all commits

View File

@ -121,6 +121,7 @@
"Y": 213.03185, "Y": 213.03185,
"Z": -110.7348 "Z": -110.7348
}, },
"StopDistance": 7,
"TerritoryId": 478, "TerritoryId": 478,
"InteractionType": "Interact", "InteractionType": "Interact",
"AetheryteShortcut": "Idyllshire", "AetheryteShortcut": "Idyllshire",
@ -142,6 +143,7 @@
"Y": 212.84532, "Y": 212.84532,
"Z": -109.9718 "Z": -109.9718
}, },
"StopDistance": 5,
"TerritoryId": 478, "TerritoryId": 478,
"InteractionType": "Interact", "InteractionType": "Interact",
"AetheryteShortcut": "Idyllshire", "AetheryteShortcut": "Idyllshire",
@ -195,7 +197,6 @@
"StopDistance": 5, "StopDistance": 5,
"TerritoryId": 399, "TerritoryId": 399,
"InteractionType": "SinglePlayerDuty", "InteractionType": "SinglePlayerDuty",
"Fly": true,
"AetheryteShortcut": "Idyllshire", "AetheryteShortcut": "Idyllshire",
"AethernetShortcut": [ "AethernetShortcut": [
"[Idyllshire] Aetheryte Plaza", "[Idyllshire] Aetheryte Plaza",
@ -213,6 +214,9 @@
} }
] ]
}, },
{
"Sequence": 7
},
{ {
"Sequence": 8, "Sequence": 8,
"Steps": [ "Steps": [
@ -226,7 +230,6 @@
"TerritoryId": 399, "TerritoryId": 399,
"InteractionType": "Interact", "InteractionType": "Interact",
"StopDistance": 5, "StopDistance": 5,
"Fly": true,
"AetheryteShortcut": "Idyllshire", "AetheryteShortcut": "Idyllshire",
"AethernetShortcut": [ "AethernetShortcut": [
"[Idyllshire] Aetheryte Plaza", "[Idyllshire] Aetheryte Plaza",

View File

@ -122,6 +122,7 @@
"Z": -215.22852 "Z": -215.22852
}, },
"TerritoryId": 141, "TerritoryId": 141,
"Fly": true,
"InteractionType": "Interact", "InteractionType": "Interact",
"AetheryteShortcut": "Central Thanalan - Black Brush Station", "AetheryteShortcut": "Central Thanalan - Black Brush Station",
"SkipConditions": { "SkipConditions": {

View File

@ -77,6 +77,7 @@
"Y": -24.721268, "Y": -24.721268,
"Z": 205.34058 "Z": 205.34058
}, },
"StopDistance": 6,
"TerritoryId": 138, "TerritoryId": 138,
"InteractionType": "Action", "InteractionType": "Action",
"AetheryteShortcut": "Western La Noscea - Aleport", "AetheryteShortcut": "Western La Noscea - Aleport",
@ -99,6 +100,7 @@
"Y": -24.724764, "Y": -24.724764,
"Z": 205.24902 "Z": 205.24902
}, },
"StopDistance": 6,
"TerritoryId": 138, "TerritoryId": 138,
"InteractionType": "Interact", "InteractionType": "Interact",
"AetheryteShortcut": "Western La Noscea - Aleport", "AetheryteShortcut": "Western La Noscea - Aleport",

View File

@ -67,6 +67,21 @@
} }
] ]
}, },
{
"Sequence": 3,
"Steps": [
{
"DataId": 1039288,
"Position": {
"X": 212.9701,
"Y": 52.213486,
"Z": -787.50287
},
"TerritoryId": 398,
"InteractionType": "Interact"
}
]
},
{ {
"Sequence": 255, "Sequence": 255,
"Steps": [ "Steps": [