Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- Feature: added Delivery Moogle Quests preset to Priority Quests -alydev
- Change: moved User presets above Built-in presets -alydev
- Bug fix: "moogle delivery level = quest locked" was not properly calculated -alydev
- Bug fix: quests appearing locked due to inaccurate logic -alydev
- Feature: quest accepted job now shows next to ID at top of quest window -alydev
- clicking it will switch to that job -alydev
- Feature: using game translations for priority preset names instead of contributor translations -alydev
- Change: added a couple prereq story quests to delivery moogle preset -alydev
2 changes: 1 addition & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup Condition="$(MSBuildProjectName) != 'GatheringPathRenderer'">
<Version>15.306.1.31</Version>
<Version>15.306.1.32</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "Iskierka", "Date": "2026-06-09"},
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "Iskierka", "Date": "2026-06-09"},
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "Iskierka", "Date": "2026-06-09"},
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "liza",
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://qstxiv.github.io/schema/quest-v1.json",
"Author": "FalconTaterz",
"LastChecked": {"Username": "alydev", "Date": "2026-07-09"},
"LastChecked": {"Username": "alydev", "Date": "2026-08-04"},
"QuestSequence": [
{
"Sequence": 0,
Expand Down
2 changes: 1 addition & 1 deletion Questionable/Controller/CombatController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ private unsafe (int? Priority, string Reason) GetRawKillPriority(IGameObject gam
if ((!expectQuestMarker || gameObjectStruct->NamePlateIconId != 0 || _currentFight.Data.SpawnType == EEnemySpawnType.FateEnemies) &&
_currentFight.Data.KillEnemyDataIds.Contains(GameFunctions.GetBaseID(battleNpc)))
{
if (_currentFight.Data.SpawnType == EEnemySpawnType.FateEnemies && !PlayerState.Instance()->IsLevelSynced)
if (_currentFight.Data.SpawnType == EEnemySpawnType.FateEnemies && !PlayerState.Instance()->IsLevelSynced && EzThrottler.Throttle("lsync", miliseconds: 1000))
_chatFunctions.ExecuteCommand("/lsync");
return (90, "KED");
}
Expand Down
4 changes: 2 additions & 2 deletions Questionable/Data/ClassJobUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,11 @@ var _ when GameDataAdapter.IsHealer(x.ClassJob) => 10,
return jobs.AsReadOnly();
}

private unsafe Job LookupQuestStartJob(ElementId? elementId)
internal unsafe Job LookupQuestStartJob(ElementId? elementId)
{
ArgumentNullException.ThrowIfNull(elementId);

if (elementId is QuestId questId)
if (elementId is QuestId questId && QuestFunctions.IsQuestAccepted(questId))
{
QuestWork* questWork = QuestManager.Instance()->GetQuestById(questId.Value);
if (questWork->AcceptClassJob != 0)
Expand Down
2 changes: 1 addition & 1 deletion Questionable/Data/QuestData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ internal sealed class QuestData
}
.ToImmutableDictionary(x => x.Key, x => x.Value.Select(y => new QuestId(y)).ToImmutableList());
public static readonly IReadOnlyList<ElementId> DeliveryMoogleQuests = ((ushort[])[
1481, 1483, 1482, 1484, 1531, 1532, 1533, 1485, 33, 1571, 36, 1573, 1570, 1576, 1577, 241, 242, 1574, 1572, 1575, 243, 244, 240, 496, 362
1481, 1483, 1482, 1484, 1531, 1532, 1533, 804, 805, 807, 1485, 33, 1571, 36, 1573, 1570, 1576, 1577, 241, 242, 1574, 1572, 1575, 243, 244, 1204, 240, 496, 362
]).FromNumericListOfQuests();

private static readonly IReadOnlyList<uint> TankRoleQuestChapters = [136, 154, 178];
Expand Down
1 change: 0 additions & 1 deletion Questionable/Functions/QuestFunctions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
using Lumina.Excel.Sheets;
using Questionable.Model.Common;
using Questionable.Model.Questing;
using static FFXIVClientStructs.FFXIV.Client.Game.BGMSystem;
using static Questionable.Domain.QuestInfo;
using static Questionable.Utils.CacheUtils;
using GrandCompany = FFXIVClientStructs.FFXIV.Client.UI.Agent.GrandCompany;
Expand Down
2 changes: 1 addition & 1 deletion Questionable/QuestionablePlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public QuestionablePlugin(IDalamudPluginInterface pluginInterface,
}

serviceCollection.AddSingleton(configuration);
Questionable.Utils.LocalizeShortcut.Initialize(configuration);
Questionable.Utils.LocalizeShortcut.Initialize(configuration, dataManager, clientState);
Windows.Common.Ui.QstTheme.Initialize(configuration);

AddBasicFunctionsAndData(serviceCollection);
Expand Down
14 changes: 1 addition & 13 deletions Questionable/Resources/I18N.xml
Original file line number Diff line number Diff line change
Expand Up @@ -841,74 +841,62 @@
<Value lang="zh-cn">按住 CTRL 键以覆盖现有预设。</Value>
</Entry>
<Entry>
<!-- Found in: Windows\PriorityWindow.cs -->
<Key>ARR Hard Mode Primals</Key>
<Value lang="ja-jp">真蛮神討滅戦</Value>
<Value lang="zh-cn">重生之境真蛮神讨伐歼灭战</Value>
</Entry>
<Entry>
<!-- Found in: Windows\PriorityWindow.cs -->
<!-- Found in: Windows\QuestComponents\ARealmRebornComponent.cs -->
<Key>Crystal Tower Raids</Key>
<Value lang="ja-jp">クリスタルタワーレイド</Value>
<Value lang="zh-cn">水晶塔大型任务</Value>
</Entry>
<Entry>
<!-- Found in: Windows\PriorityWindow.cs -->
<Key>Aether Currents: Heavensward</Key>
<Value lang="ja-jp">風脈:蒼天篇</Value>
<Value lang="zh-cn">风脉泉:苍穹之禁城</Value>
</Entry>
<Entry>
<!-- Found in: Windows\PriorityWindow.cs -->
<Key>Aether Currents: Stormblood</Key>
<Value lang="ja-jp">風脈:紅蓮篇</Value>
<Value lang="zh-cn">风脉泉:红莲之狂潮</Value>
</Entry>
<Entry>
<!-- Found in: Windows\PriorityWindow.cs -->
<Key>Aether Currents: Shadowbringers</Key>
<Value lang="ja-jp">風脈:漆黒篇</Value>
<Value lang="zh-cn">风脉泉:暗影之逆焰</Value>
</Entry>
<Entry>
<!-- Found in: Windows\PriorityWindow.cs -->
<Key>Aether Currents: Endwalker</Key>
<Value lang="ja-jp">風脈:暁月篇</Value>
<Value lang="zh-cn">风脉泉:晓月之终途</Value>
</Entry>
<Entry>
<!-- Found in: Windows\PriorityWindow.cs -->
<Key>Aether Currents: Dawntrail</Key>
<Value lang="ja-jp">風脈:黄金篇</Value>
<Value lang="zh-cn">风脉泉:黄金的遗产</Value>
</Entry>
<Entry>
<!-- Found in: Windows\PriorityWindow.cs -->
<Key>Role Quests: Tank</Key>
<Value lang="ja-jp">ロールクエスト:タンク</Value>
<Value lang="zh-cn">职能任务:防护</Value>
</Entry>
<Entry>
<!-- Found in: Windows\PriorityWindow.cs -->
<Key>Role Quests: Healer</Key>
<Value lang="ja-jp">ロールクエスト:ヒーラー</Value>
<Value lang="zh-cn">职能任务:治疗</Value>
</Entry>
<Entry>
<!-- Found in: Windows\PriorityWindow.cs -->
<Key>Role Quests: Melee DPS</Key>
<Value lang="ja-jp">ロールクエスト:メレー</Value>
<Value lang="zh-cn">职能任务:近战</Value>
</Entry>
<Entry>
<!-- Found in: Windows\PriorityWindow.cs -->
<Key>Role Quests: Physical Ranged</Key>
<Value lang="ja-jp">ロールクエスト:レンジ</Value>
<Value lang="zh-cn">职能任务:远程物理</Value>
</Entry>
<Entry>
<!-- Found in: Windows\PriorityWindow.cs -->
<Key>Role Quests: Caster</Key>
<Value lang="ja-jp">ロールクエスト:キャスター</Value>
<Value lang="zh-cn">职能任务:远程魔法</Value>
Expand Down Expand Up @@ -4305,4 +4293,4 @@
<Value lang="ja-jp">前提条件が満たされていません</Value>
<Value lang="zh-cn">前提条件未满足</Value>
</Entry>
</I18N>
</I18N>
Loading
Loading