diff --git a/enkaToData/drawCharCard.py b/enkaToData/drawCharCard.py index c4a392ea..1042e2b3 100644 --- a/enkaToData/drawCharCard.py +++ b/enkaToData/drawCharCard.py @@ -18,6 +18,9 @@ RELIC_PATH = R_PATH / 'relicIcon' MAP_PATH = R_PATH / 'map' ETC_PATH = R_PATH / 'etc' +version = '2.7.0' +avatarName2SkillAdd_fileName = f'avatarName2SkillAdd_mapping_{version}.json' + COLOR_MAP = {'Anemo' : (3, 90, 77), 'Cryo': (5, 85, 151), 'Dendro': (4, 87, 3), 'Electro': (47, 1, 85), 'Geo': (85, 34, 1), 'Hydro': (4, 6, 114), 'Pyro': (88, 4, 4)} @@ -446,6 +449,15 @@ async def draw_char_card(raw_data: dict, charUrl: str = None) -> bytes: e_skill_level = skillList[1]['skillLevel'] q_skill_name = skillList[-1]['skillName'] q_skill_level = skillList[-1]['skillLevel'] + + skill_add = avatarName2SkillAdd[char_name] + for skillAdd_index in range(0, 2): + if len(raw_data['talentList']) >= 3 + skillAdd_index * 2: + if skill_add[skillAdd_index] == 'E': + e_skill_level += 3 + elif skill_add[skillAdd_index] == 'Q': + q_skill_level += 3 + for skill_num, skill in enumerate(skillList[0:2] + [skillList[-1]]): skill_img = Image.open(ICON_PATH / '{}.png'.format(skill['skillIcon'])) skill_img_new = skill_img.resize((50, 50), Image.Resampling.LANCZOS).convert("RGBA") diff --git a/enkaToData/map/avatarName2SkillAdd_mapping_2.7.0.json b/enkaToData/map/avatarName2SkillAdd_mapping_2.7.0.json new file mode 100644 index 00000000..b971bcdf --- /dev/null +++ b/enkaToData/map/avatarName2SkillAdd_mapping_2.7.0.json @@ -0,0 +1,210 @@ +{ + "胡桃": [ + "E", + "Q" + ], + "托马": [ + "E", + "Q" + ], + "宵宫": [ + "E", + "Q" + ], + "烟绯": [ + "E", + "Q" + ], + "可莉": [ + "E", + "Q" + ], + "迪卢克": [ + "E", + "Q" + ], + "辛焱": [ + "E", + "Q" + ], + "安柏": [ + "Q", + "E" + ], + "香菱": [ + "Q", + "E" + ], + "班尼特": [ + "E", + "Q" + ], + "珊瑚宫心海": [ + "Q", + "E" + ], + "达达利亚": [ + "E", + "Q" + ], + "行秋": [ + "Q", + "E" + ], + "莫娜": [ + "Q", + "E" + ], + "芭芭拉": [ + "Q", + "E" + ], + "申鹤": [ + "E", + "Q" + ], + "神里绫华": [ + 3, + "E" + ], + "优菈": [ + "Q", + "E" + ], + "甘雨": [ + "Q", + "E" + ], + "凯亚": [ + "E", + "Q" + ], + "重云": [ + "Q", + "E" + ], + "七七": [ + "Q", + "E" + ], + "迪奥娜": [ + "Q", + "E" + ], + "罗莎莉亚": [ + "E", + "Q" + ], + "埃洛伊": [ + null, + null + ], + "八重神子": [ + "E", + "Q" + ], + "雷电将军": [ + "Q", + "E" + ], + "九条裟罗": [ + "Q", + "E" + ], + "刻晴": [ + "Q", + "E" + ], + "雷泽": [ + "Q", + "E" + ], + "菲谢尔": [ + "E", + "Q" + ], + "丽莎": [ + "Q", + "E" + ], + "北斗": [ + "E", + "Q" + ], + "雷主": [ + "E", + "Q" + ], + "早柚": [ + "Q", + "E" + ], + "枫原万叶": [ + "E", + "Q" + ], + "魈": [ + "E", + "Q" + ], + "温迪": [ + "Q", + "E" + ], + "琴": [ + "Q", + "E" + ], + "砂糖": [ + "E", + "Q" + ], + "风主": [ + "E", + "Q" + ], + "荒泷一斗": [ + "E", + "Q" + ], + "五郎": [ + "E", + "Q" + ], + "阿贝多": [ + "E", + "Q" + ], + "钟离": [ + "E", + "Q" + ], + "诺艾尔": [ + "E", + "Q" + ], + "凝光": [ + "Q", + "E" + ], + "岩主": [ + "E", + "Q" + ], + "云堇": [ + "Q", + "E" + ], + "神里绫人": [ + "E", + "Q" + ], + "夜兰": [ + "Q", + "E" + ], + "久岐忍": [ + "E", + "Q" + ] +} \ No newline at end of file