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

Updating repo to match main Liza repo #1

Merged
cacahuetes merged 5 commits from liza/Questionable:master into master 2024-08-21 15:51:25 +00:00
Conversation 0 Commits 5 Files Changed 43 +715 -3
8 changed files with 715 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7ca783bade - Show all commits

2
Directory.Build.targets
View File

@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
<Version>2.11</Version>
<Version>2.12</Version>
</PropertyGroup>
</Project>

84
QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3623_Hollow Pursuits.json
View File

@ -1,7 +1,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"QuestSequence": [
{
"Sequence": 0,
@ -17,6 +16,89 @@
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1027264,
"Position": {
"X": 60.593506,
"Y": 36.247692,
"Z": -171.80133
},
"TerritoryId": 819,
"InteractionType": "Interact",
"TargetTerritoryId": 815,
"AethernetShortcut": [
"[Crystarium] The Pendants",
"[Crystarium] The Amaro Launch"
]
},
{
"DataId": 1030623,
"Position": {
"X": 665.6748,
"Y": -50.355476,
"Z": -641.5351
},
"TerritoryId": 815,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 2010165,
"Position": {
"X": 483.48206,
"Y": -50.46167,
"Z": -631.52515
},
"TerritoryId": 815,
"InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
10836
],
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1030624,
"Position": {
"X": 500.54163,
"Y": -50.72601,
"Z": -647.5471
},
"TerritoryId": 815,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1030625,
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"TerritoryId": 815,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Amh Araeng - Mord Souq",
"NextQuestId": 3624
}
]
}
]
}

110
QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3624_A Voice from the Void.json Normal file
View File

@ -0,0 +1,110 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1030625,
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"TerritoryId": 815,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Amh Araeng - Mord Souq",
"SkipConditions": {
"AetheryteShortcutIf": {
"NearPosition": {
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"MaximumDistance": 100
}
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 2010166,
"Position": {
"X": 599.115,
"Y": -33.61566,
"Z": -304.49384
},
"TerritoryId": 815,
"InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
10837
],
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1030625,
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"TerritoryId": 815,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 2010214,
"Position": {
"X": 488.85327,
"Y": -26.16925,
"Z": -12.008911
},
"TerritoryId": 815,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1030625,
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"TerritoryId": 815,
"InteractionType": "CompleteQuest",
"Fly": true,
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_LUCKBA411_03624_Q1_000_100",
"Answer": "TEXT_LUCKBA411_03624_A1_000_100"
}
],
"NextQuestId": 3625
}
]
}
]
}

169
QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3625_Echoes of the Past.json Normal file
View File

@ -0,0 +1,169 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1030625,
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"TerritoryId": 815,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Amh Araeng - Mord Souq",
"SkipConditions": {
"AetheryteShortcutIf": {
"NearPosition": {
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"MaximumDistance": 100
}
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1030626,
"Position": {
"X": 331.62415,
"Y": 1.4685826,
"Z": -244.95312
},
"TerritoryId": 815,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1030627,
"Position": {
"X": 330.06775,
"Y": 1.4685818,
"Z": -164.0498
},
"TerritoryId": 815,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1030628,
"Position": {
"X": 407.6753,
"Y": -28.443933,
"Z": 260.8224
},
"TerritoryId": 815,
"InteractionType": "Interact",
"AetheryteShortcut": "Amh Araeng - Inn at Journey's Head",
"Fly": true
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1030630,
"Position": {
"X": 368.39856,
"Y": -28.620693,
"Z": 353.78027
},
"TerritoryId": 815,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 5,
"Steps": [
{
"DataId": 1030632,
"Position": {
"X": 550.225,
"Y": -45.678886,
"Z": 282.82593
},
"StopDistance": 0.5,
"TerritoryId": 815,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [
10838
],
"Fly": true
}
]
},
{
"Sequence": 6,
"Steps": [
{
"DataId": 1030632,
"Position": {
"X": 550.225,
"Y": -45.678886,
"Z": 282.82593
},
"TerritoryId": 815,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 7,
"Steps": [
{
"DataId": 1030631,
"Position": {
"X": 367.72717,
"Y": -28.562725,
"Z": 356.19116
},
"TerritoryId": 815,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1030625,
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"TerritoryId": 815,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Amh Araeng - Mord Souq",
"Fly": true,
"NextQuestId": 3626
}
]
}
]
}

69
QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3626_Nyelbert's Lament.json Normal file
View File

@ -0,0 +1,69 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1030625,
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"TerritoryId": 815,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Amh Araeng - Mord Souq",
"SkipConditions": {
"AetheryteShortcutIf": {
"NearPosition": {
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"MaximumDistance": 100
}
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1030636,
"Position": {
"X": 342.8855,
"Y": -35.843185,
"Z": 76.58496
},
"TerritoryId": 815,
"InteractionType": "SinglePlayerDuty",
"AetheryteShortcut": "Amh Araeng - Inn at Journey's Head",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1030625,
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"TerritoryId": 815,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Amh Araeng - Mord Souq",
"Fly": true,
"NextQuestId": 3627
}
]
}
]
}

144
QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3627_Taynor's Training Day.json Normal file
View File

@ -0,0 +1,144 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1030625,
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"TerritoryId": 815,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Amh Araeng - Mord Souq",
"SkipConditions": {
"AetheryteShortcutIf": {
"NearPosition": {
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"MaximumDistance": 100
}
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1030638,
"Position": {
"X": 543.8773,
"Y": -6.503428,
"Z": 811.7036
},
"TerritoryId": 813,
"InteractionType": "Interact",
"AetheryteShortcut": "Crystarium",
"AethernetShortcut": [
"[Crystarium] Aetheryte Plaza",
"[Crystarium] Tessellation (Lakeland)"
],
"Fly": true,
"SkipConditions": {
"AetheryteShortcutIf": {
"InTerritory": [
813
]
}
}
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 2010215,
"Position": {
"X": 523.9795,
"Y": -2.0599976,
"Z": 795.1018
},
"TerritoryId": 813,
"InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
10839
]
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1030639,
"Position": {
"X": 542.8092,
"Y": -6.489782,
"Z": 811.79517
},
"TerritoryId": 813,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1031033,
"Position": {
"X": 540.6727,
"Y": -6.4392195,
"Z": 801.87683
},
"TerritoryId": 813,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 5,
"Steps": [
{
"DataId": 1031033,
"Position": {
"X": 540.6727,
"Y": -6.4392195,
"Z": 801.87683
},
"TerritoryId": 813,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1030625,
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"TerritoryId": 815,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Amh Araeng - Mord Souq",
"Fly": true,
"NextQuestId": 3628
}
]
}
]
}

137
QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3628_A Tearful Reunion.json Normal file
View File

@ -0,0 +1,137 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1030625,
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"TerritoryId": 815,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Amh Araeng - Mord Souq",
"SkipConditions": {
"AetheryteShortcutIf": {
"NearPosition": {
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"MaximumDistance": 100
}
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1030697,
"Position": {
"X": 288.74634,
"Y": 7.1558266,
"Z": -219.2569
},
"TerritoryId": 815,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1030625,
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"TerritoryId": 815,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1030641,
"Position": {
"X": -255.8786,
"Y": 23.447075,
"Z": -288.4718
},
"TerritoryId": 815,
"InteractionType": "SinglePlayerDuty",
"AetheryteShortcut": "Amh Araeng - Twine",
"Fly": true
}
]
},
{
"Sequence": 4
},
{
"Sequence": 5,
"Steps": [
{
"DataId": 1030641,
"Position": {
"X": -255.8786,
"Y": 23.447075,
"Z": -288.4718
},
"TerritoryId": 815,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 6,
"Steps": [
{
"DataId": 1030625,
"Position": {
"X": 218.73804,
"Y": 7.1558266,
"Z": -249.1341
},
"TerritoryId": 815,
"InteractionType": "Interact",
"AetheryteShortcut": "Amh Araeng - Mord Souq"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1030643,
"Position": {
"X": -0.16790771,
"Y": 3.9998174,
"Z": 201.9226
},
"TerritoryId": 819,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Crystarium",
"AethernetShortcut": [
"[Crystarium] Aetheryte Plaza",
"[Crystarium] The Pendants"
]
}
]
}
]
}

3
Questionable/Controller/Steps/Interactions/Interact.cs
View File

@ -151,7 +151,8 @@ internal static class Interact
{
logger.LogDebug("Condition change: {Flag} = {Value}", flag, value);
if (_interactionState == EInteractionState.InteractionTriggered &&
flag == ConditionFlag.OccupiedInQuestEvent && value)
flag is ConditionFlag.OccupiedInQuestEvent or ConditionFlag.OccupiedInEvent &&
value)
{
logger.LogInformation("Interaction was most likely triggered");
_interactionState = EInteractionState.InteractionConfirmed;