master #2

Merged
cacahuetes merged 79 commits from liza/Questionable:master into master 2024-08-25 10:51:08 +00:00
11 changed files with 868 additions and 4 deletions
Showing only changes of commit e13007469e - Show all commits

View File

@ -23,7 +23,7 @@
"AetheryteShortcutIf": { "AetheryteShortcutIf": {
"InSameTerritory": true, "InSameTerritory": true,
"InTerritory": [ "InTerritory": [
129 128
] ]
}, },
"AethernetShortcutIf": { "AethernetShortcutIf": {

View File

@ -0,0 +1,193 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1000926,
"Position": {
"X": -10.055725,
"Y": 44.999794,
"Z": -245.80762
},
"TerritoryId": 128,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza",
"[Limsa Lominsa] Marauders' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
128
]
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1000927,
"Position": {
"X": -1.2055054,
"Y": 44.999886,
"Z": -255.8786
},
"TerritoryId": 128,
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_CLSEXC020_00311_Q2_000_1",
"Yes": true
}
]
}
]
},
{
"Sequence": 2,
"Steps": [
{
"Position": {
"X": 31.662792,
"Y": 44.020653,
"Z": 146.94322
},
"TerritoryId": 134,
"InteractionType": "Combat",
"EnemySpawnType": "OverworldEnemies",
"ComplexCombatData": [
{
"DataId": 347,
"MinimumKillCount": 3,
"CompletionQuestVariablesFlags": [
{
"Low": 3
},
null,
null,
null,
null,
null
]
}
],
"AethernetShortcut": [
"[Limsa Lominsa] Marauders' Guild",
"[Limsa Lominsa] Zephyr Gate (Middle La Noscea)"
],
"CompletionQuestVariablesFlags": [
{
"Low": 3
},
null,
null,
null,
null,
null
]
},
{
"Position": {
"X": 74.15681,
"Y": 45.953808,
"Z": 169.73499
},
"TerritoryId": 134,
"InteractionType": "Combat",
"EnemySpawnType": "OverworldEnemies",
"ComplexCombatData": [
{
"DataId": 49,
"MinimumKillCount": 3,
"CompletionQuestVariablesFlags": [
null,
{
"Low": 3
},
null,
null,
null,
null
]
}
],
"CompletionQuestVariablesFlags": [
null,
{
"Low": 3
},
null,
null,
null,
null
]
},
{
"Position": {
"X": 74.15681,
"Y": 45.953808,
"Z": 169.73499
},
"TerritoryId": 134,
"InteractionType": "Combat",
"EnemySpawnType": "OverworldEnemies",
"ComplexCombatData": [
{
"DataId": 338,
"MinimumKillCount": 3,
"CompletionQuestVariablesFlags": [
null,
{
"High": 3
},
null,
null,
null,
null
]
}
],
"CompletionQuestVariablesFlags": [
null,
{
"High": 3
},
null,
null,
null,
null
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1000927,
"Position": {
"X": -1.2055054,
"Y": 44.999886,
"Z": -255.8786
},
"TerritoryId": 128,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza",
"[Limsa Lominsa] Marauders' Guild"
]
}
]
}
]
}

View File

@ -0,0 +1,311 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1000927,
"Position": {
"X": -1.2055054,
"Y": 44.999886,
"Z": -255.8786
},
"TerritoryId": 128,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza",
"[Limsa Lominsa] Marauders' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
128
]
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1002680,
"Position": {
"X": 1.4800415,
"Y": 30.47563,
"Z": -242.20648
},
"TerritoryId": 128,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1002108,
"Position": {
"X": -57.236633,
"Y": 43.829678,
"Z": 45.334473
},
"TerritoryId": 134,
"InteractionType": "Interact",
"AethernetShortcut": [
"[Limsa Lominsa] Marauders' Guild",
"[Limsa Lominsa] Zephyr Gate (Middle La Noscea)"
]
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 2001481,
"Position": {
"X": -52.140076,
"Y": 46.158447,
"Z": 15.823547
},
"TerritoryId": 134,
"InteractionType": "Action",
"Action": "Heavy Swing",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"DataId": 2001482,
"Position": {
"X": -73.80792,
"Y": 43.259277,
"Z": 4.623413
},
"TerritoryId": 134,
"InteractionType": "Action",
"Action": "Heavy Swing",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
},
{
"DataId": 2001480,
"Position": {
"X": -68.467285,
"Y": 43.503418,
"Z": 20.248657
},
"TerritoryId": 134,
"InteractionType": "Action",
"Action": "Heavy Swing",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1002108,
"Position": {
"X": -57.236633,
"Y": 43.829678,
"Z": 45.334473
},
"TerritoryId": 134,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 5,
"Steps": [
{
"DataId": 2001483,
"Position": {
"X": -12.314087,
"Y": 46.402588,
"Z": 31.47937
},
"TerritoryId": 134,
"InteractionType": "Action",
"Action": "Heavy Swing",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 2001485,
"Position": {
"X": 1.663208,
"Y": 48.2948,
"Z": 9.597839
},
"TerritoryId": 134,
"InteractionType": "Action",
"Action": "Heavy Swing",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
},
{
"DataId": 2001484,
"Position": {
"X": -14.572449,
"Y": 47.40979,
"Z": 12.344482
},
"TerritoryId": 134,
"InteractionType": "Action",
"Action": "Heavy Swing",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
}
]
},
{
"Sequence": 6,
"Steps": [
{
"DataId": 1002108,
"Position": {
"X": -57.236633,
"Y": 43.829678,
"Z": 45.334473
},
"TerritoryId": 134,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 7,
"Steps": [
{
"DataId": 1000927,
"Position": {
"X": -1.2055054,
"Y": 44.999886,
"Z": -255.8786
},
"TerritoryId": 128,
"InteractionType": "Interact",
"AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza",
"[Limsa Lominsa] Marauders' Guild"
]
}
]
},
{
"Sequence": 8,
"Steps": [
{
"DataId": 1002679,
"Position": {
"X": -5.2339478,
"Y": 31.475597,
"Z": -256.97723
},
"TerritoryId": 128,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 9,
"Steps": [
{
"DataId": 2000284,
"Position": {
"X": 130.84607,
"Y": 35.99597,
"Z": 28.519043
},
"TerritoryId": 135,
"InteractionType": "Interact",
"AethernetShortcut": [
"[Limsa Lominsa] Marauders' Guild",
"[Limsa Lominsa] Tempest Gate (Lower La Noscea)"
]
}
]
},
{
"Sequence": 10,
"Steps": [
{
"Position": {
"X": 157.25027,
"Y": 33.93623,
"Z": 91.90441
},
"StopDistance": 0.5,
"TerritoryId": 135,
"InteractionType": "SinglePlayerDuty"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1000927,
"Position": {
"X": -1.2055054,
"Y": 44.999886,
"Z": -255.8786
},
"TerritoryId": 128,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza",
"[Limsa Lominsa] Marauders' Guild"
]
}
]
}
]
}

View File

@ -0,0 +1,140 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1000927,
"Position": {
"X": -1.2055054,
"Y": 44.999886,
"Z": -255.8786
},
"TerritoryId": 128,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza",
"[Limsa Lominsa] Marauders' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
128
]
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": 391.3196,
"Y": 73.47712,
"Z": -313.9601
},
"TerritoryId": 135,
"InteractionType": "Combat",
"EnemySpawnType": "OverworldEnemies",
"ComplexCombatData": [
{
"DataId": 135,
"MinimumKillCount": 3,
"CompletionQuestVariablesFlags": [
{
"Low": 3
},
null,
null,
null,
null,
null
]
}
],
"AethernetShortcut": [
"[Limsa Lominsa] Marauders' Guild",
"[Limsa Lominsa] Tempest Gate (Lower La Noscea)"
],
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1000927,
"Position": {
"X": -1.2055054,
"Y": 44.999886,
"Z": -255.8786
},
"TerritoryId": 128,
"InteractionType": "Interact",
"AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza",
"[Limsa Lominsa] Marauders' Guild"
]
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 2000286,
"Position": {
"X": -88.60913,
"Y": 43.564453,
"Z": -303.05945
},
"TerritoryId": 134,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [
2
],
"AetheryteShortcut": "Middle La Noscea - Summerford Farms",
"AethernetShortcut": [
"[Limsa Lominsa] Marauders' Guild",
"[Limsa Lominsa] Zephyr Gate (Middle La Noscea)"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"AetheryteLocked": "Middle La Noscea - Summerford Farms"
}
},
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1000927,
"Position": {
"X": -1.2055054,
"Y": 44.999886,
"Z": -255.8786
},
"TerritoryId": 128,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza",
"[Limsa Lominsa] Marauders' Guild"
]
}
]
}
]
}

View File

@ -0,0 +1,217 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1000927,
"Position": {
"X": -1.2055054,
"Y": 44.999886,
"Z": -255.8786
},
"TerritoryId": 128,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza",
"[Limsa Lominsa] Marauders' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
128
]
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1000868,
"Position": {
"X": -192.00433,
"Y": 0.9999907,
"Z": 211.68835
},
"StopDistance": 7,
"TerritoryId": 129,
"InteractionType": "Interact",
"TargetTerritoryId": 138,
"AethernetShortcut": [
"[Limsa Lominsa] Marauders' Guild",
"[Limsa Lominsa] Fishermens' Guild"
]
},
{
"DataId": 1002110,
"Position": {
"X": 319.84436,
"Y": -31.898647,
"Z": 273.51794
},
"TerritoryId": 138,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"TerritoryId": 138,
"InteractionType": "AttuneAetheryte",
"Aetheryte": "Western La Noscea - Aleport"
},
{
"Position": {
"X": 139.18224,
"Y": -20.931536,
"Z": 139.35034
},
"TerritoryId": 138,
"InteractionType": "WalkTo",
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{
"DataId": 2000288,
"Position": {
"X": 99.22937,
"Y": -14.2977295,
"Z": 141.86316
},
"TerritoryId": 138,
"InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
28
],
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1000927,
"Position": {
"X": -1.2055054,
"Y": 44.999886,
"Z": -255.8786
},
"TerritoryId": 128,
"InteractionType": "Interact",
"AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza",
"[Limsa Lominsa] Marauders' Guild"
]
}
]
},
{
"Sequence": 4,
"Steps": [
{
"Position": {
"X": -182.58467,
"Y": 39.786213,
"Z": -46.777275
},
"StopDistance": 0.5,
"TerritoryId": 134,
"InteractionType": "Jump",
"AethernetShortcut": [
"[Limsa Lominsa] Marauders' Guild",
"[Limsa Lominsa] Zephyr Gate (Middle La Noscea)"
],
"JumpDestination": {
"Position": {
"X": -192.3236,
"Y": 41.73779,
"Z": -49.477997
}
},
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{
"DataId": 1002111,
"Position": {
"X": -206.80554,
"Y": 41.757885,
"Z": -39.627747
},
"TerritoryId": 134,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 5,
"Steps": [
{
"DataId": 2001486,
"Position": {
"X": -225.33002,
"Y": 42.191162,
"Z": -35.202576
},
"TerritoryId": 134,
"InteractionType": "Action",
"Action": "Heavy Swing"
}
]
},
{
"Sequence": 6,
"Steps": [
{
"DataId": 1002111,
"Position": {
"X": -206.80554,
"Y": 41.757885,
"Z": -39.627747
},
"TerritoryId": 134,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1000927,
"Position": {
"X": -1.2055054,
"Y": 44.999886,
"Z": -255.8786
},
"TerritoryId": 128,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza",
"[Limsa Lominsa] Marauders' Guild"
]
}
]
}
]
}

View File

@ -23,7 +23,7 @@
"AetheryteShortcutIf": { "AetheryteShortcutIf": {
"InSameTerritory": true, "InSameTerritory": true,
"InTerritory": [ "InTerritory": [
129 128
] ]
}, },
"AethernetShortcutIf": { "AethernetShortcutIf": {

View File

@ -23,7 +23,7 @@
"AetheryteShortcutIf": { "AetheryteShortcutIf": {
"InSameTerritory": true, "InSameTerritory": true,
"InTerritory": [ "InTerritory": [
129 128
] ]
}, },
"AethernetShortcutIf": { "AethernetShortcutIf": {

View File

@ -23,7 +23,7 @@
"AetheryteShortcutIf": { "AetheryteShortcutIf": {
"InSameTerritory": true, "InSameTerritory": true,
"InTerritory": [ "InTerritory": [
129 128
] ]
}, },
"AethernetShortcutIf": { "AethernetShortcutIf": {

View File

@ -837,6 +837,7 @@
"type": "string", "type": "string",
"description": "The action to use", "description": "The action to use",
"enum": [ "enum": [
"Heavy Swing",
"Cure", "Cure",
"Esuna", "Esuna",
"Physick", "Physick",

View File

@ -7,6 +7,7 @@ public sealed class ActionConverter() : EnumConverter<EAction>(Values)
{ {
private static readonly Dictionary<EAction, string> Values = new() private static readonly Dictionary<EAction, string> Values = new()
{ {
{ EAction.HeavySwing, "Heavy Swing" },
{ EAction.Cure, "Cure" }, { EAction.Cure, "Cure" },
{ EAction.Esuna, "Esuna" }, { EAction.Esuna, "Esuna" },
{ EAction.Physick, "Physick" }, { EAction.Physick, "Physick" },

View File

@ -6,6 +6,7 @@ namespace Questionable.Model.Questing;
[JsonConverter(typeof(ActionConverter))] [JsonConverter(typeof(ActionConverter))]
public enum EAction public enum EAction
{ {
HeavySwing = 31,
Cure = 120, Cure = 120,
Esuna = 7568, Esuna = 7568,
Physick = 190, Physick = 190,