PaiGramTeam/PaiGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/PaiGram.git synced 2024-11-25 18:04:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ Use updated python-genshin-artifact

Browse Source
This commit is contained in:
kotoriのねこ 2023-11-07 21:14:01 -05:00 committed by GitHub
parent 00087317be
commit 1bda5a9d86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/genshin/player_cards.py
View File

@ -40,11 +40,10 @@ from utils.log import logger
from utils.uid import mask_number from utils.uid import mask_number
try: try:
from python_genshin_artifact.calculator import get_damage_analysis, get_transformative_damage from python_genshin_artifact import get_damage_analysis, get_transformative_damage
from python_genshin_artifact.enka.enka_parser import enka_parser from python_genshin_artifact.enka.enka_parser import enka_parser
from python_genshin_artifact.error import JsonParseException, EnkaParseException from python_genshin_artifact.error import JsonParseException, EnkaParseException
from python_genshin_artifact.models.calculator import CalculatorConfig from python_genshin_artifact import CalculatorConfig, SkillInterface
from python_genshin_artifact.models.skill import SkillInfo
GENSHIN_ARTIFACT_FUNCTION_AVAILABLE = True GENSHIN_ARTIFACT_FUNCTION_AVAILABLE = True
except ImportError: except ImportError:
@ -52,7 +51,7 @@ except ImportError:
get_transformative_damage = None get_transformative_damage = None
enka_parser = None enka_parser = None
CalculatorConfig = None CalculatorConfig = None
SkillInfo = None SkillInterface = None
GENSHIN_ARTIFACT_FUNCTION_AVAILABLE = False GENSHIN_ARTIFACT_FUNCTION_AVAILABLE = False
@ -605,8 +604,6 @@ class RenderTemplate:
config_skill = damage_config.get("config_skill") config_skill = damage_config.get("config_skill")
if config_skill is not None: if config_skill is not None:
config_skill = {character_name: config_skill} config_skill = {character_name: config_skill}
else:
config_skill = "NoConfig"
character_config = damage_config.get("config") character_config = damage_config.get("config")
artifact_config = damage_config.get("artifact_config") artifact_config = damage_config.get("artifact_config")
if character_config is not None: if character_config is not None:
@ -619,7 +616,7 @@ class RenderTemplate:
damage = [] damage = []
for skill in skills: for skill in skills:
index = skill.get("index") index = skill.get("index")
skill_info = SkillInfo(index=index, config=config_skill) skill_info = SkillInterface(index=index, config=config_skill)
calculator_config = CalculatorConfig( calculator_config = CalculatorConfig(
character=character, character=character,
weapon=weapon, weapon=weapon,