sync with upstreaom #2

Open
goatzone wants to merge 581 commits from liza/Questionable:master into master
2 changed files with 268 additions and 194 deletions
Showing only changes of commit 97cbeada2a - Show all commits

View File

@ -1,104 +1,156 @@
{ {
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "goatzone", "Author": "goatzone",
"QuestSequence": [ "QuestSequence": [
{ {
"Sequence": 0, "Sequence": 0,
"Steps": [ "Steps": [
{ {
"DataId": 1012294, "DataId": 1012294,
"Position": { "Position": {
"X": 366.4148, "X": 366.4148,
"Y": 20.214104, "Y": 20.214104,
"Z": 756.7101 "Z": 756.7101
}, },
"TerritoryId": 402, "TerritoryId": 402,
"InteractionType": "AcceptQuest", "InteractionType": "AcceptQuest",
"Fly": true "Fly": true
} }
] ]
}, },
{ {
"Sequence": 1, "Sequence": 1,
"Steps": [ "Steps": [
{ {
"Position": { "Position": {
"X": 502.06363, "X": 505.4667,
"Y": 16.87959, "Y": 16.87959,
"Z": 742.68134 "Z": 751.14856
}, },
"TerritoryId": 402, "TerritoryId": 402,
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"Fly": true, "Fly": true,
"$": "can get stuck on the spire structure when trying to land. could land elsewhere but we want to start with this one because it's the first on foot, so if done before flying unlocked that would necessitate walking directly past it." "$": "can get stuck on the spire structure when trying to land. could land elsewhere but we want to start with this one because it's the first on foot, so if done before flying unlocked that would necessitate walking directly past it.",
}, "SkipConditions": {
{ "StepIf": {
"DataId": 2005900, "CompletionQuestVariablesFlags": [
"Position": { null,
"X": 506.76733, null,
"Y": 16.861145, null,
"Z": 750.24023 null,
}, null,
"TerritoryId": 402, 64
"InteractionType": "Interact" ]
}, }
{ }
"DataId": 2005903, },
"Position": { {
"X": 544.64014, "DataId": 2005900,
"Y": 15.945618, "Position": {
"Z": 760.61633 "X": 506.76733,
}, "Y": 16.861145,
"TerritoryId": 402, "Z": 750.24023
"InteractionType": "Interact" },
}, "TerritoryId": 402,
{ "InteractionType": "Interact",
"DataId": 2005899, "CompletionQuestVariablesFlags": [
"Position": { null,
"X": 545.4031, null,
"Y": 20.2182, null,
"Z": 802.8534 null,
}, null,
"TerritoryId": 402, 64
"InteractionType": "Interact" ]
}, },
{ {
"DataId": 2005902, "DataId": 2005903,
"Position": { "Position": {
"X": 614.6791, "X": 544.64014,
"Y": 20.2182, "Y": 15.945618,
"Z": 758.938 "Z": 760.61633
}, },
"TerritoryId": 402, "TerritoryId": 402,
"InteractionType": "Interact" "InteractionType": "Interact",
}, "CompletionQuestVariablesFlags": [
{ null,
"DataId": 2005901, null,
"Position": { null,
"X": 605.3406, null,
"Y": 15.945618, null,
"Z": 708.06433 8
}, ]
"TerritoryId": 402, },
"InteractionType": "Interact" {
} "DataId": 2005899,
] "Position": {
}, "X": 545.4031,
{ "Y": 20.2182,
"Sequence": 255, "Z": 802.8534
"Steps": [ },
{ "TerritoryId": 402,
"DataId": 1012294, "InteractionType": "Interact",
"Position": { "CompletionQuestVariablesFlags": [
"X": 366.4148, null,
"Y": 20.214104, null,
"Z": 756.7101 null,
}, null,
"TerritoryId": 402, null,
"InteractionType": "CompleteQuest", 128
"Fly": true ]
} },
] {
} "DataId": 2005902,
] "Position": {
"X": 614.6791,
"Y": 20.2182,
"Z": 758.938
},
"TerritoryId": 402,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
16
]
},
{
"DataId": 2005901,
"Position": {
"X": 605.3406,
"Y": 15.945618,
"Z": 708.06433
},
"TerritoryId": 402,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1012294,
"Position": {
"X": 366.4148,
"Y": 20.214104,
"Z": 756.7101
},
"TerritoryId": 402,
"InteractionType": "CompleteQuest",
"Fly": true
}
]
}
]
} }

View File

@ -1,94 +1,116 @@
{ {
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "goatzone", "Author": "goatzone",
"QuestSequence": [ "QuestSequence": [
{ {
"Sequence": 0, "Sequence": 0,
"Steps": [ "Steps": [
{ {
"DataId": 1012298, "DataId": 1012298,
"Position": { "Position": {
"X": -192.67572, "X": -192.67572,
"Y": -102.749916, "Y": -102.749916,
"Z": 476.9817 "Z": 476.9817
}, },
"TerritoryId": 402, "TerritoryId": 402,
"InteractionType": "AcceptQuest", "InteractionType": "AcceptQuest",
"Fly": true "Fly": true
} }
] ]
}, },
{ {
"Sequence": 1, "Sequence": 1,
"Steps": [ "Steps": [
{ {
"Position": { "Position": {
"X": -375.98807, "X": -375.98807,
"Y": -106.10026, "Y": -106.10026,
"Z": 710.48956 "Z": 710.48956
}, },
"TerritoryId": 402, "TerritoryId": 402,
"InteractionType": "Combat", "InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea", "EnemySpawnType": "AutoOnEnterArea",
"ComplexCombatData": [ "ComplexCombatData": [
{ {
"DataId": 4493, "DataId": 4493,
"MinimumKillCount": 1 "MinimumKillCount": 1
} }
], ],
"CompletionQuestVariablesFlags": [null, null, null, null, null, 128], "CompletionQuestVariablesFlags": [
"Fly": true null,
}, null,
{ null,
"Position": { null,
"X": -372.88766, null,
"Y": -105.78837, 128
"Z": 746.95245 ],
}, "Fly": true
"TerritoryId": 402, },
"InteractionType": "Combat", {
"EnemySpawnType": "AutoOnEnterArea", "Position": {
"ComplexCombatData": [ "X": -372.88766,
{ "Y": -105.78837,
"DataId": 4493, "Z": 746.95245
"MinimumKillCount": 1 },
} "TerritoryId": 402,
], "InteractionType": "Combat",
"CompletionQuestVariablesFlags": [null, null, null, null, null, 64] "EnemySpawnType": "AutoOnEnterArea",
}, "ComplexCombatData": [
{ {
"Position": { "DataId": 4493,
"X": -321.94852, "MinimumKillCount": 1
"Y": -106.57244, }
"Z": 716.5662 ],
}, "CompletionQuestVariablesFlags": [
"TerritoryId": 402, null,
"InteractionType": "Combat", null,
"EnemySpawnType": "AutoOnEnterArea", null,
"ComplexCombatData": [ null,
{ null,
"DataId": 4493, 64
"MinimumKillCount": 1 ]
} },
] {
} "Position": {
] "X": -321.94852,
}, "Y": -106.57244,
{ "Z": 716.5662
"Sequence": 255, },
"Steps": [ "TerritoryId": 402,
{ "InteractionType": "Combat",
"DataId": 1012298, "EnemySpawnType": "AutoOnEnterArea",
"Position": { "ComplexCombatData": [
"X": -192.67572, {
"Y": -102.749916, "DataId": 4493,
"Z": 476.9817 "MinimumKillCount": 1
}, }
"TerritoryId": 402, ],
"InteractionType": "CompleteQuest", "CompletionQuestVariablesFlags": [
"Fly": true null,
} null,
] null,
} null,
] null,
32
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1012298,
"Position": {
"X": -192.67572,
"Y": -102.749916,
"Z": 476.9817
},
"TerritoryId": 402,
"InteractionType": "CompleteQuest",
"Fly": true
}
]
}
]
} }