From bd86564fd72b74283caa925ab3c388dc9552e118 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Fri, 19 Jul 2024 02:00:01 +0800
Subject: [PATCH] Fix: Assume daily quests if it's expired

---
 module/config/argument/stored.json |  4 +++-
 module/config/config.py            | 12 +++++++++++-
 module/config/stored/classes.py    | 17 +++++++++++++++--
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/module/config/argument/stored.json b/module/config/argument/stored.json
index 519f2cad2..857b38430 100644
--- a/module/config/argument/stored.json
+++ b/module/config/argument/stored.json
@@ -715,7 +715,9 @@
       "quest4": "",
       "quest5": "",
       "quest6": "",
-      "total": 6,
+      "quest7": "",
+      "quest8": "",
+      "total": 8,
       "value": 0
     },
     "order": 0,
diff --git a/module/config/config.py b/module/config/config.py
index 61d8cb5d7..fc5a680fe 100644
--- a/module/config/config.py
+++ b/module/config/config.py
@@ -516,7 +516,17 @@ class AzurLaneConfig(ConfigUpdater, ManualConfig, GeneratedConfig, ConfigWatcher
                 self.stored.DailyActivity.clear()
             if self.stored.DailyQuest.is_expired():
                 logger.info('DailyQuest expired')
-                self.stored.DailyQuest.clear()
+                q = self.stored.DailyQuest
+                q.clear()
+                # Assume fixed quests
+                q.write_quests([
+                    'Complete_1_Daily_Mission',
+                    'Log_in_to_the_game',
+                    'Dispatch_1_assignments',
+                    'Complete_Divergent_Universe_or_Simulated_Universe_1_times',
+                    'Obtain_victory_in_combat_with_Support_Characters_1_times',
+                    'Consume_120_Trailblaze_Power',
+                ])
 
     def update_battle_pass_quests(self):
         """
diff --git a/module/config/stored/classes.py b/module/config/stored/classes.py
index 24c9edad4..8d5073e61 100644
--- a/module/config/stored/classes.py
+++ b/module/config/stored/classes.py
@@ -234,8 +234,10 @@ class StoredDaily(StoredCounter, StoredExpiredAt0400):
     quest4 = ''
     quest5 = ''
     quest6 = ''
+    quest7 = ''
+    quest8 = ''
 
-    FIXED_TOTAL = 6
+    FIXED_TOTAL = 8
 
     def load_quests(self):
         """
@@ -245,7 +247,8 @@ class StoredDaily(StoredCounter, StoredExpiredAt0400):
         # DailyQuest should be lazy loaded
         from tasks.daily.keywords import DailyQuest
         quests = []
-        for name in [self.quest1, self.quest2, self.quest3, self.quest4, self.quest5, self.quest6]:
+        for name in [self.quest1, self.quest2, self.quest3, self.quest4,
+                     self.quest5, self.quest6, self.quest7, self.quest8]:
             if not name:
                 continue
             try:
@@ -288,6 +291,14 @@ class StoredDaily(StoredCounter, StoredExpiredAt0400):
                 self.quest6 = quests[5]
             except IndexError:
                 self.quest6 = ''
+            try:
+                self.quest7 = quests[6]
+            except IndexError:
+                self.quest7 = ''
+            try:
+                self.quest8 = quests[7]
+            except IndexError:
+                self.quest8 = ''
 
     def clear(self):
         with self._config.multi_set():
@@ -297,6 +308,8 @@ class StoredDaily(StoredCounter, StoredExpiredAt0400):
             self.quest4 = ''
             self.quest5 = ''
             self.quest6 = ''
+            self.quest7 = ''
+            self.quest8 = ''
 
 
 class StoredDungeonDouble(StoredExpiredAt0400):