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

master #3

Open
cacahuetes wants to merge 653 commits from liza/Questionable:master into cacahuetes-ShB-Healer
pull from: liza/Questionable:master
merge into: cacahuetes:cacahuetes-ShB-Healer
Conversation 0 Commits 653 Files Changed 1490 +288 -104
17 changed files with 288 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3379458385 - Show all commits

50
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4217_Armored Up.json
View File

@ -44,19 +44,22 @@
"Y": -18.777306, "Y": -18.777306,
"Z": 527.2946 "Z": 527.2946
}, },
"StopDistance": 0.5,
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "WaitForManualProgress", "InteractionType": "Combat",
"CompletionQuestVariablesFlags": [ "EnemySpawnType": "AutoOnEnterArea",
null, "KillEnemyDataIds": [
null, 14107
null,
null,
null,
128
], ],
"Comment": "Use the mount's abilities to kill the drones.", "CompletionQuestVariablesFlags": [
"$.0": "0 0 0 0 0 0 -> 16 64 0 0 0 128", null,
"$.1": "can't find any currently extant method of automating this - could add the actions, but it's combat with the actions specifically, repeat use on targets" null,
null,
null,
null,
128
],
"$.0": "0 0 0 0 0 0 -> 16 64 0 0 0 128"
}, },
{ {
"Position": { "Position": {
@ -64,9 +67,21 @@
"Y": -18.937208, "Y": -18.937208,
"Z": 338.0957 "Z": 338.0957
}, },
"StopDistance": 0.5,
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "WaitForManualProgress", "InteractionType": "Combat",
"Comment": "Use the mount's abilities to kill the drones." "EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [
14107
],
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
} }
] ]
}, },
@ -74,6 +89,12 @@
"Sequence": 255, "Sequence": 255,
"Steps": [ "Steps": [
{ {
"Position": {
"X": 135.85095,
"Y": -17.135998,
"Z": 567.8645
},
"StopDistance": 2000,
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "None", "InteractionType": "None",
"Mount": false "Mount": false
@ -87,7 +108,8 @@
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "CompleteQuest", "InteractionType": "CompleteQuest",
"Fly": true "Fly": true,
"NextQuestId": 4218
} }
] ]
} }

34
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4219_Your Inventory Is Not Full.json
View File

@ -30,12 +30,12 @@
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact", "InteractionType": "Interact",
"CompletionQuestVariablesFlags": [ "CompletionQuestVariablesFlags": [
null, null,
1, null,
null, null,
null, null,
null, null,
128 128
], ],
"$": "0 0 0 0 0 0 -> 16 1 0 0 0 128" "$": "0 0 0 0 0 0 -> 16 1 0 0 0 128"
}, },
@ -49,12 +49,12 @@
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact", "InteractionType": "Interact",
"CompletionQuestVariablesFlags": [ "CompletionQuestVariablesFlags": [
null, null,
16, null,
null, null,
null, null,
null, null,
32 32
], ],
"$": "16 1 0 0 0 128 -> 32 17 0 0 0 160" "$": "16 1 0 0 0 128 -> 32 17 0 0 0 160"
}, },
@ -67,7 +67,15 @@
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact", "InteractionType": "Interact",
"$": "32 17 0 0 0 160 -> 0 0 0 0 0 0" "$": "32 17 0 0 0 160 -> 0 0 0 0 0 0",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
} }
] ]
}, },

10
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4221_Heroes All.json
View File

@ -67,7 +67,15 @@
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact", "InteractionType": "Interact",
"$": "33 1 16 0 0 192 -> 0 0 0 0 0 0" "$": "33 1 16 0 0 192 -> 0 0 0 0 0 0",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
} }
] ]
}, },

10
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4223_Bear Baiting.json
View File

@ -75,7 +75,15 @@
"KillEnemyDataIds": [ "KillEnemyDataIds": [
14104 14104
], ],
"$": "33 16 16 0 0 192 -> 0 0 0 0 0 0" "$": "33 16 16 0 0 192 -> 0 0 0 0 0 0",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
} }
] ]
}, },

36
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4224_Under Lock and Code.json
View File

@ -45,12 +45,12 @@
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact", "InteractionType": "Interact",
"CompletionQuestVariablesFlags": [ "CompletionQuestVariablesFlags": [
null, null,
128, null,
null, null,
null, null,
null, null,
64 64
], ],
"$": "0 0 0 0 0 0 -> 0 128 0 0 0 64" "$": "0 0 0 0 0 0 -> 0 128 0 0 0 64"
}, },
@ -64,12 +64,12 @@
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact", "InteractionType": "Interact",
"CompletionQuestVariablesFlags": [ "CompletionQuestVariablesFlags": [
null, null,
64, null,
null, null,
null, null,
null, null,
32 32
], ],
"$": "0 128 0 0 0 64 -> 0 192 0 0 0 96" "$": "0 128 0 0 0 64 -> 0 192 0 0 0 96"
}, },
@ -83,12 +83,12 @@
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact", "InteractionType": "Interact",
"CompletionQuestVariablesFlags": [ "CompletionQuestVariablesFlags": [
null, null,
32, null,
null, null,
null, null,
null, null,
16 16
], ],
"$": "0 192 0 0 0 96 -> 0 224 0 0 0 112" "$": "0 192 0 0 0 96 -> 0 224 0 0 0 112"
}, },

34
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4225_And Then a Hero Comes Along.json
View File

@ -48,12 +48,12 @@
], ],
"Fly": true, "Fly": true,
"CompletionQuestVariablesFlags": [ "CompletionQuestVariablesFlags": [
null, null,
null, null,
null, null,
null, null,
null, null,
64 64
], ],
"$": "0 0 0 0 0 0 -> 0 0 0 128 0 64" "$": "0 0 0 0 0 0 -> 0 0 0 128 0 64"
}, },
@ -74,12 +74,12 @@
} }
], ],
"CompletionQuestVariablesFlags": [ "CompletionQuestVariablesFlags": [
null, null,
null, null,
null, null,
null, null,
null, null,
32 32
], ],
"$": "0 0 0 128 0 64 -> 0 0 0 192 0 96" "$": "0 0 0 128 0 64 -> 0 0 0 192 0 96"
}, },
@ -91,7 +91,15 @@
"Z": -292.98853 "Z": -292.98853
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact" "InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
} }
] ]
}, },

11
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4229_Brick by Brick, Tank by Tank.json
View File

@ -72,6 +72,7 @@
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact", "InteractionType": "Interact",
"Mount": true,
"CompletionQuestVariablesFlags": [ "CompletionQuestVariablesFlags": [
null, null,
null, null,
@ -91,7 +92,15 @@
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact", "InteractionType": "Interact",
"$": "49 16 16 0 0 224 -> 0 16 0 0 0 0" "$": "49 16 16 0 0 224 -> 0 16 0 0 0 0",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
16
]
} }
] ]
}, },

56
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4231_Some Like It Hot.json
View File

@ -27,6 +27,28 @@
{ {
"Sequence": 1, "Sequence": 1,
"Steps": [ "Steps": [
{
"Position": {
"X": 545.40717,
"Y": -36.616177,
"Z": -267.17505
},
"TerritoryId": 958,
"InteractionType": "WalkTo",
"SkipConditions": {
"StepIf": {
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
}
},
"$": "Without this step, it'll interact with the NPC in the wagon through the wall"
},
{ {
"DataId": 1037766, "DataId": 1037766,
"Position": { "Position": {
@ -37,12 +59,12 @@
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact", "InteractionType": "Interact",
"CompletionQuestVariablesFlags": [ "CompletionQuestVariablesFlags": [
null, null,
null, null,
null, null,
null, null,
null, null,
64 64
], ],
"$": "0 0 0 0 0 0 -> 1 32 0 0 0 64" "$": "0 0 0 0 0 0 -> 1 32 0 0 0 64"
}, },
@ -63,12 +85,12 @@
} }
], ],
"CompletionQuestVariablesFlags": [ "CompletionQuestVariablesFlags": [
null, null,
null, null,
null, null,
null, null,
null, null,
128 128
], ],
"$": "1 32 0 0 0 64 -> 2 16 0 0 0 192" "$": "1 32 0 0 0 64 -> 2 16 0 0 0 192"
}, },
@ -80,7 +102,15 @@
"Z": -175.21942 "Z": -175.21942
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact" "InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
} }
] ]
}, },

10
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4235_The Hero Never Bombs.json
View File

@ -81,7 +81,15 @@
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "UseItem", "InteractionType": "UseItem",
"ItemId": 2003210 "ItemId": 2003210,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
} }
] ]
}, },

122
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4237_Ordnance Cleanup Committee.json
View File

@ -20,6 +20,29 @@
{ {
"Sequence": 1, "Sequence": 1,
"Steps": [ "Steps": [
{
"Position": {
"X": -189.97284,
"Y": 15.907461,
"Z": -169.83481
},
"TerritoryId": 958,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
}
}
},
{ {
"DataId": 2012054, "DataId": 2012054,
"Position": { "Position": {
@ -30,17 +53,15 @@
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact", "InteractionType": "Interact",
"CompletionQuestVariablesFlags": [ "CompletionQuestVariablesFlags": [
null, null,
null, null,
null, null,
null, null,
null, null,
128 128
], ],
"$.0": "0 0 0 0 0 0 -> 1 16 0 0 0 128", "$.0": "0 0 0 0 0 0 -> 1 16 0 0 0 128",
"AetheryteShortcut": "Garlemald - Tertium", "Fly": true
"Fly": true,
"$.1": "flight path gets stuck from camp BG, not so from tertium; walkto would probably be cleaner but this seems intuitive."
}, },
{ {
"DataId": 2012055, "DataId": 2012055,
@ -52,15 +73,61 @@
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact", "InteractionType": "Interact",
"CompletionQuestVariablesFlags": [ "CompletionQuestVariablesFlags": [
null, null,
null, null,
null, null,
null, null,
null, null,
64 64
], ],
"Fly": true,
"$": "1 16 0 0 0 128 -> 2 32 0 0 0 192" "$": "1 16 0 0 0 128 -> 2 32 0 0 0 192"
}, },
{
"Position": {
"X": -223.12543,
"Y": 10.826223,
"Z": -368.8611
},
"TerritoryId": 958,
"InteractionType": "WalkTo",
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
}
}
},
{
"Position": {
"X": -140.08179,
"Y": 16.226164,
"Z": -310.9478
},
"TerritoryId": 958,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
}
}
},
{ {
"DataId": 2012056, "DataId": 2012056,
"Position": { "Position": {
@ -71,15 +138,15 @@
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact", "InteractionType": "Interact",
"CompletionQuestVariablesFlags": [ "CompletionQuestVariablesFlags": [
null, null,
null, null,
null, null,
null, null,
null, null,
32 32
], ],
"$.0": "2 32 0 0 0 192 -> 3 48 0 0 0 224", "$.0": "2 32 0 0 0 192 -> 3 48 0 0 0 224",
"$.1": "fly also gets stuck here" "Fly": true
}, },
{ {
"DataId": 2012057, "DataId": 2012057,
@ -88,10 +155,19 @@
"Y": 16.494995, "Y": 16.494995,
"Z": -413.016 "Z": -413.016
}, },
"StopDistance": 1,
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact", "InteractionType": "Interact",
"$.0": "3 48 0 0 0 224 -> 0 64 0 0 0 0", "$.0": "3 48 0 0 0 224 -> 0 64 0 0 0 0",
"$.1": "no fly here, tries and fails to land on the railing: can't interact while flying" "Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
16
]
} }
] ]
}, },

3
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4499_Camp Broken Engines.json
View File

@ -53,7 +53,8 @@
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "CompleteQuest", "InteractionType": "CompleteQuest",
"AetheryteShortcut": "Garlemald - Camp Broken Glass" "AetheryteShortcut": "Garlemald - Camp Broken Glass",
"NextQuestId": 4500
} }
] ]
} }

3
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4500_Operation Reactivation.json
View File

@ -71,7 +71,8 @@
"Prompt": "TEXT_AKTKZC103_04500_Q2_000_000", "Prompt": "TEXT_AKTKZC103_04500_Q2_000_000",
"Answer": "TEXT_AKTKZC103_04500_A2_000_001" "Answer": "TEXT_AKTKZC103_04500_A2_000_001"
} }
] ],
"NextQuestId": 4501
} }
] ]
} }

3
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4503_Longing for Home.json
View File

@ -83,7 +83,8 @@
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "CompleteQuest", "InteractionType": "CompleteQuest",
"AetheryteShortcut": "Garlemald - Tertium" "AetheryteShortcut": "Garlemald - Tertium",
"NextQuestId": 4504
} }
] ]
} }

3
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4504_Palatial Possibilities.json
View File

@ -77,7 +77,8 @@
"Prompt": "TEXT_AKTKZD103_04504_Q2_000_000", "Prompt": "TEXT_AKTKZD103_04504_Q2_000_000",
"Answer": "TEXT_AKTKZD103_04504_A2_000_001" "Answer": "TEXT_AKTKZD103_04504_A2_000_001"
} }
] ],
"NextQuestId": 4505
} }
] ]
} }

4
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4505_Mum Is the Word.json
View File

@ -12,6 +12,7 @@
"Y": 23.164677, "Y": 23.164677,
"Z": -415.36584 "Z": -415.36584
}, },
"StopDistance": 7,
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "AcceptQuest", "InteractionType": "AcceptQuest",
"Fly": true, "Fly": true,
@ -86,7 +87,8 @@
"Answer": "TEXT_AKTKZD104_04505_A1_000_002" "Answer": "TEXT_AKTKZD104_04505_A1_000_002"
} }
], ],
"AetheryteShortcut": "Garlemald - Tertium" "AetheryteShortcut": "Garlemald - Tertium",
"NextQuestId": 4506
} }
] ]
} }

1
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4506_Who Is Your Daddy.json
View File

@ -12,6 +12,7 @@
"Y": -36.65, "Y": -36.65,
"Z": -132.64673 "Z": -132.64673
}, },
"StopDistance": 5,
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "AcceptQuest", "InteractionType": "AcceptQuest",
"DialogueChoices": [ "DialogueChoices": [

2
Questionable/Controller/CombatModules/Mount128Module.cs
View File

@ -47,5 +47,5 @@ internal sealed class Mount128Module : ICombatModule
{ {
} }
public bool CanAttack(IBattleNpc target) => target.DataId is 7504 or 7505; public bool CanAttack(IBattleNpc target) => target.DataId is 7504 or 7505 or 14107;
} }