master #3

Open
cacahuetes wants to merge 640 commits from liza/Questionable:master into cacahuetes-ShB-Healer
46 changed files with 425 additions and 41 deletions
Showing only changes of commit 842715337c - Show all commits

View File

@ -196,6 +196,17 @@
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": -465.66104,
"Y": 43.041187,
"Z": 380.90747
},
"TerritoryId": 400,
"InteractionType": "WalkTo",
"Mount": true,
"DisableNavmesh": true
},
{
"DataId": 1013420,
"Position": {
@ -204,8 +215,7 @@
"Z": 347.0968
},
"TerritoryId": 400,
"InteractionType": "CompleteQuest",
"DisableNavmesh": true
"InteractionType": "CompleteQuest"
}
]
}

View File

@ -111,6 +111,7 @@
},
"TerritoryId": 398,
"InteractionType": "WalkTo",
"Mount": true,
"SkipConditions": {
"StepIf": {
"CompletionQuestVariablesFlags": [

View File

@ -20,6 +20,15 @@
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": 67.682434,
"Y": -49.685223,
"Z": -148.21802
},
"TerritoryId": 398,
"InteractionType": "WalkTo"
},
{
"DataId": 4001,
"Position": {

View File

@ -118,6 +118,7 @@
},
"TerritoryId": 398,
"InteractionType": "WalkTo",
"Mount": true,
"SkipConditions": {
"StepIf": {
"CompletionQuestVariablesFlags": [

View File

@ -152,7 +152,8 @@
"Z": 22.9953
},
"TerritoryId": 398,
"InteractionType": "CompleteQuest"
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
}
]
}

View File

@ -98,6 +98,7 @@
"Y": 205.6815,
"Z": 31.631958
},
"StopDistance": 5,
"TerritoryId": 478,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Idyllshire"

View File

@ -30,6 +30,17 @@
"InteractionType": "WalkTo",
"TargetTerritoryId": 399
},
{
"DataId": 2006210,
"Position": {
"X": -487.48004,
"Y": 144.64026,
"Z": -285.359
},
"TerritoryId": 399,
"InteractionType": "AttuneAetherCurrent",
"AetherCurrentId": 2818088
},
{
"DataId": 1013651,
"Position": {

View File

@ -20,6 +20,15 @@
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -44.83911,
"Y": -1.6023016,
"Z": -655.73804
},
"TerritoryId": 401,
"InteractionType": "WalkTo"
},
{
"DataId": 2005824,
"Position": {

View File

@ -135,6 +135,20 @@
{
"Sequence": 3,
"Steps": [
{
"Position": {
"X": 423.53406,
"Y": -26.253891,
"Z": -550.60297
},
"TerritoryId": 398,
"InteractionType": "WalkTo",
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{
"DataId": 2005573,
"Position": {
@ -177,7 +191,8 @@
"StepIf": {
"Flying": "Unlocked"
}
}
},
"DisableNavmesh": true
}
]
},

View File

@ -12,6 +12,7 @@
"Y": 0.014982708,
"Z": -0.07635498
},
"StopDistance": 7,
"TerritoryId": 395,
"InteractionType": "AcceptQuest"
}

View File

@ -114,8 +114,7 @@
"Z": 761.01306
},
"TerritoryId": 401,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop"
"InteractionType": "CompleteQuest"
}
]
}

View File

@ -83,6 +83,15 @@
128
]
},
{
"Position": {
"X": -368.08698,
"Y": -185.05266,
"Z": 792.836
},
"TerritoryId": 401,
"InteractionType": "WalkTo"
},
{
"DataId": 1012360,
"Position": {

View File

@ -20,6 +20,23 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1011952,
"Position": {
"X": -277.63788,
"Y": -184.59735,
"Z": 741.60376
},
"TerritoryId": 401,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop",
"PickUpQuestId": 1748,
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
},
{
"DataId": 1001029,
"Position": {

View File

@ -47,6 +47,7 @@
"Y": 16.009666,
"Z": -9.567444
},
"StopDistance": 7,
"TerritoryId": 419,
"InteractionType": "Interact",
"TargetTerritoryId": 433
@ -63,6 +64,7 @@
"Y": 0.022254243,
"Z": -4.409851
},
"StopDistance": 5,
"TerritoryId": 433,
"InteractionType": "CompleteQuest",
"DialogueChoices": [

View File

@ -12,6 +12,7 @@
"Y": 0.022254243,
"Z": -4.409851
},
"StopDistance": 5,
"TerritoryId": 433,
"InteractionType": "AcceptQuest"
}
@ -27,7 +28,6 @@
"Y": 1.1443481,
"Z": 13.199036
},
"StopDistance": 7,
"TerritoryId": 433,
"InteractionType": "Interact",
"TargetTerritoryId": 419

View File

@ -87,6 +87,17 @@
{
"Sequence": 4,
"Steps": [
{
"DataId": 1011240,
"Position": {
"X": 493.15625,
"Y": 200.2377,
"Z": 663.01965
},
"TerritoryId": 397,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1744
},
{
"DataId": 2005536,
"Position": {

View File

@ -20,6 +20,39 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1011910,
"Position": {
"X": -298.26813,
"Y": 126.67049,
"Z": -1.4191895
},
"TerritoryId": 397,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1759
},
{
"DataId": 1011907,
"Position": {
"X": -288.8686,
"Y": 127.06639,
"Z": 13.199036
},
"TerritoryId": 397,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1760
},
{
"DataId": 1011911,
"Position": {
"X": -279.56055,
"Y": 127.08131,
"Z": 13.595764
},
"TerritoryId": 397,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 2111
},
{
"Position": {
"X": -365.48965,

View File

@ -20,6 +20,16 @@
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -826.9342,
"Y": 117.95439,
"Z": -642.92413
},
"TerritoryId": 397,
"InteractionType": "WalkTo",
"Fly": true
},
{
"Position": {
"X": -850.3646,

View File

@ -35,6 +35,17 @@
{
"Sequence": 2,
"Steps": [
{
"DataId": 1011916,
"Position": {
"X": 470.02356,
"Y": -49.89133,
"Z": 20.370789
},
"TerritoryId": 398,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1771
},
{
"Position": {
"X": 634.0371,

View File

@ -105,6 +105,17 @@
{
"Sequence": 3,
"Steps": [
{
"DataId": 1011929,
"Position": {
"X": 70.81714,
"Y": -49.2083,
"Z": -141.55798
},
"TerritoryId": 398,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1790
},
{
"Position": {
"X": 70.535545,

View File

@ -90,13 +90,52 @@
"Sequence": 255,
"Steps": [
{
"DataId": 1011916,
"Position": {
"X": 123.44939,
"Y": -60.88712,
"Z": -118.79085
"X": 470.02356,
"Y": -49.89133,
"Z": 20.370789
},
"TerritoryId": 398,
"InteractionType": "WalkTo"
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1797,
"AetheryteShortcut": "The Dravanian Forelands - Tailfeather",
"SkipConditions": {
"AetheryteShortcutIf": {
"QuestsCompleted": [
1797
]
}
}
},
{
"DataId": 1011937,
"Position": {
"X": -305.56195,
"Y": 39.04307,
"Z": 22.9953
},
"TerritoryId": 398,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1802,
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
"SkipConditions": {
"AetheryteShortcutIf": {
"QuestsCompleted": [
1802
]
}
}
},
{
"Position": {
"X": 22.235865,
"Y": -24.754946,
"Z": -119.65716
},
"TerritoryId": 398,
"InteractionType": "WalkTo",
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
},
{
"DataId": 1014544,
@ -106,7 +145,8 @@
"Z": -142.50409
},
"TerritoryId": 398,
"InteractionType": "CompleteQuest"
"InteractionType": "CompleteQuest",
"DisableNavmesh": true
}
]
}

View File

@ -12,7 +12,7 @@
"Y": -50.325172,
"Z": -146.95972
},
"StopDistance": 5,
"StopDistance": 7,
"TerritoryId": 398,
"InteractionType": "AcceptQuest"
}

View File

@ -12,7 +12,7 @@
"Y": -69.42934,
"Z": 693.5072
},
"StopDistance": 5,
"StopDistance": 6.5,
"TerritoryId": 400,
"InteractionType": "AcceptQuest"
}

View File

@ -31,6 +31,17 @@
"DisableNavmesh": true,
"Mount": true
},
{
"DataId": 1012284,
"Position": {
"X": 363.24097,
"Y": -73.25598,
"Z": 678.4314
},
"TerritoryId": 400,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1819
},
{
"Position": {
"X": 286.46622,

View File

@ -155,7 +155,7 @@
"Y": -69.42934,
"Z": 693.5072
},
"StopDistance": 5,
"StopDistance": 7,
"TerritoryId": 400,
"InteractionType": "CompleteQuest"
}

View File

@ -12,7 +12,7 @@
"Y": -69.42934,
"Z": 693.5072
},
"StopDistance": 5,
"StopDistance": 7,
"TerritoryId": 400,
"InteractionType": "AcceptQuest"
}

View File

@ -58,6 +58,25 @@
{
"Sequence": 255,
"Steps": [
{
"DataId": 1012285,
"Position": {
"X": 247.11987,
"Y": -42.33362,
"Z": 565.3314
},
"TerritoryId": 400,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1823,
"AetheryteShortcut": "The Churning Mists - Moghome",
"SkipConditions": {
"AetheryteShortcutIf": {
"QuestsCompleted": [
1823
]
}
}
},
{
"DataId": 1013202,
"Position": {

View File

@ -85,6 +85,7 @@
"Y": 123.72873,
"Z": 210.74231
},
"StopDistance": 7,
"TerritoryId": 400,
"InteractionType": "CompleteQuest"
}

View File

@ -12,6 +12,7 @@
"Y": 123.72873,
"Z": 210.74231
},
"StopDistance": 7,
"TerritoryId": 400,
"InteractionType": "AcceptQuest"
}

View File

@ -20,6 +20,17 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1013434,
"Position": {
"X": 517.9064,
"Y": -1.1917055,
"Z": -354.63495
},
"TerritoryId": 400,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1835
},
{
"DataId": 1012720,
"Position": {

View File

@ -12,6 +12,7 @@
"Y": 16.979584,
"Z": -37.521973
},
"StopDistance": 7,
"TerritoryId": 418,
"InteractionType": "AcceptQuest"
}
@ -58,6 +59,7 @@
"Y": 0,
"Z": -3.1281738
},
"StopDistance": 7,
"TerritoryId": 212,
"InteractionType": "Interact"
}

View File

@ -21,6 +21,25 @@
{
"Sequence": 255,
"Steps": [
{
"DataId": 1013420,
"Position": {
"X": -511.46716,
"Y": 50,
"Z": 347.0968
},
"TerritoryId": 400,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "The Churning Mists - Zenith",
"PickUpQuestId": 1828,
"SkipConditions": {
"AetheryteShortcutIf": {
"QuestsCompleted": [
1828
]
}
}
},
{
"DataId": 1013172,
"Position": {
@ -30,7 +49,6 @@
},
"TerritoryId": 400,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "The Churning Mists - Zenith",
"Fly": true
}
]

View File

@ -21,6 +21,18 @@
{
"Sequence": 255,
"Steps": [
{
"DataId": 1014720,
"Position": {
"X": 13.809326,
"Y": 15.96505,
"Z": -13.870483
},
"StopDistance": 7,
"TerritoryId": 419,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1874
},
{
"DataId": 1011223,
"Position": {
@ -37,8 +49,9 @@
"Yes": true
}
],
"AetheryteShortcut": "Ishgard",
"AethernetShortcut": [
"[Ishgard] The Last Vigil",
"[Ishgard] Aetheryte Plaza",
"[Ishgard] The Forgotten Knight"
]
},

View File

@ -38,7 +38,7 @@
"Z": 113.54166
},
"TerritoryId": 401,
"InteractionType": "SinglePlayerDuty",
"InteractionType": "Emote",
"Emote": "lookout",
"StopDistance": 0.25
}
@ -54,10 +54,9 @@
"Z": 77.39858
},
"TerritoryId": 401,
"InteractionType": "Emote",
"InteractionType": "SinglePlayerDuty",
"Emote": "lookout",
"StopDistance": 0.25,
"Comment": "Solo Duty triggered by emoting?"
"StopDistance": 0.25
}
]
},

View File

@ -20,6 +20,17 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1012069,
"Position": {
"X": -647.0283,
"Y": -51.05719,
"Z": -417.74628
},
"TerritoryId": 401,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1909
},
{
"DataId": 1012064,
"Position": {
@ -35,6 +46,17 @@
{
"Sequence": 2,
"Steps": [
{
"DataId": 1012068,
"Position": {
"X": -597.0398,
"Y": -51.05185,
"Z": -387.0451
},
"TerritoryId": 401,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1910
},
{
"DataId": 2006231,
"Position": {
@ -68,6 +90,7 @@
"Y": -14.730623,
"Z": -537.56006
},
"StopDistance": 7,
"TerritoryId": 401,
"InteractionType": "Interact",
"DialogueChoices": [
@ -100,7 +123,7 @@
"Y": -14.153766,
"Z": -543.0228
},
"StopDistance": 5,
"StopDistance": 7,
"TerritoryId": 401,
"InteractionType": "CompleteQuest"
}

View File

@ -12,7 +12,7 @@
"Y": -14.153766,
"Z": -543.0228
},
"StopDistance": 5,
"StopDistance": 7,
"TerritoryId": 401,
"InteractionType": "AcceptQuest"
}

View File

@ -21,6 +21,15 @@
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": 43.620056,
"Y": -7.9655867,
"Z": 103.63884
},
"TerritoryId": 132,
"InteractionType": "WalkTo"
},
{
"DataId": 1000691,
"Position": {

View File

@ -45,7 +45,8 @@
},
"TerritoryId": 398,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "The Dravanian Forelands - Tailfeather"
"AetheryteShortcut": "The Dravanian Forelands - Tailfeather",
"Fly": true
}
]
}

View File

@ -27,6 +27,7 @@
"Y": 205.62819,
"Z": 26.901611
},
"StopDistance": 7,
"TerritoryId": 478,
"InteractionType": "Interact"
}
@ -47,7 +48,15 @@
"$": "0 0 0 0 0 0 -> 1 0 0 0 0 64",
"ChatMessage": {
"Key": "TEXT_HEAVNA607_01656_SAYTODO_000"
}
},
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"DataId": 1012413,
@ -60,7 +69,15 @@
"InteractionType": "Say",
"ChatMessage": {
"Key": "TEXT_HEAVNA607_01656_SAYTODO_000"
}
},
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
}
]
},

View File

@ -20,6 +20,21 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1012287,
"Position": {
"X": -28.397034,
"Y": 100.969696,
"Z": -186.4195
},
"TerritoryId": 399,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1936,
"AethernetShortcut": [
"[Idyllshire] Aetheryte Plaza",
"[Idyllshire] Epilogue Gate (Eastern Hinterlands)"
]
},
{
"DataId": 1012416,
"Position": {

View File

@ -20,6 +20,17 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1012102,
"Position": {
"X": 72.40405,
"Y": 205.6815,
"Z": 31.631958
},
"TerritoryId": 478,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1945
},
{
"DataId": 1012419,
"Position": {

View File

@ -21,6 +21,17 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1012133,
"Position": {
"X": -26.840637,
"Y": 206.49944,
"Z": 28.67163
},
"TerritoryId": 478,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1963
},
{
"Position": {
"X": 71.86769,
@ -29,18 +40,15 @@
},
"TerritoryId": 478,
"InteractionType": "WalkTo",
"TargetTerritoryId": 399
},
{
"DataId": 2006210,
"Position": {
"X": -487.48004,
"Y": 144.64026,
"Z": -285.359
"TargetTerritoryId": 399,
"SkipConditions": {
"StepIf": {
"InTerritory": [
399
]
}
},
"TerritoryId": 399,
"InteractionType": "AttuneAetherCurrent",
"AetherCurrentId": 2818088
"$": "Skipped if already in the Hinterlands, since 'Taking Stock' already leaves you closer to the entrance to Matoya's cave"
},
{
"DataId": 2006214,

View File

@ -44,7 +44,7 @@
"Y": 38.43,
"Z": 3.5552979
},
"StopDistance": 7,
"StopDistance": 6,
"TerritoryId": 463,
"InteractionType": "Interact"
}
@ -53,6 +53,17 @@
{
"Sequence": 3,
"Steps": [
{
"DataId": 1012141,
"Position": {
"X": 35.690796,
"Y": 38.43,
"Z": 12.985352
},
"TerritoryId": 463,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 1966
},
{
"DataId": 2005337,
"Position": {
@ -114,7 +125,8 @@
},
"TerritoryId": 399,
"InteractionType": "WalkTo",
"DisableNavmesh": true
"DisableNavmesh": true,
"Mount": true
},
{
"DataId": 2005336,

View File

@ -28,6 +28,7 @@
"Y": -14.52896,
"Z": 41.153564
},
"StopDistance": 7,
"TerritoryId": 419,
"InteractionType": "Interact"
}

View File

@ -61,7 +61,8 @@
"Z": -659.2356
},
"TerritoryId": 402,
"InteractionType": "Interact"
"InteractionType": "Interact",
"DisableNavmesh": true
}
]
},

View File

@ -35,6 +35,15 @@
{
"Sequence": 2,
"Steps": [
{
"Position": {
"X": 642.1002,
"Y": -32.964188,
"Z": -532.8383
},
"TerritoryId": 402,
"InteractionType": "WalkTo"
},
{
"DataId": 2005568,
"Position": {