master #3

Open
cacahuetes wants to merge 673 commits from liza/Questionable:master into cacahuetes-ShB-Healer
11 changed files with 144 additions and 43 deletions
Showing only changes of commit 4ecff4a433 - Show all commits

View File

@ -96,7 +96,15 @@
},
"TerritoryId": 154,
"InteractionType": "Interact",
"AetheryteShortcut": "North Shroud - Fallgourd Float"
"AetheryteShortcut": "North Shroud - Fallgourd Float",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 1007092,
@ -106,7 +114,15 @@
"Z": 232.62378
},
"TerritoryId": 154,
"InteractionType": "Interact"
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"DataId": 1002804,
@ -116,7 +132,15 @@
"Z": 172.74731
},
"TerritoryId": 154,
"InteractionType": "Interact"
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
}
]
},
@ -133,7 +157,15 @@
"TerritoryId": 154,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [4683]
"KillEnemyDataIds": [4683],
"CompletionQuestVariablesFlags": [
2,
null,
null,
null,
null,
null
]
},
{
"DataId": 1013605,

View File

@ -35,7 +35,8 @@
},
"TerritoryId": 155,
"InteractionType": "Interact",
"AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead"
"AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
"Mount": true
}
]
},

View File

@ -50,7 +50,15 @@
"Z": 792.4772
},
"TerritoryId": 397,
"InteractionType": "Interact"
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 1011237,
@ -60,7 +68,15 @@
"Z": 725.00183
},
"TerritoryId": 397,
"InteractionType": "Interact"
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
}
]
},
@ -92,7 +108,12 @@
"TerritoryId": 397,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 5,
"Steps": [
{
"Position": {
"X": -336.4157,
@ -102,24 +123,19 @@
"TerritoryId": 397,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [4677]
},
{
"DataId": 2005855,
"Position": {
"X": -336.4157,
"Y": 89.00586,
"Z": -586.5721
},
"TerritoryId": 397,
"InteractionType": "Interact"
}
"KillEnemyDataIds": [
4677
],
"Fly": true,
"CompletionQuestVariablesFlags": [
2,
null,
null,
null,
null,
null
]
},
{
"Sequence": 5,
"Steps": [
{
"DataId": 2005855,
"Position": {
@ -143,7 +159,8 @@
"Z": -688.53284
},
"TerritoryId": 397,
"InteractionType": "Interact"
"InteractionType": "Interact",
"Fly": true
}
]
},

View File

@ -49,9 +49,10 @@
"Y": 125.596924,
"Z": -11.215393
},
"StopDistance": 5,
"TerritoryId": 397,
"InteractionType": "WaitForManualProgress",
"$": "Cure II needs to be added to list of actions"
"InteractionType": "Action",
"Action": "Cure II"
}
]
},
@ -68,7 +69,16 @@
"TerritoryId": 397,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [4690]
"KillEnemyDataIds": [4690],
"Fly": true,
"CompletionQuestVariablesFlags": [
4,
null,
null,
null,
null,
null
]
},
{
"DataId": 2005857,

View File

@ -52,7 +52,15 @@
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [4691, 4692],
"Fly": true
"Fly": true,
"CompletionQuestVariablesFlags": [
4,
null,
null,
null,
null,
null
]
},
{
"DataId": 2005859,

View File

@ -176,7 +176,8 @@
},
"TerritoryId": 398,
"InteractionType": "SinglePlayerDuty",
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
"Fly": true
}
]
},
@ -272,7 +273,7 @@
},
"TerritoryId": 153,
"InteractionType": "CompleteQuest",
"NextQuestId": 1725
"NextQuestId": 2414
}
]
}

View File

@ -99,7 +99,8 @@
},
"TerritoryId": 152,
"InteractionType": "Interact",
"AetheryteShortcut": "East Shroud - Hawthorne Hut"
"AetheryteShortcut": "East Shroud - Hawthorne Hut",
"Fly": true
}
]
},
@ -130,7 +131,8 @@
"Z": -291.52362
},
"TerritoryId": 612,
"InteractionType": "Interact"
"InteractionType": "Interact",
"Fly": true
}
]
},

View File

@ -34,7 +34,8 @@
"Z": -100.23657
},
"TerritoryId": 612,
"InteractionType": "Interact"
"InteractionType": "Interact",
"Fly": true
}
]
},
@ -47,10 +48,12 @@
"Y": 54.95936,
"Z": 204.82178
},
"StopDistance": 0.5,
"TerritoryId": 612,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [7214]
"KillEnemyDataIds": [7214],
"Fly": true
},
{
"DataId": 1018758,

View File

@ -34,7 +34,8 @@
"Z": 86.96118
},
"TerritoryId": 612,
"InteractionType": "Interact"
"InteractionType": "Interact",
"Fly": true
}
]
},
@ -49,7 +50,8 @@
"Z": 186.08374
},
"TerritoryId": 612,
"InteractionType": "Interact"
"InteractionType": "Interact",
"Fly": true
}
]
},
@ -64,7 +66,8 @@
"Z": 451.16345
},
"TerritoryId": 612,
"InteractionType": "Interact"
"InteractionType": "Interact",
"Fly": true
}
]
},
@ -79,7 +82,8 @@
"Z": 374.92932
},
"TerritoryId": 612,
"InteractionType": "SinglePlayerDuty"
"InteractionType": "SinglePlayerDuty",
"Fly": true
}
]
},

View File

@ -34,7 +34,8 @@
"Z": 370.80945
},
"TerritoryId": 612,
"InteractionType": "Interact"
"InteractionType": "Interact",
"Fly": true
}
]
},
@ -51,7 +52,8 @@
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [7215],
"AetheryteShortcut": "Fringes - Castrum Oriens"
"AetheryteShortcut": "Fringes - Castrum Oriens",
"Fly": true
},
{
"DataId": 1019128,
@ -68,6 +70,16 @@
{
"Sequence": 3,
"Steps": [
{
"Position": {
"X": -650.58673,
"Y": 39.856243,
"Z": 371.54846
},
"TerritoryId": 612,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1019131,
"Position": {

View File

@ -42,6 +42,16 @@
{
"Sequence": 2,
"Steps": [
{
"Position": {
"X": -650.58673,
"Y": 39.856243,
"Z": 371.54846
},
"TerritoryId": 612,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1019130,
"Position": {
@ -89,7 +99,8 @@
"TerritoryId": 612,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [7216]
"KillEnemyDataIds": [7216],
"Fly": true
}
]
},