Merge pull request '[SB][Allied Society][Ananta] Updated some daily quests' (#40) from plogon_enjoyer/Questionable:ananta into master

Reviewed-on: liza/Questionable#40
This commit is contained in:
Liza 2024-09-08 17:05:25 +00:00
commit d6797d18f8
12 changed files with 382 additions and 28 deletions

View File

@ -35,7 +35,8 @@
8578,
8579,
8580
]
],
"Fly": true
}
]
},

View File

@ -1,7 +1,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
@ -22,7 +21,48 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 2009337,
"Position": {
"X": 94.95691,
"Y": 49.05774,
"Z": 575.2803
},
"TerritoryId": 612,
"InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [8584],
"RequiredQuestVariables": [null, null, [1, 2], null, null, null],
"Fly": true
},
{
"DataId": 2009338,
"Position": {
"X": 180.07166,
"Y": 47.470703,
"Z": 546.1051
},
"TerritoryId": 612,
"InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [8584],
"RequiredQuestVariables": [null, null, [3, 17], null, null, null],
"Fly": true
},
{
"DataId": 2009339,
"Position": {
"X": 291.21838,
"Y": 47.501343,
"Z": 496.75732
},
"TerritoryId": 612,
"InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [8584],
"RequiredQuestVariables": [null, null, [18, 19], null, null, null],
"Fly": true
}
]
},
{

View File

@ -0,0 +1,6 @@
```
0 0 x 0 0 0 |
1 2009337 -> 2009338
2 2009337 -> 2009339
3 2009338 -> 2009339
```

View File

@ -12,15 +12,40 @@
"Y": 56.113926,
"Z": 236.25537
},
"StopDistance": 7,
"TerritoryId": 612,
"InteractionType": "AcceptQuest"
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Fringes - Peering Stones",
"Fly": true,
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1025120,
"Position": {
"X": -333.66907,
"Y": 43.042835,
"Z": -22.201904
},
"TerritoryId": 612,
"InteractionType": "Interact",
"RequiredQuestVariables": [null, null, null, [2, 4], null, null],
"Fly": true,
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_BANANA402_03051_Q1_000_000",
"Answer": "TEXT_BANANA402_03051_A1_000_001"
}
]
},
{
"DataId": 1025062,
"Position": {
@ -30,6 +55,7 @@
},
"TerritoryId": 612,
"InteractionType": "Combat",
"RequiredQuestVariables": [null, null, null, [1, 3, 5], null, null],
"Fly": true,
"DialogueChoices": [
{
@ -41,6 +67,25 @@
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [8587]
},
{
"DataId": 1025119,
"Position": {
"X": -488.18192,
"Y": 81.128265,
"Z": -191.33289
},
"TerritoryId": 612,
"InteractionType": "Interact",
"RequiredQuestVariables": [null, null, null, [1, 2, 5], null, null],
"Fly": true,
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_BANANA402_03051_Q1_000_000",
"Answer": "TEXT_BANANA402_03051_A1_000_001"
}
]
},
{
"DataId": 1025061,
"Position": {
@ -50,11 +95,7 @@
},
"TerritoryId": 612,
"InteractionType": "Combat",
"SkipConditions": {
"StepIf": {
"NotTargetable": true
}
},
"RequiredQuestVariables": [null, null, null, [3, 4], null, null],
"Fly": true,
"DialogueChoices": [
{
@ -64,32 +105,28 @@
}
],
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [8586],
"$": "This NPC will become an enemy"
"KillEnemyDataIds": [8586]
},
{
"DataId": 1025119,
"DataId": 1025060,
"Position": {
"X": -488.18192,
"Y": 81.128265,
"Z": -191.33289
"X": -572.9916,
"Y": 112.44218,
"Z": -229.32788
},
"TerritoryId": 612,
"InteractionType": "Interact",
"SkipConditions": {
"StepIf": {
"NotTargetable": true
}
},
"InteractionType": "Combat",
"RequiredQuestVariables": [null, null, null, [2, 4], null, null],
"Fly": true,
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_BANANA402_03051_Q1_000_000",
"Answer": "TEXT_BANANA402_03051_A1_000_001"
"Answer": "TEXT_BANANA402_03051_A1_000_002"
}
],
"$": "This NPC will not become an enemy"
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [8585]
},
{
"DataId": 1025118,
@ -100,6 +137,7 @@
},
"TerritoryId": 612,
"InteractionType": "Interact",
"RequiredQuestVariables": [null, null, null, [1, 3, 5], null, null],
"Fly": true,
"DialogueChoices": [
{
@ -122,6 +160,7 @@
},
"TerritoryId": 612,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Fringes - Peering Stones",
"Fly": true
},
{

View File

@ -0,0 +1,8 @@
```
0 0 0 x 0 0 |
1 1025062 -> 1025119 -> 1025118
2 1025120 -> 1025119 -> 1025060
3 1025062 -> 1025061 -> 1025118
4 1025120 -> 1025061 -> 1025060
5 1025062 -> 1025119 -> 1025118
```

View File

@ -21,6 +21,32 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1025066,
"Position": {
"X": -155.90149,
"Y": 66.2623,
"Z": -366.93372
},
"TerritoryId": 612,
"InteractionType": "Emote",
"Emote": "rally",
"Fly": true,
"RequiredQuestVariables": [null, null, [16], null, null, null]
},
{
"DataId": 1025064,
"Position": {
"X": 185.62585,
"Y": 68.93902,
"Z": -372.15234
},
"TerritoryId": 612,
"InteractionType": "Emote",
"RequiredQuestVariables": [null, [1, 17], null, null, null, null],
"Emote": "soothe",
"Fly": true
},
{
"DataId": 1025063,
"Position": {
@ -30,6 +56,7 @@
},
"TerritoryId": 612,
"InteractionType": "Emote",
"RequiredQuestVariables": [null, [2, 18], null, null, null, null],
"Emote": "soothe",
"Fly": true
},
@ -42,6 +69,7 @@
},
"TerritoryId": 612,
"InteractionType": "Emote",
"RequiredQuestVariables": [null, null, [32], null, null, null],
"Emote": "rally",
"Fly": true
}
@ -58,6 +86,7 @@
},
"TerritoryId": 612,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Fringes - Peering Stones",
"Fly": true
},
{

View File

@ -0,0 +1,7 @@
```
0 0 x x 0 0 | 1025063 1025064 1025065 1025066
1 16 x x
2 16 x x
1 32 x x
2 32 x x
```

View File

@ -1,7 +1,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
@ -22,7 +21,34 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1025067,
"Position": {
"X": 39.04773,
"Y": 43.373318,
"Z": -221.9425
},
"TerritoryId": 612,
"InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [8588],
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1025247,
"Position": {
"X": 41.45874,
"Y": 42.875717,
"Z": -218.28033
},
"TerritoryId": 612,
"InteractionType": "Interact"
}
]
},
{

View File

@ -0,0 +1,194 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1024771,
"Position": {
"X": 12.008789,
"Y": 55.97821,
"Z": 237.96448
},
"TerritoryId": 612,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1024903,
"Position": {
"X": 111.31445,
"Y": 39.096542,
"Z": 296.34546
},
"TerritoryId": 612,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1021591,
"Position": {
"X": -277.82104,
"Y": 258.90652,
"Z": 782.77246
},
"TerritoryId": 620,
"InteractionType": "Interact",
"Fly": true,
"AetheryteShortcut": "Peaks - Ala Ghiri"
},
{
"DataId": 1020871,
"Position": {
"X": -237.90344,
"Y": 257.71973,
"Z": 741.5731
},
"TerritoryId": 620,
"InteractionType": "Interact",
"Fly": true
},
{
"DataId": 1021587,
"Position": {
"X": -210.68134,
"Y": 257.8064,
"Z": 767.4829
},
"TerritoryId": 620,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1024906,
"Position": {
"X": -239.12415,
"Y": 258.90652,
"Z": 782.62
},
"TerritoryId": 620,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1024908,
"Position": {
"X": -238.91058,
"Y": 266.39832,
"Z": 508.14062
},
"TerritoryId": 620,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 5,
"Steps": [
{
"DataId": 1024911,
"Position": {
"X": 10.971252,
"Y": 55.943913,
"Z": 239.88696
},
"TerritoryId": 612,
"InteractionType": "Interact",
"Fly": true,
"AetheryteShortcut": "Fringes - Peering Stones"
}
]
},
{
"Sequence": 6,
"Steps": [
{
"DataId": 1024912,
"Position": {
"X": -92.27136,
"Y": 50.00444,
"Z": 186.29736
},
"TerritoryId": 612,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 7,
"Steps": [
{
"Position": {
"X": -212.2359,
"Y": 43.672523,
"Z": -133.15985
},
"TerritoryId": 612,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 2009281,
"Position": {
"X": -209.79633,
"Y": 42.70996,
"Z": -153.85675
},
"TerritoryId": 612,
"InteractionType": "Action",
"Action": "Trample",
"Land": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": 5.853586,
"Y": 55.943962,
"Z": 237.26181
},
"TerritoryId": 612,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1024911,
"Position": {
"X": 10.971252,
"Y": 55.943913,
"Z": 239.88696
},
"TerritoryId": 612,
"InteractionType": "CompleteQuest",
"Mount": false
}
]
}
]
}

View File

@ -873,6 +873,7 @@
"Physick",
"Buffet (Sanuwa)",
"Buffet (Griffin)",
"Trample",
"Fumigate",
"Siphon Snout",
"Cannonfire",

View File

@ -15,6 +15,7 @@ public sealed class ActionConverter() : EnumConverter<EAction>(Values)
{ EAction.Physick, "Physick" },
{ EAction.BuffetSanuwa, "Buffet (Sanuwa)" },
{ EAction.BuffetGriffin, "Buffet (Griffin)" },
{ EAction.Trample, "Trample" },
{ EAction.Fumigate, "Fumigate" },
{ EAction.SiphonSnout, "Siphon Snout" },
{ EAction.Cannonfire, "Cannonfire" },

View File

@ -14,6 +14,7 @@ public enum EAction
Physick = 190,
BuffetSanuwa = 4931,
BuffetGriffin = 4583,
Trample = 4585,
Fumigate = 5872,
MagitekPulse = 8624,
MagitekThunder = 8625,
@ -50,6 +51,7 @@ public static class EActionExtensions
return action
is EAction.BuffetSanuwa
or EAction.BuffetGriffin
or EAction.Trample
or EAction.Fumigate
or EAction.SiphonSnout
or EAction.Cannonfire