Skip to content

Commit 3f50d42

Browse files
authored
Merge pull request #423 from LmeSzinc/dev
Bug fix
2 parents 9849267 + 9216d8b commit 3f50d42

27 files changed

Lines changed: 365 additions & 32 deletions

assets/character/Aventurine.png

16.9 KB
Loading

module/config/argument/args.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,7 @@
427427
"Argenti",
428428
"Arlan",
429429
"Asta",
430+
"Aventurine",
430431
"Bailu",
431432
"BlackSwan",
432433
"Blade",
@@ -1341,6 +1342,7 @@
13411342
"Argenti",
13421343
"Arlan",
13431344
"Asta",
1345+
"Aventurine",
13441346
"Bailu",
13451347
"BlackSwan",
13461348
"Blade",

module/config/config.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,10 @@ def close_game(self):
176176
self.data, keys="Alas.Optimization.CloseGameDuringWait", default=False
177177
)
178178

179+
@property
180+
def is_actual_task(self):
181+
return self.task.command.lower() not in ['alas', 'template']
182+
179183
@property
180184
def is_cloud_game(self):
181185
return deep_get(

module/config/config_generated.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class GeneratedConfig:
5959

6060
# Group `DungeonSupport`
6161
DungeonSupport_Use = 'when_daily' # always_use, when_daily, do_not_use
62-
DungeonSupport_Character = 'FirstCharacter' # FirstCharacter, Acheron, Argenti, Arlan, Asta, Bailu, BlackSwan, Blade, Bronya, Clara, DanHeng, DanHengImbibitorLunae, DrRatio, FuXuan, Gallagher, Gepard, Guinaifen, Hanya, Herta, Himeko, Hook, Huohuo, JingYuan, Jingliu, Kafka, Luka, Luocha, Lynx, March7th, Misha, Natasha, Pela, Qingque, RuanMei, Sampo, Seele, Serval, SilverWolf, Sparkle, Sushang, Tingyun, TopazNumby, TrailblazerDestruction, TrailblazerPreservation, Welt, Xueyi, Yanqing, Yukong
62+
DungeonSupport_Character = 'FirstCharacter' # FirstCharacter, Acheron, Argenti, Arlan, Asta, Aventurine, Bailu, BlackSwan, Blade, Bronya, Clara, DanHeng, DanHengImbibitorLunae, DrRatio, FuXuan, Gallagher, Gepard, Guinaifen, Hanya, Herta, Himeko, Hook, Huohuo, JingYuan, Jingliu, Kafka, Luka, Luocha, Lynx, March7th, Misha, Natasha, Pela, Qingque, RuanMei, Sampo, Seele, Serval, SilverWolf, Sparkle, Sushang, Tingyun, TopazNumby, TrailblazerDestruction, TrailblazerPreservation, Welt, Xueyi, Yanqing, Yukong
6363

6464
# Group `DungeonStorage`
6565
DungeonStorage_TrailblazePower = {}

module/config/config_updater.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def option_add(keys, options):
100100
options=[dungeon.name for dungeon in DungeonList.instances.values() if dungeon.is_Echo_of_War])
101101
# Insert characters
102102
from tasks.character.keywords import CharacterList
103-
unsupported_characters = ['Aventurine']
103+
unsupported_characters = []
104104
characters = [character.name for character in CharacterList.instances.values()
105105
if character.name not in unsupported_characters]
106106
option_add(keys='DungeonSupport.Character.option', options=characters)

module/config/i18n/en-US.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,7 @@
441441
"Argenti": "Argenti",
442442
"Arlan": "Arlan",
443443
"Asta": "Asta",
444+
"Aventurine": "Aventurine",
444445
"Bailu": "Bailu",
445446
"BlackSwan": "Black Swan",
446447
"Blade": "Blade",

module/config/i18n/es-ES.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,7 @@
441441
"Argenti": "Argenti",
442442
"Arlan": "Arlan",
443443
"Asta": "Asta",
444+
"Aventurine": "Aventurino",
444445
"Bailu": "Bailu",
445446
"BlackSwan": "Cisne Negro",
446447
"Blade": "Blade",

module/config/i18n/ja-JP.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,7 @@
441441
"Argenti": "アルジェンティ",
442442
"Arlan": "アーラン",
443443
"Asta": "アスター",
444+
"Aventurine": "アベンチュリン",
444445
"Bailu": "白露",
445446
"BlackSwan": "ブラックスワン",
446447
"Blade": "",

module/config/i18n/zh-CN.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,7 @@
441441
"Argenti": "银枝",
442442
"Arlan": "阿兰",
443443
"Asta": "艾丝妲",
444+
"Aventurine": "砂金",
444445
"Bailu": "白露",
445446
"BlackSwan": "黑天鹅",
446447
"Blade": "",

module/config/i18n/zh-TW.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,7 @@
441441
"Argenti": "銀枝",
442442
"Arlan": "阿蘭",
443443
"Asta": "艾絲妲",
444+
"Aventurine": "砂金",
444445
"Bailu": "白露",
445446
"BlackSwan": "黑天鵝",
446447
"Blade": "",

0 commit comments

Comments
 (0)