1
0
forked from liza/Questionable

Merge pull request 'Updating repo to match main Liza repo' (#1) from liza/Questionable:master into master

Reviewed-on: cacahuetes/Questionable#1
This commit is contained in:
cacahuetes 2024-08-21 15:51:24 +00:00
commit 43bb9631fc
43 changed files with 1891 additions and 71 deletions

View File

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

View File

@ -0,0 +1,78 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"DataId": 2013074,
"Position": {
"X": 304.3412,
"Y": 483.48206,
"Z": 143.11438
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 1073,
"SkipConditions": {
"StepIf": {
"InTerritory": [
1073
]
}
}
},
{
"TerritoryId": 1073,
"InteractionType": "None"
}
],
"Groups": [
{
"Nodes": [
{
"DataId": 33840,
"Locations": [
{
"Position": {
"X": 10.28351,
"Y": 486.144,
"Z": -136.9586
}
}
]
}
]
},
{
"Nodes": [
{
"DataId": 33841,
"Locations": [
{
"Position": {
"X": 19.46428,
"Y": 485.9226,
"Z": -136.738
}
}
]
}
]
},
{
"Nodes": [
{
"DataId": 33643,
"Locations": [
{
"Position": {
"X": 14.21117,
"Y": 486.0551,
"Z": -143.435
}
}
]
}
]
}
]
}

View File

@ -0,0 +1,78 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"DataId": 2013074,
"Position": {
"X": 304.3412,
"Y": 483.48206,
"Z": 143.11438
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 1073,
"SkipConditions": {
"StepIf": {
"InTerritory": [
1073
]
}
}
},
{
"TerritoryId": 1073,
"InteractionType": "None"
}
],
"Groups": [
{
"Nodes": [
{
"DataId": 34350,
"Locations": [
{
"Position": {
"X": 18.9518,
"Y": 485.9131,
"Z": -133.3762
}
}
]
}
]
},
{
"Nodes": [
{
"DataId": 34351,
"Locations": [
{
"Position": {
"X": 15.71416,
"Y": 486.0302,
"Z": -136.2497
}
}
]
}
]
},
{
"Nodes": [
{
"DataId": 34349,
"Locations": [
{
"Position": {
"X": 9.524881,
"Y": 486.2234,
"Z": -142.2316
}
}
]
}
]
}
]
}

View File

@ -114,7 +114,7 @@
},
"TerritoryId": 401,
"InteractionType": "Action",
"Action": "Buffet",
"Action": "Buffet (Sanuwa)",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
@ -134,7 +134,7 @@
},
"TerritoryId": 401,
"InteractionType": "Action",
"Action": "Buffet",
"Action": "Buffet (Sanuwa)",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
@ -154,7 +154,7 @@
},
"TerritoryId": 401,
"InteractionType": "Action",
"Action": "Buffet",
"Action": "Buffet (Sanuwa)",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,

View File

@ -1,7 +1,7 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"$": "TODO Check if this is a sp1ecial mount that can always fly",
"QuestSequence": [
{
"Sequence": 0,
@ -22,7 +22,61 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1024775,
"Position": {
"X": -35.599304,
"Y": 55.9782,
"Z": 214.58752
},
"TerritoryId": 612,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1025170,
"Position": {
"X": 253.10132,
"Y": 45.434376,
"Z": 416.98328
},
"TerritoryId": 612,
"InteractionType": "Action",
"Action": "Buffet (Griffin)",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 1025171,
"Position": {
"X": 349.8435,
"Y": 51.839485,
"Z": 229.66345
},
"TerritoryId": 612,
"InteractionType": "Action",
"Action": "Buffet (Griffin)",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
}
]
},
{
@ -48,7 +102,7 @@
"StopDistance": 7,
"TerritoryId": 612,
"InteractionType": "CompleteQuest",
"Fly": true
"Mount": false
}
]
}

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,
@ -22,7 +21,20 @@
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -50.436653,
"Y": 41.158955,
"Z": -264.4358
},
"TerritoryId": 612,
"InteractionType": "Instruction",
"Comment": "Use item on enemy, then kill it",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [
7030
]
}
]
},
{

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,
@ -22,7 +21,126 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 2009344,
"Position": {
"X": 101.304565,
"Y": 41.031494,
"Z": -180.89569
},
"TerritoryId": 612,
"InteractionType": "WaitForManualProgress",
"Comment": "Kill enemy, then use item",
"ItemId": 2002439,
"EnemySpawnType": "AfterItemUse",
"KillEnemyDataIds": [
8591
],
"Fly": true,
"RequiredQuestVariables": [
null,
null,
[
{
"Low": 2
},
{
"Low": 3
}
],
null,
null,
null
],
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 2009345,
"Position": {
"X": 136.40039,
"Y": 50.369995,
"Z": -397.69592
},
"TerritoryId": 612,
"InteractionType": "WaitForManualProgress",
"Comment": "Kill enemy, then use item",
"ItemId": 2002439,
"EnemySpawnType": "AfterItemUse",
"KillEnemyDataIds": [
8591
],
"Fly": true,
"RequiredQuestVariables": [
null,
null,
[
{
"Low": 1
},
{
"Low": 3
}
],
null,
null,
null
],
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"DataId": 2009346,
"Position": {
"X": 12.588623,
"Y": 41.672363,
"Z": -294.02612
},
"TerritoryId": 612,
"InteractionType": "WaitForManualProgress",
"Comment": "Kill enemy, then use item",
"ItemId": 2002439,
"EnemySpawnType": "AfterItemUse",
"KillEnemyDataIds": [
8591
],
"Fly": true,
"RequiredQuestVariables": [
null,
null,
[
{
"Low": 1
},
{
"Low": 2
}
],
null,
null,
null
],
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
}
]
},
{

View File

@ -0,0 +1,6 @@
```
0 0 xx 0 0 0 | 2009344 2009345 2009346
33 x x | unconfirmed
34 x x
35 x x
```

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,

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,
@ -30,8 +29,39 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1033750,
"Position": {
"X": -591.3329,
"Y": 72.00111,
"Z": -451.01093
},
"StopDistance": 5,
"TerritoryId": 813,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"TerritoryId": 813,
"InteractionType": "Craft",
"ItemId": 31167,
"ItemCount": 1
},
{
"DataId": 1033750,
"Position": {
"X": -591.3329,
"Y": 72.00111,
"Z": -451.01093
},
"StopDistance": 5,
"TerritoryId": 813,
"InteractionType": "Interact"
}
]
},
{

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,
@ -30,8 +29,154 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 2011169,
"Position": {
"X": -95.903015,
"Y": 1.6326294,
"Z": 41.244995
},
"TerritoryId": 813,
"InteractionType": "Interact",
"Fly": true,
"RequiredQuestVariables": [
null,
null,
null,
[
{
"High": 1
},
{
"High": 4
},
{
"High": 5
}
],
null,
null
],
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 2011170,
"Position": {
"X": -84.916504,
"Y": 2.39563,
"Z": 36.850464
},
"TerritoryId": 813,
"InteractionType": "Interact",
"Fly": true,
"RequiredQuestVariables": [
null,
null,
null,
[
{
"High": 1
},
{
"High": 2
},
{
"High": 6
}
],
null,
null
],
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"DataId": 2011171,
"Position": {
"X": -68.55884,
"Y": 2.5177002,
"Z": 38.04065
},
"TerritoryId": 813,
"InteractionType": "Interact",
"Fly": true,
"RequiredQuestVariables": [
null,
null,
null,
[
{
"High": 3
},
{
"High": 5
},
{
"High": 6
}
],
null,
null
],
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
},
{
"DataId": 2011172,
"Position": {
"X": -70.2984,
"Y": 1.449585,
"Z": 62.210938
},
"TerritoryId": 813,
"InteractionType": "Interact",
"Fly": true,
"RequiredQuestVariables": [
null,
null,
null,
[
{
"High": 2
},
{
"High": 3
},
{
"High": 4
}
],
null,
null
],
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
16
]
}
]
},
{
@ -45,6 +190,7 @@
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Lakeland - Ostall Imperative",
"Fly": true
},
{

View File

@ -0,0 +1,9 @@
```
0 0 0 xx 0 0 | 2011169 2011170 2011171 2011172
16(1) x x
32(2) x x
48(3) x x
64(4) x x
80(5) x x
96(6) x x
```

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,
@ -30,8 +29,39 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1033767,
"Position": {
"X": -608.6061,
"Y": 65.60222,
"Z": -431.81506
},
"TerritoryId": 813,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"TerritoryId": 813,
"InteractionType": "Craft",
"ItemId": 31169,
"ItemCount": 3
},
{
"DataId": 1033694,
"Position": {
"X": 593.19434,
"Y": 5.8981767,
"Z": 704.86
},
"TerritoryId": 813,
"InteractionType": "Interact",
"AetheryteShortcut": "Lakeland - Fort Jobb",
"Fly": true
}
]
},
{
@ -45,6 +75,7 @@
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Lakeland - Ostall Imperative",
"Fly": true
},
{

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,
@ -30,8 +29,26 @@
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -27.174656,
"Y": 1.063369,
"Z": 661.43774
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1034072,
"Position": {
"X": -25.92511,
"Y": 1.3904266,
"Z": 662.8976
},
"TerritoryId": 813,
"InteractionType": "Interact"
}
]
},
{
@ -45,6 +62,7 @@
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Lakeland - Ostall Imperative",
"Fly": true
},
{

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,
@ -30,8 +29,38 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1033767,
"Position": {
"X": -608.6061,
"Y": 65.60222,
"Z": -431.81506
},
"TerritoryId": 813,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"TerritoryId": 813,
"InteractionType": "Craft",
"ItemId": 31181,
"ItemCount": 1
},
{
"DataId": 1034073,
"Position": {
"X": -504.0513,
"Y": 3.623286,
"Z": 25.802979
},
"TerritoryId": 813,
"InteractionType": "Interact",
"Fly": true
}
]
},
{

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,
@ -30,13 +29,38 @@
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -134.17696,
"Y": 14.623874,
"Z": -124.68204
},
"TerritoryId": 813,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1034075,
"Position": {
"X": -137.71265,
"Y": 14.623856,
"Z": -124.89508
},
"StopDistance": 5,
"TerritoryId": 813,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"TerritoryId": 813,
"InteractionType": "Craft",
"ItemId": 31183,
"ItemCount": 3
},
{
"Position": {
"X": -615.73865,

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,
@ -18,6 +17,25 @@
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1032413,
"Position": {
"X": 144.36548,
"Y": -19.982845,
"Z": -459.8001
},
"TerritoryId": 817,
"InteractionType": "Say",
"ChatMessage": {
"Key": "TEXT_BANQIQ114_03819_SAYTODO_000_000"
},
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
@ -30,12 +48,7 @@
"TerritoryId": 817,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Rak'tika - Fanow",
"Fly": true,
"RequiredGatheredItems": [
]
"Fly": true
},
{
"DataId": 1032643,

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,
@ -32,7 +31,16 @@
"AetheryteShortcut": "Rak'tika - Fanow",
"Fly": true,
"RequiredGatheredItems": [
{
"QuestAcceptedAsClass": "Miner",
"ItemId": 29528,
"ItemCount": 3
},
{
"QuestAcceptedAsClass": "Botanist",
"ItemId": 29554,
"ItemCount": 3
}
]

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,
@ -32,9 +31,16 @@
"AetheryteShortcut": "Rak'tika - Fanow",
"Fly": true,
"RequiredGatheredItems": [
{
"QuestAcceptedAsClass": "Miner",
"ItemId": 29529,
"ItemCount": 3
},
{
"QuestAcceptedAsClass": "Botanist",
"ItemId": 29555,
"ItemCount": 3
}
]
},
{

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
}
]
}
]
}

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
}
]
}
]
}

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
}
]
}
]
}

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
}
]
}
]
}

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
}
]
}
]
}

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"
]
}
]
}
]
}

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,
@ -43,6 +42,16 @@
}
}
},
{
"Position": {
"X": 103.41005,
"Y": -23.878786,
"Z": 187.79831
},
"TerritoryId": 957,
"InteractionType": "WalkTo",
"DisableNavmesh": true
},
{
"DataId": 2012907,
"Position": {
@ -52,7 +61,6 @@
},
"TerritoryId": 957,
"InteractionType": "Interact",
"DisableNavmesh": true,
"CompletionQuestVariablesFlags": [
null,
null,

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,
@ -30,6 +29,52 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1045113,
"Position": {
"X": -315.66345,
"Y": -144,
"Z": -492.0272
},
"TerritoryId": 959,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1044585,
"Position": {
"X": -496.14713,
"Y": -154.93994,
"Z": -484.88593
},
"TerritoryId": 959,
"InteractionType": "Say",
"Fly": true,
"ChatMessage": {
"Key": "TEXT_BANLOP114_04700_SAYTODO_000_050"
}
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1045113,
"Position": {
"X": -315.66345,
"Y": -144,
"Z": -492.0272
},
"TerritoryId": 959,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
@ -42,7 +87,8 @@
"Z": -273.68756
},
"TerritoryId": 959,
"InteractionType": "WalkTo"
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1044403,

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,
@ -30,11 +29,27 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044412,
"Position": {
"X": -181.56714,
"Y": -49.19972,
"Z": -304.76843
},
"TerritoryId": 959,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"TerritoryId": 959,
"InteractionType": "Craft",
"ItemId": 38873,
"ItemCount": 3
},
{
"Position": {
"X": -201.42024,

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,
@ -30,6 +29,39 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044586,
"Position": {
"X": -524.19324,
"Y": -158.8955,
"Z": -521.17194
},
"StopDistance": 0.5,
"TerritoryId": 959,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"TerritoryId": 959,
"InteractionType": "Craft",
"ItemId": 38875,
"ItemCount": 1
},
{
"DataId": 1044586,
"Position": {
"X": -524.19324,
"Y": -158.8955,
"Z": -521.17194
},
"TerritoryId": 959,
"InteractionType": "Interact"
}
]
},
{
@ -42,7 +74,9 @@
"Z": -273.68756
},
"TerritoryId": 959,
"InteractionType": "WalkTo"
"InteractionType": "WalkTo",
"AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
"Fly": true
},
{
"DataId": 1044403,

View File

@ -2,7 +2,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"QuestSequence": [
{
"Sequence": 0,
@ -31,6 +30,25 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044613,
"Position": {
"X": 493.55298,
"Y": -163.52985,
"Z": -711.54346
},
"TerritoryId": 959,
"InteractionType": "Interact",
"AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
"Fly": true,
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_BANLOP125_04711_Q1_000_000",
"Answer": "TEXT_BANLOP125_04711_A3_000_003"
}
]
}
]
},
{
@ -43,7 +61,9 @@
"Z": -273.68756
},
"TerritoryId": 959,
"InteractionType": "WalkTo"
"InteractionType": "WalkTo",
"AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
"Fly": true
},
{
"DataId": 1044403,

View File

@ -2,7 +2,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"QuestSequence": [
{
"Sequence": 0,
@ -31,6 +30,38 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044615,
"Position": {
"X": -84.7334,
"Y": -49.589592,
"Z": -351.73578
},
"TerritoryId": 959,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"TerritoryId": 959,
"InteractionType": "Craft",
"ItemId": 38887,
"ItemCount": 3
},
{
"DataId": 1044615,
"Position": {
"X": -84.7334,
"Y": -49.589592,
"Z": -351.73578
},
"TerritoryId": 959,
"InteractionType": "Interact"
}
]
},
{
@ -43,7 +74,8 @@
"Z": -273.68756
},
"TerritoryId": 959,
"InteractionType": "WalkTo"
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1044403,

View File

@ -2,7 +2,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"QuestSequence": [
{
"Sequence": 0,
@ -31,11 +30,29 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044616,
"Position": {
"X": -630.67065,
"Y": -140.39087,
"Z": -789.79175
},
"StopDistance": 0.5,
"TerritoryId": 959,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"TerritoryId": 959,
"InteractionType": "Craft",
"ItemId": 38889,
"ItemCount": 1
},
{
"Position": {
"X": -201.42024,
@ -43,7 +60,9 @@
"Z": -273.68756
},
"TerritoryId": 959,
"InteractionType": "WalkTo"
"InteractionType": "WalkTo",
"AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
"Fly": true
},
{
"DataId": 1044403,

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,
@ -18,9 +17,73 @@
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 2013074,
"Position": {
"X": 304.3412,
"Y": 483.48206,
"Z": 143.11438
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 1073
},
{
"DataId": 1044059,
"Position": {
"X": -15.304871,
"Y": 494.9991,
"Z": -68.16211
},
"TerritoryId": 1073,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1044059,
"Position": {
"X": -15.304871,
"Y": 494.9991,
"Z": -68.16211
},
"TerritoryId": 1073,
"InteractionType": "Interact",
"RequiredGatheredItems": [
{
"QuestAcceptedAsClass": "Miner",
"ItemId": 38289,
"ItemCount": 3
},
{
"QuestAcceptedAsClass": "Botanist",
"ItemId": 38313,
"ItemCount": 3
}
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1043421,
"Position": {
"X": 2.4261475,
"Y": 499.87805,
"Z": 46.036377
},
"TerritoryId": 1073,
"InteractionType": "Interact",
"TargetTerritoryId": 960
},
{
"DataId": 1043417,
"Position": {

View File

@ -1,7 +1,7 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"$": "TODO Check if this is a special mount that can always fly",
"QuestSequence": [
{
"Sequence": 0,
@ -18,9 +18,82 @@
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044060,
"Position": {
"X": 57.75537,
"Y": 269.00012,
"Z": -674.49457
},
"TerritoryId": 960,
"InteractionType": "Interact",
"AetheryteShortcut": "Ultima Thule - Abode of the Ea"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1044063,
"Position": {
"X": -193.53015,
"Y": 269.23087,
"Z": -315.63293
},
"TerritoryId": 960,
"InteractionType": "Action",
"Action": "Electric Flux",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"DataId": 1044062,
"Position": {
"X": -213.42798,
"Y": 268.01166,
"Z": -299.5194
},
"TerritoryId": 960,
"InteractionType": "Action",
"Action": "Electric Flux",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 2013072,
"Position": {
"X": 456.65674,
"Y": 438.04077,
"Z": 310.2312
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 960,
"AetheryteShortcut": "Ultima Thule - Base Omicron"
},
{
"DataId": 1043417,
"Position": {

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,
@ -18,9 +17,50 @@
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044064,
"Position": {
"X": 86.503296,
"Y": 269.08234,
"Z": -515.0683
},
"TerritoryId": 960,
"InteractionType": "Interact",
"AetheryteShortcut": "Ultima Thule - Abode of the Ea",
"Fly": true,
"RequiredGatheredItems": [
{
"QuestAcceptedAsClass": "Miner",
"ItemId": 38290,
"ItemCount": 3
},
{
"QuestAcceptedAsClass": "Botanist",
"ItemId": 38314,
"ItemCount": 3
}
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 2013072,
"Position": {
"X": 456.65674,
"Y": 438.04077,
"Z": 310.2312
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 960,
"AetheryteShortcut": "Ultima Thule - Base Omicron"
},
{
"DataId": 1043417,
"Position": {

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,
@ -18,9 +17,50 @@
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044076,
"Position": {
"X": -499.96188,
"Y": 77.00467,
"Z": 241.07727
},
"StopDistance": 9,
"TerritoryId": 960,
"InteractionType": "Interact",
"AetheryteShortcut": "Ultima Thule - Reah Tahra",
"RequiredGatheredItems": [
{
"QuestAcceptedAsClass": "Miner",
"ItemId": 38297,
"ItemCount": 3
},
{
"QuestAcceptedAsClass": "Botanist",
"ItemId": 38321,
"ItemCount": 3
}
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 2013072,
"Position": {
"X": 456.65674,
"Y": 438.04077,
"Z": 310.2312
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 960,
"AetheryteShortcut": "Ultima Thule - Base Omicron"
},
{
"DataId": 1043417,
"Position": {

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,
@ -18,9 +17,61 @@
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044078,
"Position": {
"X": 97.154175,
"Y": 269.09738,
"Z": -498.3139
},
"TerritoryId": 960,
"InteractionType": "Interact",
"AetheryteShortcut": "Ultima Thule - Abode of the Ea",
"Fly": true,
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_BANOMI127_04633_Q1_000_000",
"Answer": "TEXT_BANOMI127_04633_A1_000_002"
}
]
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1044079,
"Position": {
"X": 99.412476,
"Y": 269.09763,
"Z": -497.1237
},
"StopDistance": 5,
"TerritoryId": 960,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 2013072,
"Position": {
"X": 456.65674,
"Y": 438.04077,
"Z": 310.2312
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 960,
"AetheryteShortcut": "Ultima Thule - Base Omicron"
},
{
"DataId": 1043417,
"Position": {

View File

@ -835,12 +835,14 @@
"Cure",
"Esuna",
"Physick",
"Buffet",
"Buffet (Sanuwa)",
"Buffet (Griffin)",
"Fumigate",
"Siphon Snout",
"Red Gulal",
"Yellow Gulal",
"Blue Gulal"
"Blue Gulal",
"Electric Flux"
]
}
},

View File

@ -10,11 +10,13 @@ public sealed class ActionConverter() : EnumConverter<EAction>(Values)
{ EAction.Cure, "Cure" },
{ EAction.Esuna, "Esuna" },
{ EAction.Physick, "Physick" },
{ EAction.Buffet, "Buffet" },
{ EAction.BuffetSanuwa, "Buffet (Sanuwa)" },
{ EAction.BuffetGriffin, "Buffet (Griffin)" },
{ EAction.Fumigate, "Fumigate" },
{ EAction.SiphonSnout, "Siphon Snout" },
{ EAction.RedGulal, "Red Gulal" },
{ EAction.YellowGulal, "Yellow Gulal" },
{ EAction.BlueGulal, "Blue Gulal" },
{ EAction.ElectrixFlux, "Electric Flux" },
};
}

View File

@ -9,12 +9,14 @@ public enum EAction
Cure = 120,
Esuna = 7568,
Physick = 190,
Buffet = 4931,
BuffetSanuwa = 4931,
BuffetGriffin = 4583,
Fumigate = 5872,
SiphonSnout = 18187,
RedGulal = 29382,
YellowGulal = 29383,
BlueGulal = 29384,
ElectrixFlux = 29718,
CollectMiner = 240,
ScourMiner = 22182,
@ -39,11 +41,13 @@ public static class EActionExtensions
public static bool RequiresMount(this EAction action)
{
return action
is EAction.Buffet
is EAction.BuffetSanuwa
or EAction.BuffetGriffin
or EAction.Fumigate
or EAction.SiphonSnout
or EAction.RedGulal
or EAction.YellowGulal
or EAction.BlueGulal;
or EAction.BlueGulal
or EAction.ElectrixFlux;
}
}

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;

View File

@ -21,7 +21,7 @@ internal sealed class SwitchClassJob(EClassJob classJob, IClientState clientStat
var gearset = gearsetModule->GetGearset(i);
if (gearset->ClassJob == (byte)classJob)
{
gearsetModule->EquipGearset(gearset->Id, gearset->BannerIndex);
gearsetModule->EquipGearset(gearset->Id);
return true;
}
}

2
vendor/ECommons vendored

@ -1 +1 @@
Subproject commit 9e90d0032f0efd4c9e65d9c5a8e8bd0e99557d68
Subproject commit ac744e72d99da3f3b4efc64bcadcfd40de7c21eb