xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-11-16 06:25:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: unique daily quest config

Browse Source
This commit is contained in:
X-Zero-L 2023-12-28 00:43:20 +08:00
parent 949d4f2cdf
commit e9d62faa1a
14 changed files with 75 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
config/template.json
View File

@ -79,36 +79,26 @@
"In_a_single_battle_inflict_3_Weakness_Break_of_different_Types": "achievable",
"Inflict_Weakness_Break_5_times": "achievable",
"Defeat_a_total_of_20_enemies": "achievable",
"Destroy_3_destructible_objects": "achievable",
"Complete_Forgotten_Hall_1_time": "achievable",
"Complete_Echo_of_War_1_times": "not_set",
"Obtain_victory_in_combat_with_Support_Characters_1_time": "achievable",
"Use_an_Ultimate_to_deal_the_final_blow_1_time": "achievable",
"Salvage_any_Relic": "achievable",
"Use_Consumables_1_time": "achievable",
"Log_in_to_the_game": "achievable",
"Dispatch_1_assignments": "achievable",
"Complete_Simulated_Universe_1_times": "achievable",
"Complete_Simulated_Universe_1_times": "not_set",
"Clear_Calyx_Crimson_1_times": "achievable",
"Enter_combat_by_attacking_enemie_Weakness_and_win_3_times": "achievable",
"Use_Technique_2_times": "achievable",
"Destroy_3_destructible_objects": "achievable",
"Obtain_victory_in_combat_with_Support_Characters_1_times": "achievable",
"Level_up_any_character_1_times": "achievable",
"Level_up_any_Light_Cone_1_times": "achievable",
"Level_up_any_character_1_times": "not_supported",
"Level_up_any_Light_Cone_1_times": "not_supported",
"Use_the_Omni_Synthesizer_1_times": "achievable",
"Take_photos_1_times": "achievable",
"Consume_120_Trailblaze_Power": "achievable",
"Level_up_any_Relic_1_times": "achievable",
"Complete_Calyx_Crimson_1_time": "achievable",
"Enter_combat_by_attacking_enemy_Weakness_and_win_3_times": "achievable",
"Go_on_assignment_1_time": "achievable",
"Take_1_photo": "achievable",
"Complete_1_stage_in_Simulated_Universe_Any_world": "not_set",
"Level_up_any_character_1_time": "not_supported",
"Level_up_any_Light_Cone_1_time": "not_supported",
"Level_up_any_Relic_1_time": "not_supported",
"Synthesize_Consumable_1_time": "achievable",
"Synthesize_material_1_time": "achievable"
"Level_up_any_Relic_1_times": "not_supported",
"Enter_combat_by_attacking_enemy_Weakness_and_win_3_times": "achievable"
},
"DailyStorage": {
"DailyActivity": {},

2
dev_tools/keyword_extract.py
View File

@ -250,7 +250,7 @@ class KeywordExtract:
"Complete_Calyx_Crimson_1_time", # -> Clear_Calyx_Crimson_1_times
"Enter_combat_by_attacking_enemy_Weakness_and_win_3_times", # -> Enter_combat_by_attacking_enemie_Weakness_and_win_1_times
"Use_Technique_2_times", # -> Use_Technique_1_times
"Destroy_3_destructible_objects" # -> Destroy_1_destructible_objects
"Destroy_3_destructible_objects", # -> Destroy_1_destructible_objects
"Obtain_victory_in_combat_with_Support_Characters_1_time", # -> Obtain_victory_in_combat_with_Support_Characters_1_times
"Level_up_any_character_1_time", # -> Level_up_any_character_1_times
"Level_up_any_Light_Cone_1_time", # -> Level_up_any_Light_Cone_1_times

45
module/config/argument/args.json
View File

@ -564,21 +564,6 @@
"not_supported"
]
},
"Destroy_3_destructible_objects": {
"type": "state",
"value": "achievable",
"option": [
"achievable",
"not_set",
"not_supported"
],
"option_bold": [
"achievable"
],
"option_light": [
"not_supported"
]
},
"Complete_Forgotten_Hall_1_time": {
"type": "state",
"value": "achievable",
@ -609,21 +594,6 @@
"not_supported"
]
},
"Obtain_victory_in_combat_with_Support_Characters_1_time": {
"type": "state",
"value": "achievable",
"option": [
"achievable",
"not_set",
"not_supported"
],
"option_bold": [
"achievable"
],
"option_light": [
"not_supported"
]
},
"Use_an_Ultimate_to_deal_the_final_blow_1_time": {
"type": "state",
"value": "achievable",
@ -759,6 +729,21 @@
"not_supported"
]
},
"Destroy_3_destructible_objects": {
"type": "state",
"value": "achievable",
"option": [
"achievable",
"not_set",
"not_supported"
],
"option_bold": [
"achievable"
],
"option_light": [
"not_supported"
]
},
"Obtain_victory_in_combat_with_Support_Characters_1_times": {
"type": "state",
"value": "achievable",

3
module/config/config_generated.py
View File

@ -77,10 +77,8 @@ class GeneratedConfig:
AchievableQuest_In_a_single_battle_inflict_3_Weakness_Break_of_different_Types = 'achievable' # achievable, not_set, not_supported
AchievableQuest_Inflict_Weakness_Break_5_times = 'achievable' # achievable, not_set, not_supported
AchievableQuest_Defeat_a_total_of_20_enemies = 'achievable' # achievable, not_set, not_supported
AchievableQuest_Destroy_3_destructible_objects = 'achievable' # achievable, not_set, not_supported
AchievableQuest_Complete_Forgotten_Hall_1_time = 'achievable' # achievable, not_set, not_supported
AchievableQuest_Complete_Echo_of_War_1_times = 'achievable' # achievable, not_set, not_supported
AchievableQuest_Obtain_victory_in_combat_with_Support_Characters_1_time = 'achievable' # achievable, not_set, not_supported
AchievableQuest_Use_an_Ultimate_to_deal_the_final_blow_1_time = 'achievable' # achievable, not_set, not_supported
AchievableQuest_Salvage_any_Relic = 'achievable' # achievable, not_set, not_supported
AchievableQuest_Use_Consumables_1_time = 'achievable' # achievable, not_set, not_supported
@ -90,6 +88,7 @@ class GeneratedConfig:
AchievableQuest_Clear_Calyx_Crimson_1_times = 'achievable' # achievable, not_set, not_supported
AchievableQuest_Enter_combat_by_attacking_enemie_Weakness_and_win_3_times = 'achievable' # achievable, not_set, not_supported
AchievableQuest_Use_Technique_2_times = 'achievable' # achievable, not_set, not_supported
AchievableQuest_Destroy_3_destructible_objects = 'achievable' # achievable, not_set, not_supported
AchievableQuest_Obtain_victory_in_combat_with_Support_Characters_1_times = 'achievable' # achievable, not_set, not_supported
AchievableQuest_Level_up_any_character_1_times = 'achievable' # achievable, not_set, not_supported
AchievableQuest_Level_up_any_Light_Cone_1_times = 'achievable' # achievable, not_set, not_supported

19
module/config/config_updater.py
View File

@ -684,7 +684,7 @@ class ConfigUpdater:
dungeon = deep_get(data, keys='Dungeon.Scheduler.Enable')
set_daily('Clear_Calyx_Golden_1_times',
dungeon and deep_get(data, 'Dungeon.DungeonDaily.CalyxGolden') != 'do_not_achieve')
set_daily('Complete_Calyx_Crimson_1_time',
set_daily('Clear_Calyx_Crimson_1_times',
dungeon and deep_get(data, 'Dungeon.DungeonDaily.CalyxCrimson') != 'do_not_achieve')
set_daily('Clear_Stagnant_Shadow_1_times',
dungeon and deep_get(data, 'Dungeon.DungeonDaily.StagnantShadow') != 'do_not_achieve')
@ -697,24 +697,23 @@ class ConfigUpdater:
set_daily('Enter_combat_by_attacking_enemy_Weakness_and_win_3_times', 'achievable')
set_daily('Use_Technique_2_times', 'achievable')
# Other game systems
set_daily('Go_on_assignment_1_time', deep_get(data, 'Assignment.Scheduler.Enable'))
set_daily('Take_1_photo', 'achievable')
set_daily('Dispatch_1_assignments', deep_get(data, 'Assignment.Scheduler.Enable'))
set_daily('Take_photos_1_times', 'achievable')
set_daily('Destroy_3_destructible_objects', 'achievable')
set_daily('Complete_Forgotten_Hall_1_time', 'achievable')
set_daily('Complete_Echo_of_War_1_times', deep_get(data, 'Weekly.Scheduler.Enable'))
set_daily('Complete_1_stage_in_Simulated_Universe_Any_world',
set_daily('Complete_Simulated_Universe_1_times',
deep_get(data, 'Rogue.Scheduler.Enable'))
set_daily('Obtain_victory_in_combat_with_Support_Characters_1_time',
set_daily('Obtain_victory_in_combat_with_Support_Characters_1_times',
dungeon and deep_get(data, 'Dungeon.DungeonSupport.Use') in ['when_daily', 'always_use'])
set_daily('Use_an_Ultimate_to_deal_the_final_blow_1_time', 'achievable')
# Build
set_daily('Level_up_any_character_1_time', 'not_supported')
set_daily('Level_up_any_Light_Cone_1_time', 'not_supported')
set_daily('Level_up_any_Relic_1_time', 'not_supported')
set_daily('Level_up_any_character_1_times', 'not_supported')
set_daily('Level_up_any_Light_Cone_1_times', 'not_supported')
set_daily('Level_up_any_Relic_1_times', 'not_supported')
# Items
set_daily('Salvage_any_Relic', 'achievable')
set_daily('Synthesize_Consumable_1_time', 'achievable')
set_daily('Synthesize_material_1_time', 'achievable')
set_daily('Use_the_Omni_Synthesizer_1_times', 'achievable')
set_daily('Use_Consumables_1_time', 'achievable')
# Limit setting combinations

21
module/config/i18n/en-US.json
View File

@ -525,13 +525,6 @@
"not_set": "Not Set",
"not_supported": "Not Supported Yet"
},
"Destroy_3_destructible_objects": {
"name": "Destroy 3 destructible object(s)",
"help": "Achievable by default, will do Himeko trial",
"achievable": "Achievable",
"not_set": "Not Set",
"not_supported": "Not Supported Yet"
},
"Complete_Forgotten_Hall_1_time": {
"name": "Complete Forgotten Hall 1 time",
"help": "Achievable by default, will choose the first four characters to do stage 1 once, please ensure that account build is sufficient to do stage 1",
@ -546,13 +539,6 @@
"not_set": "Not Set",
"not_supported": "Not Supported Yet"
},
"Obtain_victory_in_combat_with_Support_Characters_1_time": {
"name": "Obtain victory in combat with Support Characters 1 time",
"help": "Need to configure and enable the \"Dungeon\" task, configure support settings also",
"achievable": "Achievable",
"not_set": "Not Set",
"not_supported": "Not Supported Yet"
},
"Use_an_Ultimate_to_deal_the_final_blow_1_time": {
"name": "Use an Ultimate to deal the final blow 1 time",
"help": "Achievable by default, will do Himeko trial",
@ -616,6 +602,13 @@
"not_set": "Not Set",
"not_supported": "Not Supported Yet"
},
"Destroy_3_destructible_objects": {
"name": "Destroy 3 destructible object(s)",
"help": "Achievable by default, will do Himeko trial",
"achievable": "Achievable",
"not_set": "Not Set",
"not_supported": "Not Supported Yet"
},
"Obtain_victory_in_combat_with_Support_Characters_1_times": {
"name": "Obtain victory in combat with Support Characters 1 time(s)",
"help": "Need to configure and enable the \"Dungeon\" task, configure support settings also",

21
module/config/i18n/es-ES.json
View File

@ -525,13 +525,6 @@
"not_set": "No configurado",
"not_supported": "No soportado aún"
},
"Destroy_3_destructible_objects": {
"name": "Destruye 3 objetos destruibles",
"help": "Completable por defecto, se hará el desafío de Himeko",
"achievable": "Completable",
"not_set": "No configurado",
"not_supported": "No soportado aún"
},
"Complete_Forgotten_Hall_1_time": {
"name": "Completa el Salón olvidado 1 vez",
"help": "Completable por defecto, se seleccionarán los primeros 4 personajes y se hará el primer nivel. Por favor, asegúrate de que estos pueden hacerlo.",
@ -546,13 +539,6 @@
"not_set": "No configurado",
"not_supported": "No soportado aún"
},
"Obtain_victory_in_combat_with_Support_Characters_1_time": {
"name": "Gana 1 batalla utilizando personajes de apoyo",
"help": "Necesitas configurar la tarea de \"Mazmorra\", así como configurar a los héroes de apoyo.",
"achievable": "Completable",
"not_set": "No configurado",
"not_supported": "No soportado aún"
},
"Use_an_Ultimate_to_deal_the_final_blow_1_time": {
"name": "Asesta el golpe final con una habilidad definitiva 1 vez",
"help": "Completable por defecto, se hará el desafío de Himeko",
@ -616,6 +602,13 @@
"not_set": "No configurado",
"not_supported": "No soportado aún"
},
"Destroy_3_destructible_objects": {
"name": "Destruye 3 objetos destruibles",
"help": "Completable por defecto, se hará el desafío de Himeko",
"achievable": "Completable",
"not_set": "No configurado",
"not_supported": "No soportado aún"
},
"Obtain_victory_in_combat_with_Support_Characters_1_times": {
"name": "Gana 1 batalla(s) utilizando personajes de apoyo",
"help": "Necesitas configurar la tarea de \"Mazmorra\", así como configurar a los héroes de apoyo.",

21
module/config/i18n/ja-JP.json
View File

@ -525,13 +525,6 @@
"not_set": "not_set",
"not_supported": "not_supported"
},
"Destroy_3_destructible_objects": {
"name": "破壊できるオブジェクトを累計で3個破壊する",
"help": "AchievableQuest.Destroy_3_destructible_objects.help",
"achievable": "achievable",
"not_set": "not_set",
"not_supported": "not_supported"
},
"Complete_Forgotten_Hall_1_time": {
"name": "「忘却の庭」を1回クリアする",
"help": "AchievableQuest.Complete_Forgotten_Hall_1_time.help",
@ -546,13 +539,6 @@
"not_set": "not_set",
"not_supported": "not_supported"
},
"Obtain_victory_in_combat_with_Support_Characters_1_time": {
"name": "サポートキャラを使い、戦闘に1回勝利する",
"help": "AchievableQuest.Obtain_victory_in_combat_with_Support_Characters_1_time.help",
"achievable": "achievable",
"not_set": "not_set",
"not_supported": "not_supported"
},
"Use_an_Ultimate_to_deal_the_final_blow_1_time": {
"name": "必殺技で最後の一撃を1回与える",
"help": "AchievableQuest.Use_an_Ultimate_to_deal_the_final_blow_1_time.help",
@ -616,6 +602,13 @@
"not_set": "not_set",
"not_supported": "not_supported"
},
"Destroy_3_destructible_objects": {
"name": "破壊できるオブジェクトを累計で3個破壊する",
"help": "AchievableQuest.Destroy_3_destructible_objects.help",
"achievable": "achievable",
"not_set": "not_set",
"not_supported": "not_supported"
},
"Obtain_victory_in_combat_with_Support_Characters_1_times": {
"name": "サポートキャラを使い、戦闘に1回勝利する",
"help": "AchievableQuest.Obtain_victory_in_combat_with_Support_Characters_1_times.help",

21
module/config/i18n/zh-CN.json
View File

@ -525,13 +525,6 @@
"not_set": "未设置",
"not_supported": "暂未支持"
},
"Destroy_3_destructible_objects": {
"name": "累计击碎3个可破坏物",
"help": "默认可完成，将做姬子试用",
"achievable": "可完成",
"not_set": "未设置",
"not_supported": "暂未支持"
},
"Complete_Forgotten_Hall_1_time": {
"name": "完成1次「忘却之庭」",
"help": "默认可完成，将使用前四个角色打一次深渊一，请保证帐号练度足够打深渊一",
@ -546,13 +539,6 @@
"not_set": "未设置",
"not_supported": "暂未支持"
},
"Obtain_victory_in_combat_with_Support_Characters_1_time": {
"name": "使用支援角色并获得战斗胜利1次",
"help": "需要设置并启用\"每日副本\"，且设置好友支援",
"achievable": "可完成",
"not_set": "未设置",
"not_supported": "暂未支持"
},
"Use_an_Ultimate_to_deal_the_final_blow_1_time": {
"name": "施放终结技造成制胜一击1次",
"help": "默认可完成，将做姬子试用",
@ -616,6 +602,13 @@
"not_set": "未设置",
"not_supported": "暂未支持"
},
"Destroy_3_destructible_objects": {
"name": "累计击碎3个可破坏物",
"help": "默认可完成，将做姬子试用",
"achievable": "可完成",
"not_set": "未设置",
"not_supported": "暂未支持"
},
"Obtain_victory_in_combat_with_Support_Characters_1_times": {
"name": "使用支援角色并获得战斗胜利1次",
"help": "需要设置并启用\"每日副本\"，且设置好友支援",

21
module/config/i18n/zh-TW.json
View File

@ -525,13 +525,6 @@
"not_set": "未設定",
"not_supported": "暫未支援"
},
"Destroy_3_destructible_objects": {
"name": "累積擊碎3個可破壞物",
"help": "預設可完成，將做姬子試用",
"achievable": "可完成",
"not_set": "未設定",
"not_supported": "暫未支援"
},
"Complete_Forgotten_Hall_1_time": {
"name": "完成1次「忘卻之庭」",
"help": "預設可完成，將使用前四個角色打一次深淵一，請確保帳號練度足夠打深淵一",
@ -546,13 +539,6 @@
"not_set": "未設定",
"not_supported": "暫未支援"
},
"Obtain_victory_in_combat_with_Support_Characters_1_time": {
"name": "使用支援角色並獲得戰鬥勝利1次",
"help": "需要設定並啟用\"每日副本\"，且設並好友支援",
"achievable": "可完成",
"not_set": "未設定",
"not_supported": "暫未支援"
},
"Use_an_Ultimate_to_deal_the_final_blow_1_time": {
"name": "施放終結技造成制勝一擊1次",
"help": "預設可完成，將做姬子試用",
@ -616,6 +602,13 @@
"not_set": "未設定",
"not_supported": "暫未支援"
},
"Destroy_3_destructible_objects": {
"name": "累積擊碎3個可破壞物",
"help": "預設可完成，將做姬子試用",
"achievable": "可完成",
"not_set": "未設定",
"not_supported": "暫未支援"
},
"Obtain_victory_in_combat_with_Support_Characters_1_times": {
"name": "使用支援角色並獲得戰鬥勝利1次",
"help": "需要設定並啟用\"每日副本\"，且設並好友支援",

4
tasks/assignment/assignment.py
View File

@ -65,8 +65,8 @@ class Assignment(AssignmentClaim, SynthesizeUI):
with self.config.multi_set():
# Check daily
quests = self.config.stored.DailyQuest.load_quests()
if KEYWORDS_DAILY_QUEST.Go_on_assignment_1_time in quests:
logger.info('Achieved daily quest Go_on_assignment_1_time')
if KEYWORDS_DAILY_QUEST.Dispatch_1_assignments in quests:
logger.info('Achieved daily quest Dispatch_1_assignments')
self.config.task_call('DailyQuest')
if self.has_new_dispatch:
if KEYWORDS_DAILY_QUEST.Dispatch_1_assignments in quests:

18
tasks/daily/keywords/daily_quest.py
View File

@ -66,15 +66,6 @@ Defeat_a_total_of_20_enemies = DailyQuest(
jp='敵を累計で20体倒す',
es='Derrota a 20 enemigos',
)
Destroy_3_destructible_objects = DailyQuest(
id=13,
name='Destroy_3_destructible_objects',
cn='累计击碎3个可破坏物',
cht='累積擊碎3個可破壞物',
en='Destroy 3 destructible objects',
jp='破壊できるオブジェクトを累計で3つ破壊する',
es='Destruye 3 objetos destruibles',
)
Complete_Forgotten_Hall_1_time = DailyQuest(
id=14,
name='Complete_Forgotten_Hall_1_time',
@ -93,15 +84,6 @@ Complete_Echo_of_War_1_times = DailyQuest(
jp='「歴戦余韻」を1回クリアする',
es='Completa Ecos de la guerra 1 vez',
)
Obtain_victory_in_combat_with_Support_Characters_1_time = DailyQuest(
id=17,
name='Obtain_victory_in_combat_with_Support_Characters_1_time',
cn='使用支援角色并获得战斗胜利1次',
cht='使用支援角色並獲得戰鬥勝利1次',
en='Obtain victory in combat with Support Characters 1 time',
jp='サポートキャラを使い、戦闘に1回勝利する',
es='Gana 1 batalla utilizando personajes de apoyo',
)
Use_an_Ultimate_to_deal_the_final_blow_1_time = DailyQuest(
id=18,
name='Use_an_Ultimate_to_deal_the_final_blow_1_time',

6
tasks/dungeon/dungeon.py
View File

@ -81,8 +81,8 @@ class Dungeon(DungeonStamina, DungeonEvent, Combat):
logger.info('Achieved daily quest Clear_Calyx_Golden_1_times')
self.achieved_daily_quest = True
if dungeon.is_Calyx_Crimson \
and KEYWORDS_DAILY_QUEST.Complete_Calyx_Crimson_1_time in self.daily_quests:
logger.info('Achieve daily quest Complete_Calyx_Crimson_1_time')
and KEYWORDS_DAILY_QUEST.Clear_Calyx_Crimson_1_times in self.daily_quests:
logger.info('Achieve daily quest Clear_Calyx_Crimson_1_times')
self.achieved_daily_quest = True
if dungeon.is_Stagnant_Shadow \
and KEYWORDS_DAILY_QUEST.Clear_Stagnant_Shadow_1_times in self.daily_quests:
@ -215,7 +215,7 @@ class Dungeon(DungeonStamina, DungeonEvent, Combat):
dungeon = DungeonList.find(self.config.DungeonDaily_CalyxGolden)
self.dungeon_run(dungeon=dungeon, wave_limit=1)
# Calyx_Crimson
if KEYWORDS_DAILY_QUEST.Complete_Calyx_Crimson_1_time in self.daily_quests \
if KEYWORDS_DAILY_QUEST.Clear_Calyx_Crimson_1_times in self.daily_quests \
and self.config.DungeonDaily_CalyxCrimson != 'do_not_achieve' \
and not final.is_Calyx_Crimson \
and not ran_calyx_crimson:

6
tasks/rogue/rogue.py
View File

@ -1,5 +1,5 @@
from module.logger import logger
from tasks.daily.keywords.daily_quest import Complete_1_stage_in_Simulated_Universe_Any_world
from tasks.daily.keywords.daily_quest import Complete_Simulated_Universe_1_times
from tasks.rogue.entry.entry import RogueEntry
from tasks.rogue.exception import RogueReachedWeeklyPointLimit, RogueTeamNotPrepared
from tasks.rogue.route.loader import RouteLoader
@ -43,8 +43,8 @@ class Rogue(RouteLoader, RogueEntry):
# Archived daily quest
if success:
quests = self.config.stored.DailyQuest.load_quests()
if Complete_1_stage_in_Simulated_Universe_Any_world in quests:
logger.info('Achieve daily quest Complete_1_stage_in_Simulated_Universe_Any_world')
if Complete_Simulated_Universe_1_times in quests:
logger.info('Achieve daily quest Complete_Simulated_Universe_1_times')
self.config.task_call('DailyQuest')
self.config.task_stop()
# End