cacahuetes/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests 1 Activity

master #3

Open
cacahuetes wants to merge 640 commits from liza/Questionable:master into cacahuetes-ShB-Healer
pull from: liza/Questionable:master
merge into: cacahuetes:cacahuetes-ShB-Healer
Conversation 0 Commits 640 Files Changed 1480 +342 -10
9 changed files with 342 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 07de5666f5 - Show all commits

54
QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json
View File

@ -23,6 +23,59 @@
{ {
"Sequence": 1, "Sequence": 1,
"Steps": [ "Steps": [
{
"TerritoryId": 819,
"AetheryteShortcut": "Crystarium",
"AethernetShortcut": [
"[Crystarium] Aetheryte Plaza",
"[Crystarium] Tessellation (Lakeland)"
],
"InteractionType": "None"
},
{
"Position": {
"X": 55.589294,
"Y": 2.0276523,
"Z": 669.1557
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
},
"Comment": "these bridges have navmesh problems"
},
{
"Position": {
"X": 15.410904,
"Y": 2.2598603,
"Z": 677.3755
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"DisableNavmesh": true,
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{
"Position": {
"X": -54.93826,
"Y": 3.1323283,
"Z": 690.1962
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{ {
"Position": { "Position": {
"X": -115.65658, "X": -115.65658,
@ -32,7 +85,6 @@
"StopDistance": 0.5, "StopDistance": 0.5,
"TerritoryId": 813, "TerritoryId": 813,
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"AetheryteShortcut": "Lakeland - Fort Jobb",
"Fly": true "Fly": true
}, },
{ {

14
QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3676_Good for the Soul.json
View File

@ -58,6 +58,20 @@
{ {
"Sequence": 3, "Sequence": 3,
"Steps": [ "Steps": [
{
"Position": {
"X": -27.96634,
"Y": 41.707367,
"Z": -482.99057
},
"TerritoryId": 815,
"InteractionType": "WalkTo",
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{ {
"DataId": 2010811, "DataId": 2010811,
"Position": { "Position": {

16
QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3679_For the People.json
View File

@ -36,6 +36,22 @@
{ {
"Sequence": 2, "Sequence": 2,
"Steps": [ "Steps": [
{
"DataId": 1028319,
"Position": {
"X": -454.7036,
"Y": 65.77815,
"Z": 58.27417
},
"TerritoryId": 814,
"InteractionType": "Interact",
"TargetTerritoryId": 814,
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{ {
"DataId": 1031751, "DataId": 1031751,
"Position": { "Position": {

43
QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3767_Deep Designs.json
View File

@ -51,6 +51,49 @@
} }
} }
}, },
{
"Position": {
"X": -559.0543,
"Y": 394.95718,
"Z": -611.97614
},
"TerritoryId": 818,
"InteractionType": "WalkTo",
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{
"Position": {
"X": -681.43286,
"Y": 404.5379,
"Z": -693.3609
},
"TerritoryId": 818,
"InteractionType": "WalkTo",
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{
"Position": {
"X": -675.946,
"Y": 408.10754,
"Z": -711.8061
},
"TerritoryId": 818,
"InteractionType": "WalkTo",
"DisableNavmesh": true,
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{ {
"Position": { "Position": {
"X": -423.6145, "X": -423.6145,

206
QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3768_A Whale's Tale.json
View File

@ -20,6 +20,73 @@
{ {
"Sequence": 1, "Sequence": 1,
"Steps": [ "Steps": [
{
"TerritoryId": 819,
"AetheryteShortcut": "Crystarium",
"AethernetShortcut": [
"[Crystarium] Aetheryte Plaza",
"[Crystarium] Tessellation (Lakeland)"
],
"InteractionType": "None"
},
{
"Position": {
"X": 55.589294,
"Y": 2.0276523,
"Z": 669.1557
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
},
"Comment": "these bridges have navmesh problems"
},
{
"Position": {
"X": 15.410904,
"Y": 2.2598603,
"Z": 677.3755
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"DisableNavmesh": true,
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{
"Position": {
"X": -82.79376,
"Y": 11.970126,
"Z": 765.8721
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{
"Position": {
"X": -234.70464,
"Y": 1.0942776,
"Z": 738.40204
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{ {
"Position": { "Position": {
"X": -269.44116, "X": -269.44116,
@ -28,7 +95,6 @@
}, },
"TerritoryId": 813, "TerritoryId": 813,
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"AetheryteShortcut": "Lakeland - Fort Jobb",
"Fly": true "Fly": true
}, },
{ {
@ -72,7 +138,12 @@
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"Mount": true, "Mount": true,
"Fly": true, "Fly": true,
"DisableNavmesh": true "DisableNavmesh": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
}, },
{ {
"Position": { "Position": {
@ -83,7 +154,44 @@
"TerritoryId": 813, "TerritoryId": 813,
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"Fly": true, "Fly": true,
"DisableNavmesh": true "DisableNavmesh": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"Position": {
"X": -565.32196,
"Y": -1.9743931,
"Z": 799.9003
},
"StopDistance": 1,
"TerritoryId": 813,
"InteractionType": "Dive",
"DisableNavmesh": true,
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{
"Position": {
"X": -630.4265,
"Y": -29.862,
"Z": 752.5597
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"Mount": true,
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
}, },
{ {
"DataId": 2010280, "DataId": 2010280,
@ -105,6 +213,16 @@
64 64
] ]
}, },
{
"Position": {
"X": -654.167,
"Y": -41.328938,
"Z": 741.29126
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"Mount": true
},
{ {
"DataId": 2010278, "DataId": 2010278,
"Position": { "Position": {
@ -133,6 +251,7 @@
}, },
"TerritoryId": 813, "TerritoryId": 813,
"InteractionType": "Interact", "InteractionType": "Interact",
"Mount": true,
"CompletionQuestVariablesFlags": [ "CompletionQuestVariablesFlags": [
null, null,
null, null,
@ -140,8 +259,7 @@
null, null,
null, null,
32 32
], ]
"Comment": "TODO Check if pathfinding works automatically now"
} }
] ]
}, },
@ -151,14 +269,44 @@
{ {
"Position": { "Position": {
"X": -643.2488, "X": -643.2488,
"Y": 4.133975, "Y": -1.974393,
"Z": 714.8211 "Z": 714.8211
}, },
"TerritoryId": 813, "TerritoryId": 813,
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"Mount": true, "Mount": true,
"Fly": true, "Fly": true,
"DisableNavmesh": true "DisableNavmesh": true,
"RestartNavigationIfCancelled": false
},
{
"Position": {
"X": -573.45654,
"Y": 0.39776123,
"Z": 810.7269
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{
"Position": {
"X": -619.98676,
"Y": 24.866888,
"Z": 794.4714
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"Mount": true,
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
}, },
{ {
"DataId": 1030333, "DataId": 1030333,
@ -191,6 +339,50 @@
{ {
"Sequence": 255, "Sequence": 255,
"Steps": [ "Steps": [
{
"Position": {
"X": -82.79376,
"Y": 11.970126,
"Z": 765.8721
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{
"Position": {
"X": 15.410904,
"Y": 2.2598603,
"Z": 677.3755
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{
"Position": {
"X": 55.589294,
"Y": 2.0276523,
"Z": 669.1557
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"DisableNavmesh": true,
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
},
"Comment": "these bridges have navmesh problems"
},
{ {
"DataId": 1032554, "DataId": 1032554,
"Position": { "Position": {

2
QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3779_Nothing Unsaid.json
View File

@ -28,7 +28,7 @@
"Y": -2.59839E-07, "Y": -2.59839E-07,
"Z": -1.4801636 "Z": -1.4801636
}, },
"StopDistance": 5, "StopDistance": 7,
"TerritoryId": 819, "TerritoryId": 819,
"InteractionType": "Interact" "InteractionType": "Interact"
} }

14
QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3780_The Journey Continues.json
View File

@ -54,6 +54,20 @@
{ {
"Sequence": 255, "Sequence": 255,
"Steps": [ "Steps": [
{
"Position": {
"X": -221.27931,
"Y": 55.081436,
"Z": -553.9665
},
"TerritoryId": 816,
"InteractionType": "WalkTo",
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{ {
"DataId": 1033872, "DataId": 1033872,
"Position": { "Position": {

2
QuestPaths/6.x - Endwalker/Aether Currents/Thavnair/4489_Steppe Child.json
View File

@ -83,7 +83,7 @@
"Y": 41.614826, "Y": 41.614826,
"Z": 409.53687 "Z": 409.53687
}, },
"StopDistance": 5, "StopDistance": 7,
"TerritoryId": 957, "TerritoryId": 957,
"InteractionType": "Interact" "InteractionType": "Interact"
} }

1
Questionable/Controller/NavigationOverrides/MovementOverrideController.cs
View File

@ -60,6 +60,7 @@ internal sealed class MovementOverrideController
// leaving Idyllshire through the west gate attempts to run into this wall // leaving Idyllshire through the west gate attempts to run into this wall
new BlacklistedPoint(399, new(-514.4851f, 149.63762f, -480.58087f), new(-528.78656f, 151.17374f, -473.07077f), 5, true), new BlacklistedPoint(399, new(-514.4851f, 149.63762f, -480.58087f), new(-528.78656f, 151.17374f, -473.07077f), 5, true),
new BlacklistedPoint(399, new(-534.5f, 153, -476.75f), new(-528.78656f, 151.17374f, -473.07077f), 5, true),
// Idyllshire: random rocks in the north, passable one way only // Idyllshire: random rocks in the north, passable one way only
new BlacklistedPoint(478, new(14.5f, 215.25f, -101.5f), new(18.133032f, 215.44998f, -107.83075f), 5), new BlacklistedPoint(478, new(14.5f, 215.25f, -101.5f), new(18.133032f, 215.44998f, -107.83075f), 5),