sync with upstreaom #2

Open
goatzone wants to merge 620 commits from liza/Questionable:master into master
2 changed files with 218 additions and 216 deletions
Showing only changes of commit ca20cfcd88 - Show all commits

View File

@ -51,7 +51,8 @@
"AetheryteShortcutIf": { "AetheryteShortcutIf": {
"InSameTerritory": true "InSameTerritory": true
} }
} },
"NextQuestId": 970
} }
] ]
} }

View File

@ -155,7 +155,8 @@
}, },
"TerritoryId": 152, "TerritoryId": 152,
"InteractionType": "CompleteQuest", "InteractionType": "CompleteQuest",
"Fly": true "Fly": true,
"NextQuestId": 972
} }
] ]
} }