master #3

Open
cacahuetes wants to merge 653 commits from liza/Questionable:master into cacahuetes-ShB-Healer
6 changed files with 49 additions and 6 deletions
Showing only changes of commit 9a6909dba3 - Show all commits

View File

@ -13,7 +13,20 @@
"Z": 95.26196 "Z": 95.26196
}, },
"TerritoryId": 131, "TerritoryId": 131,
"InteractionType": "AcceptQuest" "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Goldsmiths' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InTerritory": [130, 131]
},
"AethernetShortcutIf": {
"InSameTerritory": true
}
}
} }
] ]
}, },

View File

@ -13,7 +13,13 @@
"Z": -682.76495 "Z": -682.76495
}, },
"TerritoryId": 156, "TerritoryId": 156,
"InteractionType": "AcceptQuest" "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Mor Dhona",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
} }
] ]
}, },

View File

@ -13,7 +13,13 @@
"Z": -682.76495 "Z": -682.76495
}, },
"TerritoryId": 156, "TerritoryId": 156,
"InteractionType": "AcceptQuest" "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Mor Dhona",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
} }
] ]
}, },

View File

@ -13,7 +13,13 @@
"Z": -682.76495 "Z": -682.76495
}, },
"TerritoryId": 156, "TerritoryId": 156,
"InteractionType": "AcceptQuest" "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Mor Dhona",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
} }
] ]
}, },

View File

@ -13,7 +13,13 @@
"Z": -682.76495 "Z": -682.76495
}, },
"TerritoryId": 156, "TerritoryId": 156,
"InteractionType": "AcceptQuest" "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Mor Dhona",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
} }
] ]
}, },

View File

@ -13,7 +13,13 @@
"Z": -682.76495 "Z": -682.76495
}, },
"TerritoryId": 156, "TerritoryId": 156,
"InteractionType": "AcceptQuest" "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Mor Dhona",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
} }
] ]
}, },