cacahuetes/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests 1 Activity

Minor cleanup for SB part 3

Browse Source
This commit is contained in:
Liza 2024-08-23 19:46:37 +02:00
parent f973f3cc5c
commit 1eed73afdf
Signed by: liza
GPG Key ID: 7199F8D727D55F67
23 changed files with 233 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json
View File

@ -112,6 +112,9 @@
}
]
},
{
"Sequence": 7
},
{
"Sequence": 8,
"Steps": [

42
QuestPaths/4.x - Stormblood/MSQ/B-4.1/2963_The Darkness Below.json
View File

@ -12,6 +12,7 @@
"Y": 0,
"Z": 58.64038
},
"StopDistance": 5,
"TerritoryId": 635,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Rhalgr's Reach",
@ -36,7 +37,14 @@
"TerritoryId": 621,
"InteractionType": "Interact",
"AetheryteShortcut": "Lochs - Ala Mhigan Quarter",
"$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 128"
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 1024131,
@ -47,7 +55,24 @@
},
"TerritoryId": 621,
"InteractionType": "Interact",
"$": "QW: 1 0 0 0 0 128 -> QW: 2 0 0 0 0 192",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"Position": {
"X": 682.593,
"Y": 69.99999,
"Z": 538.1847
},
"TerritoryId": 621,
"InteractionType": "WalkTo",
"Fly": true
},
{
@ -59,7 +84,14 @@
},
"TerritoryId": 621,
"InteractionType": "Interact",
"Fly": true
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
}
]
},
@ -74,8 +106,7 @@
"Z": 489.76868
},
"TerritoryId": 621,
"InteractionType": "Interact",
"Fly": true
"InteractionType": "Interact"
}
]
},
@ -91,6 +122,7 @@
},
"TerritoryId": 621,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Lochs - Ala Mhigan Quarter",
"Fly": true
}
]

2
QuestPaths/4.x - Stormblood/MSQ/B-4.1/2964_The Mad King's Trove.json
View File

@ -12,6 +12,7 @@
"Y": 70,
"Z": 576.0128
},
"StopDistance": 5,
"TerritoryId": 621,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Lochs - Ala Mhigan Quarter",
@ -99,6 +100,7 @@
"Y": 70,
"Z": 576.0128
},
"StopDistance": 5,
"TerritoryId": 621,
"InteractionType": "CompleteQuest"
}

12
QuestPaths/4.x - Stormblood/MSQ/B-4.1/2965_The Butcher's Blood.json
View File

@ -12,6 +12,7 @@
"Y": 70,
"Z": 576.1653
},
"StopDistance": 7,
"TerritoryId": 621,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Lochs - Ala Mhigan Quarter",
@ -49,6 +50,7 @@
"Y": 69.999916,
"Z": 637.3845
},
"StopDistance": 5,
"TerritoryId": 621,
"InteractionType": "Interact"
}
@ -64,8 +66,16 @@
"Y": 69.9999,
"Z": 634.76
},
"StopDistance": 7,
"TerritoryId": 621,
"InteractionType": "CompleteQuest"
"InteractionType": "CompleteQuest",
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_STMBDB104_02965_Q1_000_000",
"Yes": true
}
]
}
]
}

16
QuestPaths/4.x - Stormblood/MSQ/B-4.1/2966_Echoes of an Echo.json
View File

@ -35,7 +35,14 @@
},
"TerritoryId": 621,
"InteractionType": "Interact",
"Fly": true
"Fly": true,
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_STMBDB105_02966_Q1_000_000",
"Yes": true
}
]
}
]
},
@ -70,7 +77,8 @@
"X": -2.9769177,
"Y": -1.3092512,
"Z": -36.29651
}
},
"DelaySeconds": 0.1
},
"StopDistance": 0.25
},
@ -87,7 +95,8 @@
"X": -2.8188858,
"Y": 0.16235979,
"Z": -38.626305
}
},
"DelaySeconds": 0.1
},
"StopDistance": 0.25
},
@ -101,6 +110,7 @@
"TerritoryId": 738,
"InteractionType": "Interact",
"StopDistance": 4,
"DelaySecondsAtStart": 3,
"$": "QW: 0 0 0 0 0 0 -> QW: 16 16 0 0 0 128"
},
{

23
QuestPaths/4.x - Stormblood/MSQ/B-4.1/2967_A Sultana's Strings.json
View File

@ -26,6 +26,22 @@
{
"Sequence": 1,
"Steps": [
{
"TerritoryId": 131,
"InteractionType": "None",
"AetheryteShortcut": "Ul'dah"
},
{
"DataId": 1011565,
"Position": {
"X": -78.8739,
"Y": 4,
"Z": -110.429565
},
"TerritoryId": 130,
"InteractionType": "AcceptQuest",
"PickUpQuestId": 434
},
{
"DataId": 1001821,
"Position": {
@ -39,7 +55,12 @@
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] The Chamber of Rule"
]
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
}
]
},

2
QuestPaths/4.x - Stormblood/MSQ/B-4.1/2969_A Sultana's Resolve.json
View File

@ -80,6 +80,7 @@
"Y": -2.0000012,
"Z": -17.166443
},
"StopDistance": 5,
"TerritoryId": 212,
"InteractionType": "Interact"
}
@ -95,6 +96,7 @@
"Y": -2.0000012,
"Z": -17.166443
},
"StopDistance": 5,
"TerritoryId": 212,
"InteractionType": "CompleteQuest"
}

13
QuestPaths/4.x - Stormblood/MSQ/B-4.1/2970_Securing the Saltery.json
View File

@ -12,6 +12,7 @@
"Y": -2.0000012,
"Z": -17.166443
},
"StopDistance": 5,
"TerritoryId": 212,
"InteractionType": "AcceptQuest"
}
@ -45,7 +46,8 @@
},
"TerritoryId": 621,
"InteractionType": "Interact",
"Fly": true
"Fly": true,
"AetheryteShortcut": "Lochs - Porta Praetoria"
}
]
},
@ -60,8 +62,9 @@
"Z": 196.55139
},
"TerritoryId": 621,
"InteractionType": "Interact",
"Comment": "Aim at jaw"
"InteractionType": "Instruction",
"Comment": "Aim at jaw",
"Fly": true
}
]
},
@ -75,6 +78,7 @@
"Y": -0.3,
"Z": 207.6294
},
"StopDistance": 5,
"TerritoryId": 621,
"InteractionType": "Interact"
}
@ -91,7 +95,7 @@
"Z": 282.7954
},
"TerritoryId": 621,
"InteractionType": "Interact",
"InteractionType": "Instruction",
"Fly": true,
"Comment": "Aim at nearest eye"
}
@ -107,6 +111,7 @@
"Y": 3.1742485,
"Z": 249.34766
},
"StopDistance": 6,
"TerritoryId": 621,
"InteractionType": "Interact"
}

14
QuestPaths/4.x - Stormblood/MSQ/B-4.1/2971_A Blissful Arrival.json
View File

@ -12,6 +12,7 @@
"Y": 11.183233,
"Z": 187.02979
},
"StopDistance": 5,
"TerritoryId": 621,
"InteractionType": "AcceptQuest"
}
@ -20,6 +21,16 @@
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": 528.8298,
"Y": 70,
"Z": 580.3701
},
"TerritoryId": 621,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 2009047,
"Position": {
@ -27,9 +38,9 @@
"Y": 69.962524,
"Z": 577.3861
},
"StopDistance": 4,
"TerritoryId": 621,
"InteractionType": "Interact",
"Fly": true,
"AetheryteShortcut": "Lochs - Ala Mhigan Quarter"
}
]
@ -44,6 +55,7 @@
"Y": 70,
"Z": 574.6699
},
"StopDistance": 7,
"TerritoryId": 621,
"InteractionType": "Interact"
}

13
QuestPaths/4.x - Stormblood/MSQ/B-4.1/2972_Return of the Bull.json
View File

@ -12,6 +12,7 @@
"Y": 74.00002,
"Z": 75.48633
},
"StopDistance": 5,
"TerritoryId": 621,
"InteractionType": "AcceptQuest",
"DialogueChoices": [
@ -52,7 +53,14 @@
},
"TerritoryId": 621,
"InteractionType": "Interact",
"Fly": true
"Fly": true,
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_STMBDB111_02972_Q2_000_000",
"Yes": true
}
]
}
]
},
@ -66,6 +74,7 @@
"Y": 122,
"Z": -349.0807
},
"StopDistance": 5,
"TerritoryId": 737,
"InteractionType": "SinglePlayerDuty"
}
@ -99,6 +108,7 @@
"Y": 70,
"Z": 525.5055
},
"StopDistance": 6,
"TerritoryId": 621,
"InteractionType": "Interact"
}
@ -114,6 +124,7 @@
"Y": 70,
"Z": 525.5055
},
"StopDistance": 6,
"TerritoryId": 621,
"InteractionType": "Interact"
}

1
QuestPaths/4.x - Stormblood/MSQ/C-4.2/3023_The Sword in the Store.json
View File

@ -12,6 +12,7 @@
"Y": 10.503965,
"Z": -213.76367
},
"StopDistance": 4,
"TerritoryId": 628,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Kugane",

1
QuestPaths/4.x - Stormblood/MSQ/C-4.2/3024_Hope on the Waves.json
View File

@ -97,6 +97,7 @@
"Y": 11.709066,
"Z": -283.0091
},
"StopDistance": 7,
"TerritoryId": 613,
"InteractionType": "CompleteQuest"
}

35
QuestPaths/4.x - Stormblood/MSQ/C-4.2/3025_Elation and Trepidation.json
View File

@ -12,6 +12,7 @@
"Y": 12.349811,
"Z": -283.8026
},
"StopDistance": 7,
"TerritoryId": 613,
"InteractionType": "AcceptQuest"
}
@ -56,7 +57,14 @@
},
"TerritoryId": 614,
"InteractionType": "Interact",
"$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 128"
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 1019286,
@ -66,7 +74,15 @@
"Z": -425.3758
},
"TerritoryId": 614,
"InteractionType": "Interact"
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
}
]
},
@ -111,6 +127,7 @@
"Y": 36.90612,
"Z": -524.71204
},
"StopDistance": 4,
"TerritoryId": 614,
"InteractionType": "Interact"
}
@ -119,16 +136,6 @@
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": 228.99776,
"Y": 5.218606,
"Z": -407.7175
},
"TerritoryId": 614,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1020524,
"Position": {
@ -137,7 +144,9 @@
"Z": -433.24945
},
"TerritoryId": 614,
"InteractionType": "CompleteQuest"
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Yanxia - House of the Fierce",
"Fly": true
}
]
}

42
QuestPaths/4.x - Stormblood/MSQ/C-4.2/3026_Storm on the Horizon.json
View File

@ -50,6 +50,7 @@
"Y": 1.7862457,
"Z": 738.9486
},
"StopDistance": 5,
"TerritoryId": 614,
"InteractionType": "Interact"
}
@ -86,43 +87,25 @@
"TargetTerritoryId": 759
},
{
"DataId": 162,
"Position": {
"X": 96.269165,
"Y": -3.4332886,
"Z": 81.01013
},
"TerritoryId": 759,
"InteractionType": "Interact",
"Comment": "Aethernet Attunement: [Doman Enclave] Ferry Docks"
"InteractionType": "AttuneAethernetShard",
"AethernetShard": "[Doman Enclave] Ferry Docks"
},
{
"DataId": 130,
"Position": {
"X": -61.57019,
"Y": 0.77819824,
"Z": 90.684326
},
"TerritoryId": 759,
"InteractionType": "Interact",
"Comment": "Aethernet Attunement: [Doman Enclave] The Southern Enclave"
},
{
"DataId": 129,
"Position": {
"X": 8.987488,
"Y": 0.8086548,
"Z": -105.85187
},
"TerritoryId": 759,
"InteractionType": "Interact",
"Comment": "Aethernet Attunement: [Doman Enclave] The Northern Enclave"
"InteractionType": "AttuneAethernetShard",
"AethernetShard": "[Doman Enclave] The Southern Enclave"
},
{
"TerritoryId": 759,
"InteractionType": "AttuneAetheryte",
"Aetheryte": "Doman Enclave"
},
{
"TerritoryId": 759,
"InteractionType": "AttuneAethernetShard",
"AethernetShard": "[Doman Enclave] The Northern Enclave"
},
{
"DataId": 1024970,
"Position": {
@ -132,6 +115,10 @@
},
"TerritoryId": 759,
"InteractionType": "Interact",
"AethernetShortcut": [
"[Doman Enclave] The Northern Enclave",
"[Doman Enclave] Aetheryte Plaza"
],
"DialogueChoices": [
{
"Type": "List",
@ -178,6 +165,7 @@
"Y": 0.19999999,
"Z": -4.837158
},
"StopDistance": 7,
"TerritoryId": 744,
"InteractionType": "Interact"
}

1
QuestPaths/4.x - Stormblood/MSQ/C-4.2/3029_Rise of a New Sun.json
View File

@ -56,6 +56,7 @@
"Y": 1.286227,
"Z": 746.2118
},
"StopDistance": 5,
"TerritoryId": 614,
"InteractionType": "Interact"
}

5
QuestPaths/4.x - Stormblood/MSQ/D-4.3/3070_Gosetsu and Tsuyu.json
View File

@ -74,7 +74,10 @@
},
"TerritoryId": 759,
"InteractionType": "CompleteQuest",
"Comment": "AethernetShortcut: [Doman Enclave] Aetheryte Plaza -> [Doman Enclave] Ferry Docks"
"AethernetShortcut": [
"[Doman Enclave] Aetheryte Plaza",
"[Doman Enclave] Ferry Docks"
]
}
]
}

19
QuestPaths/4.x - Stormblood/MSQ/D-4.3/3071_Gone Like the Morning Dew.json
View File

@ -36,7 +36,14 @@
"TerritoryId": 614,
"InteractionType": "Interact",
"Fly": true,
"$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 128"
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 1019303,
@ -46,7 +53,15 @@
"Z": 512.47424
},
"TerritoryId": 614,
"InteractionType": "Interact"
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
}
]
},

1
QuestPaths/4.x - Stormblood/MSQ/D-4.3/3074_The Primary Agreement.json
View File

@ -60,6 +60,7 @@
"Y": -8.000055,
"Z": 44.327393
},
"StopDistance": 5,
"TerritoryId": 786,
"InteractionType": "Interact"
}

15
QuestPaths/4.x - Stormblood/MSQ/D-4.3/3075_Under the Moonlight.json
View File

@ -40,6 +40,17 @@
{
"Sequence": 2,
"Steps": [
{
"Position": {
"X": 70.965355,
"Y": 26.085297,
"Z": -607.26685
},
"TerritoryId": 621,
"InteractionType": "WalkTo",
"Fly": true,
"AetheryteShortcut": "Lochs - Porta Praetoria"
},
{
"DataId": 1025546,
"Position": {
@ -48,9 +59,7 @@
"Z": -609.43005
},
"TerritoryId": 621,
"InteractionType": "Interact",
"Fly": true,
"AetheryteShortcut": "Lochs - Porta Praetoria"
"InteractionType": "Interact"
}
]
},

3
QuestPaths/4.x - Stormblood/Raid Quests/3035_Test World of Ruin.json
View File

@ -44,6 +44,9 @@
}
]
},
{
"Sequence": 3
},
{
"Sequence": 4,
"Steps": [

1
Questionable.Model/Common/EAetheryteLocation.cs
View File

@ -156,6 +156,7 @@ public enum EAetheryteLocation
DomanEnclaveSouthern = 130,
DomanEnclaveOneRiver = 131,
DomanEnclaveDocks = 162,
DomanEnclaveGangos = 163,
Crystarium = 133,
CrystariumMarkets = 149,

7
Questionable.Model/Questing/Converter/AethernetShardConverter.cs
View File

@ -100,6 +100,13 @@ public sealed class AethernetShardConverter() : EnumConverter<EAetheryteLocation
{ EAetheryteLocation.KuganeRubyPrice, "[Kugane] The Ruby Price" },
{ EAetheryteLocation.KuganeAirship, "[Kugane] Airship Landing" },
{ EAetheryteLocation.DomanEnclave, "[Doman Enclave] Aetheryte Plaza" },
{ EAetheryteLocation.DomanEnclaveNorthern, "[Doman Enclave] The Northern Enclave" },
{ EAetheryteLocation.DomanEnclaveSouthern, "[Doman Enclave] The Southern Enclave" },
{ EAetheryteLocation.DomanEnclaveDocks, "[Doman Enclave] Ferry Docks" },
{ EAetheryteLocation.DomanEnclaveOneRiver, "[Doman Enclave] The One River" },
{ EAetheryteLocation.DomanEnclaveGangos, "[Doman Enclave] Gangos" },
{ EAetheryteLocation.Crystarium, "[Crystarium] Aetheryte Plaza" },
{ EAetheryteLocation.CrystariumMarkets, "[Crystarium] Musica Universalis Markets" },
{ EAetheryteLocation.CrystariumTemenosRookery, "[Crystarium] Temenos Rookery" },

6
Questionable.Model/common-schema.json
View File

@ -219,6 +219,12 @@
"[Kugane] Rakuza District",
"[Kugane] The Ruby Price",
"[Kugane] Airship Landing",
"[Doman Enclave] Aetheryte Plaza",
"[Doman Enclave] The Northern Enclave",
"[Doman Enclave] The Southern Enclave",
"[Doman Enclave] Ferry Docks",
"[Doman Enclave] The One River",
"[Doman Enclave] Gangos",
"[Crystarium] Aetheryte Plaza",
"[Crystarium] Musica Universalis Markets",
"[Crystarium] Temenos Rookery",