goatzone/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests 1 Activity

sync with upstreaom #2

Open
goatzone wants to merge 581 commits from liza/Questionable:master into master
pull from: liza/Questionable:master
merge into: goatzone:master
Conversation 0 Commits 581 Files Changed 1147 +206 -7
7 changed files with 206 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e7c52322b1 - Show all commits

63
QuestPaths/3.x - Heavensward/Allied Societies/Moogles/Dailies/2300_Stumbling Blocks.json
View File

@ -1,7 +1,6 @@
{ {
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza", "Author": "plogon_enjoyer",
"Disabled": true,
"QuestSequence": [ "QuestSequence": [
{ {
"Sequence": 0, "Sequence": 0,
@ -18,6 +17,66 @@
} }
] ]
}, },
{
"Sequence": 1,
"Steps": [
{
"DataId": 1017383,
"Position": {
"X": -657.46545,
"Y": 73.76131,
"Z": 219.28735
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"TerritoryId": 400,
"InteractionType": "Craft",
"ItemId": 15733,
"ItemCount": 1
},
{
"DataId": 1017384,
"Position": {
"X": -651.51447,
"Y": 73,
"Z": 217.2732
},
"TerritoryId": 400,
"InteractionType": "Interact",
"DialogueChoices": [
{
"Prompt": "TEXT_BANMOG303_02300_Q1_000_000",
"Type": "List",
"Answer": "TEXT_BANMOG303_02300_A1_000_001"
}
]
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1017387,
"Position": {
"X": -59.55603,
"Y": -8.685017,
"Z": 186.84668
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
}
]
},
{ {
"Sequence": 255, "Sequence": 255,
"Steps": [ "Steps": [

73
QuestPaths/3.x - Heavensward/Allied Societies/Moogles/Dailies/2301_Tricks without Treats.json
View File

@ -1,7 +1,6 @@
{ {
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza", "Author": "plogon_enjoyer",
"Disabled": true,
"QuestSequence": [ "QuestSequence": [
{ {
"Sequence": 0, "Sequence": 0,
@ -18,6 +17,76 @@
} }
] ]
}, },
{
"Sequence": 1,
"Steps": [
{
"DataId": 1017321,
"Position": {
"X": -376.4859,
"Y": 60.89619,
"Z": 319.7832
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"TerritoryId": 400,
"InteractionType": "Craft",
"ItemId": 15734,
"ItemCount": 1
},
{
"DataId": 1017392,
"Position": {
"X": 112.687744,
"Y": -24.088774,
"Z": 167.74243
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 2007234,
"Position": {
"X": 111.86377,
"Y": -21.988281,
"Z": 192.43152
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1017392,
"Position": {
"X": 112.687744,
"Y": -24.088774,
"Z": 167.74243
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
}
]
},
{ {
"Sequence": 255, "Sequence": 255,
"Steps": [ "Steps": [

70
QuestPaths/3.x - Heavensward/Allied Societies/Moogles/Dailies/2302_For Moogles in Peril.json
View File

@ -1,7 +1,6 @@
{ {
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza", "Author": "plogon_enjoyer",
"Disabled": true,
"QuestSequence": [ "QuestSequence": [
{ {
"Sequence": 0, "Sequence": 0,
@ -18,6 +17,73 @@
} }
] ]
}, },
{
"Sequence": 1,
"Steps": [
{
"DataId": 1017470,
"Position": {
"X": -353.53632,
"Y": 60.896175,
"Z": 299.61084
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 2007272,
"Position": {
"X": 306.53845,
"Y": -38.254395,
"Z": 111.0094
},
"TerritoryId": 400,
"InteractionType": "Action",
"Action": "Roar",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 2007273,
"Position": {
"X": 431.99805,
"Y": -28.152893,
"Z": 112.321655
},
"TerritoryId": 400,
"InteractionType": "Action",
"Action": "Roar",
"Fly": true
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 2007274,
"Position": {
"X": 390.70715,
"Y": -35.599304,
"Z": 252.58252
},
"TerritoryId": 400,
"InteractionType": "Action",
"Action": "Roar",
"Fly": true
}
]
},
{ {
"Sequence": 255, "Sequence": 255,
"Steps": [ "Steps": [

1
QuestPaths/quest-v1.json
View File

@ -963,6 +963,7 @@
"Buffet (Griffin)", "Buffet (Griffin)",
"Trample", "Trample",
"Fumigate", "Fumigate",
"Roar",
"Seed", "Seed",
"Inhale", "Inhale",
"Siphon Snout", "Siphon Snout",

1
Questionable.Model/Questing/Converter/ActionConverter.cs
View File

@ -27,6 +27,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.Roar, "Roar" },
{ EAction.Seed, "Seed" }, { EAction.Seed, "Seed" },
{ EAction.Inhale, "Inhale" }, { EAction.Inhale, "Inhale" },
{ EAction.SiphonSnout, "Siphon Snout" }, { EAction.SiphonSnout, "Siphon Snout" },

2
Questionable.Model/Questing/EAction.cs
View File

@ -26,6 +26,7 @@ public enum EAction
BuffetGriffin = 4583, BuffetGriffin = 4583,
Trample = 4585, Trample = 4585,
Fumigate = 5872, Fumigate = 5872,
Roar = 6293,
Seed = 6294, Seed = 6294,
MagitekPulse = 8624, MagitekPulse = 8624,
MagitekThunder = 8625, MagitekThunder = 8625,
@ -81,6 +82,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.Roar
or EAction.Seed or EAction.Seed
or EAction.Inhale or EAction.Inhale
or EAction.SiphonSnout or EAction.SiphonSnout

3
Questionable/Data/AlliedSocietyData.cs
View File

@ -15,6 +15,7 @@ internal sealed class AlliedSocietyData
{ {
{ 66, new(1016093, EAetheryteLocation.SeaOfCloudsOkZundu) }, { 66, new(1016093, EAetheryteLocation.SeaOfCloudsOkZundu) },
{ 79, new(1017031, EAetheryteLocation.DravanianForelandsAnyxTrine) }, { 79, new(1017031, EAetheryteLocation.DravanianForelandsAnyxTrine) },
{ 88, new(1017470, EAetheryteLocation.ChurningMistsZenith) },
{ 89, new(1017322, EAetheryteLocation.ChurningMistsZenith) }, { 89, new(1017322, EAetheryteLocation.ChurningMistsZenith) },
{ 147, new(1024777, EAetheryteLocation.FringesPeeringStones) }, { 147, new(1024777, EAetheryteLocation.FringesPeeringStones) },
{ 369, new(1051798, EAetheryteLocation.KozamaukaDockPoga) }, { 369, new(1051798, EAetheryteLocation.KozamaukaDockPoga) },
@ -52,7 +53,7 @@ internal sealed class AlliedSocietyData
else if (alliedSociety == EAlliedSociety.Moogles) else if (alliedSociety == EAlliedSociety.Moogles)
{ {
normalNpcs = []; normalNpcs = [];
mountNpcs = [1017322]; mountNpcs = [1017322, 1017470];
} }
else else
{ {