Merge pull request '[ARR][Allied Society][Amalj'aa] Added new story and daily quests' (#99) from plogon_enjoyer/Questionable:amaljaa into master

Reviewed-on: #99
This commit is contained in:
Liza 2024-11-09 19:13:12 +00:00
commit c841edda8d
10 changed files with 656 additions and 1 deletions

View File

@ -0,0 +1,116 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1005550,
"Position": {
"X": 105.27197,
"Y": 15.359643,
"Z": -357.3816
},
"TerritoryId": 146,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 2002979,
"Position": {
"X": -180.68213,
"Y": 6.301941,
"Z": -136.21735
},
"TerritoryId": 146,
"InteractionType": "Interact",
"RequiredQuestVariables": [null, [1, 2], null, null, null, null],
"Fly": true
},
{
"DataId": 2002981,
"Position": {
"X": -30.655396,
"Y": 8.651855,
"Z": -87.02222
},
"TerritoryId": 146,
"InteractionType": "Interact",
"RequiredQuestVariables": [null, [4, 17], null, null, null, null],
"Fly": true
},
{
"DataId": 2002982,
"Position": {
"X": -116.44165,
"Y": -0.3204956,
"Z": -34.40918
},
"TerritoryId": 146,
"InteractionType": "Interact",
"RequiredQuestVariables": [null, [18, 20], null, null, null, null],
"Fly": true
},
{
"DataId": 2002985,
"Position": {
"X": -41.031555,
"Y": 0.16778564,
"Z": 15.915161
},
"TerritoryId": 146,
"InteractionType": "Interact",
"RequiredQuestVariables": [
null,
[33, 34, 36],
null,
null,
null,
null
],
"Fly": true
},
{
"DataId": 2002986,
"Position": {
"X": -78.81293,
"Y": -1.083435,
"Z": 44.052734
},
"TerritoryId": 146,
"InteractionType": "Interact",
"RequiredQuestVariables": [
null,
[49, 50, 52],
null,
null,
null,
null
],
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1005550,
"Position": {
"X": 105.27197,
"Y": 15.359643,
"Z": -357.3816
},
"TerritoryId": 146,
"InteractionType": "CompleteQuest",
"Fly": true
}
]
}
]
}

View File

@ -0,0 +1,63 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1005550,
"Position": {
"X": 105.27197,
"Y": 15.359643,
"Z": -357.3816
},
"TerritoryId": 146,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -40.402416,
"Y": -1.1266766,
"Z": 0.71999836
},
"TerritoryId": 146,
"InteractionType": "Combat",
"EnemySpawnType": "OverworldEnemies",
"ComplexCombatData": [
{
"DataId": 358,
"MinimumKillCount": 3
},
{
"DataId": 2451,
"MinimumKillCount": 1
}
],
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1005550,
"Position": {
"X": 105.27197,
"Y": 15.359643,
"Z": -357.3816
},
"TerritoryId": 146,
"InteractionType": "CompleteQuest",
"Fly": true
}
]
}
]
}

View File

@ -0,0 +1,37 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1005551,
"Position": {
"X": 98.924194,
"Y": 15.29447,
"Z": -349.4469
},
"TerritoryId": 146,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1005551,
"Position": {
"X": 98.924194,
"Y": 15.29447,
"Z": -349.4469
},
"TerritoryId": 146,
"InteractionType": "CompleteQuest",
"Fly": true
}
]
}
]
}

View File

@ -0,0 +1,37 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1005551,
"Position": {
"X": 98.924194,
"Y": 15.29447,
"Z": -349.4469
},
"TerritoryId": 146,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1005551,
"Position": {
"X": 98.924194,
"Y": 15.29447,
"Z": -349.4469
},
"TerritoryId": 146,
"InteractionType": "CompleteQuest",
"Fly": true
}
]
}
]
}

View File

@ -0,0 +1,118 @@
{
"$schema": "https://git.carvel.li/plogon_enjoyer/Questionable/raw/branch/temp/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1005551,
"Position": {
"X": 98.924194,
"Y": 15.29447,
"Z": -349.4469
},
"TerritoryId": 146,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1005848,
"Position": {
"X": -101.487854,
"Y": 8.097177,
"Z": 403.28064
},
"TerritoryId": 146,
"InteractionType": "Interact",
"AetheryteShortcut": "Southern Thanalan - Forgotten Springs",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 2003353,
"Position": {
"X": -248.0965,
"Y": 2.8533936,
"Z": 675.95935
},
"TerritoryId": 146,
"InteractionType": "Action",
"Action": "Fiery Breath",
"RequiredQuestVariables": [null, null, null, [1], null, null]
},
{
"DataId": 2003354,
"Position": {
"X": -132.03638,
"Y": -1.449646,
"Z": 778.8052
},
"TerritoryId": 146,
"InteractionType": "Action",
"Action": "Fiery Breath",
"RequiredQuestVariables": [null, null, null, [1, 5], null, null]
},
{
"DataId": 2003356,
"Position": {
"X": 78.446655,
"Y": 14.328186,
"Z": 589.9595
},
"TerritoryId": 146,
"InteractionType": "Action",
"Action": "Fiery Breath",
"RequiredQuestVariables": [null, null, null, [1, 5], null, null]
},
{
"DataId": 2003357,
"Position": {
"X": 179.9801,
"Y": 6.6376343,
"Z": 601.15967
},
"TerritoryId": 146,
"InteractionType": "Action",
"Action": "Fiery Breath",
"RequiredQuestVariables": [null, null, null, [5], null, null]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": -56.11375,
"Y": 25.301596,
"Z": -391.2648
},
"TerritoryId": 146,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo",
"Mount": true
},
{
"DataId": 1005551,
"Position": {
"X": 98.924194,
"Y": 15.29447,
"Z": -349.4469
},
"TerritoryId": 146,
"InteractionType": "CompleteQuest",
"Fly": true
}
]
}
]
}

View File

@ -0,0 +1,59 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1005551,
"Position": {
"X": 98.924194,
"Y": 15.29447,
"Z": -349.4469
},
"TerritoryId": 146,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -38.375584,
"Y": 8.492833,
"Z": 156.09068
},
"TerritoryId": 146,
"InteractionType": "Combat",
"EnemySpawnType": "OverworldEnemies",
"ComplexCombatData": [
{
"DataId": 2452,
"MinimumKillCount": 2
}
],
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1005551,
"Position": {
"X": 98.924194,
"Y": 15.29447,
"Z": -349.4469
},
"TerritoryId": 146,
"InteractionType": "CompleteQuest",
"Fly": true
}
]
}
]
}

View File

@ -0,0 +1,221 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1005553,
"Position": {
"X": 122.6062,
"Y": 16.402647,
"Z": -362.11188
},
"TerritoryId": 146,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1005581,
"Position": {
"X": -55.985413,
"Y": -1.6554508,
"Z": -47.56244
},
"TerritoryId": 146,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 2002949,
"Position": {
"X": -70.17627,
"Y": 11.36792,
"Z": 97.0625
},
"TerritoryId": 146,
"InteractionType": "Action",
"Action": "Fiery Breath"
},
{
"DataId": 2002956,
"Position": {
"X": -199.96954,
"Y": 5.661072,
"Z": 101.823364
},
"TerritoryId": 146,
"InteractionType": "Action",
"Action": "Fiery Breath"
},
{
"DataId": 2002950,
"Position": {
"X": -118.0896,
"Y": 27.695068,
"Z": 126.97034
},
"TerritoryId": 146,
"InteractionType": "Action",
"Action": "Fiery Breath"
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1005585,
"Position": {
"X": -114.64105,
"Y": 7.539109,
"Z": 308.82727
},
"TerritoryId": 146,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1005583,
"Position": {
"X": -114.27484,
"Y": 7.6587763,
"Z": 310.01746
},
"TerritoryId": 146,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 5,
"Steps": [
{
"DataId": 1005584,
"Position": {
"X": -261.55493,
"Y": 7.084492,
"Z": 412.28345
},
"TerritoryId": 146,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 6,
"Steps": [
{
"DataId": 1008284,
"Position": {
"X": -306.44696,
"Y": 6.321288,
"Z": 392.5078
},
"TerritoryId": 146,
"InteractionType": "Interact",
"Fly": true
},
{
"Position": {
"X": -365.44217,
"Y": 6.691126,
"Z": 395.09555
},
"TerritoryId": 146,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1008287,
"Position": {
"X": -366.10974,
"Y": 6.9095497,
"Z": 394.64404
},
"TerritoryId": 146,
"InteractionType": "Interact"
},
{
"DataId": 1008285,
"Position": {
"X": -319.50867,
"Y": 8.2855835,
"Z": 428.18335
},
"TerritoryId": 146,
"InteractionType": "Interact",
"Fly": true
},
{
"DataId": 1008286,
"Position": {
"X": -330.5562,
"Y": 8.096848,
"Z": 480.0641
},
"TerritoryId": 146,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 7,
"Steps": [
{
"Position": {
"X": -159.56685,
"Y": 23.290625,
"Z": -334.22568
},
"TerritoryId": 146,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo"
},
{
"DataId": 1005578,
"Position": {
"X": 89.00586,
"Y": 14.439478,
"Z": -387.77753
},
"TerritoryId": 146,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1005553,
"Position": {
"X": 122.6062,
"Y": 16.402647,
"Z": -362.11188
},
"TerritoryId": 146,
"InteractionType": "CompleteQuest",
"Fly": true
}
]
}
]
}

View File

@ -946,6 +946,7 @@
"Physick",
"Aspected Benefic",
"Form Shift",
"Fiery Breath",
"Buffet (Sanuwa)",
"Buffet (Griffin)",
"Trample",

View File

@ -22,6 +22,7 @@ public sealed class ActionConverter() : EnumConverter<EAction>(Values)
{ EAction.Physick, "Physick" },
{ EAction.AspectedBenefic, "Aspected Benefic" },
{ EAction.FormShift, "Form Shift" },
{ EAction.FieryBreath, "Fiery Breath" },
{ EAction.BuffetSanuwa, "Buffet (Sanuwa)" },
{ EAction.BuffetGriffin, "Buffet (Griffin)" },
{ EAction.Trample, "Trample" },

View File

@ -21,6 +21,7 @@ public enum EAction
Physick = 190,
AspectedBenefic = 3595,
FormShift = 4262,
FieryBreath = 1764,
BuffetSanuwa = 4931,
BuffetGriffin = 4583,
Trample = 4585,
@ -70,7 +71,8 @@ public static class EActionExtensions
public static bool RequiresMount(this EAction action)
{
return action
is EAction.BuffetSanuwa
is EAction.FieryBreath
or EAction.BuffetSanuwa
or EAction.BuffetGriffin
or EAction.Trample
or EAction.Fumigate