sync with upstreaom #2

Open
goatzone wants to merge 541 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",
"Author": "goatzone",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1012294,
"Position": {
"X": 366.4148,
"Y": 20.214104,
"Z": 756.7101
},
"TerritoryId": 402,
"InteractionType": "AcceptQuest",
"Fly": true
}
]
},
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": 502.06363,
"Y": 16.87959,
"Z": 742.68134
},
"TerritoryId": 402,
"InteractionType": "WalkTo",
"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."
},
{
"DataId": 2005900,
"Position": {
"X": 506.76733,
"Y": 16.861145,
"Z": 750.24023
},
"TerritoryId": 402,
"InteractionType": "Interact"
},
{
"DataId": 2005903,
"Position": {
"X": 544.64014,
"Y": 15.945618,
"Z": 760.61633
},
"TerritoryId": 402,
"InteractionType": "Interact"
},
{
"DataId": 2005899,
"Position": {
"X": 545.4031,
"Y": 20.2182,
"Z": 802.8534
},
"TerritoryId": 402,
"InteractionType": "Interact"
},
{
"DataId": 2005902,
"Position": {
"X": 614.6791,
"Y": 20.2182,
"Z": 758.938
},
"TerritoryId": 402,
"InteractionType": "Interact"
},
{
"DataId": 2005901,
"Position": {
"X": 605.3406,
"Y": 15.945618,
"Z": 708.06433
},
"TerritoryId": 402,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1012294,
"Position": {
"X": 366.4148,
"Y": 20.214104,
"Z": 756.7101
},
"TerritoryId": 402,
"InteractionType": "CompleteQuest",
"Fly": true
}
]
}
]
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "goatzone",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1012294,
"Position": {
"X": 366.4148,
"Y": 20.214104,
"Z": 756.7101
},
"TerritoryId": 402,
"InteractionType": "AcceptQuest",
"Fly": true
}
]
},
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": 505.4667,
"Y": 16.87959,
"Z": 751.14856
},
"TerritoryId": 402,
"InteractionType": "WalkTo",
"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.",
"SkipConditions": {
"StepIf": {
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
}
}
},
{
"DataId": 2005900,
"Position": {
"X": 506.76733,
"Y": 16.861145,
"Z": 750.24023
},
"TerritoryId": 402,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"DataId": 2005903,
"Position": {
"X": 544.64014,
"Y": 15.945618,
"Z": 760.61633
},
"TerritoryId": 402,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
8
]
},
{
"DataId": 2005899,
"Position": {
"X": 545.4031,
"Y": 20.2182,
"Z": 802.8534
},
"TerritoryId": 402,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"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",
"Author": "goatzone",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1012298,
"Position": {
"X": -192.67572,
"Y": -102.749916,
"Z": 476.9817
},
"TerritoryId": 402,
"InteractionType": "AcceptQuest",
"Fly": true
}
]
},
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -375.98807,
"Y": -106.10026,
"Z": 710.48956
},
"TerritoryId": 402,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"ComplexCombatData": [
{
"DataId": 4493,
"MinimumKillCount": 1
}
],
"CompletionQuestVariablesFlags": [null, null, null, null, null, 128],
"Fly": true
},
{
"Position": {
"X": -372.88766,
"Y": -105.78837,
"Z": 746.95245
},
"TerritoryId": 402,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"ComplexCombatData": [
{
"DataId": 4493,
"MinimumKillCount": 1
}
],
"CompletionQuestVariablesFlags": [null, null, null, null, null, 64]
},
{
"Position": {
"X": -321.94852,
"Y": -106.57244,
"Z": 716.5662
},
"TerritoryId": 402,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"ComplexCombatData": [
{
"DataId": 4493,
"MinimumKillCount": 1
}
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1012298,
"Position": {
"X": -192.67572,
"Y": -102.749916,
"Z": 476.9817
},
"TerritoryId": 402,
"InteractionType": "CompleteQuest",
"Fly": true
}
]
}
]
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "goatzone",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1012298,
"Position": {
"X": -192.67572,
"Y": -102.749916,
"Z": 476.9817
},
"TerritoryId": 402,
"InteractionType": "AcceptQuest",
"Fly": true
}
]
},
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -375.98807,
"Y": -106.10026,
"Z": 710.48956
},
"TerritoryId": 402,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"ComplexCombatData": [
{
"DataId": 4493,
"MinimumKillCount": 1
}
],
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
],
"Fly": true
},
{
"Position": {
"X": -372.88766,
"Y": -105.78837,
"Z": 746.95245
},
"TerritoryId": 402,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"ComplexCombatData": [
{
"DataId": 4493,
"MinimumKillCount": 1
}
],
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"Position": {
"X": -321.94852,
"Y": -106.57244,
"Z": 716.5662
},
"TerritoryId": 402,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"ComplexCombatData": [
{
"DataId": 4493,
"MinimumKillCount": 1
}
],
"CompletionQuestVariablesFlags": [
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
}
]
}
]
}