diff --git a/config/template.json b/config/template.json index 8cc4e99b2..1a8648a3b 100644 --- a/config/template.json +++ b/config/template.json @@ -97,8 +97,7 @@ "Use_the_Omni_Synthesizer_1_times": "achievable", "Take_photos_1_times": "achievable", "Consume_120_Trailblaze_Power": "achievable", - "Level_up_any_Relic_1_times": "not_supported", - "Enter_combat_by_attacking_enemy_Weakness_and_win_3_times": "achievable" + "Level_up_any_Relic_1_times": "not_supported" }, "DailyStorage": { "DailyActivity": {}, diff --git a/module/config/config_updater.py b/module/config/config_updater.py index f49974636..beb8936d5 100644 --- a/module/config/config_updater.py +++ b/module/config/config_updater.py @@ -694,7 +694,7 @@ class ConfigUpdater: set_daily('In_a_single_battle_inflict_3_Weakness_Break_of_different_Types', 'achievable') set_daily('Inflict_Weakness_Break_5_times', 'achievable') set_daily('Defeat_a_total_of_20_enemies', 'achievable') - set_daily('Enter_combat_by_attacking_enemy_Weakness_and_win_3_times', 'achievable') + set_daily('Enter_combat_by_attacking_enemie_Weakness_and_win_3_times', 'achievable') set_daily('Use_Technique_2_times', 'achievable') # Other game systems set_daily('Dispatch_1_assignments', deep_get(data, 'Assignment.Scheduler.Enable')) diff --git a/tasks/daily/daily_quest.py b/tasks/daily/daily_quest.py index 425619026..127f07a17 100644 --- a/tasks/daily/daily_quest.py +++ b/tasks/daily/daily_quest.py @@ -242,13 +242,15 @@ class DailyQuestUI(DungeonUI, RouteLoader): done = 0 logger.hr('Do quests', level=1) - if KEYWORDS_DAILY_QUEST.Take_1_photo in quests: + if KEYWORDS_DAILY_QUEST.Take_photos_1_times in quests: CameraUI(self.config, self.device).take_picture() done += 1 + """ if KEYWORDS_DAILY_QUEST.Synthesize_Consumable_1_time in quests: if SynthesizeConsumablesUI(self.config, self.device).synthesize_consumables(): done += 1 - if KEYWORDS_DAILY_QUEST.Synthesize_material_1_time in quests: + """ + if KEYWORDS_DAILY_QUEST.Use_the_Omni_Synthesizer_1_times in quests: if SynthesizeMaterialUI(self.config, self.device).synthesize_material(): done += 1 if KEYWORDS_DAILY_QUEST.Use_Consumables_1_time in quests: @@ -268,7 +270,7 @@ class DailyQuestUI(DungeonUI, RouteLoader): enemy x1 In_a_single_battle_inflict_3_Weakness_Break_of_different_Types enemy x1 Inflict_Weakness_Break_5_times enemy x2 Defeat_a_total_of_20_enemies - enemy x3 Enter_combat_by_attacking_enemy_Weakness_and_win_3_times + enemy x3 Enter_combat_by_attacking_enemie_Weakness_and_win_3_times item x1 Destroy_3_destructible_objects enemy x1 Use_an_Ultimate_to_deal_the_final_blow_1_time """ @@ -280,7 +282,7 @@ class DailyQuestUI(DungeonUI, RouteLoader): enemy = max(enemy, 1) if KEYWORDS_DAILY_QUEST.Defeat_a_total_of_20_enemies in quests: enemy = max(enemy, 2) - if KEYWORDS_DAILY_QUEST.Enter_combat_by_attacking_enemy_Weakness_and_win_3_times in quests: + if KEYWORDS_DAILY_QUEST.Enter_combat_by_attacking_enemie_Weakness_and_win_3_times in quests: enemy = max(enemy, 3) if KEYWORDS_DAILY_QUEST.Destroy_3_destructible_objects in quests: item = max(item, 1) diff --git a/tasks/dungeon/dungeon.py b/tasks/dungeon/dungeon.py index 3b1b59fbf..d03112af8 100644 --- a/tasks/dungeon/dungeon.py +++ b/tasks/dungeon/dungeon.py @@ -94,8 +94,8 @@ class Dungeon(DungeonStamina, DungeonEvent, Combat): self.achieved_daily_quest = True if support_character is not None: self.called_daily_support = True - if KEYWORDS_DAILY_QUEST.Obtain_victory_in_combat_with_Support_Characters_1_time: - logger.info('Achieve daily quest Obtain_victory_in_combat_with_Support_Characters_1_time') + if KEYWORDS_DAILY_QUEST.Obtain_victory_in_combat_with_Support_Characters_1_times: + logger.info('Achieve daily quest Obtain_victory_in_combat_with_Support_Characters_1_times') self.achieved_daily_quest = True # Check trailblaze power, this may stop current task @@ -326,7 +326,7 @@ class Dungeon(DungeonStamina, DungeonEvent, Combat): require = False if not self.config.stored.DailyActivity.is_full(): - if KEYWORDS_DAILY_QUEST.Obtain_victory_in_combat_with_Support_Characters_1_time \ + if KEYWORDS_DAILY_QUEST.Obtain_victory_in_combat_with_Support_Characters_1_times \ in self.daily_quests: require = True