From: Liza Carvelli Date: Tue, 27 May 2025 10:53:00 +0000 (+0200) Subject: Add Mamool Ja unlock X-Git-Tag: v5.13~5 X-Git-Url: https://git.jacobcasper.com/?a=commitdiff_plain;h=c0ba9a1481654e57294b6530c9f129c51f24e9af;p=Questionable.git Add Mamool Ja unlock --- diff --git a/GatheringPaths/7.x - Dawntrail/Yak T'el/1196__MIN.json b/GatheringPaths/7.x - Dawntrail/Yak T'el/1196__MIN.json new file mode 100644 index 00000000..a4add15a --- /dev/null +++ b/GatheringPaths/7.x - Dawntrail/Yak T'el/1196__MIN.json @@ -0,0 +1,66 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "TerritoryId": 1189, + "InteractionType": "None" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 35251, + "Locations": [ + { + "Position": { + "X": -120.962, + "Y": -214.1182, + "Z": 349.0067 + }, + "MinimumAngle": -65, + "MaximumAngle": 115 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 35249, + "Locations": [ + { + "Position": { + "X": -151.3246, + "Y": -213.9648, + "Z": 361.8845 + }, + "MinimumAngle": 145, + "MaximumAngle": 280 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 35250, + "Locations": [ + { + "Position": { + "X": -164.6348, + "Y": -214.1782, + "Z": 337.2287 + }, + "MinimumAngle": -135, + "MaximumAngle": 20 + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/GatheringPaths/7.x - Dawntrail/Yak T'el/1197__MIN.json b/GatheringPaths/7.x - Dawntrail/Yak T'el/1197__MIN.json new file mode 100644 index 00000000..0bed0382 --- /dev/null +++ b/GatheringPaths/7.x - Dawntrail/Yak T'el/1197__MIN.json @@ -0,0 +1,60 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "TerritoryId": 1189, + "InteractionType": "None" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 35254, + "Locations": [ + { + "Position": { + "X": 649.5298, + "Y": 14.19326, + "Z": -222.9378 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 35252, + "Locations": [ + { + "Position": { + "X": 652.2325, + "Y": 13.41525, + "Z": -227.1611 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 35253, + "Locations": [ + { + "Position": { + "X": 657.8542, + "Y": 13.34004, + "Z": -225.5971 + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/GatheringPaths/7.x - Dawntrail/Yak T'el/1202__BTN.json b/GatheringPaths/7.x - Dawntrail/Yak T'el/1202__BTN.json new file mode 100644 index 00000000..83ab38b2 --- /dev/null +++ b/GatheringPaths/7.x - Dawntrail/Yak T'el/1202__BTN.json @@ -0,0 +1,72 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "TerritoryId": 1189, + "InteractionType": "None" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 35267, + "Locations": [ + { + "Position": { + "X": -136.4091, + "Y": -213.3115, + "Z": 348.263 + }, + "MinimumAngle": -115, + "MaximumAngle": -35, + "MinimumDistance": 1.8, + "MaximumDistance": 3 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 35269, + "Locations": [ + { + "Position": { + "X": -138.786, + "Y": -213.2544, + "Z": 335.4114 + }, + "MinimumAngle": -220, + "MaximumAngle": -110, + "MinimumDistance": 1.5, + "MaximumDistance": 3 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 35268, + "Locations": [ + { + "Position": { + "X": -147.5682, + "Y": -212.363, + "Z": 348.0441 + }, + "MinimumAngle": 30, + "MaximumAngle": 105, + "MinimumDistance": 2.2, + "MaximumDistance": 3 + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/GatheringPaths/7.x - Dawntrail/Yak T'el/1203__BTN.json b/GatheringPaths/7.x - Dawntrail/Yak T'el/1203__BTN.json new file mode 100644 index 00000000..1c5764cb --- /dev/null +++ b/GatheringPaths/7.x - Dawntrail/Yak T'el/1203__BTN.json @@ -0,0 +1,66 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "TerritoryId": 1189, + "InteractionType": "None" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 35272, + "Locations": [ + { + "Position": { + "X": 712.1951, + "Y": 19.23321, + "Z": -299.8495 + }, + "MinimumAngle": 195, + "MaximumAngle": 340 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 35270, + "Locations": [ + { + "Position": { + "X": 740.6464, + "Y": 23.75824, + "Z": -303.4917 + }, + "MinimumAngle": -20, + "MaximumAngle": 115 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 35271, + "Locations": [ + { + "Position": { + "X": 702.0139, + "Y": 21.35347, + "Z": -331.0941 + }, + "MinimumAngle": -140, + "MaximumAngle": 40 + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/7.x - Dawntrail/Allied Societies/Mamool Ja/Dailies/5262_Taking Your Leavings.json b/QuestPaths/7.x - Dawntrail/Allied Societies/Mamool Ja/Dailies/5262_Taking Your Leavings.json new file mode 100644 index 00000000..3a30a003 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Allied Societies/Mamool Ja/Dailies/5262_Taking Your Leavings.json @@ -0,0 +1,38 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1052560, + "Position": { + "X": 589.3186, + "Y": -142.89168, + "Z": 729.4575 + }, + "TerritoryId": 1189, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1052560, + "Position": { + "X": 589.3186, + "Y": -142.89168, + "Z": 729.4575 + }, + "TerritoryId": 1189, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Yak T'el - Mamook", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Allied Societies/Mamool Ja/Dailies/5263_Cultivating Data.json b/QuestPaths/7.x - Dawntrail/Allied Societies/Mamool Ja/Dailies/5263_Cultivating Data.json new file mode 100644 index 00000000..72ec65df --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Allied Societies/Mamool Ja/Dailies/5263_Cultivating Data.json @@ -0,0 +1,64 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1052560, + "Position": { + "X": 589.3186, + "Y": -142.89168, + "Z": 729.4575 + }, + "TerritoryId": 1189, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "TerritoryId": 1189, + "InteractionType": "Gather", + "RequiredQuestAcceptedJob": [ + "Miner" + ], + "ItemsToGather": [ + { + "ItemId": 48027, + "ItemCount": 3 + } + ] + }, + { + "TerritoryId": 1189, + "InteractionType": "Gather", + "RequiredQuestAcceptedJob": [ + "Botanist" + ], + "ItemsToGather": [ + { + "ItemId": 48028, + "ItemCount": 3 + } + ] + }, + { + "DataId": 1052560, + "Position": { + "X": 589.3186, + "Y": -142.89168, + "Z": 729.4575 + }, + "TerritoryId": 1189, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Yak T'el - Mamook", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Allied Societies/Mamool Ja/Dailies/5264_Toil for the Soil.json b/QuestPaths/7.x - Dawntrail/Allied Societies/Mamool Ja/Dailies/5264_Toil for the Soil.json new file mode 100644 index 00000000..3a30a003 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Allied Societies/Mamool Ja/Dailies/5264_Toil for the Soil.json @@ -0,0 +1,38 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1052560, + "Position": { + "X": 589.3186, + "Y": -142.89168, + "Z": 729.4575 + }, + "TerritoryId": 1189, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1052560, + "Position": { + "X": 589.3186, + "Y": -142.89168, + "Z": 729.4575 + }, + "TerritoryId": 1189, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Yak T'el - Mamook", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Allied Societies/Mamool Ja/Story/5255_Cultivating Hope.json b/QuestPaths/7.x - Dawntrail/Allied Societies/Mamool Ja/Story/5255_Cultivating Hope.json new file mode 100644 index 00000000..97d77ba0 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Allied Societies/Mamool Ja/Story/5255_Cultivating Hope.json @@ -0,0 +1,223 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1052565, + "Position": { + "X": 706.69104, + "Y": -133.174, + "Z": 530.7545 + }, + "TerritoryId": 1189, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Yak T'el - Mamook", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1052566, + "Position": { + "X": 535.3932, + "Y": -150, + "Z": 749.20264 + }, + "TerritoryId": 1189, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 562.12634, + "Y": -137.174, + "Z": 563.6532 + }, + "TerritoryId": 1189, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 1052568, + "Position": { + "X": 562.46277, + "Y": -137.17401, + "Z": 565.1482 + }, + "TerritoryId": 1189, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1052569, + "Position": { + "X": 561.94385, + "Y": -137.17401, + "Z": 561.9745 + }, + "TerritoryId": 1189, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_BANMAM001_05255_Q1_000_000", + "Answer": "TEXT_BANMAM001_05255_A1_000_001" + } + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1053754, + "Position": { + "X": 559.8688, + "Y": -137.174, + "Z": 563.9581 + }, + "TerritoryId": 1189, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_BANMAM001_05255_Q2_000_000", + "Answer": "TEXT_BANMAM001_05255_A2_000_002" + } + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1053755, + "Position": { + "X": 564.6599, + "Y": -137.174, + "Z": 563.8971 + }, + "TerritoryId": 1189, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_BANMAM001_05255_Q3_000_000", + "Answer": "TEXT_BANMAM001_05255_A3_000_001" + } + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1053756, + "Position": { + "X": 686.48804, + "Y": -137.17401, + "Z": 552.697 + }, + "TerritoryId": 1189, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1052566, + "Position": { + "X": 535.3932, + "Y": -150, + "Z": 749.20264 + }, + "TerritoryId": 1189, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "TerritoryId": 1189, + "InteractionType": "Gather", + "RequiredQuestAcceptedJob": [ + "Miner" + ], + "ItemsToGather": [ + { + "ItemId": 48009, + "ItemCount": 3 + } + ] + }, + { + "TerritoryId": 1189, + "InteractionType": "Gather", + "RequiredQuestAcceptedJob": [ + "Botanist" + ], + "ItemsToGather": [ + { + "ItemId": 48010, + "ItemCount": 3 + } + ] + }, + { + "DataId": 1052566, + "Position": { + "X": 535.3932, + "Y": -150, + "Z": 749.20264 + }, + "TerritoryId": 1189, + "InteractionType": "Interact", + "AetheryteShortcut": "Yak T'el - Mamook", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Stories/Occult Crescent/Relics/5319_Arcane Artistry.json b/QuestPaths/7.x - Dawntrail/Side Stories/Occult Crescent/Relics/5319_Arcane Artistry.json new file mode 100644 index 00000000..168f0904 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Stories/Occult Crescent/Relics/5319_Arcane Artistry.json @@ -0,0 +1,58 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1053906, + "Position": { + "X": 25.802979, + "Y": 0, + "Z": 13.38208 + }, + "TerritoryId": 1278, + "InteractionType": "AcceptQuest", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_KINGKW001_05319_Q1_000_000", + "Answer": "TEXT_KINGKW001_05319_A1_000_003" + } + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1053907, + "Position": { + "X": -49.485046, + "Y": 4.999985, + "Z": 33.12732 + }, + "TerritoryId": 1278, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1053906, + "Position": { + "X": 25.802979, + "Y": 0, + "Z": 13.38208 + }, + "TerritoryId": 1278, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/Data/AlliedSocietyData.cs b/Questionable/Data/AlliedSocietyData.cs index 88b80845..011be991 100644 --- a/Questionable/Data/AlliedSocietyData.cs +++ b/Questionable/Data/AlliedSocietyData.cs @@ -19,6 +19,7 @@ internal sealed class AlliedSocietyData { 89, new([1017322], EAetheryteLocation.ChurningMistsZenith) }, { 147, new([1024777,1024912], EAetheryteLocation.FringesPeeringStones) }, { 369, new([1051798], EAetheryteLocation.KozamaukaDockPoga) }, + //{ ??, new([], EAetheryteLocation.YakTelMamook) }, }.AsReadOnly(); public EAlliedSociety GetCommonAlliedSocietyTurnIn(ElementId elementId) @@ -31,6 +32,7 @@ internal sealed class AlliedSocietyData >= 2261 and <= 2280 => EAlliedSociety.Vath, >= 2290 and <= 2319 => EAlliedSociety.Moogles, >= 5199 and <= 5226 => EAlliedSociety.Pelupelu, + >= 5261 and <= 5288 => EAlliedSociety.MamoolJa, _ => EAlliedSociety.None, }; } diff --git a/Questionable/Model/AlliedSocietyDailyInfo.cs b/Questionable/Model/AlliedSocietyDailyInfo.cs index a4a63eb1..cdc3f8bd 100644 --- a/Questionable/Model/AlliedSocietyDailyInfo.cs +++ b/Questionable/Model/AlliedSocietyDailyInfo.cs @@ -30,11 +30,12 @@ internal sealed class AlliedSocietyDailyInfo : IQuestInfo EAlliedSociety.Ixal or EAlliedSociety.Moogles or EAlliedSociety.Dwarves or - EAlliedSociety.Loporrits or - EAlliedSociety.MamoolJa => + EAlliedSociety.Loporrits => classJobUtils.AsIndividualJobs(EExtendedClassJob.DoH, null).ToList(), - EAlliedSociety.Qitari or EAlliedSociety.Omicrons => + EAlliedSociety.Qitari or + EAlliedSociety.Omicrons or + EAlliedSociety.MamoolJa => classJobUtils.AsIndividualJobs(EExtendedClassJob.DoL, null).ToList(), EAlliedSociety.Namazu =>