Merge remote-tracking branch 'origin/master'

This commit is contained in:
Liza 2024-11-28 22:44:56 +01:00
commit 5d82d923d4
Signed by: liza
GPG Key ID: 8DD6D21C03BB0848
12 changed files with 1050 additions and 1 deletions

View File

@ -0,0 +1,190 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1012132,
"Position": {
"X": 43.015137,
"Y": 206.04718,
"Z": 56.50415
},
"TerritoryId": 478,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Idyllshire",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1016802,
"Position": {
"X": 53.360718,
"Y": -48.000004,
"Z": -169.97028
},
"TerritoryId": 398,
"InteractionType": "Interact",
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1018232,
"Position": {
"X": 236.01123,
"Y": -42.313934,
"Z": 596.3989
},
"TerritoryId": 400,
"InteractionType": "Interact",
"AetheryteShortcut": "The Churning Mists - Moghome",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1017320,
"Position": {
"X": -342.15308,
"Y": 59.03801,
"Z": 315.14453
},
"TerritoryId": 400,
"InteractionType": "Interact",
"AetheryteShortcut": "The Churning Mists - Zenith",
"Fly": true
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1017170,
"Position": {
"X": -344.22827,
"Y": 59.038006,
"Z": 317.1587
},
"TerritoryId": 400,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 5,
"Steps": [
{
"DataId": 1017173,
"Position": {
"X": -363.82086,
"Y": 60.896187,
"Z": 306.38586
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 6,
"Steps": [
{
"DataId": 1017173,
"Position": {
"X": -363.82086,
"Y": 60.896187,
"Z": 306.38586
},
"TerritoryId": 400,
"InteractionType": "Emote",
"Emote": "rally"
}
]
},
{
"Sequence": 7,
"Steps": [
{
"DataId": 1017170,
"Position": {
"X": -344.22827,
"Y": 59.038006,
"Z": 317.1587
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 8,
"Steps": [
{
"DataId": 2007517,
"Position": {
"X": -332.6314,
"Y": 59.067627,
"Z": 298.39014
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 9,
"Steps": [
{
"DataId": 1018234,
"Position": {
"X": -635.85876,
"Y": 82.249985,
"Z": 142.96167
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1017320,
"Position": {
"X": -342.15308,
"Y": 59.03801,
"Z": 315.14453
},
"TerritoryId": 400,
"InteractionType": "CompleteQuest",
"Fly": true,
"NextQuestId": 2383
}
]
}
]
}

View File

@ -0,0 +1,149 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1017320,
"Position": {
"X": -342.15308,
"Y": 59.03801,
"Z": 315.14453
},
"TerritoryId": 400,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "The Churning Mists - Zenith",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
},
"Fly": true
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1018242,
"Position": {
"X": -365.1942,
"Y": 60.616608,
"Z": 279.89612
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
},
{
"DataId": 1018241,
"Position": {
"X": -421.40845,
"Y": 60.89619,
"Z": 272.755
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1018239,
"Position": {
"X": -339.25385,
"Y": 59.038,
"Z": 317.03674
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1011928,
"Position": {
"X": 73.19751,
"Y": -49.19563,
"Z": -139.05548
},
"TerritoryId": 398,
"InteractionType": "Interact",
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
"Fly": true
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1018243,
"Position": {
"X": 35.99597,
"Y": -130.7033,
"Z": 543.3279
},
"TerritoryId": 398,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 5,
"Steps": [
{
"Position": {
"X": 471.06836,
"Y": -51.141403,
"Z": 35.919243
},
"TerritoryId": 398,
"InteractionType": "WalkTo",
"AetheryteShortcut": "The Dravanian Forelands - Tailfeather",
"Fly": true,
"Land": true
},
{
"DataId": 1011916,
"Position": {
"X": 470.02356,
"Y": -49.89133,
"Z": 20.370789
},
"TerritoryId": 398,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1011907,
"Position": {
"X": -288.8686,
"Y": 127.06639,
"Z": 13.199036
},
"TerritoryId": 397,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
"Fly": true,
"NextQuestId": 2384
}
]
}
]
}

View File

@ -0,0 +1,111 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1018248,
"Position": {
"X": -287.34265,
"Y": 126.77467,
"Z": 3.3721924
},
"TerritoryId": 397,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
},
"Fly": true
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1018249,
"Position": {
"X": -814.9691,
"Y": -130.31683,
"Z": -415.85413
},
"TerritoryId": 401,
"InteractionType": "Interact",
"AetheryteShortcut": "The Sea of Clouds - Ok' Zundu",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1018251,
"Position": {
"X": 285.7556,
"Y": -112.76572,
"Z": 562.1881
},
"TerritoryId": 401,
"InteractionType": "Interact",
"AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1018251,
"Position": {
"X": 285.7556,
"Y": -112.76572,
"Z": 562.1881
},
"TerritoryId": 401,
"InteractionType": "Emote",
"Emote": "mogdance"
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1018254,
"Position": {
"X": 383.93213,
"Y": -125.28945,
"Z": 734.4929
},
"TerritoryId": 401,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1018255,
"Position": {
"X": -793.7896,
"Y": -133.26949,
"Z": -412.6803
},
"TerritoryId": 401,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "The Sea of Clouds - Ok' Zundu",
"Fly": true,
"NextQuestId": 2385
}
]
}
]
}

View File

@ -0,0 +1,110 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1018255,
"Position": {
"X": -793.7896,
"Y": -133.26949,
"Z": -412.6803
},
"TerritoryId": 401,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "The Sea of Clouds - Ok' Zundu",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
},
"Fly": true
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1018257,
"Position": {
"X": -664.36255,
"Y": -176.4502,
"Z": -570.3975
},
"TerritoryId": 402,
"InteractionType": "Interact",
"AetheryteShortcut": "Azys Lla - Helix",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1018260,
"Position": {
"X": -189.5628,
"Y": -102.63812,
"Z": 449.60706
},
"TerritoryId": 402,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 2007518,
"Position": {
"X": -697.01685,
"Y": -37.82715,
"Z": 431.2047
},
"TerritoryId": 402,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1018261,
"Position": {
"X": 785.3054,
"Y": -24.802603,
"Z": -766.3539
},
"TerritoryId": 402,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1016087,
"Position": {
"X": -796.7498,
"Y": -133.2695,
"Z": -410.6966
},
"TerritoryId": 401,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "The Sea of Clouds - Ok' Zundu",
"Fly": true
}
]
}
]
}

View File

@ -0,0 +1,36 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1016087,
"Position": {
"X": -796.7498,
"Y": -133.2695,
"Z": -410.6966
},
"TerritoryId": 401,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1016088,
"Position": {
"X": -818.143,
"Y": -129.93259,
"Z": -414.02307
},
"TerritoryId": 401,
"InteractionType": "CompleteQuest"
}
]
}
]
}

View File

@ -0,0 +1,180 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1024217,
"Position": {
"X": 394.39978,
"Y": -119.58932,
"Z": -232.28815
},
"TerritoryId": 613,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"TerritoryId": 613,
"InteractionType": "None",
"AetheryteShortcut": "Kugane",
"AethernetShortcut": [
"[Kugane] Aetheryte Plaza",
"[Kugane] The Ruby Price"
]
},
{
"DataId": 2009100,
"Position": {
"X": 394.7661,
"Y": 16.983276,
"Z": 845.9448
},
"TerritoryId": 613,
"InteractionType": "Combat",
"EnemySpawnType": "AfterItemUse",
"ItemId": 2002419,
"KillEnemyDataIds": [8242],
"RequiredQuestVariables": [
null,
null,
null,
null,
[48, 80, 112, 128],
null
],
"Fly": true
},
{
"DataId": 2009101,
"Position": {
"X": 460.99023,
"Y": 0.56451416,
"Z": 889.494
},
"TerritoryId": 613,
"InteractionType": "Combat",
"EnemySpawnType": "AfterItemUse",
"ItemId": 2002419,
"KillEnemyDataIds": [8242],
"RequiredQuestVariables": [
null,
null,
null,
null,
[16, 32, 128],
null
],
"Fly": true
},
{
"DataId": 2009142,
"Position": {
"X": 480.4607,
"Y": 3.829956,
"Z": 841.3672
},
"TerritoryId": 613,
"InteractionType": "Combat",
"EnemySpawnType": "AfterItemUse",
"ItemId": 2002419,
"KillEnemyDataIds": [8242],
"RequiredQuestVariables": [
null,
null,
null,
null,
[16, 64, 80, 96],
null
],
"Fly": true
},
{
"DataId": 2009140,
"Position": {
"X": 543.1753,
"Y": -0.015319824,
"Z": 685.7251
},
"TerritoryId": 613,
"InteractionType": "Combat",
"EnemySpawnType": "AfterItemUse",
"ItemId": 2002419,
"KillEnemyDataIds": [8243, 8243],
"RequiredQuestVariables": [null, null, null, null, [96, 112], null],
"Fly": true
},
{
"DataId": 2009141,
"Position": {
"X": 352.1018,
"Y": -0.015319824,
"Z": 860.31885
},
"TerritoryId": 613,
"InteractionType": "Combat",
"EnemySpawnType": "AfterItemUse",
"ItemId": 2002419,
"KillEnemyDataIds": [8243, 8243],
"RequiredQuestVariables": [
null,
null,
null,
null,
[32, 48, 64],
null
],
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1024317,
"Position": {
"X": 823.3004,
"Y": 5.9230013,
"Z": 866.6361
},
"TerritoryId": 613,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": 392.59683,
"Y": -119.589325,
"Z": -234.30063
},
"TerritoryId": 613,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Ruby Sea - Tamamizu",
"Fly": true
},
{
"DataId": 1024217,
"Position": {
"X": 394.39978,
"Y": -119.58932,
"Z": -232.28815
},
"TerritoryId": 613,
"InteractionType": "CompleteQuest"
}
]
}
]
}

View File

@ -0,0 +1,10 @@
0 0 0 0 xxx 0 | 2009100 2009101 2009140 2009141 2009142
16 x x
32 x x
48 x x
64 x x
80 x x
96 x x
112 x x
128 x x

View File

@ -0,0 +1,137 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1027233,
"Position": {
"X": 9.292725,
"Y": 20.186,
"Z": -124.55945
},
"TerritoryId": 819,
"InteractionType": "AcceptQuest",
"DialogueChoices": [
{
"Prompt": "TEXT_LUCKLA102_03228_Q1_000_000",
"Type": "List",
"Answer": "TEXT_LUCKLA102_03228_A1_000_001"
},
{
"Prompt": "TEXT_LUCKLA102_03228_Q2_000_000",
"Type": "List",
"Answer": "TEXT_LUCKLA102_03228_A2_000_001"
}
],
"AetheryteShortcut": "Crystarium",
"AethernetShortcut": [
"[Crystarium] Aetheryte Plaza",
"[Crystarium] The Crystalline Mean"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
},
"AethernetShortcutIf": {
"InSameTerritory": true
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1028450,
"Position": {
"X": -311.94025,
"Y": 113.85077,
"Z": -824.4602
},
"TerritoryId": 813,
"InteractionType": "Interact",
"AetheryteShortcut": "Lakeland - Ostall Imperative",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1028451,
"Position": {
"X": -138.96393,
"Y": 58.34806,
"Z": -670.6798
},
"TerritoryId": 816,
"InteractionType": "Interact",
"AetheryteShortcut": "Il Mheg - Pla Enni",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1028452,
"Position": {
"X": -14.511353,
"Y": 104.487236,
"Z": -861.6312
},
"TerritoryId": 816,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1027233,
"Position": {
"X": 9.292725,
"Y": 20.186,
"Z": -124.55945
},
"TerritoryId": 819,
"InteractionType": "Interact",
"AetheryteShortcut": "Crystarium",
"AethernetShortcut": [
"[Crystarium] Aetheryte Plaza",
"[Crystarium] The Crystalline Mean"
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"TerritoryId": 819,
"InteractionType": "Craft",
"ItemId": 27237,
"ItemCount": 1
},
{
"DataId": 1027233,
"Position": {
"X": 9.292725,
"Y": 20.186,
"Z": -124.55945
},
"TerritoryId": 819,
"InteractionType": "CompleteQuest"
}
]
}
]
}

View File

@ -0,0 +1,123 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1027233,
"Position": {
"X": 9.292725,
"Y": 20.186,
"Z": -124.55945
},
"TerritoryId": 819,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Crystarium",
"AethernetShortcut": [
"[Crystarium] Aetheryte Plaza",
"[Crystarium] The Crystalline Mean"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
},
"AethernetShortcutIf": {
"InSameTerritory": true
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1028454,
"Position": {
"X": -17.441101,
"Y": 3.9998174,
"Z": 191.94324
},
"TerritoryId": 819,
"InteractionType": "Interact",
"AethernetShortcut": [
"[Crystarium] The Crystalline Mean",
"[Crystarium] Musica Universalis Markets"
]
}
]
},
{
"Sequence": 2,
"Steps": [
{
"TerritoryId": 819,
"InteractionType": "Craft",
"ItemId": 27239,
"ItemCount": 1
},
{
"DataId": 1028454,
"Position": {
"X": -17.441101,
"Y": 3.9998174,
"Z": 191.94324
},
"TerritoryId": 819,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1028458,
"Position": {
"X": -96.665955,
"Y": -4.200001,
"Z": 133.1654
},
"TerritoryId": 819,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1028454,
"Position": {
"X": -17.441101,
"Y": 3.9998174,
"Z": 191.94324
},
"TerritoryId": 819,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1027233,
"Position": {
"X": 9.292725,
"Y": 20.186,
"Z": -124.55945
},
"TerritoryId": 819,
"InteractionType": "CompleteQuest",
"AethernetShortcut": [
"[Crystarium] Musica Universalis Markets",
"[Crystarium] The Crystalline Mean"
]
}
]
}
]
}

View File

@ -848,7 +848,8 @@
"cry", "cry",
"disappointed", "disappointed",
"examineself", "examineself",
"joy" "joy",
"mogdance"
] ]
} }
} }

View File

@ -37,6 +37,7 @@ public sealed class EmoteConverter() : EnumConverter<EEmote>(Values)
{ EEmote.SundropDance, "sundropdance"}, { EEmote.SundropDance, "sundropdance"},
{ EEmote.BattleStance, "battlestance" }, { EEmote.BattleStance, "battlestance" },
{ EEmote.VictoryPose, "victorypose" }, { EEmote.VictoryPose, "victorypose" },
{ EEmote.MogDance, "mogdance" },
{ EEmote.Flex, "flex" }, { EEmote.Flex, "flex" },
{ EEmote.Respect, "respect" }, { EEmote.Respect, "respect" },
{ EEmote.Box, "box" }, { EEmote.Box, "box" },

View File

@ -38,6 +38,7 @@ public enum EEmote
SundropDance = 120, SundropDance = 120,
BattleStance = 121, BattleStance = 121,
VictoryPose = 122, VictoryPose = 122,
MogDance = 126,
Flex = 139, Flex = 139,
Respect = 140, Respect = 140,
Box = 166, Box = 166,