Minor cleanup for SB part 3

pull/2/head
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

View File

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

View File

@ -12,6 +12,7 @@
"Y": 0, "Y": 0,
"Z": 58.64038 "Z": 58.64038
}, },
"StopDistance": 5,
"TerritoryId": 635, "TerritoryId": 635,
"InteractionType": "AcceptQuest", "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Rhalgr's Reach", "AetheryteShortcut": "Rhalgr's Reach",
@ -36,7 +37,14 @@
"TerritoryId": 621, "TerritoryId": 621,
"InteractionType": "Interact", "InteractionType": "Interact",
"AetheryteShortcut": "Lochs - Ala Mhigan Quarter", "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, "DataId": 1024131,
@ -47,7 +55,24 @@
}, },
"TerritoryId": 621, "TerritoryId": 621,
"InteractionType": "Interact", "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 "Fly": true
}, },
{ {
@ -59,7 +84,14 @@
}, },
"TerritoryId": 621, "TerritoryId": 621,
"InteractionType": "Interact", "InteractionType": "Interact",
"Fly": true "CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
} }
] ]
}, },
@ -74,8 +106,7 @@
"Z": 489.76868 "Z": 489.76868
}, },
"TerritoryId": 621, "TerritoryId": 621,
"InteractionType": "Interact", "InteractionType": "Interact"
"Fly": true
} }
] ]
}, },
@ -91,6 +122,7 @@
}, },
"TerritoryId": 621, "TerritoryId": 621,
"InteractionType": "CompleteQuest", "InteractionType": "CompleteQuest",
"AetheryteShortcut": "Lochs - Ala Mhigan Quarter",
"Fly": true "Fly": true
} }
] ]

View File

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

View File

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

View File

@ -35,7 +35,14 @@
}, },
"TerritoryId": 621, "TerritoryId": 621,
"InteractionType": "Interact", "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, "X": -2.9769177,
"Y": -1.3092512, "Y": -1.3092512,
"Z": -36.29651 "Z": -36.29651
} },
"DelaySeconds": 0.1
}, },
"StopDistance": 0.25 "StopDistance": 0.25
}, },
@ -87,7 +95,8 @@
"X": -2.8188858, "X": -2.8188858,
"Y": 0.16235979, "Y": 0.16235979,
"Z": -38.626305 "Z": -38.626305
} },
"DelaySeconds": 0.1
}, },
"StopDistance": 0.25 "StopDistance": 0.25
}, },
@ -101,6 +110,7 @@
"TerritoryId": 738, "TerritoryId": 738,
"InteractionType": "Interact", "InteractionType": "Interact",
"StopDistance": 4, "StopDistance": 4,
"DelaySecondsAtStart": 3,
"$": "QW: 0 0 0 0 0 0 -> QW: 16 16 0 0 0 128" "$": "QW: 0 0 0 0 0 0 -> QW: 16 16 0 0 0 128"
}, },
{ {

View File

@ -26,6 +26,22 @@
{ {
"Sequence": 1, "Sequence": 1,
"Steps": [ "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, "DataId": 1001821,
"Position": { "Position": {
@ -39,7 +55,12 @@
"AethernetShortcut": [ "AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza", "[Ul'dah] Aetheryte Plaza",
"[Ul'dah] The Chamber of Rule" "[Ul'dah] The Chamber of Rule"
] ],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
} }
] ]
}, },

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -36,7 +36,14 @@
"TerritoryId": 614, "TerritoryId": 614,
"InteractionType": "Interact", "InteractionType": "Interact",
"Fly": true, "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, "DataId": 1019303,
@ -46,7 +53,15 @@
"Z": 512.47424 "Z": 512.47424
}, },
"TerritoryId": 614, "TerritoryId": 614,
"InteractionType": "Interact" "InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
} }
] ]
}, },

View File

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

View File

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

View File

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

View File

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

View File

@ -100,6 +100,13 @@ public sealed class AethernetShardConverter() : EnumConverter<EAetheryteLocation
{ EAetheryteLocation.KuganeRubyPrice, "[Kugane] The Ruby Price" }, { EAetheryteLocation.KuganeRubyPrice, "[Kugane] The Ruby Price" },
{ EAetheryteLocation.KuganeAirship, "[Kugane] Airship Landing" }, { 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.Crystarium, "[Crystarium] Aetheryte Plaza" },
{ EAetheryteLocation.CrystariumMarkets, "[Crystarium] Musica Universalis Markets" }, { EAetheryteLocation.CrystariumMarkets, "[Crystarium] Musica Universalis Markets" },
{ EAetheryteLocation.CrystariumTemenosRookery, "[Crystarium] Temenos Rookery" }, { EAetheryteLocation.CrystariumTemenosRookery, "[Crystarium] Temenos Rookery" },

View File

@ -219,6 +219,12 @@
"[Kugane] Rakuza District", "[Kugane] Rakuza District",
"[Kugane] The Ruby Price", "[Kugane] The Ruby Price",
"[Kugane] Airship Landing", "[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] Aetheryte Plaza",
"[Crystarium] Musica Universalis Markets", "[Crystarium] Musica Universalis Markets",
"[Crystarium] Temenos Rookery", "[Crystarium] Temenos Rookery",