Compare commits

...

7 Commits

Author SHA1 Message Date
pot0to
3297b7009c idk 2025-02-27 13:23:17 -08:00
pot0to
276a97477b Merge branch 'master' of https://git.carvel.li/liza/Questionable 2025-02-27 12:56:16 -08:00
pot0to
60be4cc618 reverting one quest i don't know why i changed 2025-02-23 23:59:54 -08:00
pot0to
ddaa651865 adding 3 more beast tribe dailies 2025-02-23 23:46:28 -08:00
pot0to
e74551693d Merge branch 'master' of https://git.carvel.li/liza/Questionable 2025-02-23 22:49:51 -08:00
pot0to
4ecc1fb675 adding one more moog 2025-02-20 14:17:20 -08:00
pot0to
ae8a6e20be added in missing BLU class quest 2025-02-16 19:22:38 -08:00
7 changed files with 477 additions and 5 deletions

View File

@ -1,4 +1,4 @@
{
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [

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": "pot0to",
"QuestSequence": [
{
"Sequence": 0,
@ -14,10 +13,119 @@
"Z": 313.98486
},
"TerritoryId": 400,
"InteractionType": "AcceptQuest"
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "The Churning Mists - Zenith",
"Fly": true
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1017459,
"Position": {
"X": -611.41376,
"Y": 70,
"Z": 209.30798
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
},
{
"DataId": 1017458,
"Position": {
"X": -618.7381,
"Y": 70,
"Z": 207.9347
},
"TerritoryId": 400,
"InteractionType": "Interact"
},
{
"DataId": 1017457,
"Position": {
"X": -619.74524,
"Y": 70,
"Z": 214.52649
},
"TerritoryId": 400,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1017352,
"Position": {
"X": -56.809387,
"Y": -8.866012,
"Z": 161.8219
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1017461,
"Position": {
"X": 79.9115,
"Y": -22.838034,
"Z": -123.67438
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
},
{
"DataId": 1017462,
"Position": {
"X": -479.08752,
"Y": 106.92683,
"Z": -112.077515
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
},
{
"DataId": 1017460,
"Position": {
"X": -689.05164,
"Y": 78.99983,
"Z": 266.0105
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true,
"AetheryteShortcut": "The Churning Mists - Zenith"
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1017352,
"Position": {
"X": -56.809387,
"Y": -8.866012,
"Z": 161.8219
},
"TerritoryId": 400,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [

View File

@ -0,0 +1,164 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "pot0to",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1024217,
"Position": {
"X": 394.39978,
"Y": -119.58932,
"Z": -232.28815
},
"TerritoryId": 613,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ruby Sea - Tamamizu"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 2009137,
"Position": {
"X": -141.68011,
"Y": -149.34009,
"Z": -214.64868
},
"TerritoryId": 613,
"InteractionType": "Interact",
"RequiredQuestVariables": [
null,
null,
null,
[ 2, 3, 4, 5, 18, 19, 20, 21, 34, 35, 36, 37, 50, 51, 52, 53 ],
null,
null
]
},
{
"DataId": 2009138,
"Position": {
"X": -298.2376,
"Y": -194.17108,
"Z": -126.20746
},
"TerritoryId": 613,
"InteractionType": "Interact",
"RequiredQuestVariables": [
null,
null,
null,
[ 1, 3, 4, 5, 17, 19, 20, 21, 33, 35, 36, 37, 49, 51, 52, 53 ],
null,
null
]
},
{
"DataId": 2009139,
"Position": {
"X": -131.7312,
"Y": -191.97375,
"Z": -6.1189575
},
"TerritoryId": 613,
"InteractionType": "Interact",
"RequiredQuestVariables": [
null,
null,
null,
[ 1, 2, 3, 4, 5, 17, 18, 19, 21, 33, 34, 35, 37, 49, 50, 51, 53 ],
null,
null
]
},
{
"DataId": 2009135,
"Position": {
"X": -77.74481,
"Y": -180.6211,
"Z": 33.157837
},
"TerritoryId": 613,
"InteractionType": "Interact",
"RequiredQuestVariables": [
null,
null,
null,
[ 1, 2, 4, 5, 17, 18, 20, 21, 33, 34, 36, 37, 49, 50, 52, 53 ],
null,
null
]
},
{
"DataId": 2009136,
"Position": {
"X": -150.10309,
"Y": -167.01001,
"Z": 87.60205
},
"TerritoryId": 613,
"InteractionType": "Interact",
"RequiredQuestVariables": [
null,
null,
null,
[ 1, 2, 3, 4, 17, 18, 19, 20, 33, 34, 35, 36, 49, 50, 51, 52 ],
null,
null
]
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1025824,
"Position": {
"X": 87.08313,
"Y": -11.459534,
"Z": 653.2234
},
"TerritoryId": 622,
"InteractionType": "Interact"
},
{
"TerritoryId": 622,
"InteractionType": "Craft",
"ItemId": 22743,
"ItemCount": 1
},
{
"DataId": 1025822,
"Position": {
"X": 88.45642,
"Y": -11.547716,
"Z": 652.7351
},
"TerritoryId": 622,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1024217,
"Position": {
"X": 394.39978,
"Y": -119.58932,
"Z": -232.28815
},
"TerritoryId": 613,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Ruby Sea - Tamamizu"
}
]
}
]
}

View File

@ -0,0 +1,95 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "pot0to",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1025602,
"Position": {
"X": -780.148,
"Y": 128.25195,
"Z": 97.154175
},
"TerritoryId": 622,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Azim Steppe - Dhoro Iloh",
"SkipConditions": {
"AetheryteShortcutIf": {
"AetheryteLocked": "Azim Steppe - Dhoro Iloh"
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1025822,
"Position": {
"X": 88.45642,
"Y": -11.547716,
"Z": 652.7351
},
"TerritoryId": 622,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1025824,
"Position": {
"X": 87.08313,
"Y": -11.459534,
"Z": 653.2234
},
"TerritoryId": 622,
"InteractionType": "Interact"
},
{
"TerritoryId": 622,
"InteractionType": "Craft",
"ItemId": 22743,
"ItemCount": 1
},
{
"DataId": 1025822,
"Position": {
"X": 88.45642,
"Y": -11.547716,
"Z": 652.7351
},
"TerritoryId": 622,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1025602,
"Position": {
"X": -780.148,
"Y": 128.25195,
"Z": 97.154175
},
"TerritoryId": 622,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Azim Steppe - Dhoro Iloh",
"SkipConditions": {
"AetheryteShortcutIf": {
"AetheryteLocked": "Azim Steppe - Dhoro Iloh"
}
}
}
]
}
]
}

View File

@ -1 +0,0 @@
stopdistance: 5

View File

@ -0,0 +1,86 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "pot0to",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1026852,
"Position": {
"X": 63.126587,
"Y": 14.005002,
"Z": 89.86035
},
"TerritoryId": 131,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Weavers' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
131
]
}
},
"StopDistance": 5
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1045580,
"Position": {
"X": -11.215393,
"Y": 14.000013,
"Z": 18.417542
},
"TerritoryId": 131,
"InteractionType": "Interact"
},
{
"DataId": 1045578,
"Position": {
"X": 0.9613037,
"Y": 15.000003,
"Z": -6.4851074
},
"TerritoryId": 131,
"InteractionType": "Interact"
},
{
"DataId": 1045579,
"Position": {
"X": 16.372864,
"Y": 14.000015,
"Z": -16.342468
},
"TerritoryId": 131,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1026937,
"Position": {
"X": 65.7511,
"Y": 14.005002,
"Z": 90.440186
},
"TerritoryId": 131,
"InteractionType": "CompleteQuest",
"NextQuestId": 4774
}
]
}
]
}

View File

@ -6,6 +6,7 @@ using Dalamud.Plugin;
using Dalamud.Plugin.Ipc;
using JetBrains.Annotations;
using Questionable.Controller;
using Questionable.Functions;
using Questionable.Model.Questing;
using Questionable.Windows.QuestComponents;
@ -19,9 +20,11 @@ internal sealed class QuestionableIpc : IDisposable
private const string IpcGetCurrentlyActiveEventQuests = "Questionable.GetCurrentlyActiveEventQuests";
private const string IpcStartQuest = "Questionable.StartQuest";
private const string IpcStartSingleQuest = "Questionable.StartSingleQuest";
private const string IpcIsQuestLocked = "Questionable.IsQuestLocked";
private readonly QuestController _questController;
private readonly QuestRegistry _questRegistry;
private readonly QuestFunctions _questFunctions;
private readonly ICallGateProvider<bool> _isRunning;
private readonly ICallGateProvider<string?> _getCurrentQuestId;
@ -29,15 +32,18 @@ internal sealed class QuestionableIpc : IDisposable
private readonly ICallGateProvider<List<string>> _getCurrentlyActiveEventQuests;
private readonly ICallGateProvider<string, bool> _startQuest;
private readonly ICallGateProvider<string, bool> _startSingleQuest;
private readonly ICallGateProvider<string, bool> _isQuestLocked;
public QuestionableIpc(
QuestController questController,
EventInfoComponent eventInfoComponent,
QuestRegistry questRegistry,
QuestFunctions questFunctions,
IDalamudPluginInterface pluginInterface)
{
_questController = questController;
_questRegistry = questRegistry;
_questFunctions = questFunctions;
_isRunning = pluginInterface.GetIpcProvider<bool>(IpcIsRunning);
_isRunning.RegisterFunc(() =>
@ -59,6 +65,10 @@ internal sealed class QuestionableIpc : IDisposable
_startSingleQuest = pluginInterface.GetIpcProvider<string, bool>(IpcStartSingleQuest);
_startSingleQuest.RegisterFunc(questId => StartQuest(questId, true));
//_startSingleQuest.RegisterFunc((questId) => StartQuest(questController, questRegistry, questId, true));
_isQuestLocked = pluginInterface.GetIpcProvider<string, bool>(IpcIsQuestLocked);
_isQuestLocked.RegisterFunc((questId) => IsQuestLocked(questId));
}
private bool StartQuest(string questId, bool single)
@ -102,6 +112,16 @@ internal sealed class QuestionableIpc : IDisposable
};
}
private bool IsQuestLocked(string questId)
{
if (ElementId.TryFromString(questId, out var elementId) && elementId != null &&
_questRegistry.TryGetQuest(elementId, out var quest))
{
return _questFunctions.IsQuestLocked(elementId);
}
return true;
}
public void Dispose()
{
_startSingleQuest.UnregisterFunc();