diff --git a/pyproject.toml b/pyproject.toml index c5bbad1..b948d1d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "starrail_damage_cal" -version = "1.0.4" +version = "1.0.5" description = "For StarRail Role Damage Cal" authors = [ {name = "qwerdvd", email = "105906879+qwerdvd@users.noreply.github.com"}, diff --git a/starrail_damage_cal/damage/AvatarDamage/AvatarDamage.py b/starrail_damage_cal/damage/AvatarDamage/AvatarDamage.py index 5197e3c..58c462c 100644 --- a/starrail_damage_cal/damage/AvatarDamage/AvatarDamage.py +++ b/starrail_damage_cal/damage/AvatarDamage/AvatarDamage.py @@ -10,6 +10,8 @@ from starrail_damage_cal.damage.Role import ( calculate_damage, calculate_heal, calculate_shield, + get_damage, + break_damage, ) from starrail_damage_cal.logger import logger @@ -4369,10 +4371,241 @@ class Hanya(BaseAvatar): return skill_info_list +class DrRatio(BaseAvatar): + Buff: BaseAvatarBuff + + def __init__(self, char: DamageInstanceAvatar, skills: List[DamageInstanceSkill]): + super().__init__(char=char, skills=skills) + self.eidolon_attribute: Dict[str, float] = {} + self.extra_ability_attribute: Dict[str, float] = {} + self.eidolons() + self.extra_ability() + + def Technique(self): + pass + + def eidolons(self): + if self.avatar_rank >= 6: + self.eidolon_attribute["TalentDmgAdd"] = 0.2 + + def extra_ability(self): + self.extra_ability_attribute["AllDamageAddedRatio"] = 0.1 + + async def getdamage( + self, + base_attr: Dict[str, float], + attribute_bonus: Dict[str, float], + ): + # 计算天赋属性加成 + ATK_ADD = self.Skill_num("Talent", "Talent_A") + CC_ADD = self.Skill_num("Talent", "Talent_CC") + CD_ADD = self.Skill_num("Talent", "Talent_CD") + SPD_ADD = self.Skill_num("Talent", "Talent_S") + + buff_num = 3 + if self.avatar_rank >= 1: + buff_num = 5 + + attribute_bonus["AttackAddedRatio"] = attribute_bonus.get("AttackAddedRatio",0) + ATK_ADD * buff_num + attribute_bonus["CriticalChanceBase"] = attribute_bonus.get("CriticalChanceBase",0) + CC_ADD * buff_num + attribute_bonus["CriticalDamageBase"] = attribute_bonus.get("CriticalDamageBase",0) + CD_ADD * buff_num + attribute_bonus["SpeedAddedRatio"] = attribute_bonus.get("SpeedAddedRatio",0) + SPD_ADD * buff_num + + + damage1, damage2, damage3 = await calculate_damage( + base_attr, + attribute_bonus, + "fujia", + "fujia", + "Thunder", + 0.44, + self.avatar_level, + ) + + skill_info_list = [] + # 计算普攻伤害 + skill_multiplier = self.Skill_num("Normal", "Normal") + damagelist1 = await calculate_damage( + base_attr, + attribute_bonus, + "Normal", + "Normal", + self.avatar_element, + skill_multiplier, + self.avatar_level, + ) + damagelist1[2] += damage3 + skill_info_list.append({"name": "普攻", "damagelist": damagelist1}) + + # 计算战技伤害 + skill_multiplier = self.Skill_num("BPSkill", "BPSkill") + damagelist2 = await calculate_damage( + base_attr, + attribute_bonus, + "BPSkill", + "BPSkill", + self.avatar_element, + skill_multiplier, + self.avatar_level, + ) + damagelist2[2] += damage3 + skill_info_list.append({"name": "战技", "damagelist": damagelist2}) + + # 计算终结技1伤害 + skill_multiplier = self.Skill_num("Ultra", "Ultra") + damagelist3 = await calculate_damage( + base_attr, + attribute_bonus, + "Ultra", + "Ultra", + self.avatar_element, + skill_multiplier, + self.avatar_level, + ) + damagelist3[2] += damage3 + skill_info_list.append({"name": "终结技", "damagelist": damagelist3}) + + # 计算天赋追伤伤害 + skill_multiplier = self.Skill_num("Talent", "Talent") + damagelist4 = await calculate_damage( + base_attr, + attribute_bonus, + "Talent", + "Talent", + self.avatar_element, + skill_multiplier, + self.avatar_level, + ) + damagelist4[2] += damage3 + if self.avatar_rank >= 2: + damagelist5 = await calculate_damage( + base_attr, + attribute_bonus, + "fujia", + "fujia", + self.avatar_element, + 0.2, + self.avatar_level, + ) + damagelist4[0] += damagelist5[0] * 4 + damagelist4[1] += damagelist5[1] * 4 + damagelist4[2] += damagelist5[2] * 4 + skill_info_list.append({"name": "协同攻击", "damagelist": damagelist4}) + + return skill_info_list + +class RuanMei(BaseAvatar): + Buff: BaseAvatarBuff + + def __init__(self, char: DamageInstanceAvatar, skills: List[DamageInstanceSkill]): + super().__init__(char=char, skills=skills) + self.eidolon_attribute: Dict[str, float] = {} + self.extra_ability_attribute: Dict[str, float] = {} + self.eidolons() + self.extra_ability() + + def Technique(self): + pass + + def eidolons(self): + if self.avatar_rank >= 1: + self.eidolon_attribute["AttackAddedRatio"] = 0.4 + if self.avatar_rank >= 2: + self.eidolon_attribute["BreakDamageAddedRatioBase"] = 1 + if self.avatar_rank >= 4: + self.eidolon_attribute["CriticalDamageBase"] = 0.4 + + def extra_ability(self): + self.extra_ability_attribute["AllDamageAddedRatio"] = 0.24 + + async def getdamage( + self, + base_attr: Dict[str, float], + attribute_bonus: Dict[str, float], + ): + # 计算属性加成 + attribute_bonus["SpeedAddedRatio"] = attribute_bonus.get("SpeedAddedRatio",0) + self.Skill_num("BPSkill", "BPSkill") + attribute_bonus["ResistancePenetration"] = attribute_bonus.get("ResistancePenetration",0) + self.Skill_num("Ultra", "Ultra_P") + attribute_bonus["AllDamageAddedRatio"] = attribute_bonus.get("AllDamageAddedRatio",0) + self.Skill_num("Talent", "Talent_A") + + + damage1, damage2, damage3 = await calculate_damage( + base_attr, + attribute_bonus, + "fujia", + "fujia", + "Thunder", + 0.44, + self.avatar_level, + ) + + skill_info_list = [] + # 计算普攻伤害 + skill_multiplier = self.Skill_num("Normal", "Normal") + damagelist1 = await calculate_damage( + base_attr, + attribute_bonus, + "Normal", + "Normal", + self.avatar_element, + skill_multiplier, + self.avatar_level, + ) + damagelist1[2] += damage3 + skill_info_list.append({"name": "普攻", "damagelist": damagelist1}) + + # 计算终结技伤害 + skill_multiplier = self.Skill_num("Ultra", "Ultra") + if self.avatar_rank >= 6: + break_damage_added_ratio_base = merged_attr.get("BreakDamageAddedRatioBase", 0) + if break_damage_added_ratio_base >= 1.8: + break_damage_added_ratio = break_damage_added_ratio_base - 1.8 + skill_multiplier_add = int((break_damage_added_ratio * 100) / 10) * 0.24 + skill_multiplier_add = min(skill_multiplier_add, 2.4) + skill_multiplier = skill_multiplier + skill_multiplier_add + jipodamage = await break_damage( + base_attr, + attribute_bonus, + "jipo", + "jipo", + self.avatar_element, + self.avatar_level, + ) + damagelist3 = await get_damage( + jipodamage[0], + base_attr, + attribute_bonus, + "fujia", + "fujia", + self.avatar_element, + skill_multiplier, + ) + damagelist3[2] += damage3 + skill_info_list.append({"name": "残梅绽附加伤害", "damagelist": damagelist3}) + + # 计算天赋追伤伤害 + skill_multiplier = self.Skill_num("Talent", "Talent") + damagelist4 = await get_damage( + jipodamage[0], + base_attr, + attribute_bonus, + "fujia", + "fujia", + self.avatar_element, + skill_multiplier, + ) + damagelist4[2] += damage3 + skill_info_list.append({"name": "天赋附加伤害", "damagelist": damagelist4}) + + return skill_info_list class AvatarDamage: @classmethod def create(cls, char: DamageInstanceAvatar, skills: List[DamageInstanceSkill]): + if char.id_ == 1303: + return RuanMei(char, skills) + if char.id_ == 1305: + return DrRatio(char, skills) if char.id_ == 1215: return Hanya(char, skills) if char.id_ == 1217: diff --git a/starrail_damage_cal/damage/Excel/SkillData.json b/starrail_damage_cal/damage/Excel/SkillData.json index aec7f59..7dd002b 100644 --- a/starrail_damage_cal/damage/Excel/SkillData.json +++ b/starrail_damage_cal/damage/Excel/SkillData.json @@ -1087,5 +1087,107 @@ "Talent": [0.15, 0.165, 0.18, 0.195, 0.21, 0.225, 0.24375, 0.2625, 0.28125, 0.3, 0.315, 0.33, 0.345, 0.36, 0.375], "Maze": [20], "Ultra_Use": [100] + }, + "1305": { + "Normal": [ + 0.5000000004656613, 0.6000000005587935, 0.7000000006519258, + 0.8000000007450581, 0.9000000008381903, 1.0000000000931323, + 1.1000000000931323, 1.2000000001862645, 1.3000000002793968 + ], + "BPSkill": [ + 0.7500000006984919, 0.8250000004190952, 0.9000000008381903, + 0.9750000005587935, 1.0500000000465661, 1.1249999997671694, + 1.2187500004656613, 1.3125000004656613, 1.4062500004656613, + 1.5000000004656613, 1.5750000001862645, 1.6500000006053597, + 1.725000000325963, 1.800000000745058, 1.8750000004656613 + ], + "Ultra": [ + 1.440000000409782, 1.5360000000800937, 1.6320000004488975, + 1.7280000001192093, 1.824000000488013, 1.9200000008568168, + 2.040000000037253, 2.1600000001490116, 2.2800000002607703, + 2.400000000372529, 2.496000000042841, 2.5920000004116446, + 2.6880000000819564, 2.78400000045076, 2.880000000819564 + ], + "Talent": [ + 1.6000000005587935, 1.7600000007078052, 1.9200000008568168, + 2.080000000074506, 2.2400000002235174, 2.400000000372529, + 2.6000000005587935, 2.800000000745058, 3, + 3.2000000001862645, 3.360000000335276, 3.5200000004842877, + 3.6800000006332994, 3.840000000782311, 4 + ], + "Talent_A": [ + 0.060000000055879354, 0.06599999964237213, 0.07199999992735684, + 0.07799999951384962, 0.08399999979883432, 0.09000000008381903, + 0.09749999991618097, 0.1049999997485429, 0.11250000027939677, + 0.12000000011175871, 0.12599999969825149, 0.1319999999832362, + 0.13799999956972897, 0.14399999985471368, 0.1500000001396984 + ], + "Talent_CC": [ + 0.02000000001862645, 0.02199999988079071, 0.02399999974295497, + 0.02599999960511923, 0.027999999467283487, 0.030000000027939677, + 0.032500000204890966, 0.034999999683350325, 0.037499999860301614, + 0.0400000000372529, 0.04199999989941716, 0.04399999976158142, + 0.04599999962374568, 0.04799999948590994, 0.05000000004656613 + ], + "Talent_CD": [ + 0.060000000055879354, 0.06599999964237213, 0.07199999992735684, + 0.07799999951384962, 0.08399999979883432, 0.09000000008381903, + 0.09749999991618097, 0.1049999997485429, 0.11250000027939677, + 0.12000000011175871, 0.12599999969825149, 0.1319999999832362, + 0.13799999956972897, 0.14399999985471368, 0.1500000001396984 + ], + "Talent_S": [ + 0.0249999996740371, 0.027499999850988388, 0.030000000027939677, + 0.032500000204890966, 0.034999999683350325, 0.037499999860301614, + 0.040625000605359674, 0.0437500006519258, 0.04687500069849193, + 0.05000000004656613, 0.05250000022351742, 0.054999999701976776, + 0.057499999878928065, 0.060000000055879354, 0.06250000023283064 + ], + "Maze": [20], + "Ultra_Use": [140] + }, + "1303": { + "Normal": [ + 0.5000000004656613, 0.6000000005587935, 0.7000000006519258, + 0.8000000007450581, 0.9000000008381903, 1.0000000000931323, + 1.1000000000931323, 1.2000000001862645, 1.3000000002793968 + ], + "BPSkill": [ + 0.12000000011175871, 0.12399999983608723, 0.12799999956041574, + 0.1319999999832362, 0.1359999997075647, 0.14000000013038516, + 0.1449999997857958, 0.1500000001396984, 0.15499999979510903, + 0.1600000001490116, 0.16399999987334013, 0.16799999959766865, + 0.1720000000204891, 0.17599999974481761, 0.18000000016763806 + ], + "Ultra": [ + 0.9000000008381903, 0.9600000008940697, 1.0200000000186265, + 1.0800000000745058, 1.1400000001303852, 1.2000000001862645, + 1.2749999999068677, 1.350000000325963, 1.4250000000465661, + 1.5000000004656613, 1.5600000005215406, 1.62000000057742, + 1.6800000006332994, 1.7400000006891787, 1.800000000745058 + ], + "Ultra_P": [ + 0.12000000011175871, 0.12799999956041574, 0.1359999997075647, + 0.14399999985471368, 0.15200000000186265, 0.1600000001490116, + 0.17000000015832484, 0.18000000016763806, 0.1900000001769513, + 0.20000000018626451, 0.20799999963492155, 0.21599999978207052, + 0.22399999992921948, 0.23200000007636845, 0.24000000022351742 + ], + "Talent_A": [ + 0.1500000001396984, 0.16499999980442226, 0.18000000016763806, + 0.19499999983236194, 0.21000000019557774, 0.2249999998603016, + 0.24375000083819032, 0.26250000041909516, 0.28125000069849193, + 0.3000000002793968, 0.31499999994412065, 0.33000000030733645, + 0.3449999999720603, 0.3600000003352761, 0.375 + ], + "Talent": [ + 0.060000000055879354, 0.06599999964237213, 0.07199999992735684, + 0.07799999951384962, 0.08399999979883432, 0.09000000008381903, + 0.09749999991618097, 0.1049999997485429, 0.11250000027939677, + 0.12000000011175871, 0.12599999969825149, 0.1319999999832362, + 0.13799999956972897, 0.14399999985471368, 0.1500000001396984 + ], + "Maze": [20], + "Ultra_Use": [140] } } diff --git a/starrail_damage_cal/damage/Excel/weapon_effect.json b/starrail_damage_cal/damage/Excel/weapon_effect.json index 77987aa..c67aae6 100644 --- a/starrail_damage_cal/damage/Excel/weapon_effect.json +++ b/starrail_damage_cal/damage/Excel/weapon_effect.json @@ -422,6 +422,22 @@ ] } }, + "23020": { + "Param": { + "CriticalDamageBase": [ + 0.060000000055879354, 0.07000000006519258, 0.0800000000745058, + 0.09000000008381903, 0.10000000009313226 + ], + "AllDamageAddedRatio": [ + 0.36000000022351742, 0.4200000002793968, 0.4800000003352761, + 0.5400000003911555, 0.60000000044703484 + ], + "ignore_defence": [ + 0.1600000001490116, 0.18000000016763806, 0.20000000018626451, + 0.22000000020489097, 0.24000000022351742 + ] + } + }, "21032": { "Param": { "AttackAddedRatio": [ @@ -497,6 +513,19 @@ 0.18000000013038516, 0.2000000001490116 ] } + } + , + "23019": { + "Param": { + "AllDamageAddedRatio": [ + 0.1500000001396984, 0.17499999981373549, 0.20000000018626451, + 0.2249999998603016, 0.25000000023283064 + ], + "ResistancePenetration": [ + 0.060000000055879354, 0.07000000006519258, 0.0800000000745058, + 0.09000000008381903, 0.10000000009313226 + ] + } }, "23002": { "Param": { diff --git a/starrail_damage_cal/damage/Role.py b/starrail_damage_cal/damage/Role.py index 0f21a28..b10a994 100644 --- a/starrail_damage_cal/damage/Role.py +++ b/starrail_damage_cal/damage/Role.py @@ -52,6 +52,86 @@ async def calculate_shield( return [defence_num] +async def get_damage( + damege: int, + base_attr: Dict[str, float], + attribute_bonus: Dict[str, float], + skill_type: str, + add_skill_type: str, + element: str, + skill_multiplier: float, +): + add_attr_bonus = copy.deepcopy(attribute_bonus) + + add_attr_bonus = apply_attribute_bonus(add_attr_bonus, skill_type, add_skill_type) + + merged_attr = await merge_attribute(base_attr, add_attr_bonus) + + injury_area, element_area = calculate_injury_area( + merged_attr, + skill_type, + add_skill_type, + element, + ) + + critical_damage = calculate_critical_damage(merged_attr, skill_type, add_skill_type) + + critical_chance = calculate_critical_chance(merged_attr, skill_type, add_skill_type) + + expected_damage = calculate_expected_damage(critical_chance, critical_damage) + + damage_cd = damege * skill_multiplier * injury_area * critical_damage + + damage_qw = damege * skill_multiplier * injury_area * expected_damage + + damage_tz = damege * skill_multiplier * (injury_area + 2.626) * (critical_damage + 1.794) * 10 + + return [damage_cd, damage_qw, damage_tz] + +async def break_damage( + base_attr: Dict[str, float], + attribute_bonus: Dict[str, float], + skill_type: str, + add_skill_type: str, + element: str, + level: int, +): + break_element = { + 'Ice': 1, + 'Imaginary': 1, + 'Quantum': 1, + 'Thunder': 2, + 'Wind': 3, + 'Physical': 4, + 'Fire': 5, + } + + add_attr_bonus = copy.deepcopy(attribute_bonus) + + add_attr_bonus = apply_attribute_bonus(add_attr_bonus, skill_type, add_skill_type) + + merged_attr = await merge_attribute(base_attr, add_attr_bonus) + + break_atk = 3767.55 #80级敌人击破伤害基数，我也不知道为什么是这个，反正都说是这个 + + damage_reduction = calculate_damage_reduction(level) + + resistance_area = calculate_resistance_area( + merged_attr, + skill_type, + add_skill_type, + element, + ) + + defence_multiplier = calculate_defence_multiplier(level, merged_attr) + + damage_ratio = calculate_damage_ratio(merged_attr, skill_type, add_skill_type) + + break_damage = merged_attr.get("BreakDamageAddedRatioBase", 0) + 1 + + damage_cd = break_atk * break_element[element] * 5 * break_damage * damage_ratio * damage_reduction * resistance_area * defence_multiplier + + return [damage_cd] async def calculate_damage( base_attr: Dict[str, float], diff --git a/starrail_damage_cal/damage/Weapon/Weapon.py b/starrail_damage_cal/damage/Weapon/Weapon.py index aa17cdc..2cad957 100644 --- a/starrail_damage_cal/damage/Weapon/Weapon.py +++ b/starrail_damage_cal/damage/Weapon/Weapon.py @@ -2261,10 +2261,82 @@ class Mediation(BaseWeapon): ) return attribute_bonus +# 纯粹思维的洗礼 +class BaptismofPureThought(BaseWeapon): + weapon_base_attributes: Dict + + def __init__(self, weapon: DamageInstanceWeapon): + super().__init__(weapon) + + async def check(self): + # 当装备者施放终结技后,使我方全体速度提高12点,持续1回合。 + return True + + async def weapon_ability( + self, + Ultra_Use: float, + base_attr: Dict[str, float], + attribute_bonus: Dict[str, float], + ): + if await self.check(): + critical_damage_base = attribute_bonus.get("CriticalDamageBase", 0) + attribute_bonus["CriticalDamageBase"] = ( + critical_damage_base + + (weapon_effect["23020"]["Param"]["CriticalDamageBase"][self.weapon_rank - 1]) + * 3 + ) + + all_damage_added_ratio = attribute_bonus.get("AllDamageAddedRatio", 0) + attribute_bonus["AllDamageAddedRatio"] = ( + all_damage_added_ratio + + (weapon_effect["23020"]["Param"]["AllDamageAddedRatio"][self.weapon_rank - 1]) + ) + + resistance_penetration = attribute_bonus.get("ignore_defence", 0) + attribute_bonus["ignore_defence"] = ( + resistance_penetration + + (weapon_effect["23020"]["Param"]["ignore_defence"][self.weapon_rank - 1]) + ) + return attribute_bonus + +# 镜中故我 +class PastSelfinMirror(BaseWeapon): + weapon_base_attributes: Dict + + def __init__(self, weapon: DamageInstanceWeapon): + super().__init__(weapon) + + async def check(self): + # 当装备者施放战技后，使我方全体造成的伤害提高15%，使处于加速状态的我方目标的全属性穿透提高6%，持续3回合。 + return True + + async def weapon_ability( + self, + Ultra_Use: float, + base_attr: Dict[str, float], + attribute_bonus: Dict[str, float], + ): + if await self.check(): + all_damage_added_ratio = attribute_bonus.get("AllDamageAddedRatio", 0) + attribute_bonus["AllDamageAddedRatio"] = ( + all_damage_added_ratio + + (weapon_effect["23019"]["Param"]["AllDamageAddedRatio"][self.weapon_rank - 1]) + ) + + resistance_penetration = attribute_bonus.get("ResistancePenetration", 0) + attribute_bonus["ResistancePenetration"] = ( + resistance_penetration + + (weapon_effect["23019"]["Param"]["ResistancePenetration"][self.weapon_rank - 1]) + ) + return attribute_bonus class Weapon: @classmethod def create(cls, weapon: DamageInstanceWeapon): + if weapon.id_ == 23019: + return PastSelfinMirror(weapon) + if weapon.id_ == 23020: + return BaptismofPureThought(weapon) if weapon.id_ == 22001: return HeyOverHere(weapon) if weapon.id_ == 20019: @@ -2291,8 +2363,6 @@ class Weapon: return FineFruit(weapon) if weapon.id_ == 20001: return Cornucopia(weapon) - if weapon.id_ == 22001: - return HeyOverHere(weapon) if weapon.id_ == 21028: return WarmthShortensColdNights(weapon) if weapon.id_ == 21021: diff --git a/starrail_damage_cal/excel/AvatarPromotionConfig.json b/starrail_damage_cal/excel/AvatarPromotionConfig.json index 678f250..04b3822 100644 --- a/starrail_damage_cal/excel/AvatarPromotionConfig.json +++ b/starrail_damage_cal/excel/AvatarPromotionConfig.json @@ -13569,5 +13569,667 @@ "Value": 100 } } + }, + "1305": { + "0": { + "AvatarID": 1305, + "Promotion": 0, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 4000 + }, + { + "ItemID": 111011, + "ItemNum": 5 + } + ], + "MaxLevel": 20, + "PlayerLevelRequire": 15, + "AttackBase": { + "Value": 95.04 + }, + "AttackAdd": { + "Value": 4.752 + }, + "DefenceBase": { + "Value": 62.7 + }, + "DefenceAdd": { + "Value": 3.135 + }, + "HPBase": { + "Value": 142.56 + }, + "HPAdd": { + "Value": 7.128 + }, + "SpeedBase": { + "Value": 106 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + "1": { + "AvatarID": 1305, + "Promotion": 1, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 8000 + }, + { + "ItemID": 111011, + "ItemNum": 10 + } + ], + "MaxLevel": 30, + "WorldLevelRequire": 1, + "AttackBase": { + "Value": 133.056 + }, + "AttackAdd": { + "Value": 4.752 + }, + "DefenceBase": { + "Value": 87.78 + }, + "DefenceAdd": { + "Value": 3.135 + }, + "HPBase": { + "Value": 199.584 + }, + "HPAdd": { + "Value": 7.128 + }, + "SpeedBase": { + "Value": 106 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + "2": { + "AvatarID": 1305, + "Promotion": 2, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 16000 + }, + { + "ItemID": 110417, + "ItemNum": 3 + }, + { + "ItemID": 111012, + "ItemNum": 6 + } + ], + "MaxLevel": 40, + "WorldLevelRequire": 2, + "AttackBase": { + "Value": 171.072 + }, + "AttackAdd": { + "Value": 4.752 + }, + "DefenceBase": { + "Value": 112.86 + }, + "DefenceAdd": { + "Value": 3.135 + }, + "HPBase": { + "Value": 256.608 + }, + "HPAdd": { + "Value": 7.128 + }, + "SpeedBase": { + "Value": 106 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + "3": { + "AvatarID": 1305, + "Promotion": 3, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 40000 + }, + { + "ItemID": 110417, + "ItemNum": 7 + }, + { + "ItemID": 111012, + "ItemNum": 9 + } + ], + "MaxLevel": 50, + "WorldLevelRequire": 3, + "AttackBase": { + "Value": 209.088 + }, + "AttackAdd": { + "Value": 4.752 + }, + "DefenceBase": { + "Value": 137.94 + }, + "DefenceAdd": { + "Value": 3.135 + }, + "HPBase": { + "Value": 313.632 + }, + "HPAdd": { + "Value": 7.128 + }, + "SpeedBase": { + "Value": 106 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + "4": { + "AvatarID": 1305, + "Promotion": 4, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 80000 + }, + { + "ItemID": 110417, + "ItemNum": 20 + }, + { + "ItemID": 111013, + "ItemNum": 6 + } + ], + "MaxLevel": 60, + "WorldLevelRequire": 4, + "AttackBase": { + "Value": 247.104 + }, + "AttackAdd": { + "Value": 4.752 + }, + "DefenceBase": { + "Value": 163.02 + }, + "DefenceAdd": { + "Value": 3.135 + }, + "HPBase": { + "Value": 370.656 + }, + "HPAdd": { + "Value": 7.128 + }, + "SpeedBase": { + "Value": 106 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + "5": { + "AvatarID": 1305, + "Promotion": 5, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 160000 + }, + { + "ItemID": 110417, + "ItemNum": 35 + }, + { + "ItemID": 111013, + "ItemNum": 9 + } + ], + "MaxLevel": 70, + "WorldLevelRequire": 5, + "AttackBase": { + "Value": 285.12 + }, + "AttackAdd": { + "Value": 4.752 + }, + "DefenceBase": { + "Value": 188.1 + }, + "DefenceAdd": { + "Value": 3.135 + }, + "HPBase": { + "Value": 427.68 + }, + "HPAdd": { + "Value": 7.128 + }, + "SpeedBase": { + "Value": 106 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + }, + "6": { + "AvatarID": 1305, + "Promotion": 6, + "PromotionCostList": [], + "MaxLevel": 80, + "WorldLevelRequire": 5, + "AttackBase": { + "Value": 323.136 + }, + "AttackAdd": { + "Value": 4.752 + }, + "DefenceBase": { + "Value": 213.18 + }, + "DefenceAdd": { + "Value": 3.135 + }, + "HPBase": { + "Value": 484.704 + }, + "HPAdd": { + "Value": 7.128 + }, + "SpeedBase": { + "Value": 106 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 75 + } + } + }, + "1303": { + "0": { + "AvatarID": 1303, + "Promotion": 0, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 4000 + }, + { + "ItemID": 113001, + "ItemNum": 5 + } + ], + "MaxLevel": 20, + "PlayerLevelRequire": 15, + "AttackBase": { + "Value": 89.76 + }, + "AttackAdd": { + "Value": 4.488 + }, + "DefenceBase": { + "Value": 66 + }, + "DefenceAdd": { + "Value": 3.3 + }, + "HPBase": { + "Value": 147.84 + }, + "HPAdd": { + "Value": 7.392 + }, + "SpeedBase": { + "Value": 104 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 100 + } + }, + "1": { + "AvatarID": 1303, + "Promotion": 1, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 8000 + }, + { + "ItemID": 113001, + "ItemNum": 10 + } + ], + "MaxLevel": 30, + "WorldLevelRequire": 1, + "AttackBase": { + "Value": 125.664 + }, + "AttackAdd": { + "Value": 4.488 + }, + "DefenceBase": { + "Value": 92.4 + }, + "DefenceAdd": { + "Value": 3.3 + }, + "HPBase": { + "Value": 206.976 + }, + "HPAdd": { + "Value": 7.392 + }, + "SpeedBase": { + "Value": 104 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 100 + } + }, + "2": { + "AvatarID": 1303, + "Promotion": 2, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 16000 + }, + { + "ItemID": 110413, + "ItemNum": 3 + }, + { + "ItemID": 113002, + "ItemNum": 6 + } + ], + "MaxLevel": 40, + "WorldLevelRequire": 2, + "AttackBase": { + "Value": 161.568 + }, + "AttackAdd": { + "Value": 4.488 + }, + "DefenceBase": { + "Value": 118.8 + }, + "DefenceAdd": { + "Value": 3.3 + }, + "HPBase": { + "Value": 266.112 + }, + "HPAdd": { + "Value": 7.392 + }, + "SpeedBase": { + "Value": 104 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 100 + } + }, + "3": { + "AvatarID": 1303, + "Promotion": 3, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 40000 + }, + { + "ItemID": 110413, + "ItemNum": 7 + }, + { + "ItemID": 113002, + "ItemNum": 9 + } + ], + "MaxLevel": 50, + "WorldLevelRequire": 3, + "AttackBase": { + "Value": 197.472 + }, + "AttackAdd": { + "Value": 4.488 + }, + "DefenceBase": { + "Value": 145.2 + }, + "DefenceAdd": { + "Value": 3.3 + }, + "HPBase": { + "Value": 325.248 + }, + "HPAdd": { + "Value": 7.392 + }, + "SpeedBase": { + "Value": 104 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 100 + } + }, + "4": { + "AvatarID": 1303, + "Promotion": 4, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 80000 + }, + { + "ItemID": 110413, + "ItemNum": 20 + }, + { + "ItemID": 113003, + "ItemNum": 6 + } + ], + "MaxLevel": 60, + "WorldLevelRequire": 4, + "AttackBase": { + "Value": 233.376 + }, + "AttackAdd": { + "Value": 4.488 + }, + "DefenceBase": { + "Value": 171.6 + }, + "DefenceAdd": { + "Value": 3.3 + }, + "HPBase": { + "Value": 384.384 + }, + "HPAdd": { + "Value": 7.392 + }, + "SpeedBase": { + "Value": 104 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 100 + } + }, + "5": { + "AvatarID": 1303, + "Promotion": 5, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 160000 + }, + { + "ItemID": 110413, + "ItemNum": 35 + }, + { + "ItemID": 113003, + "ItemNum": 9 + } + ], + "MaxLevel": 70, + "WorldLevelRequire": 5, + "AttackBase": { + "Value": 269.28 + }, + "AttackAdd": { + "Value": 4.488 + }, + "DefenceBase": { + "Value": 198 + }, + "DefenceAdd": { + "Value": 3.3 + }, + "HPBase": { + "Value": 443.52 + }, + "HPAdd": { + "Value": 7.392 + }, + "SpeedBase": { + "Value": 104 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 100 + } + }, + "6": { + "AvatarID": 1303, + "Promotion": 6, + "PromotionCostList": [], + "MaxLevel": 80, + "WorldLevelRequire": 5, + "AttackBase": { + "Value": 305.184 + }, + "AttackAdd": { + "Value": 4.488 + }, + "DefenceBase": { + "Value": 224.4 + }, + "DefenceAdd": { + "Value": 3.3 + }, + "HPBase": { + "Value": 502.656 + }, + "HPAdd": { + "Value": 7.392 + }, + "SpeedBase": { + "Value": 104 + }, + "CriticalChance": { + "Value": 0.05 + }, + "CriticalDamage": { + "Value": 0.5 + }, + "BaseAggro": { + "Value": 100 + } + } } } \ No newline at end of file diff --git a/starrail_damage_cal/excel/EquipmentPromotionConfig.json b/starrail_damage_cal/excel/EquipmentPromotionConfig.json index a52721f..e3f1f71 100644 --- a/starrail_damage_cal/excel/EquipmentPromotionConfig.json +++ b/starrail_damage_cal/excel/EquipmentPromotionConfig.json @@ -20329,5 +20329,507 @@ "Value": 6.48 } } + }, + "23020": { + "0": { + "EquipmentID": 23020, + "Promotion": 0, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 5000 + }, + { + "ItemID": 111011, + "ItemNum": 8 + } + ], + "MaxLevel": 20, + "PlayerLevelRequire": 15, + "BaseAttack": { + "Value": 26.4 + }, + "BaseAttackAdd": { + "Value": 3.96 + }, + "BaseDefence": { + "Value": 24 + }, + "BaseDefenceAdd": { + "Value": 3.6 + }, + "BaseHP": { + "Value": 43.2 + }, + "BaseHPAdd": { + "Value": 6.48 + } + }, + "1": { + "EquipmentID": 23020, + "Promotion": 1, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 10000 + }, + { + "ItemID": 110121, + "ItemNum": 4 + }, + { + "ItemID": 111011, + "ItemNum": 12 + } + ], + "MaxLevel": 30, + "WorldLevelRequire": 1, + "BaseAttack": { + "Value": 58.08 + }, + "BaseAttackAdd": { + "Value": 3.96 + }, + "BaseDefence": { + "Value": 52.8 + }, + "BaseDefenceAdd": { + "Value": 3.6 + }, + "BaseHP": { + "Value": 95.04 + }, + "BaseHPAdd": { + "Value": 6.48 + } + }, + "2": { + "EquipmentID": 23020, + "Promotion": 2, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 20000 + }, + { + "ItemID": 110122, + "ItemNum": 4 + }, + { + "ItemID": 111012, + "ItemNum": 8 + } + ], + "MaxLevel": 40, + "WorldLevelRequire": 2, + "BaseAttack": { + "Value": 100.32 + }, + "BaseAttackAdd": { + "Value": 3.96 + }, + "BaseDefence": { + "Value": 91.2 + }, + "BaseDefenceAdd": { + "Value": 3.6 + }, + "BaseHP": { + "Value": 164.16 + }, + "BaseHPAdd": { + "Value": 6.48 + } + }, + "3": { + "EquipmentID": 23020, + "Promotion": 3, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 50000 + }, + { + "ItemID": 110122, + "ItemNum": 8 + }, + { + "ItemID": 111012, + "ItemNum": 12 + } + ], + "MaxLevel": 50, + "WorldLevelRequire": 3, + "BaseAttack": { + "Value": 142.56 + }, + "BaseAttackAdd": { + "Value": 3.96 + }, + "BaseDefence": { + "Value": 129.6 + }, + "BaseDefenceAdd": { + "Value": 3.6 + }, + "BaseHP": { + "Value": 233.28 + }, + "BaseHPAdd": { + "Value": 6.48 + } + }, + "4": { + "EquipmentID": 23020, + "Promotion": 4, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 100000 + }, + { + "ItemID": 110123, + "ItemNum": 5 + }, + { + "ItemID": 111013, + "ItemNum": 6 + } + ], + "MaxLevel": 60, + "WorldLevelRequire": 4, + "BaseAttack": { + "Value": 184.8 + }, + "BaseAttackAdd": { + "Value": 3.96 + }, + "BaseDefence": { + "Value": 168 + }, + "BaseDefenceAdd": { + "Value": 3.6 + }, + "BaseHP": { + "Value": 302.4 + }, + "BaseHPAdd": { + "Value": 6.48 + } + }, + "5": { + "EquipmentID": 23020, + "Promotion": 5, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 200000 + }, + { + "ItemID": 110123, + "ItemNum": 10 + }, + { + "ItemID": 111013, + "ItemNum": 8 + } + ], + "MaxLevel": 70, + "WorldLevelRequire": 5, + "BaseAttack": { + "Value": 227.04 + }, + "BaseAttackAdd": { + "Value": 3.96 + }, + "BaseDefence": { + "Value": 206.4 + }, + "BaseDefenceAdd": { + "Value": 3.6 + }, + "BaseHP": { + "Value": 371.52 + }, + "BaseHPAdd": { + "Value": 6.48 + } + }, + "6": { + "EquipmentID": 23020, + "Promotion": 6, + "PromotionCostList": [], + "MaxLevel": 80, + "WorldLevelRequire": 5, + "BaseAttack": { + "Value": 269.28 + }, + "BaseAttackAdd": { + "Value": 3.96 + }, + "BaseDefence": { + "Value": 244.8 + }, + "BaseDefenceAdd": { + "Value": 3.6 + }, + "BaseHP": { + "Value": 440.64 + }, + "BaseHPAdd": { + "Value": 6.48 + } + } + }, + "23019": { + "0": { + "EquipmentID": 23019, + "Promotion": 0, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 5000 + }, + { + "ItemID": 113001, + "ItemNum": 8 + } + ], + "MaxLevel": 20, + "PlayerLevelRequire": 15, + "BaseAttack": { + "Value": 24 + }, + "BaseAttackAdd": { + "Value": 3.6 + }, + "BaseDefence": { + "Value": 24 + }, + "BaseDefenceAdd": { + "Value": 3.6 + }, + "BaseHP": { + "Value": 48 + }, + "BaseHPAdd": { + "Value": 7.2 + } + }, + "1": { + "EquipmentID": 23019, + "Promotion": 1, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 10000 + }, + { + "ItemID": 110161, + "ItemNum": 4 + }, + { + "ItemID": 113001, + "ItemNum": 12 + } + ], + "MaxLevel": 30, + "WorldLevelRequire": 1, + "BaseAttack": { + "Value": 52.8 + }, + "BaseAttackAdd": { + "Value": 3.6 + }, + "BaseDefence": { + "Value": 52.8 + }, + "BaseDefenceAdd": { + "Value": 3.6 + }, + "BaseHP": { + "Value": 105.6 + }, + "BaseHPAdd": { + "Value": 7.2 + } + }, + "2": { + "EquipmentID": 23019, + "Promotion": 2, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 20000 + }, + { + "ItemID": 110162, + "ItemNum": 4 + }, + { + "ItemID": 113002, + "ItemNum": 8 + } + ], + "MaxLevel": 40, + "WorldLevelRequire": 2, + "BaseAttack": { + "Value": 91.2 + }, + "BaseAttackAdd": { + "Value": 3.6 + }, + "BaseDefence": { + "Value": 91.2 + }, + "BaseDefenceAdd": { + "Value": 3.6 + }, + "BaseHP": { + "Value": 182.4 + }, + "BaseHPAdd": { + "Value": 7.2 + } + }, + "3": { + "EquipmentID": 23019, + "Promotion": 3, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 50000 + }, + { + "ItemID": 110162, + "ItemNum": 8 + }, + { + "ItemID": 113002, + "ItemNum": 12 + } + ], + "MaxLevel": 50, + "WorldLevelRequire": 3, + "BaseAttack": { + "Value": 129.6 + }, + "BaseAttackAdd": { + "Value": 3.6 + }, + "BaseDefence": { + "Value": 129.6 + }, + "BaseDefenceAdd": { + "Value": 3.6 + }, + "BaseHP": { + "Value": 259.2 + }, + "BaseHPAdd": { + "Value": 7.2 + } + }, + "4": { + "EquipmentID": 23019, + "Promotion": 4, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 100000 + }, + { + "ItemID": 110163, + "ItemNum": 5 + }, + { + "ItemID": 113003, + "ItemNum": 6 + } + ], + "MaxLevel": 60, + "WorldLevelRequire": 4, + "BaseAttack": { + "Value": 168 + }, + "BaseAttackAdd": { + "Value": 3.6 + }, + "BaseDefence": { + "Value": 168 + }, + "BaseDefenceAdd": { + "Value": 3.6 + }, + "BaseHP": { + "Value": 336 + }, + "BaseHPAdd": { + "Value": 7.2 + } + }, + "5": { + "EquipmentID": 23019, + "Promotion": 5, + "PromotionCostList": [ + { + "ItemID": 2, + "ItemNum": 200000 + }, + { + "ItemID": 110163, + "ItemNum": 10 + }, + { + "ItemID": 113003, + "ItemNum": 8 + } + ], + "MaxLevel": 70, + "WorldLevelRequire": 5, + "BaseAttack": { + "Value": 206.4 + }, + "BaseAttackAdd": { + "Value": 3.6 + }, + "BaseDefence": { + "Value": 206.4 + }, + "BaseDefenceAdd": { + "Value": 3.6 + }, + "BaseHP": { + "Value": 412.8 + }, + "BaseHPAdd": { + "Value": 7.2 + } + }, + "6": { + "EquipmentID": 23019, + "Promotion": 6, + "PromotionCostList": [], + "MaxLevel": 80, + "WorldLevelRequire": 5, + "BaseAttack": { + "Value": 244.8 + }, + "BaseAttackAdd": { + "Value": 3.6 + }, + "BaseDefence": { + "Value": 244.8 + }, + "BaseDefenceAdd": { + "Value": 3.6 + }, + "BaseHP": { + "Value": 489.6 + }, + "BaseHPAdd": { + "Value": 7.2 + } + } } } \ No newline at end of file diff --git a/starrail_damage_cal/excel/light_cone_ranks.json b/starrail_damage_cal/excel/light_cone_ranks.json index 14f3d75..3cf18a3 100644 --- a/starrail_damage_cal/excel/light_cone_ranks.json +++ b/starrail_damage_cal/excel/light_cone_ranks.json @@ -4062,5 +4062,128 @@ } ] ] + }, + "23020": { + "id": "23020", + "skill": "思想训练", + "desc": "使装备者的暴击伤害提高#1[i]%。敌方目标每承受1个负面效果，装备者对其造成的暴击伤害额外提高#2[i]%，最多叠加#3[i]层。施放终结技攻击敌方目标时，使装备者获得【论辩】效果，造成的伤害提高#4[i]%，追加攻击无视目标#5[i]%的防御力，该效果持续#6[i]回合。", + "params": [ + [ + 0.2, + 0.06, + 3, + 0.36, + 0.16, + 2 + ], + [ + 0.23, + 0.07, + 3, + 0.42, + 0.18, + 2 + ], + [ + 0.26, + 0.08, + 3, + 0.48, + 0.2, + 2 + ], + [ + 0.29, + 0.09, + 3, + 0.54, + 0.22, + 2 + ], + [ + 0.32, + 0.1, + 3, + 0.6, + 0.24, + 2 + ] + ], + "properties": [ + [ + { + "type": "CriticalDamageBase", + "value": 0.2 + } + ], + [ + { + "type": "CriticalDamageBase", + "value": 0.23 + } + ], + [ + { + "type": "CriticalDamageBase", + "value": 0.26 + } + ], + [ + { + "type": "CriticalDamageBase", + "value": 0.29 + } + ], + [ + { + "type": "CriticalDamageBase", + "value": 0.32 + } + ] + ] + }, + "23019": { + "id": "23019", + "skill": "彻骨梅香", + "desc": "每个波次开始时，装备者立即恢复#1[i]点能量。当装备者施放战技后，使我方全体造成的伤害提高#2[i]%，使处于加速状态的我方目标的全属性穿透提高#3[i]%，持续#4[i]回合。", + "params": [ + [ + 10, + 0.15, + 0.06, + 3 + ], + [ + 12.5, + 0.175, + 0.07, + 3 + ], + [ + 15, + 0.2, + 0.08, + 3 + ], + [ + 17.5, + 0.225, + 0.09, + 3 + ], + [ + 20, + 0.25, + 0.1, + 3 + ] + ], + "properties": [ + [], + [], + [], + [], + [] + ] } } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/EquipmentID2AbilityProperty_mapping_1.4.0.json b/starrail_damage_cal/map/data/EquipmentID2AbilityProperty_mapping_1.4.0.json index a192358..ae367a2 100644 --- a/starrail_damage_cal/map/data/EquipmentID2AbilityProperty_mapping_1.4.0.json +++ b/starrail_damage_cal/map/data/EquipmentID2AbilityProperty_mapping_1.4.0.json @@ -2120,5 +2120,54 @@ } } ] + }, + "23020": { + "1": [ + { + "PropertyType": "CriticalDamageBase", + "Value": { + "Value": 0.2 + } + } + ], + "2": [ + { + "PropertyType": "CriticalDamageBase", + "Value": { + "Value": 0.23 + } + } + ], + "3": [ + { + "PropertyType": "CriticalDamageBase", + "Value": { + "Value": 0.26 + } + } + ], + "4": [ + { + "PropertyType": "CriticalDamageBase", + "Value": { + "Value": 0.29 + } + } + ], + "5": [ + { + "PropertyType": "CriticalDamageBase", + "Value": { + "Value": 0.32 + } + } + ] + }, + "23019": { + "1": [], + "2": [], + "3": [], + "4": [], + "5": [] } } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/EquipmentID2EnName_mapping_1.4.0.json b/starrail_damage_cal/map/data/EquipmentID2EnName_mapping_1.4.0.json index 69ab416..c5f2508 100644 --- a/starrail_damage_cal/map/data/EquipmentID2EnName_mapping_1.4.0.json +++ b/starrail_damage_cal/map/data/EquipmentID2EnName_mapping_1.4.0.json @@ -79,5 +79,7 @@ "24003": "SolitaryHealing", "23018": "AnInstanceForeverCherished", "23017": "NightofFright", - "22001": "Hey,OverHere" + "22001": "Hey,OverHere", + "23020": "BaptismofPureThought", + "23019": "PastSelfinMirror" } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/EquipmentID2Name_mapping_1.4.0.json b/starrail_damage_cal/map/data/EquipmentID2Name_mapping_1.4.0.json index 3e33de8..f91716b 100644 --- a/starrail_damage_cal/map/data/EquipmentID2Name_mapping_1.4.0.json +++ b/starrail_damage_cal/map/data/EquipmentID2Name_mapping_1.4.0.json @@ -79,5 +79,7 @@ "24003": "孤独的疗愈", "23018": "片刻，留在眼底", "23017": "惊魂夜", - "22001": "嘿，我在这儿" + "22001": "嘿，我在这儿", + "23020": "纯粹思维的洗礼", + "23019": "镜中故我" } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/EquipmentID2Rarity_mapping_1.4.0.json b/starrail_damage_cal/map/data/EquipmentID2Rarity_mapping_1.4.0.json index 8b0888d..18bd41e 100644 --- a/starrail_damage_cal/map/data/EquipmentID2Rarity_mapping_1.4.0.json +++ b/starrail_damage_cal/map/data/EquipmentID2Rarity_mapping_1.4.0.json @@ -79,5 +79,7 @@ "24003": 5, "23018": 5, "23017": 5, - "22001": 4 + "22001": 4, + "23020": 5, + "23019": 5 } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/avatarId2DamageType_mapping_1.4.0.json b/starrail_damage_cal/map/data/avatarId2DamageType_mapping_1.4.0.json index 595885e..7a12ccc 100644 --- a/starrail_damage_cal/map/data/avatarId2DamageType_mapping_1.4.0.json +++ b/starrail_damage_cal/map/data/avatarId2DamageType_mapping_1.4.0.json @@ -39,5 +39,7 @@ "8004": "Fire", "1302": "Physical", "1217": "Wind", - "1215": "Physical" + "1215": "Physical", + "1305": "Imaginary", + "1303": "Ice" } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/avatarId2EnName_mapping_1.4.0.json b/starrail_damage_cal/map/data/avatarId2EnName_mapping_1.4.0.json index 15c6fc9..fb4b675 100644 --- a/starrail_damage_cal/map/data/avatarId2EnName_mapping_1.4.0.json +++ b/starrail_damage_cal/map/data/avatarId2EnName_mapping_1.4.0.json @@ -39,5 +39,7 @@ "8004": "{NICKNAME}", "1302": "Argenti", "1217": "Huohuo", - "1215": "Hanya" + "1215": "Hanya", + "1305": "Dr. Ratio", + "1303": "Ruan Mei" } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/avatarId2Name_mapping_1.4.0.json b/starrail_damage_cal/map/data/avatarId2Name_mapping_1.4.0.json index bd1deab..4a4e3d3 100644 --- a/starrail_damage_cal/map/data/avatarId2Name_mapping_1.4.0.json +++ b/starrail_damage_cal/map/data/avatarId2Name_mapping_1.4.0.json @@ -39,5 +39,7 @@ "8004": "开拓者", "1302": "银枝", "1217": "藿藿", - "1215": "寒鸦" + "1215": "寒鸦", + "1305": "真理医生", + "1303": "阮•梅" } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/avatarId2Rarity_mapping_1.4.0.json b/starrail_damage_cal/map/data/avatarId2Rarity_mapping_1.4.0.json index 9a53ee9..12fb95b 100644 --- a/starrail_damage_cal/map/data/avatarId2Rarity_mapping_1.4.0.json +++ b/starrail_damage_cal/map/data/avatarId2Rarity_mapping_1.4.0.json @@ -39,5 +39,7 @@ "8004": "5", "1302": "5", "1217": "5", - "1215": "4" + "1215": "4", + "1305": "5", + "1303": "5" } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/avatarId2Star_mapping_1.4.0.json b/starrail_damage_cal/map/data/avatarId2Star_mapping_1.4.0.json index 9a53ee9..12fb95b 100644 --- a/starrail_damage_cal/map/data/avatarId2Star_mapping_1.4.0.json +++ b/starrail_damage_cal/map/data/avatarId2Star_mapping_1.4.0.json @@ -39,5 +39,7 @@ "8004": "5", "1302": "5", "1217": "5", - "1215": "4" + "1215": "4", + "1305": "5", + "1303": "5" } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/avatarRankSkillUp_mapping_1.4.0.json b/starrail_damage_cal/map/data/avatarRankSkillUp_mapping_1.4.0.json index 59ac964..e84224c 100644 --- a/starrail_damage_cal/map/data/avatarRankSkillUp_mapping_1.4.0.json +++ b/starrail_damage_cal/map/data/avatarRankSkillUp_mapping_1.4.0.json @@ -1042,5 +1042,53 @@ "num": 2 } ], - "121506": [] + "121506": [], + "130501": [], + "130502": [], + "130503": [ + { + "id": "130501", + "num": 1 + }, + { + "id": "130503", + "num": 2 + } + ], + "130504": [], + "130505": [ + { + "id": "130502", + "num": 2 + }, + { + "id": "130504", + "num": 2 + } + ], + "130506": [], + "130301": [], + "130302": [], + "130303": [ + { + "id": "130303", + "num": 2 + }, + { + "id": "130304", + "num": 2 + } + ], + "130304": [], + "130305": [ + { + "id": "130301", + "num": 1 + }, + { + "id": "130302", + "num": 2 + } + ], + "130306": [] } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/char_alias.json b/starrail_damage_cal/map/data/char_alias.json index ea54050..21c18f3 100644 --- a/starrail_damage_cal/map/data/char_alias.json +++ b/starrail_damage_cal/map/data/char_alias.json @@ -181,6 +181,13 @@ ], "1302": [ "银枝" + ], + "1305": [ + "真理医生" + ], + "1303": [ + "阮•梅", + "阮梅" ], "8000": [ "开拓者", @@ -465,6 +472,13 @@ "片刻，留在眼底", "片刻留在眼底", "留在眼底" + ], + "23019": [ + "镜中故我" + ], + "23020": [ + "纯粹思维的洗礼", + "思维的洗礼" ], "24000": [ "记一位星神的陨落", diff --git a/starrail_damage_cal/map/data/characterSkillTree_mapping_1.4.0.json b/starrail_damage_cal/map/data/characterSkillTree_mapping_1.4.0.json index 1fec407..29ab3d2 100644 --- a/starrail_damage_cal/map/data/characterSkillTree_mapping_1.4.0.json +++ b/starrail_damage_cal/map/data/characterSkillTree_mapping_1.4.0.json @@ -51183,5 +51183,2522 @@ ], "icon": "icon/property/IconAttack.png" } + }, + "1305": { + "1305001": { + "id": "1305001", + "name": "", + "max_level": 6, + "desc": "", + "params": [], + "anchor": "Point01", + "pre_points": [], + "level_up_skills": [ + { + "id": "130501", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110121", + "num": 3 + }, + { + "id": "111011", + "num": 6 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110122", + "num": 3 + }, + { + "id": "111012", + "num": 3 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110122", + "num": 5 + }, + { + "id": "111012", + "num": 4 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110123", + "num": 3 + }, + { + "id": "111013", + "num": 3 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110123", + "num": 8 + }, + { + "id": "111013", + "num": 4 + } + ] + } + ], + "icon": "icon/skill/1305_basic_atk.png" + }, + "1305002": { + "id": "1305002", + "name": "", + "max_level": 10, + "desc": "", + "params": [], + "anchor": "Point02", + "pre_points": [], + "level_up_skills": [ + { + "id": "130502", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 2500 + }, + { + "id": "111011", + "num": 3 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110121", + "num": 3 + }, + { + "id": "111011", + "num": 6 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110122", + "num": 3 + }, + { + "id": "111012", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110122", + "num": 5 + }, + { + "id": "111012", + "num": 4 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 30000 + }, + { + "id": "110122", + "num": 7 + }, + { + "id": "111012", + "num": 6 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110123", + "num": 3 + }, + { + "id": "111013", + "num": 3 + } + ] + }, + { + "promotion": 7, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 80000 + }, + { + "id": "110123", + "num": 5 + }, + { + "id": "110504", + "num": 1 + }, + { + "id": "111013", + "num": 4 + } + ] + }, + { + "promotion": 8, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110123", + "num": 8 + }, + { + "id": "110504", + "num": 1 + } + ] + }, + { + "promotion": 9, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 300000 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110123", + "num": 14 + }, + { + "id": "110504", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1305_skill.png" + }, + "1305003": { + "id": "1305003", + "name": "", + "max_level": 10, + "desc": "", + "params": [], + "anchor": "Point03", + "pre_points": [], + "level_up_skills": [ + { + "id": "130503", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 2500 + }, + { + "id": "111011", + "num": 3 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110121", + "num": 3 + }, + { + "id": "111011", + "num": 6 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110122", + "num": 3 + }, + { + "id": "111012", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110122", + "num": 5 + }, + { + "id": "111012", + "num": 4 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 30000 + }, + { + "id": "110122", + "num": 7 + }, + { + "id": "111012", + "num": 6 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110123", + "num": 3 + }, + { + "id": "111013", + "num": 3 + } + ] + }, + { + "promotion": 7, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 80000 + }, + { + "id": "110123", + "num": 5 + }, + { + "id": "110504", + "num": 1 + }, + { + "id": "111013", + "num": 4 + } + ] + }, + { + "promotion": 8, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110123", + "num": 8 + }, + { + "id": "110504", + "num": 1 + } + ] + }, + { + "promotion": 9, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 300000 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110123", + "num": 14 + }, + { + "id": "110504", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1305_ultimate.png" + }, + "1305004": { + "id": "1305004", + "name": "", + "max_level": 10, + "desc": "", + "params": [], + "anchor": "Point04", + "pre_points": [], + "level_up_skills": [ + { + "id": "130504", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 2500 + }, + { + "id": "111011", + "num": 3 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110121", + "num": 3 + }, + { + "id": "111011", + "num": 6 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110122", + "num": 3 + }, + { + "id": "111012", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110122", + "num": 5 + }, + { + "id": "111012", + "num": 4 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 30000 + }, + { + "id": "110122", + "num": 7 + }, + { + "id": "111012", + "num": 6 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110123", + "num": 3 + }, + { + "id": "111013", + "num": 3 + } + ] + }, + { + "promotion": 7, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 80000 + }, + { + "id": "110123", + "num": 5 + }, + { + "id": "110504", + "num": 1 + }, + { + "id": "111013", + "num": 4 + } + ] + }, + { + "promotion": 8, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110123", + "num": 8 + }, + { + "id": "110504", + "num": 1 + } + ] + }, + { + "promotion": 9, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 300000 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110123", + "num": 14 + }, + { + "id": "110504", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1305_talent.png" + }, + "1305007": { + "id": "1305007", + "name": "", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point05", + "pre_points": [], + "level_up_skills": [ + { + "id": "130507", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + } + ], + "icon": "icon/skill/1305_technique.png" + }, + "1305101": { + "id": "1305101", + "name": "归纳", + "max_level": 1, + "desc": "当真理医生的队友攻击持有【智者的短见】的目标后，目标每持有1个负面效果，天赋的追加攻击触发概率提高#1[i]%，最多提高#2[i]%。", + "params": [ + [ + 0.08 + ], + [ + 0.4 + ] + ], + "anchor": "Point06", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110121", + "num": 3 + }, + { + "id": "110504", + "num": 1 + } + ] + } + ], + "icon": "icon/property/SkillIcon_1305_SkillTree1.png" + }, + "1305102": { + "id": "1305102", + "name": "演绎", + "max_level": 1, + "desc": "施放战技攻击敌方目标后，有#1[i]%的基础概率使受到攻击的敌方目标效果抵抗降低#2[i]%，持续#3[i]回合。", + "params": [ + [ + 1 + ], + [ + 0.1 + ], + [ + 2 + ] + ], + "anchor": "Point07", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110122", + "num": 5 + }, + { + "id": "110504", + "num": 1 + } + ] + } + ], + "icon": "icon/property/SkillIcon_1305_SkillTree2.png" + }, + "1305103": { + "id": "1305103", + "name": "推理", + "max_level": 1, + "desc": "真理医生在场时，我方全体对处于负面效果的敌方目标造成的伤害提高#1[i]%。", + "params": [ + [ + 0.1 + ] + ], + "anchor": "Point08", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110123", + "num": 8 + }, + { + "id": "110504", + "num": 1 + } + ] + } + ], + "icon": "icon/property/SkillIcon_1305_SkillTree3.png" + }, + "1305201": { + "id": "1305201", + "name": "攻击强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point09", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [ + { + "type": "AttackAddedRatio", + "value": 0.04 + } + ], + "materials": [ + { + "id": "2", + "num": 2500 + }, + { + "id": "111011", + "num": 2 + } + ] + } + ], + "icon": "icon/property/IconAttack.png" + }, + "1305202": { + "id": "1305202", + "name": "伤害强化•虚数", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point10", + "pre_points": [ + "1305101" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 2, + "level": 0, + "properties": [ + { + "type": "ImaginaryAddedRatio", + "value": 0.032 + } + ], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110121", + "num": 3 + }, + { + "id": "111011", + "num": 6 + } + ] + } + ], + "icon": "icon/property/IconImaginaryAddedRatio.png" + }, + "1305203": { + "id": "1305203", + "name": "攻击强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point11", + "pre_points": [ + "1305202" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 3, + "level": 0, + "properties": [ + { + "type": "AttackAddedRatio", + "value": 0.04 + } + ], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110122", + "num": 3 + }, + { + "id": "111012", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconAttack.png" + }, + "1305204": { + "id": "1305204", + "name": "防御强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point12", + "pre_points": [ + "1305203" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 3, + "level": 0, + "properties": [ + { + "type": "DefenceAddedRatio", + "value": 0.05 + } + ], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110122", + "num": 3 + }, + { + "id": "111012", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconDefence.png" + }, + "1305205": { + "id": "1305205", + "name": "攻击强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point13", + "pre_points": [ + "1305102" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 4, + "level": 0, + "properties": [ + { + "type": "AttackAddedRatio", + "value": 0.06 + } + ], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110122", + "num": 5 + }, + { + "id": "111012", + "num": 4 + } + ] + } + ], + "icon": "icon/property/IconAttack.png" + }, + "1305206": { + "id": "1305206", + "name": "伤害强化•虚数", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point14", + "pre_points": [ + "1305205" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 5, + "level": 0, + "properties": [ + { + "type": "ImaginaryAddedRatio", + "value": 0.048 + } + ], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110123", + "num": 3 + }, + { + "id": "111013", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconImaginaryAddedRatio.png" + }, + "1305207": { + "id": "1305207", + "name": "攻击强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point15", + "pre_points": [ + "1305206" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 5, + "level": 0, + "properties": [ + { + "type": "AttackAddedRatio", + "value": 0.06 + } + ], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110123", + "num": 3 + }, + { + "id": "111013", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconAttack.png" + }, + "1305208": { + "id": "1305208", + "name": "防御强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point16", + "pre_points": [ + "1305103" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 6, + "level": 0, + "properties": [ + { + "type": "DefenceAddedRatio", + "value": 0.075 + } + ], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110123", + "num": 8 + }, + { + "id": "111013", + "num": 8 + } + ] + } + ], + "icon": "icon/property/IconDefence.png" + }, + "1305209": { + "id": "1305209", + "name": "伤害强化•虚数", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point17", + "pre_points": [ + "1305208" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [ + { + "type": "ImaginaryAddedRatio", + "value": 0.064 + } + ], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110123", + "num": 8 + }, + { + "id": "111013", + "num": 8 + } + ] + } + ], + "icon": "icon/property/IconImaginaryAddedRatio.png" + }, + "1305210": { + "id": "1305210", + "name": "攻击强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point18", + "pre_points": [ + "1305208" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [ + { + "type": "AttackAddedRatio", + "value": 0.08 + } + ], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110123", + "num": 8 + }, + { + "id": "111013", + "num": 8 + } + ] + } + ], + "icon": "icon/property/IconAttack.png" + } + }, + "1303": { + "1303001": { + "id": "1303001", + "name": "", + "max_level": 6, + "desc": "", + "params": [], + "anchor": "Point01", + "pre_points": [], + "level_up_skills": [ + { + "id": "130301", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110161", + "num": 3 + }, + { + "id": "113001", + "num": 6 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110162", + "num": 3 + }, + { + "id": "113002", + "num": 3 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110162", + "num": 5 + }, + { + "id": "113002", + "num": 4 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110163", + "num": 3 + }, + { + "id": "113003", + "num": 3 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110163", + "num": 8 + }, + { + "id": "113003", + "num": 4 + } + ] + } + ], + "icon": "icon/skill/1303_basic_atk.png" + }, + "1303002": { + "id": "1303002", + "name": "", + "max_level": 10, + "desc": "", + "params": [], + "anchor": "Point02", + "pre_points": [], + "level_up_skills": [ + { + "id": "130302", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 2500 + }, + { + "id": "113001", + "num": 3 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110161", + "num": 3 + }, + { + "id": "113001", + "num": 6 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110162", + "num": 3 + }, + { + "id": "113002", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110162", + "num": 5 + }, + { + "id": "113002", + "num": 4 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 30000 + }, + { + "id": "110162", + "num": 7 + }, + { + "id": "113002", + "num": 6 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110163", + "num": 3 + }, + { + "id": "113003", + "num": 3 + } + ] + }, + { + "promotion": 7, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 80000 + }, + { + "id": "110163", + "num": 5 + }, + { + "id": "110504", + "num": 1 + }, + { + "id": "113003", + "num": 4 + } + ] + }, + { + "promotion": 8, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110163", + "num": 8 + }, + { + "id": "110504", + "num": 1 + } + ] + }, + { + "promotion": 9, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 300000 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110163", + "num": 14 + }, + { + "id": "110504", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1303_skill.png" + }, + "1303003": { + "id": "1303003", + "name": "", + "max_level": 10, + "desc": "", + "params": [], + "anchor": "Point03", + "pre_points": [], + "level_up_skills": [ + { + "id": "130303", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 2500 + }, + { + "id": "113001", + "num": 3 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110161", + "num": 3 + }, + { + "id": "113001", + "num": 6 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110162", + "num": 3 + }, + { + "id": "113002", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110162", + "num": 5 + }, + { + "id": "113002", + "num": 4 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 30000 + }, + { + "id": "110162", + "num": 7 + }, + { + "id": "113002", + "num": 6 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110163", + "num": 3 + }, + { + "id": "113003", + "num": 3 + } + ] + }, + { + "promotion": 7, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 80000 + }, + { + "id": "110163", + "num": 5 + }, + { + "id": "110504", + "num": 1 + }, + { + "id": "113003", + "num": 4 + } + ] + }, + { + "promotion": 8, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110163", + "num": 8 + }, + { + "id": "110504", + "num": 1 + } + ] + }, + { + "promotion": 9, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 300000 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110163", + "num": 14 + }, + { + "id": "110504", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1303_ultimate.png" + }, + "1303004": { + "id": "1303004", + "name": "", + "max_level": 10, + "desc": "", + "params": [], + "anchor": "Point04", + "pre_points": [], + "level_up_skills": [ + { + "id": "130304", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + }, + { + "promotion": 1, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 2500 + }, + { + "id": "113001", + "num": 3 + } + ] + }, + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110161", + "num": 3 + }, + { + "id": "113001", + "num": 6 + } + ] + }, + { + "promotion": 3, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110162", + "num": 3 + }, + { + "id": "113002", + "num": 3 + } + ] + }, + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110162", + "num": 5 + }, + { + "id": "113002", + "num": 4 + } + ] + }, + { + "promotion": 5, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 30000 + }, + { + "id": "110162", + "num": 7 + }, + { + "id": "113002", + "num": 6 + } + ] + }, + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110163", + "num": 3 + }, + { + "id": "113003", + "num": 3 + } + ] + }, + { + "promotion": 7, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 80000 + }, + { + "id": "110163", + "num": 5 + }, + { + "id": "110504", + "num": 1 + }, + { + "id": "113003", + "num": 4 + } + ] + }, + { + "promotion": 8, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110163", + "num": 8 + }, + { + "id": "110504", + "num": 1 + } + ] + }, + { + "promotion": 9, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 300000 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110163", + "num": 14 + }, + { + "id": "110504", + "num": 1 + } + ] + } + ], + "icon": "icon/skill/1303_talent.png" + }, + "1303007": { + "id": "1303007", + "name": "", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point05", + "pre_points": [], + "level_up_skills": [ + { + "id": "130307", + "num": 1 + } + ], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [], + "materials": [] + } + ], + "icon": "icon/skill/1303_technique.png" + }, + "1303101": { + "id": "1303101", + "name": "物体呼吸中", + "max_level": 1, + "desc": "我方全体击破特攻提高#1[i]%。", + "params": [ + [ + 0.2 + ] + ], + "anchor": "Point06", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 2, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110161", + "num": 3 + }, + { + "id": "110504", + "num": 1 + } + ] + } + ], + "icon": "icon/property/SkillIcon_1206_SkillTree1.png" + }, + "1303102": { + "id": "1303102", + "name": "日消遐思长", + "max_level": 1, + "desc": "阮•梅的回合开始时，自身恢复#1[i]点能量。", + "params": [ + [ + 5 + ] + ], + "anchor": "Point07", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 4, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110162", + "num": 5 + }, + { + "id": "110504", + "num": 1 + } + ] + } + ], + "icon": "icon/property/SkillIcon_1206_SkillTree2.png" + }, + "1303103": { + "id": "1303103", + "name": "落烛照水燃", + "max_level": 1, + "desc": "阮•梅在场时，处于弱点击破状态的敌方单位受到的伤害提高#1[i]%。", + "params": [ + [ + 0.24 + ] + ], + "anchor": "Point08", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 6, + "level": 0, + "properties": [], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "241", + "num": 1 + }, + { + "id": "110163", + "num": 8 + }, + { + "id": "110504", + "num": 1 + } + ] + } + ], + "icon": "icon/property/SkillIcon_1206_SkillTree3.png" + }, + "1303201": { + "id": "1303201", + "name": "击破强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point09", + "pre_points": [], + "level_up_skills": [], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.053 + } + ], + "materials": [ + { + "id": "2", + "num": 2500 + }, + { + "id": "113001", + "num": 2 + } + ] + } + ], + "icon": "icon/property/IconBreakUp.png" + }, + "1303202": { + "id": "1303202", + "name": "防御强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point10", + "pre_points": [ + "1303101" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 2, + "level": 0, + "properties": [ + { + "type": "DefenceAddedRatio", + "value": 0.05 + } + ], + "materials": [ + { + "id": "2", + "num": 5000 + }, + { + "id": "110161", + "num": 3 + }, + { + "id": "113001", + "num": 6 + } + ] + } + ], + "icon": "icon/property/IconDefence.png" + }, + "1303203": { + "id": "1303203", + "name": "击破强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point11", + "pre_points": [ + "1303202" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 3, + "level": 0, + "properties": [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.053 + } + ], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110162", + "num": 3 + }, + { + "id": "113002", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconBreakUp.png" + }, + "1303204": { + "id": "1303204", + "name": "速度强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point12", + "pre_points": [ + "1303203" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 3, + "level": 0, + "properties": [ + { + "type": "SpeedDelta", + "value": 2 + } + ], + "materials": [ + { + "id": "2", + "num": 10000 + }, + { + "id": "110162", + "num": 3 + }, + { + "id": "113002", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconSpeed.png" + }, + "1303205": { + "id": "1303205", + "name": "击破强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point13", + "pre_points": [ + "1303102" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 4, + "level": 0, + "properties": [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.08 + } + ], + "materials": [ + { + "id": "2", + "num": 20000 + }, + { + "id": "110162", + "num": 5 + }, + { + "id": "113002", + "num": 4 + } + ] + } + ], + "icon": "icon/property/IconBreakUp.png" + }, + "1303206": { + "id": "1303206", + "name": "防御强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point14", + "pre_points": [ + "1303205" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 5, + "level": 0, + "properties": [ + { + "type": "DefenceAddedRatio", + "value": 0.075 + } + ], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110163", + "num": 3 + }, + { + "id": "113003", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconDefence.png" + }, + "1303207": { + "id": "1303207", + "name": "击破强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point15", + "pre_points": [ + "1303206" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 5, + "level": 0, + "properties": [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.08 + } + ], + "materials": [ + { + "id": "2", + "num": 45000 + }, + { + "id": "110163", + "num": 3 + }, + { + "id": "113003", + "num": 3 + } + ] + } + ], + "icon": "icon/property/IconBreakUp.png" + }, + "1303208": { + "id": "1303208", + "name": "速度强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point16", + "pre_points": [ + "1303103" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 6, + "level": 0, + "properties": [ + { + "type": "SpeedDelta", + "value": 3 + } + ], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110163", + "num": 8 + }, + { + "id": "113003", + "num": 8 + } + ] + } + ], + "icon": "icon/property/IconSpeed.png" + }, + "1303209": { + "id": "1303209", + "name": "防御强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point17", + "pre_points": [ + "1303208" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [ + { + "type": "DefenceAddedRatio", + "value": 0.1 + } + ], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110163", + "num": 8 + }, + { + "id": "113003", + "num": 8 + } + ] + } + ], + "icon": "icon/property/IconDefence.png" + }, + "1303210": { + "id": "1303210", + "name": "击破强化", + "max_level": 1, + "desc": "", + "params": [], + "anchor": "Point18", + "pre_points": [ + "1303208" + ], + "level_up_skills": [], + "levels": [ + { + "promotion": 0, + "level": 0, + "properties": [ + { + "type": "BreakDamageAddedRatioBase", + "value": 0.107 + } + ], + "materials": [ + { + "id": "2", + "num": 160000 + }, + { + "id": "110163", + "num": 8 + }, + { + "id": "113003", + "num": 8 + } + ] + } + ], + "icon": "icon/property/IconBreakUp.png" + } } } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/rankId2Name_mapping_1.4.0.json b/starrail_damage_cal/map/data/rankId2Name_mapping_1.4.0.json index e5ecbfa..2bd191f 100644 --- a/starrail_damage_cal/map/data/rankId2Name_mapping_1.4.0.json +++ b/starrail_damage_cal/map/data/rankId2Name_mapping_1.4.0.json @@ -244,5 +244,17 @@ "121503": "三尘", "121504": "四谛", "121505": "五阴", - "121506": "六正" + "121506": "六正", + "130501": "倨傲生祸患", + "130502": "显微而阐幽", + "130503": "认识你自己", + "130504": "盲目造痴愚", + "130505": "海阔舟无楫", + "130506": "永恒唯真理", + "130301": "神经仿绣图", + "130302": "芦前漫步", + "130303": "彩缎烟衫绿婆娑", + "130304": "寻神铜镜前", + "130305": "手弄慵鬟玲珑钗", + "130306": "半脱纱巾落团扇" } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/skillId2AttackType_mapping_1.4.0.json b/starrail_damage_cal/map/data/skillId2AttackType_mapping_1.4.0.json index 8d06d9f..71fadfe 100644 --- a/starrail_damage_cal/map/data/skillId2AttackType_mapping_1.4.0.json +++ b/starrail_damage_cal/map/data/skillId2AttackType_mapping_1.4.0.json @@ -258,5 +258,15 @@ "121502": "BPSkill", "121503": "Ultra", "121504": "", - "121507": "Maze" + "121507": "Maze", + "130501": "Normal", + "130502": "BPSkill", + "130503": "Ultra", + "130504": "", + "130507": "Maze", + "130301": "Normal", + "130302": "BPSkill", + "130303": "Ultra", + "130304": "", + "130307": "Maze" } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/skillId2Name_mapping_1.4.0.json b/starrail_damage_cal/map/data/skillId2Name_mapping_1.4.0.json index c9ad97f..e5c3e32 100644 --- a/starrail_damage_cal/map/data/skillId2Name_mapping_1.4.0.json +++ b/starrail_damage_cal/map/data/skillId2Name_mapping_1.4.0.json @@ -258,5 +258,15 @@ "121502": "生灭系缚", "121503": "十王敕令，遍土遵行", "121504": "罚恶", - "121507": "判冥" + "121507": "判冥", + "130501": "知识就是力量", + "130502": "精神助产术", + "130503": "三段悖论", + "130504": "我思故我在", + "130507": "偶像塑造", + "130301": "一针幽兰", + "130302": "慢捻抹复挑", + "130303": "摇花缎水，沾衣不摘", + "130304": "分型的螺旋", + "130307": "拭琴抚罗袂" } \ No newline at end of file diff --git a/starrail_damage_cal/map/data/skillId2Type_mapping_1.4.0.json b/starrail_damage_cal/map/data/skillId2Type_mapping_1.4.0.json index 834f1b8..a75ed23 100644 --- a/starrail_damage_cal/map/data/skillId2Type_mapping_1.4.0.json +++ b/starrail_damage_cal/map/data/skillId2Type_mapping_1.4.0.json @@ -258,5 +258,15 @@ "121502": "单攻", "121503": "强化", "121504": "辅助", - "121507": "" + "121507": "", + "130501": "单攻", + "130502": "单攻", + "130503": "单攻", + "130504": "强化", + "130507": "妨害", + "130301": "单攻", + "130302": "辅助", + "130303": "辅助", + "130304": "辅助", + "130307": "强化" } \ No newline at end of file