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

master #3

Open
cacahuetes wants to merge 673 commits from liza/Questionable:master into cacahuetes-ShB-Healer
pull from: liza/Questionable:master
merge into: cacahuetes:cacahuetes-ShB-Healer
Conversation 0 Commits 673 Files Changed 1519 +318 -6
3 changed files with 318 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 33726426df - Show all commits

187
QuestPaths/7.x - Dawntrail/Seasonal Events/Rising (2024)/5015_Rising to the Call.json Normal file
View File

@ -0,0 +1,187 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1050998,
"Position": {
"X": 4.0131226,
"Y": 44.499996,
"Z": 126.17676
},
"TerritoryId": 128,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza",
"[Limsa Lominsa] The Aftcastle"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
128
]
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1050999,
"Position": {
"X": 4.837097,
"Y": 31.47563,
"Z": -256.97723
},
"TerritoryId": 128,
"InteractionType": "Interact",
"AethernetShortcut": [
"[Limsa Lominsa] The Aftcastle",
"[Limsa Lominsa] Marauders' Guild"
]
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1051000,
"Position": {
"X": -100.175476,
"Y": 18.00033,
"Z": -15.030151
},
"TerritoryId": 129,
"InteractionType": "Interact",
"AethernetShortcut": [
"[Limsa Lominsa] Marauders' Guild",
"[Limsa Lominsa] Aetheryte Plaza"
]
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1001217,
"Position": {
"X": -140.85602,
"Y": 18.199999,
"Z": 17.013733
},
"TerritoryId": 129,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"DataId": 1051003,
"Position": {
"X": -188.12854,
"Y": 16,
"Z": 33.37146
},
"TerritoryId": 129,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
},
{
"DataId": 1051002,
"Position": {
"X": -205.005,
"Y": 15.999994,
"Z": 71.97681
},
"TerritoryId": 129,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 1051004,
"Position": {
"X": -243.03046,
"Y": 16.199997,
"Z": 40.97046
},
"TerritoryId": 129,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
16
]
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 2014209,
"Position": {
"X": -385.1225,
"Y": 5.996765,
"Z": 33.707153
},
"TerritoryId": 129,
"InteractionType": "Interact",
"AethernetShortcut": [
"[Limsa Lominsa] Hawkers' Alley",
"[Limsa Lominsa] Arcanists' Guild"
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1051001,
"Position": {
"X": 3.7994385,
"Y": 44.499992,
"Z": 126.05469
},
"TerritoryId": 128,
"InteractionType": "CompleteQuest",
"AethernetShortcut": [
"[Limsa Lominsa] Arcanists' Guild",
"[Limsa Lominsa] The Aftcastle"
]
}
]
}
]
}

121
QuestPaths/7.x - Dawntrail/Seasonal Events/Rising (2024)/5016_We Who Are About to Set Sail Salute You.json Normal file
View File

@ -0,0 +1,121 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1051007,
"Position": {
"X": 2.2735596,
"Y": 44.499992,
"Z": 125.200195
},
"StopDistance": 5,
"TerritoryId": 128,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza",
"[Limsa Lominsa] The Aftcastle"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
128
]
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1051008,
"Position": {
"X": 2.5481567,
"Y": 43.999977,
"Z": -206.71399
},
"TerritoryId": 128,
"InteractionType": "Interact",
"AethernetShortcut": [
"[Limsa Lominsa] The Aftcastle",
"[Limsa Lominsa] Marauders' Guild"
]
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1051009,
"Position": {
"X": 1.5106201,
"Y": 44,
"Z": -205.8595
},
"TerritoryId": 128,
"InteractionType": "Interact",
"StopDistance": 5
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 2014210,
"Position": {
"X": -176.62323,
"Y": 40.97046,
"Z": 185.35132
},
"TerritoryId": 128,
"InteractionType": "Interact",
"AethernetShortcut": [
"[Limsa Lominsa] Marauders' Guild",
"[Limsa Lominsa] The Aftcastle"
]
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1051010,
"Position": {
"X": -178.11859,
"Y": 40.999958,
"Z": 184.67993
},
"StopDistance": 5,
"TerritoryId": 128,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1051011,
"Position": {
"X": -178.63745,
"Y": 40.999916,
"Z": 186.3584
},
"StopDistance": 7,
"TerritoryId": 128,
"InteractionType": "CompleteQuest"
}
]
}
]
}

16
Questionable/Windows/QuestComponents/EventInfoComponent.cs
View File

@ -20,8 +20,7 @@ internal sealed class EventInfoComponent
{
private readonly List<EventQuest> _eventQuests =
[
new EventQuest("Moonfire Faire", [new(5182), new(5183)],
new DateTime(new DateOnly(2024, 8, 26), new TimeOnly(14, 59), DateTimeKind.Utc)),
new("The Rising", [new(5015), new(5016)], AtDailyReset(new(2024, 9, 11))),
];
private readonly QuestData _questData;
@ -47,6 +46,11 @@ internal sealed class EventInfoComponent
_pluginInterface = pluginInterface;
}
private static DateTime AtDailyReset(DateOnly date)
{
return new DateTime(date, new TimeOnly(14, 59), DateTimeKind.Utc);
}
public bool ShouldDraw => _configuration.General.ShowIncompleteSeasonalEvents && _eventQuests.Any(IsIncomplete);
public void Draw()
@ -75,10 +79,10 @@ internal sealed class EventInfoComponent
width -= ImGui.CalcTextSize(FontAwesomeIcon.Check.ToIconString()).X;
List<QuestId> startableQuests = eventQuest.QuestIds.Where(x =>
_questRegistry.IsKnownQuest(x) &&
_questFunctions.IsReadyToAcceptQuest(x) &&
x != _questController.StartedQuest?.Quest.Id &&
x != _questController.NextQuest?.Quest.Id)
_questRegistry.IsKnownQuest(x) &&
_questFunctions.IsReadyToAcceptQuest(x) &&
x != _questController.StartedQuest?.Quest.Id &&
x != _questController.NextQuest?.Quest.Id)
.ToList();
if (startableQuests.Count == 0)
width = 0;