master #2

Merged
cacahuetes merged 79 commits from liza/Questionable:master into master 2024-08-25 10:51:08 +00:00
20 changed files with 802 additions and 44 deletions
Showing only changes of commit 258bdb451f - Show all commits

View File

@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
<Version>2.13</Version>
<Version>2.14</Version>
</PropertyGroup>
</Project>

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,47 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 2009353,
"Position": {
"X": 269.1233,
"Y": 39.78015,
"Z": -202.01422
},
"TerritoryId": 612,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 2009353,
"Position": {
"X": 269.1233,
"Y": 39.78015,
"Z": -202.01422
},
"TerritoryId": 612,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 2009353,
"Position": {
"X": 269.1233,
"Y": 39.78015,
"Z": -202.01422
},
"TerritoryId": 612,
"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,
@ -22,7 +21,174 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 2009357,
"Position": {
"X": -173.3883,
"Y": 58.1521,
"Z": -449.48505
},
"TerritoryId": 612,
"InteractionType": "Combat",
"ItemId": 2002446,
"EnemySpawnType": "AfterItemUse",
"KillEnemyDataIds": [
8594
],
"Fly": true,
"RequiredQuestVariables": [
null,
null,
null,
[
{
"Low": 1
},
{
"Low": 2
},
{
"Low": 4
}
],
null,
null
],
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 2009356,
"Position": {
"X": -210.2846,
"Y": 59.250732,
"Z": -512.0775
},
"TerritoryId": 612,
"InteractionType": "Combat",
"ItemId": 2002446,
"EnemySpawnType": "AfterItemUse",
"KillEnemyDataIds": [
8594
],
"Fly": true,
"RequiredQuestVariables": [
null,
null,
null,
[
{
"Low": 3
},
{
"Low": 4
},
{
"Low": 6
}
],
null,
null
],
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"DataId": 2009355,
"Position": {
"X": -210.98651,
"Y": 59.28125,
"Z": -668.6351
},
"TerritoryId": 612,
"InteractionType": "Combat",
"ItemId": 2002446,
"EnemySpawnType": "AfterItemUse",
"KillEnemyDataIds": [
8594
],
"Fly": true,
"RequiredQuestVariables": [
null,
null,
null,
[
{
"Low": 1
},
{
"Low": 3
},
{
"Low": 5
}
],
null,
null
],
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
16
]
},
{
"DataId": 2009358,
"Position": {
"X": -171.03839,
"Y": 59.098145,
"Z": -750.3014
},
"TerritoryId": 612,
"InteractionType": "Combat",
"ItemId": 2002446,
"EnemySpawnType": "AfterItemUse",
"KillEnemyDataIds": [
8594
],
"Fly": true,
"RequiredQuestVariables": [
null,
null,
null,
[
{
"Low": 2
},
{
"Low": 5
},
{
"Low": 6
}
],
null,
null
],
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
}
]
},
{

View File

@ -0,0 +1,9 @@
```
0 0 0 x 0 0 | 2009355 2009356 2009357 2009358
1 x x | unconfirmed
2 x x
3 x x
4 x x | after 2009356: 2 4 → 17 20
5 x x
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,64 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1033706,
"Position": {
"X": -384.9088,
"Y": 105.85561,
"Z": -645.9602
},
"StopDistance": 2,
"TerritoryId": 813,
"InteractionType": "Interact",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"DataId": 1033705,
"Position": {
"X": -380.3922,
"Y": 103.089836,
"Z": -669.8253
},
"TerritoryId": 813,
"InteractionType": "Interact",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 1033707,
"Position": {
"X": -361.83722,
"Y": 103.57124,
"Z": -703.2731
},
"TerritoryId": 813,
"InteractionType": "Interact",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
}
]
},
{

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,50 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1033715,
"Position": {
"X": -614.4961,
"Y": 65.60227,
"Z": -405.56958
},
"TerritoryId": 813,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1034065,
"Position": {
"X": -294.75854,
"Y": 99.225815,
"Z": -724.0253
},
"TerritoryId": 813,
"InteractionType": "Action",
"Action": "Cannonfire",
"Fly": true,
"Land": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1034065,
"Position": {
"X": -294.75854,
"Y": 99.225815,
"Z": -724.0253
},
"TerritoryId": 813,
"InteractionType": "Action",
"Action": "Cannonfire"
}
]
},
{
@ -55,7 +96,8 @@
"Z": -425.25372
},
"TerritoryId": 813,
"InteractionType": "CompleteQuest"
"InteractionType": "CompleteQuest",
"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,
@ -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": 31177,
"ItemCount": 1
},
{
"DataId": 1034070,
"Position": {
"X": -796.47516,
"Y": 69.28625,
"Z": 117.29602
},
"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,
@ -18,6 +17,23 @@
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 2010997,
"Position": {
"X": -399.52698,
"Y": 10.635498,
"Z": 241.50452
},
"TerritoryId": 817,
"InteractionType": "Interact",
"AetheryteShortcut": "Rak'tika - Slitherbough",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
@ -30,12 +46,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,9 +31,16 @@
"AetheryteShortcut": "Rak'tika - Fanow",
"Fly": true,
"RequiredGatheredItems": [
{
"QuestAcceptedAsClass": "Miner",
"ItemId": 29533,
"ItemCount": 3
},
{
"QuestAcceptedAsClass": "Botanist",
"ItemId": 29559,
"ItemCount": 3
}
]
},
{
@ -46,7 +52,8 @@
},
"StopDistance": 7,
"TerritoryId": 817,
"InteractionType": "CompleteQuest"
"InteractionType": "CompleteQuest",
"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,
@ -32,9 +31,16 @@
"AetheryteShortcut": "Rak'tika - Fanow",
"Fly": true,
"RequiredGatheredItems": [
{
"QuestAcceptedAsClass": "Miner",
"ItemId": 29534,
"ItemCount": 3
},
{
"QuestAcceptedAsClass": "Botanist",
"ItemId": 29560,
"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,
@ -21,7 +20,52 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 2012903,
"Position": {
"X": 37.03357,
"Y": 22.507019,
"Z": -8.133057
},
"TerritoryId": 957,
"InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
14679
],
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 2012904,
"Position": {
"X": 116.68567,
"Y": 22.262878,
"Z": -71.000244
},
"TerritoryId": 957,
"InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
14679
],
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
}
]
},
{

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,84 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044408,
"Position": {
"X": -164.08032,
"Y": -49.199722,
"Z": -250.75159
},
"TerritoryId": 959,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 2013262,
"Position": {
"X": 34.98889,
"Y": -47.56244,
"Z": -531.5481
},
"TerritoryId": 959,
"InteractionType": "Action",
"Action": "Hop-step",
"Fly": true,
"Land": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"DataId": 2013263,
"Position": {
"X": 49.79016,
"Y": -133.07397,
"Z": -558.9227
},
"TerritoryId": 959,
"InteractionType": "Action",
"Action": "Hop-step",
"Fly": true,
"Land": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
},
{
"DataId": 2013261,
"Position": {
"X": -34.28705,
"Y": -129.2287,
"Z": -495.71985
},
"TerritoryId": 959,
"InteractionType": "Action",
"Action": "Hop-step",
"Fly": true,
"Land": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
}
]
},
{
@ -43,7 +120,8 @@
"Z": -273.68756
},
"TerritoryId": 959,
"InteractionType": "WalkTo"
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1044403,
@ -53,7 +131,8 @@
"Z": -273.60956
},
"TerritoryId": 959,
"InteractionType": "CompleteQuest"
"InteractionType": "CompleteQuest",
"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,
@ -30,6 +29,39 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044608,
"Position": {
"X": 227.19153,
"Y": 93.66165,
"Z": -35.385742
},
"StopDistance": 1,
"TerritoryId": 959,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"TerritoryId": 959,
"InteractionType": "Craft",
"ItemId": 38883,
"ItemCount": 3
},
{
"DataId": 1044608,
"Position": {
"X": 227.19153,
"Y": 93.66165,
"Z": -35.385742
},
"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

@ -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,84 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 2013264,
"Position": {
"X": 47.01306,
"Y": -132.86035,
"Z": -504.08182
},
"TerritoryId": 959,
"InteractionType": "Interact",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 2013266,
"Position": {
"X": 64.65234,
"Y": -132.61621,
"Z": -451.133
},
"TerritoryId": 959,
"InteractionType": "Interact",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
},
{
"Position": {
"X": 17.153883,
"Y": -132.7894,
"Z": -444.4903
},
"TerritoryId": 959,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
}
}
},
{
"DataId": 2013265,
"Position": {
"X": 15.060608,
"Y": -131.27338,
"Z": -444.0528
},
"TerritoryId": 959,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
}
]
},
{
@ -42,7 +119,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,
@ -18,9 +17,50 @@
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044071,
"Position": {
"X": 46.066895,
"Y": 268.99976,
"Z": -584.77155
},
"TerritoryId": 960,
"InteractionType": "Interact",
"AetheryteShortcut": "Ultima Thule - Abode of the Ea",
"Fly": true,
"RequiredGatheredItems": [
{
"QuestAcceptedAsClass": "Miner",
"ItemId": 38294,
"ItemCount": 3
},
{
"QuestAcceptedAsClass": "Botanist",
"ItemId": 38318,
"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,82 @@
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044072,
"Position": {
"X": -541.9547,
"Y": 74.3691,
"Z": 208.39233
},
"TerritoryId": 960,
"InteractionType": "Interact",
"AetheryteShortcut": "Ultima Thule - Reah Tahra"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 2013132,
"Position": {
"X": -327.04663,
"Y": 88.48706,
"Z": 293.04944
},
"TerritoryId": 960,
"InteractionType": "Action",
"Action": "Electric Flux",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"DataId": 2013131,
"Position": {
"X": -324.8493,
"Y": 88.05969,
"Z": 269.79468
},
"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,49 @@
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044074,
"Position": {
"X": -585.90063,
"Y": 75.22713,
"Z": 256.67188
},
"TerritoryId": 960,
"InteractionType": "Interact",
"AetheryteShortcut": "Ultima Thule - Reah Tahra",
"RequiredGatheredItems": [
{
"QuestAcceptedAsClass": "Miner",
"ItemId": 38295,
"ItemCount": 3
},
{
"QuestAcceptedAsClass": "Botanist",
"ItemId": 38319,
"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

@ -845,10 +845,12 @@
"Buffet (Griffin)",
"Fumigate",
"Siphon Snout",
"Cannonfire",
"Red Gulal",
"Yellow Gulal",
"Blue Gulal",
"Electric Flux"
"Electric Flux",
"Hop-step"
]
}
},

View File

@ -15,9 +15,11 @@ public sealed class ActionConverter() : EnumConverter<EAction>(Values)
{ EAction.BuffetGriffin, "Buffet (Griffin)" },
{ EAction.Fumigate, "Fumigate" },
{ EAction.SiphonSnout, "Siphon Snout" },
{ EAction.Cannonfire, "Cannonfire" },
{ EAction.RedGulal, "Red Gulal" },
{ EAction.YellowGulal, "Yellow Gulal" },
{ EAction.BlueGulal, "Blue Gulal" },
{ EAction.ElectrixFlux, "Electric Flux" },
{ EAction.HopStep, "Hop-step" },
};
}

View File

@ -14,10 +14,12 @@ public enum EAction
BuffetGriffin = 4583,
Fumigate = 5872,
SiphonSnout = 18187,
Cannonfire = 20121,
RedGulal = 29382,
YellowGulal = 29383,
BlueGulal = 29384,
ElectrixFlux = 29718,
HopStep = 31116,
CollectMiner = 240,
ScourMiner = 22182,
@ -46,9 +48,11 @@ public static class EActionExtensions
or EAction.BuffetGriffin
or EAction.Fumigate
or EAction.SiphonSnout
or EAction.Cannonfire
or EAction.RedGulal
or EAction.YellowGulal
or EAction.BlueGulal
or EAction.ElectrixFlux;
or EAction.ElectrixFlux
or EAction.HopStep;
}
}