sync with upstreaom #2

Open
goatzone wants to merge 545 commits from liza/Questionable:master into master
7 changed files with 57 additions and 17 deletions
Showing only changes of commit 108d103fd8 - Show all commits

View File

@ -117,9 +117,10 @@
"Z": 4.5318604 "Z": 4.5318604
}, },
"TerritoryId": 397, "TerritoryId": 397,
"InteractionType": "CompleteQuest" "InteractionType": "CompleteQuest",
"NextQuestId": 1764
} }
] ]
} }
] ]
} }

View File

@ -28,7 +28,8 @@
"Z": -244.1596 "Z": -244.1596
}, },
"TerritoryId": 397, "TerritoryId": 397,
"InteractionType": "Interact" "InteractionType": "Interact",
"Fly": true
} }
] ]
}, },
@ -89,9 +90,10 @@
}, },
"TerritoryId": 397, "TerritoryId": 397,
"InteractionType": "CompleteQuest", "InteractionType": "CompleteQuest",
"NextQuestId": 1766 "NextQuestId": 1766,
"Fly": true
} }
] ]
} }
] ]
} }

View File

@ -28,7 +28,8 @@
"Z": -244.1596 "Z": -244.1596
}, },
"TerritoryId": 397, "TerritoryId": 397,
"InteractionType": "Interact" "InteractionType": "Interact",
"Fly": true
} }
] ]
}, },
@ -58,12 +59,14 @@
"Y": 100.08534, "Y": 100.08534,
"Z": -603.926 "Z": -603.926
}, },
"StopDistance": 0.5,
"TerritoryId": 397, "TerritoryId": 397,
"InteractionType": "Combat", "InteractionType": "Combat",
"KillEnemyDataIds": [ "KillEnemyDataIds": [
4468 4468
], ],
"EnemySpawnType": "AutoOnEnterArea" "EnemySpawnType": "AutoOnEnterArea",
"Fly": true
} }
] ]
}, },
@ -78,7 +81,8 @@
"Z": -503.7156 "Z": -503.7156
}, },
"TerritoryId": 397, "TerritoryId": 397,
"InteractionType": "Interact" "InteractionType": "Interact",
"Fly": true
} }
] ]
}, },
@ -100,4 +104,4 @@
] ]
} }
] ]
} }

View File

@ -34,7 +34,8 @@
"DataId": 3992, "DataId": 3992,
"MinimumKillCount": 5 "MinimumKillCount": 5
} }
] ],
"Fly": true
} }
] ]
}, },
@ -50,13 +51,29 @@
"Z": 791.37854 "Z": 791.37854
}, },
"TerritoryId": 397, "TerritoryId": 397,
"InteractionType": "Interact" "InteractionType": "Interact",
"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest"
} }
] ]
}, },
{ {
"Sequence": 255, "Sequence": 255,
"Steps": [ "Steps": [
{
"Position": {
"X": -110.26132,
"Y": 153.61101,
"Z": 10.394781
},
"TerritoryId": 397,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{ {
"Fly": true, "Fly": true,
"DataId": 1014146, "DataId": 1014146,
@ -72,4 +89,4 @@
] ]
} }
] ]
} }

View File

@ -75,9 +75,9 @@
}, },
"TerritoryId": 397, "TerritoryId": 397,
"InteractionType": "CompleteQuest", "InteractionType": "CompleteQuest",
"NextQuestId": 1983 "NextQuestId": 1893
} }
] ]
} }
] ]
} }

View File

@ -104,9 +104,10 @@
"Z": 3.829956 "Z": 3.829956
}, },
"TerritoryId": 397, "TerritoryId": 397,
"InteractionType": "CompleteQuest" "InteractionType": "CompleteQuest",
"NextQuestId": 1898
} }
] ]
} }
] ]
} }

View File

@ -36,6 +36,21 @@
{ {
"Sequence": 255, "Sequence": 255,
"Steps": [ "Steps": [
{
"Position": {
"X": -110.26132,
"Y": 153.61101,
"Z": 10.394781
},
"TerritoryId": 397,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{ {
"DataId": 1014719, "DataId": 1014719,
"Position": { "Position": {
@ -50,4 +65,4 @@
] ]
} }
] ]
} }