master #3

Open
cacahuetes wants to merge 640 commits from liza/Questionable:master into cacahuetes-ShB-Healer
2 changed files with 11 additions and 7 deletions
Showing only changes of commit 963442ba25 - Show all commits

View File

@ -12,6 +12,7 @@
"Y": 20, "Y": 20,
"Z": 85.55737 "Z": 85.55737
}, },
"StopDistance": 5,
"TerritoryId": 129, "TerritoryId": 129,
"InteractionType": "AcceptQuest", "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Limsa Lominsa", "AetheryteShortcut": "Limsa Lominsa",
@ -33,15 +34,13 @@
"Y": 42.597717, "Y": 42.597717,
"Z": 163.7445 "Z": 163.7445
}, },
"StopDistance": 5,
"TerritoryId": 134, "TerritoryId": 134,
"InteractionType": "Interact", "InteractionType": "Interact",
"AetheryteShortcut": "Middle La Noscea - Summerford Farms", "AethernetShortcut": [
"Fly": true, "[Limsa Lominsa] Aetheryte Plaza",
"SkipConditions": { "[Limsa Lominsa] Zephyr Gate (Middle La Noscea)"
"AetheryteShortcutIf": { ]
"InSameTerritory": true
}
}
} }
] ]
}, },
@ -55,6 +54,7 @@
"Y": 42.597717, "Y": 42.597717,
"Z": 163.7445 "Z": 163.7445
}, },
"StopDistance": 5,
"TerritoryId": 134, "TerritoryId": 134,
"InteractionType": "CompleteQuest", "InteractionType": "CompleteQuest",
"AetheryteShortcut": "Middle La Noscea - Summerford Farms", "AetheryteShortcut": "Middle La Noscea - Summerford Farms",

View File

@ -13,6 +13,7 @@
"Y": 42.597717, "Y": 42.597717,
"Z": 162.65016 "Z": 162.65016
}, },
"StopDistance": 5,
"TerritoryId": 134, "TerritoryId": 134,
"AetheryteShortcut": "Middle La Noscea - Summerford Farms", "AetheryteShortcut": "Middle La Noscea - Summerford Farms",
"Fly": true, "Fly": true,
@ -57,6 +58,7 @@
"Y": 42.597717, "Y": 42.597717,
"Z": 163.7445 "Z": 163.7445
}, },
"StopDistance": 5,
"TerritoryId": 134, "TerritoryId": 134,
"InteractionType": "AcceptQuest", "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Middle La Noscea - Summerford Farms", "AetheryteShortcut": "Middle La Noscea - Summerford Farms",
@ -79,6 +81,7 @@
"Y": 207, "Y": 207,
"Z": 49.332397 "Z": 49.332397
}, },
"StopDistance": 5,
"TerritoryId": 478, "TerritoryId": 478,
"InteractionType": "Interact", "InteractionType": "Interact",
"AetheryteShortcut": "Idyllshire", "AetheryteShortcut": "Idyllshire",
@ -100,6 +103,7 @@
"Y": 215.44214, "Y": 215.44214,
"Z": -108.171265 "Z": -108.171265
}, },
"StopDistance": 2,
"TerritoryId": 478, "TerritoryId": 478,
"InteractionType": "Interact", "InteractionType": "Interact",
"AetheryteShortcut": "Idyllshire", "AetheryteShortcut": "Idyllshire",