Merge pull request '[SB][Allied Society][Kojin] Added new story and daily quests' (#71) from plogon_enjoyer/Questionable:kojin into master

Reviewed-on: liza/Questionable#71
This commit is contained in:
Liza 2024-10-01 19:19:29 +00:00
commit 9139e8dd7b
9 changed files with 735 additions and 0 deletions

View File

@ -0,0 +1,115 @@
{
"$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": [
{
"Position": {
"X": 317.60394,
"Y": -83.29468,
"Z": -227.42934
},
"TerritoryId": 613,
"InteractionType": "WalkTo",
"Fly": true
},
{
"Position": {
"X": -3.8817294,
"Y": -146.96666,
"Z": -155.70833
},
"TerritoryId": 613,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1024294,
"Position": {
"X": -24.765442,
"Y": -190.38937,
"Z": -137.10236
},
"TerritoryId": 613,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"Position": {
"X": 368.39856,
"Y": -116.624695,
"Z": -291.34058
},
"TerritoryId": 613,
"InteractionType": "UseItem",
"ItemId": 2002400,
"AetheryteShortcut": "Ruby Sea - Tamamizu",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 2009085,
"Position": {
"X": 367.18176,
"Y": -119.93892,
"Z": -291.77762
},
"TerritoryId": 613,
"InteractionType": "Emote",
"Emote": "pray"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": 392.59683,
"Y": -119.589325,
"Z": -234.30063
},
"TerritoryId": 613,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1024217,
"Position": {
"X": 394.39978,
"Y": -119.58932,
"Z": -232.28815
},
"TerritoryId": 613,
"InteractionType": "CompleteQuest"
}
]
}
]
}

View File

@ -0,0 +1,89 @@
{
"$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": [
{
"DataId": 1019249,
"Position": {
"X": 537.1328,
"Y": 33.655228,
"Z": -811.1849
},
"TerritoryId": 613,
"InteractionType": "Interact",
"Fly": true,
"AetheryteShortcut": "Ruby Sea - Onokoro",
"RequiredQuestVariables": [null, null, [16, 32], null, null, null]
},
{
"DataId": 1024348,
"Position": {
"X": 724.8187,
"Y": 1.3691645,
"Z": -814.4198
},
"TerritoryId": 613,
"InteractionType": "Interact",
"Fly": true,
"RequiredQuestVariables": [null, null, [32], null, null, null]
},
{
"DataId": 1024420,
"Position": {
"X": 577.3556,
"Y": 9.866471,
"Z": -733.79114
},
"TerritoryId": 613,
"InteractionType": "Interact",
"Fly": true,
"RequiredQuestVariables": [null, null, [16], null, null, null]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": 392.59683,
"Y": -119.589325,
"Z": -234.30063
},
"TerritoryId": 613,
"InteractionType": "WalkTo",
"Fly": true,
"AetheryteShortcut": "Ruby Sea - Tamamizu"
},
{
"DataId": 1024217,
"Position": {
"X": 394.39978,
"Y": -119.58932,
"Z": -232.28815
},
"TerritoryId": 613,
"InteractionType": "CompleteQuest"
}
]
}
]
}

View File

@ -0,0 +1,118 @@
{
"$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": [
{
"Position": {
"X": 324.734,
"Y": -118.16611,
"Z": -310.65613
},
"TerritoryId": 613,
"InteractionType": "WalkTo",
"Fly": true,
"RestartNavigationIfCancelled": false
},
{
"DataId": 2009099,
"Position": {
"X": 829.0073,
"Y": -122.179016,
"Z": -768.91736
},
"TerritoryId": 613,
"InteractionType": "Say",
"ChatMessage": {
"Key": "TEXT_BANKJN401_02985_SAYTODO_000_015"
},
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1024295,
"Position": {
"X": 861.6616,
"Y": -108.659546,
"Z": -546.4103
},
"TerritoryId": 613,
"InteractionType": "Interact",
"Fly": true,
"RequiredQuestVariables": [null, [16], null, null, null, null]
},
{
"DataId": 1024345,
"Position": {
"X": 891.78296,
"Y": -140.61188,
"Z": -794.36945
},
"TerritoryId": 613,
"InteractionType": "Interact",
"Fly": true,
"RequiredQuestVariables": [null, [32], null, null, null, null]
},
{
"DataId": 1024344,
"Position": {
"X": 836.14856,
"Y": -127.85541,
"Z": -910.7042
},
"TerritoryId": 613,
"InteractionType": "Interact",
"Fly": true,
"RequiredQuestVariables": [null, [48], null, null, null, null]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": 392.59683,
"Y": -119.589325,
"Z": -234.30063
},
"TerritoryId": 613,
"InteractionType": "WalkTo",
"Fly": true,
"AetheryteShortcut": "Ruby Sea - Tamamizu"
},
{
"DataId": 1024217,
"Position": {
"X": 394.39978,
"Y": -119.58932,
"Z": -232.28815
},
"TerritoryId": 613,
"InteractionType": "CompleteQuest"
}
]
}
]
}

View File

@ -0,0 +1,97 @@
{
"$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": [
{
"Position": {
"X": -305.79498,
"Y": -0.5,
"Z": -517.7326
},
"TerritoryId": 613,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [8237],
"Fly": true,
"Land": true,
"AetheryteShortcut": "Ruby Sea - Onokoro",
"RequiredQuestVariables": [null, null, [1], null, null, null]
},
{
"Position": {
"X": 166.64561,
"Y": -0.4983238,
"Z": -751.1739
},
"TerritoryId": 613,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [8237],
"Fly": true,
"Land": true,
"AetheryteShortcut": "Ruby Sea - Onokoro",
"RequiredQuestVariables": [null, null, [2], null, null, null]
},
{
"Position": {
"X": -135.29268,
"Y": -0.06343824,
"Z": -805.9451
},
"TerritoryId": 613,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [8237],
"Fly": true,
"Land": true,
"AetheryteShortcut": "Ruby Sea - Onokoro",
"RequiredQuestVariables": [null, null, [3], null, null, null]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": 392.59683,
"Y": -119.589325,
"Z": -234.30063
},
"TerritoryId": 613,
"InteractionType": "WalkTo",
"Fly": true,
"AetheryteShortcut": "Ruby Sea - Tamamizu"
},
{
"DataId": 1024217,
"Position": {
"X": 394.39978,
"Y": -119.58932,
"Z": -232.28815
},
"TerritoryId": 613,
"InteractionType": "CompleteQuest"
}
]
}
]
}

View File

@ -0,0 +1,179 @@
{
"$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": [
{
"DataId": 1024218,
"Position": {
"X": 387.56384,
"Y": -119.795334,
"Z": -257.64862
},
"TerritoryId": 613,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"Position": {
"X": 322.45865,
"Y": -121.24298,
"Z": -314.65158
},
"TerritoryId": 613,
"InteractionType": "WalkTo",
"Fly": true,
"RestartNavigationIfCancelled": false
},
{
"DataId": 2009109,
"Position": {
"X": 239.18518,
"Y": -74.99817,
"Z": -464.95764
},
"TerritoryId": 613,
"InteractionType": "Action",
"Action": "Inhale",
"Fly": true,
"RequiredQuestVariables": [
null,
null,
null,
[16, 48, 128, 144],
null,
null
]
},
{
"DataId": 2009108,
"Position": {
"X": 286.33557,
"Y": -74.60144,
"Z": -499.01584
},
"TerritoryId": 613,
"InteractionType": "Action",
"Action": "Inhale",
"Fly": true,
"RequiredQuestVariables": [
null,
null,
null,
[16, 48, 128, 160],
null,
null
]
},
{
"DataId": 2009106,
"Position": {
"X": 539.2385,
"Y": -56.26001,
"Z": -364.88904
},
"TerritoryId": 613,
"InteractionType": "Action",
"Action": "Inhale",
"Fly": true,
"RequiredQuestVariables": [
null,
null,
null,
[16, 64, 160],
null,
null
]
},
{
"DataId": 2009107,
"Position": {
"X": 560.14343,
"Y": -75.547424,
"Z": -410.81866
},
"TerritoryId": 613,
"InteractionType": "Action",
"Action": "Inhale",
"Fly": true,
"RequiredQuestVariables": [
null,
null,
null,
[48, 64, 144, 160],
null,
null
]
},
{
"DataId": 2009105,
"Position": {
"X": 613.94666,
"Y": -74.57086,
"Z": -400.04578
},
"TerritoryId": 613,
"InteractionType": "Action",
"Action": "Inhale",
"Fly": true,
"RequiredQuestVariables": [
null,
null,
null,
[64, 128, 144],
null,
null
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": 392.59683,
"Y": -119.589325,
"Z": -234.30063
},
"TerritoryId": 613,
"InteractionType": "WalkTo",
"Fly": true,
"AetheryteShortcut": "Ruby Sea - Tamamizu"
},
{
"DataId": 1024217,
"Position": {
"X": 394.39978,
"Y": -119.58932,
"Z": -232.28815
},
"TerritoryId": 613,
"InteractionType": "CompleteQuest"
}
]
}
]
}

View File

@ -0,0 +1,133 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1024215,
"Position": {
"X": 400.07617,
"Y": -119.589325,
"Z": -247.54712
},
"TerritoryId": 613,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1024231,
"Position": {
"X": 463.40125,
"Y": 56.86197,
"Z": -157.94617
},
"TerritoryId": 614,
"InteractionType": "Interact",
"Fly": true,
"AetheryteShortcut": "Yanxia - Namai",
"DialogueChoices": [
{
"Prompt": "TEXT_BANKJN002_02974_Q1_000_000",
"Type": "List",
"Answer": "TEXT_BANKJN002_02974_A1_000_001"
}
]
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 2009169,
"Position": {
"X": 145.922,
"Y": 26.352295,
"Z": 456.9314
},
"TerritoryId": 614,
"InteractionType": "Snipe",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 2009170,
"Position": {
"X": 205.31006,
"Y": 14.297607,
"Z": 712.76404
},
"TerritoryId": 614,
"InteractionType": "Snipe",
"Fly": true
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1024238,
"Position": {
"X": 302.72363,
"Y": 2.8619597,
"Z": 731.44116
},
"TerritoryId": 614,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 5,
"Steps": [
{
"DataId": 1024244,
"Position": {
"X": 181.10925,
"Y": 6.1105657,
"Z": 553.2462
},
"TerritoryId": 614,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1024215,
"Position": {
"X": 400.07617,
"Y": -119.589325,
"Z": -247.54712
},
"TerritoryId": 613,
"InteractionType": "CompleteQuest",
"Fly": true,
"AetheryteShortcut": "Ruby Sea - Tamamizu",
"DialogueChoices": [
{
"Prompt": "TEXT_BANKJN002_02974_Q3_000_000",
"Type": "List",
"Answer": "TEXT_BANKJN002_02974_A3_000_001"
}
]
}
]
}
]
}

View File

@ -912,6 +912,7 @@
"Buffet (Griffin)", "Buffet (Griffin)",
"Trample", "Trample",
"Fumigate", "Fumigate",
"Inhale",
"Siphon Snout", "Siphon Snout",
"Peculiar Light", "Peculiar Light",
"Cannonfire", "Cannonfire",

View File

@ -26,6 +26,7 @@ public sealed class ActionConverter() : EnumConverter<EAction>(Values)
{ EAction.BuffetGriffin, "Buffet (Griffin)" }, { EAction.BuffetGriffin, "Buffet (Griffin)" },
{ EAction.Trample, "Trample" }, { EAction.Trample, "Trample" },
{ EAction.Fumigate, "Fumigate" }, { EAction.Fumigate, "Fumigate" },
{ EAction.Inhale, "Inhale" },
{ EAction.SiphonSnout, "Siphon Snout" }, { EAction.SiphonSnout, "Siphon Snout" },
{ EAction.PeculiarLight, "Peculiar Light" }, { EAction.PeculiarLight, "Peculiar Light" },
{ EAction.Cannonfire, "Cannonfire" }, { EAction.Cannonfire, "Cannonfire" },

View File

@ -27,6 +27,7 @@ public enum EAction
Fumigate = 5872, Fumigate = 5872,
MagitekPulse = 8624, MagitekPulse = 8624,
MagitekThunder = 8625, MagitekThunder = 8625,
Inhale = 10013,
SiphonSnout = 18187, SiphonSnout = 18187,
PeculiarLight = 20030, PeculiarLight = 20030,
Cannonfire = 20121, Cannonfire = 20121,
@ -63,6 +64,7 @@ public static class EActionExtensions
or EAction.BuffetGriffin or EAction.BuffetGriffin
or EAction.Trample or EAction.Trample
or EAction.Fumigate or EAction.Fumigate
or EAction.Inhale
or EAction.SiphonSnout or EAction.SiphonSnout
or EAction.PeculiarLight or EAction.PeculiarLight
or EAction.Cannonfire or EAction.Cannonfire