PaiGramTeam/python-genshin-artifact
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/python-genshin-artifact.git synced 2024-11-16 12:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fixed enka_parser wrongly taking some percentages as decimals

Browse Source
This commit is contained in:
Stēlla Caerulea 2023-10-23 21:51:24 +08:00 committed by GitHub
parent efc4d45dd5
commit c2d6989e6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
python_genshin_artifact/enka/enka_parser.py
View File

@ -4,7 +4,7 @@ from typing import Tuple, List, Optional
from python_genshin_artifact.enka.artifacts import artifacts_name_map, equip_type_map
from python_genshin_artifact.enka.assets import Assets
from python_genshin_artifact.enka.characters import characters_map
from python_genshin_artifact.enka.fight import fight_map
from python_genshin_artifact.enka.fight import fight_map, toFloat
from python_genshin_artifact.enka.weapon import weapon_name_map
from python_genshin_artifact.models.artifact import ArtifactInfo
from python_genshin_artifact.models.characterInfo import CharacterInfo
@ -82,26 +82,12 @@ def de_equip_list(equip_list: list[dict]) -> Tuple[WeaponInfo, List[ArtifactInfo
_reliquary_main_stat = _flat["reliquaryMainstat"]
_main_prop_id = _reliquary_main_stat["mainPropId"]
stat_name = fight_map[_main_prop_id]
stat_value = _reliquary_main_stat["statValue"]
if "_PERCENT" in _main_prop_id:
stat_value /= 100
elif "FIGHT_PROP_CRITICAL" in _main_prop_id:
stat_value /= 100
elif "FIGHT_PROP_CRITICAL_HURT" in _main_prop_id:
stat_value /= 100
elif "_ADD_HURT" in _main_prop_id:
stat_value /= 100
stat_value = toFloat(_main_prop_id, _reliquary_main_stat["statValue"])
_main_stat = (stat_name, stat_value)
for _reliquary_sub_stats in _flat["reliquarySubstats"]:
_append_prop_id = _reliquary_sub_stats["appendPropId"]
stat_name = fight_map[_append_prop_id]
stat_value = _reliquary_sub_stats["statValue"]
if "_PERCENT" in _append_prop_id:
stat_value /= 100
elif "FIGHT_PROP_CRITICAL" in _append_prop_id:
stat_value /= 100
elif "FIGHT_PROP_CRITICAL_HURT" in _append_prop_id:
stat_value /= 100
stat_value = toFloat(_append_prop_id, _reliquary_sub_stats["statValue"])
_sub_stats = (stat_name, stat_value)
sub_stats.append(_sub_stats)
slot = equip_type_map[_flat["equipType"]]

13
python_genshin_artifact/enka/fight.py
View File

@ -1,4 +1,4 @@
from typing import Dict
from typing import Dict, List
fight_map: Dict[str, str] = {
"FIGHT_PROP_ATTACK": "ATKFixed",
@ -21,3 +21,14 @@ fight_map: Dict[str, str] = {
"FIGHT_PROP_ROCK_ADD_HURT": "GeoBonus",
"FIGHT_PROP_GRASS_ADD_HURT": "DendroBonus",
}
fixed: List[str] = {
"FIGHT_PROP_ATTACK",
"FIGHT_PROP_DEFENSE",
"FIGHT_PROP_HP",
"FIGHT_PROP_ELEMENT_MASTERY",
}
def toFloat(prop_id: str, pc: float) -> float:
return pc if prop_id in fixed else (pc / 100)