master #3

Open
cacahuetes wants to merge 673 commits from liza/Questionable:master into cacahuetes-ShB-Healer
12 changed files with 119 additions and 12 deletions
Showing only changes of commit fa4043b4a2 - Show all commits

View File

@ -13,7 +13,13 @@
"Z": -51.163513 "Z": -51.163513
}, },
"TerritoryId": 130, "TerritoryId": 130,
"InteractionType": "AcceptQuest" "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
} }
] ]
}, },

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,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,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,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,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": -42.404846 "Z": -42.404846
}, },
"TerritoryId": 130, "TerritoryId": 130,
"InteractionType": "AcceptQuest" "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
} }
] ]
}, },

View File

@ -13,7 +13,13 @@
"Z": -42.404846 "Z": -42.404846
}, },
"TerritoryId": 130, "TerritoryId": 130,
"InteractionType": "AcceptQuest" "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
} }
] ]
}, },

View File

@ -13,7 +13,13 @@
"Z": -42.404846 "Z": -42.404846
}, },
"TerritoryId": 130, "TerritoryId": 130,
"InteractionType": "AcceptQuest" "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
} }
] ]
}, },

View File

@ -13,7 +13,13 @@
"Z": -42.404846 "Z": -42.404846
}, },
"TerritoryId": 130, "TerritoryId": 130,
"InteractionType": "AcceptQuest" "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
} }
] ]
}, },

View File

@ -13,7 +13,13 @@
"Z": -42.404846 "Z": -42.404846
}, },
"TerritoryId": 130, "TerritoryId": 130,
"InteractionType": "AcceptQuest" "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
} }
] ]
}, },

View File

@ -13,7 +13,13 @@
"Z": -42.404846 "Z": -42.404846
}, },
"TerritoryId": 130, "TerritoryId": 130,
"InteractionType": "AcceptQuest" "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
} }
] ]
}, },