Skip to content

Changed the quest progress reset logic again #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
myangelkamikaze merged 8 commits into from
Feb 19, 2026
Merged

Changed the quest progress reset logic again #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c8b051d
Changed the quest progress reset logic again
Jebzou Feb 17, 2026
e2539dd
using
Jebzou Feb 17, 2026
f6076e2
Revert "using"
Jebzou Feb 19, 2026
a1fe106
Revert "Changed the quest progress reset logic again"
Jebzou Feb 19, 2026
ab4dcc0
New logic
Jebzou Feb 19, 2026
1607703
usings
Jebzou Feb 19, 2026
9284325
fix
Jebzou Feb 19, 2026
d425cdc
oops
Jebzou Feb 19, 2026
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
30 changes: 25 additions & 5 deletions ElectronicObserver/Data/Quest/ProgressData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
using ElectronicObserver.Core.Types.Data;
using ElectronicObserver.Core.Types.Quests;
using ElectronicObserver.Core.Types.Serialization.Quests;

namespace ElectronicObserver.Data.Quest;

Expand Down Expand Up @@ -198,13 +200,31 @@ public virtual void ApplyTemporaryProgress(QuestData q)
}
}

public QuestResetType GetProgressResetType() => TryGetQuest()?.GetProgressResetType() ?? QuestResetType.Unknown;

private QuestData? TryGetQuest()
public QuestResetType GetProgressResetType()
{
if (!KCDatabase.Instance.Quest.Quests.ContainsKey(QuestID)) return null;
Dictionary<int, QuestMetadata> questsMetadata = KCDatabase.Instance.Translation.QuestsMetadata.QuestsMetadataList;

if (questsMetadata.TryGetValue(QuestID, out QuestMetadata? metadata) && metadata.QuestProgressResetType is { } resetType)
{
return resetType;
}

return KCDatabase.Instance.Quest[QuestID];
return QuestID switch
{
// Quests that are not daily but only appear on some days :
211 or 212 => QuestResetType.Daily, // 空母3 or 輸送5

// Some PVP quests
311 or
330 or
337 or
339 or
341 or
342 or
348 => QuestResetType.Daily,

_ => QuestResetType,
};
}

/// <summary>
Expand Down
2 changes: 0 additions & 2 deletions ElectronicObserver/Data/QuestManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using System.Collections.Generic;
using ElectronicObserver.Core;
using ElectronicObserver.Core.Types.Data;
using ElectronicObserver.Core.Types.Extensions;
using ElectronicObserver.Core.Types.Quests;

namespace ElectronicObserver.Data;
Expand Down Expand Up @@ -53,7 +52,6 @@ public override void LoadFromResponse(string apiname, dynamic data)

var progress = KCDatabase.Instance.QuestProgress;


//周期任務削除
if (DateTimeHelper.IsCrossedDay(progress.LastUpdateTime, 5, 0, 0))
{
Expand Down