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
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
- Feature: Adjusted quest window buttons -alydev
- Change: show Remaining Tasks dropdown (if enabled) even if 0 tasks -alydev
- bug fix: add description to journal progress button -alydev
- bug fix(?): restore 1 second delay for accept/complete quest -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.12</Version>
<Version>15.306.1.13</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,17 @@
"Fly": true,
"RestartNavigationIfCancelled": false
},
{
"Position": {
"X": 319.92804,
"Y": -121.95376,
"Z": -317.30713
},
"TerritoryId": 613,
"InteractionType": "WalkTo",
"DisableNavmesh": true,
"RestartNavigationIfCancelled": false
},
{
"DataId": 1020157,
"Position": {
Expand Down
10 changes: 5 additions & 5 deletions Questionable/Controller/Steps/Shared/WaitAtEnd.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ public IEnumerable<ITask> CreateAllTasks(Quest quest, QuestSequence sequence, Qu
WaitCondition.Task notInCombat = new(() => !condition[ConditionFlag.InCombat], "Wait(not in combat)");
return
[
new WaitDelay(),
new WaitDelay(TimeSpan.FromSeconds(1)),
notInCombat,
new WaitDelay(),
new WaitDelay(TimeSpan.FromSeconds(1)),
Next(quest, sequence)
];

Expand Down Expand Up @@ -69,7 +69,7 @@ public IEnumerable<ITask> CreateAllTasks(Quest quest, QuestSequence sequence, Qu
return
[
new WaitObjectAtPosition(step.DataId.Value, step.Position.Value, step.NpcWaitDistance ?? 0.5f),
new WaitDelay(),
new WaitDelay(TimeSpan.FromSeconds(1)),
Next(quest, sequence)
];

Expand Down Expand Up @@ -108,7 +108,7 @@ public IEnumerable<ITask> CreateAllTasks(Quest quest, QuestSequence sequence, Qu
case EInteractionType.AcceptQuest:
{
WaitQuestAccepted accept = new(step.PickUpQuestId ?? quest.Id);
WaitDelay delay = new();
WaitDelay delay = new(TimeSpan.FromSeconds(1));
if (step.PickUpQuestId != null)
{
if (redoUtil.IsRedoActive()) // Can't accept other quests during NG+
Expand All @@ -122,7 +122,7 @@ public IEnumerable<ITask> CreateAllTasks(Quest quest, QuestSequence sequence, Qu
case EInteractionType.CompleteQuest:
{
WaitQuestCompleted complete = new(step.TurnInQuestId ?? quest.Id);
WaitDelay delay = new();
WaitDelay delay = new(TimeSpan.FromSeconds(1));
List<ITask> tasks = [complete, delay, .. RedeemRewardItems.CreateRedeemTasks(questData, dataManager)];
if (step.TurnInQuestId != null)
tasks.Add(Next(quest, sequence));
Expand Down
30 changes: 29 additions & 1 deletion Questionable/Resources/I18N.xml
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,7 @@
<Entry>
<!-- Found in: Windows\PriorityWindow.cs -->
<!-- Found in: Windows\JournalComponents\QuestJournalUtils.cs -->
<!-- Found in: Windows\QuestComponents\QuickAccessButtonsComponent.cs -->
<Key>Priority Quests</Key>
<Value lang="ja-jp">優先クエスト</Value>
<Value lang="zh-cn">优先任务</Value>
Expand Down Expand Up @@ -1008,6 +1009,7 @@
</Entry>
<Entry>
<!-- Found in: Windows\QuestValidationWindow.cs -->
<!-- Found in: Windows\QuestComponents\QuickAccessButtonsComponent.cs -->
<Key>Quest Validation</Key>
<Value lang="ja-jp">クエスト検証</Value>
<Value lang="zh-cn">任务验证</Value>
Expand Down Expand Up @@ -2323,6 +2325,7 @@
</Entry>
<Entry>
<!-- Found in: Windows\JournalComponents\QuestJournalComponent.cs -->
<!-- Found in: Windows\QuestComponents\ActiveQuestComponent.cs -->
<Key>This quest is not yet supported.</Key>
<Value lang="ja-jp">このクエストはまだサポートされていません。</Value>
<Value lang="zh-cn">此任务尚不支持。</Value>
Expand Down Expand Up @@ -2486,7 +2489,6 @@
<Value lang="zh-cn">战斗中</Value>
</Entry>
<Entry>
<!-- Found in: Windows\QuestComponents\ActiveQuestComponent.cs -->
<!-- Found in: Windows\QuestComponents\CreationUtilsComponent.cs -->
<Key>No active quest</Key>
<Value lang="af">Geen aktiewe soeke nie</Value>
Expand Down Expand Up @@ -3021,6 +3023,7 @@
<Value lang="zh-cn">设置尽可能优先执行的优先任务。</Value>
</Entry>
<Entry>
<!-- Found in: Windows\QuestComponents\QuickAccessButtonsComponent.cs -->
<Key>Rebuild Navmesh</Key>
<Value lang="ja-jp">ナビメッシュを再構築</Value>
<Value lang="zh-cn">重建导航网格</Value>
Expand All @@ -3044,6 +3047,7 @@
<Value lang="zh-cn">重新加载数据</Value>
</Entry>
<Entry>
<!-- Found in: Windows\QuestComponents\QuickAccessButtonsComponent.cs -->
<Key>Stuck?</Key>
<Value lang="ja-jp">スタックしていますか?</Value>
<Value lang="zh-cn">卡住了?</Value>
Expand Down Expand Up @@ -3920,4 +3924,28 @@
<!-- Found in: Windows\QuestComponents\RemainingTasksComponent.cs -->
<Key>Remaining Tasks</Key>
</Entry>
<Entry>
<!-- Found in: Data\JournalData.cs -->
<Key>Instant Quests</Key>
</Entry>
<Entry>
<!-- Found in: Windows\ConfigComponents\GeneralConfigComponent.cs -->
<Key>Use Questionable theme</Key>
</Entry>
<Entry>
<!-- Found in: Windows\ConfigComponents\GeneralConfigComponent.cs -->
<Key>When disabled, Questionable's windows use your Dalamud style/theme instead.</Key>
</Entry>
<Entry>
<!-- Found in: Windows\QuestComponents\ActiveQuestComponent.cs -->
<Key>No supported quests</Key>
</Entry>
<Entry>
<!-- Found in: Windows\QuestComponents\QuickAccessButtonsComponent.cs -->
<Key>Reset sequence progess and reload quest data from disk</Key>
</Entry>
<Entry>
<!-- Found in: Windows\QuestComponents\QuickAccessButtonsComponent.cs -->
<Key>Utility to browse quest data used by this plugin</Key>
</Entry>
</I18N>
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,15 @@ internal void DrawRebuildNavmeshButton(bool showLabel = false)
internal void DrawReloadDataButton(bool showLabel = false)
{
if (QstWidgets.RailButton(FontAwesomeIcon.RedoAlt, _L("Reload Data"),
_L("Reset sequence progess and reload quest data from disk"),
showLabel: showLabel))
Reload?.Invoke(this, EventArgs.Empty);
}

internal void DrawJournalProgressButton(bool showLabel = false)
{
if (QstWidgets.RailButton(FontAwesomeIcon.BookBookmark, _L("Journal Progress"),
_L("Utility to browse quest data used by this plugin"),
showLabel: showLabel))
journalProgressWindow.ToggleOrUncollapse();
}
Expand Down
Loading