diff --git a/backend/core/basic/character/calc_equip.py b/backend/core/basic/character/calc_equip.py index 75ef11af..1d1c0e0a 100644 --- a/backend/core/basic/character/calc_equip.py +++ b/backend/core/basic/character/calc_equip.py @@ -188,8 +188,9 @@ class CalcEquipMixin(CharacterBase): apply_uppercase_attrs(self, oathSuit) if skill is not None: base_suit = next((x for x in suitList if x.suitId == oathSuit.suitId), None) - base_effect_damage = [] if base_suit is None else base_suit.effectDamage - oathSkillEffect.append((skill, base_effect_damage + skill.effectDamage)) + suit_effect_damage = [] if base_suit is None else base_suit.effectDamage + oath_effect_damage = skill.effectDamage + oathSkillEffect.append((skill, oath_effect_damage, suit_effect_damage)) # 誓约技能效果生效 apply_uppercase_attrs(self, skill) self.oathSkillInfo.append(skill) @@ -207,11 +208,11 @@ class CalcEquipMixin(CharacterBase): 'skills': [{'id': skill.id, 'skillId': i.skillId, 'name': i.name, 'imageUrl': i.imageUrl, 'enable': i.skillId == '1' or max_point_oath_suit == max_point_suit} for i in skills], # 'value': oathSuit.value, } - for skill, effectDamage in oathSkillEffect: + for skill, oath_effect_damage, suit_effect_damage in oathSkillEffect: func = equs.funs.execture(f'oath_skill_{skill.id}') if func is not None: # print(f'誓约技能 {skill.id} 生效') - func(self, effectDamage) + func(self, oath_effect_damage, suit_effect_damage) # 太初积分以上，每超过70点数增加1%技能攻击力 if self.max_point >= 2550: skillAttack = (self.max_point - 2550) // 70 * 0.02 diff --git a/backend/core/equipment/version_0/effect_damage.py b/backend/core/equipment/version_0/effect_damage.py index c7b9ce68..afc26d04 100644 --- a/backend/core/equipment/version_0/effect_damage.py +++ b/backend/core/equipment/version_0/effect_damage.py @@ -1,4 +1,4 @@ -def effect_damage(values: list[float], index: int, fallback: float) -> float: +def effect_damage(values: list[float], index: int, fallback: float = 0) -> float: if index < len(values): return values[index] return fallback diff --git a/backend/core/equipment/version_0/equ.py b/backend/core/equipment/version_0/equ.py index b6092095..1b4d02b8 100644 --- a/backend/core/equipment/version_0/equ.py +++ b/backend/core/equipment/version_0/equ.py @@ -2,6 +2,7 @@ from core.basic.equipment import EquEffect from core.abstract.character import CharacterProperty from .effect_damage import effect_damage from .register import register + # region 武器 diff --git a/backend/core/equipment/version_0/oathSuitSkill.py b/backend/core/equipment/version_0/oathSuitSkill.py index 866afcc3..63e881ea 100644 --- a/backend/core/equipment/version_0/oathSuitSkill.py +++ b/backend/core/equipment/version_0/oathSuitSkill.py @@ -312,7 +312,7 @@ def oathPointEffect(point): @register -def oath_skill_2010101(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2010101(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if check_suit(char): # 原套装效果 char.SetStatus(SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) @@ -320,7 +320,7 @@ def oath_skill_2010101(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2010102(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2010102(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if check_suit(char): # 原套装效果 char.SetStatus(SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) @@ -328,7 +328,7 @@ def oath_skill_2010102(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2010103(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2010103(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if check_suit(char): # 原套装效果 char.SetStatus(SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) @@ -336,17 +336,17 @@ def oath_skill_2010103(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2010201(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2010201(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if check_suit(char): # 原套装效果 char.SetStatus(SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) # 誓约效果 - char.equ_effect.append(EquEffect(name='噬影之冥[幽冥潜影]', icon='/equipment/skill/132.png', cd=4, data=effect_damage(effectDamage, 0, 37800))) + char.equ_effect.append(EquEffect(name='噬影之冥[幽冥潜影]', icon='/equipment/skill/132.png', cd=4, data=effect_damage(oathEffectDamage, 0, 37800))) pass @register -def oath_skill_2010202(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2010202(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.04) # 原套装效果 char.SetStatus(SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) @@ -354,7 +354,7 @@ def oath_skill_2010202(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2010203(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2010203(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.05, SpeedM=0.05, SpeedR=0.05) # 原套装效果 char.SetStatus(SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) @@ -362,17 +362,17 @@ def oath_skill_2010203(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2010301(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2010301(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if check_suit(char): # 原套装效果 char.SetStatus(SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) # 誓约效果 - char.equ_effect.append(EquEffect(name='噬影之冥[幽冥潜影]', icon='/equipment/skill/132.png', cd=4, data=effect_damage(effectDamage, 0, 37800))) + char.equ_effect.append(EquEffect(name='噬影之冥[幽冥潜影]', icon='/equipment/skill/132.png', cd=4, data=effect_damage(oathEffectDamage, 0, 37800))) pass @register -def oath_skill_2010302(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2010302(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.06) # 原套装效果 char.SetStatus(SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) @@ -380,7 +380,7 @@ def oath_skill_2010302(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2010303(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2010303(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) # 原套装效果 char.SetStatus(SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) @@ -388,17 +388,17 @@ def oath_skill_2010303(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2010401(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2010401(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if check_suit(char): # 原套装效果 char.SetStatus(SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) # 誓约效果 - char.equ_effect.append(EquEffect(name='噬影之冥[幽冥潜影]', icon='/equipment/skill/132.png', cd=4, data=effect_damage(effectDamage, 0, 37800))) + char.equ_effect.append(EquEffect(name='噬影之冥[幽冥潜影]', icon='/equipment/skill/132.png', cd=4, data=effect_damage(oathEffectDamage, 0, 37800))) pass @register -def oath_skill_2010402(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2010402(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.08) # 原套装效果 char.SetStatus(SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) @@ -406,7 +406,7 @@ def oath_skill_2010402(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2010403(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2010403(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) # 原套装效果 char.SetStatus(SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) @@ -414,18 +414,18 @@ def oath_skill_2010403(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2010501(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2010501(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if check_suit(char): # 原套装效果 char.SetStatus(SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) # 誓约效果 - char.equ_effect.append(EquEffect(name='噬影之冥[幽冥潜影]', icon='/equipment/skill/132.png', cd=4, data=effect_damage(effectDamage, 0, 37800))) - char.equ_effect.append(EquEffect(name='噬影之冥[烙印爆炸]', icon='/equipment/skill/132.png', cd=20, data=effect_damage(effectDamage, 1, 63000))) + char.equ_effect.append(EquEffect(name='噬影之冥[幽冥潜影]', icon='/equipment/skill/132.png', cd=4, data=effect_damage(oathEffectDamage, 0, 37800))) + char.equ_effect.append(EquEffect(name='噬影之冥[烙印爆炸]', icon='/equipment/skill/132.png', cd=20, data=effect_damage(oathEffectDamage, 1, 63000))) pass @register -def oath_skill_2010502(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2010502(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.1) # 原套装效果 char.SetStatus(SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) @@ -433,7 +433,7 @@ def oath_skill_2010502(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2010503(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2010503(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) # 原套装效果 char.SetStatus(SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) @@ -445,196 +445,196 @@ def oath_skill_2010503(char: CharacterProperty,effectDamage: list[float] = []): # region 精灵国度 @register -def oath_skill_2020101(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 0, 27560))) - char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 1, 34320))) - char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 2, 29380))) +def oath_skill_2020101(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 0, 27560))) + char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 1, 34320))) + char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380))) char.SetStatus(SpeedM=0.15) - char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(effectDamage, 3, 346450))) + char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 3, 346450))) pass @register -def oath_skill_2020102(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 0, 27560))) - char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 1, 34320))) - char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 2, 29380))) +def oath_skill_2020102(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 0, 27560))) + char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 1, 34320))) + char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380))) char.SetStatus(SpeedM=0.15) - char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(effectDamage, 3, 346450))) + char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 3, 346450))) pass @register -def oath_skill_2020103(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 0, 27560))) - char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 1, 34320))) - char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 2, 29380))) +def oath_skill_2020103(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 0, 27560))) + char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 1, 34320))) + char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380))) char.SetStatus(SpeedM=0.15) - char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(effectDamage, 3, 346450))) + char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 3, 346450))) pass @register -def oath_skill_2020201(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 0, 37800))) +def oath_skill_2020201(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 0, 37800))) if check_suit(char): # 原套装效果 - char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 1, 27560))) - char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 2, 34320))) - char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 3, 29380))) + char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 1, 27560))) + char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 2, 34320))) + char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 3, 29380))) char.SetStatus(SpeedM=0.15) - char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(effectDamage, 4, 96590))) + char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 4, 96590))) # 誓约追加69300%伤害 - char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(effectDamage, 5, 346450) + effect_damage(effectDamage, 6, 69300))) + char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(oathEffectDamage, 0, 346450) + effect_damage(oathEffectDamage, 1, 69300))) # 誓约效果 char.SetStatus(SkillAttack=0.019) pass @register -def oath_skill_2020202(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2020202(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): # 原套装效果 char.SetStatus(SpeedM=0.15) - char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(effectDamage, 0, 146318))) - char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 1, 34320))) - char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 2, 29380))) - char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(effectDamage, 3, 346450))) + char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 0, 146318))) + char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 1, 34320))) + char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380))) + char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 3, 346450))) pass @register -def oath_skill_2020203(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 0, 27560))) - char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 1, 34320))) - char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 2, 29380))) +def oath_skill_2020203(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 0, 27560))) + char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 1, 34320))) + char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380))) char.SetStatus(SpeedM=0.15) - char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(effectDamage, 3, 96590))) + char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 3, 96590))) # 誓约 - char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 4, 25200))) + char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 4, 25200))) pass @register -def oath_skill_2020301(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 0, 37800))) +def oath_skill_2020301(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 0, 37800))) if check_suit(char): # 原套装效果 - char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 1, 27560))) - char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 2, 34320))) - char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 3, 29380))) + char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 1, 27560))) + char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 2, 34320))) + char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 3, 29380))) char.SetStatus(SpeedM=0.15) - char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(effectDamage, 4, 96590))) + char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 4, 96590))) # 誓约追加69300%伤害 - char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(effectDamage, 5, 346450) + effect_damage(effectDamage, 6, 69300))) + char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(oathEffectDamage, 0, 346450) + effect_damage(oathEffectDamage, 1, 69300))) # 誓约效果 char.SetStatus(SkillAttack=0.019) pass @register -def oath_skill_2020302(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2020302(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): # 原套装效果 char.SetStatus(SpeedM=0.15) # 誓约效果 - char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(effectDamage, 0, 196875))) - char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 1, 29380))) - char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(effectDamage, 2, 346450))) + char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 0, 196875))) + char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 1, 29380))) + char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 2, 346450))) pass @register -def oath_skill_2020303(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 0, 27560))) - char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 1, 34320))) - char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 2, 29380))) +def oath_skill_2020303(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 0, 27560))) + char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 1, 34320))) + char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380))) char.SetStatus(SpeedM=0.15) - char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(effectDamage, 3, 96590))) + char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 3, 96590))) # 誓约 - char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 4, 25200))) - char.equ_effect.append(EquEffect(name='地灵盖亚', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 5, 37800))) + char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 4, 25200))) + char.equ_effect.append(EquEffect(name='地灵盖亚', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 0, 37800))) pass @register -def oath_skill_2020401(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 0, 37800))) +def oath_skill_2020401(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 0, 37800))) if check_suit(char): # 原套装效果 - char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 1, 27560))) - char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 2, 34320))) - char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 3, 29380))) + char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 1, 27560))) + char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 2, 34320))) + char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 3, 29380))) char.SetStatus(SpeedM=0.15) - char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(effectDamage, 4, 96590))) + char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 4, 96590))) # 誓约追加69300%伤害 - char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(effectDamage, 5, 346450) + effect_damage(effectDamage, 6, 69300))) + char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(oathEffectDamage, 0, 346450) + effect_damage(oathEffectDamage, 1, 69300))) # 誓约效果 char.SetStatus(SkillAttack=0.019) pass @register -def oath_skill_2020402(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2020402(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): # 原套装效果 char.SetStatus(SpeedM=0.15) # 誓约效果 - char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(effectDamage, 0, 261923))) - char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(effectDamage, 1, 346450))) + char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 0, 261923))) + char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 1, 346450))) pass @register -def oath_skill_2020403(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 0, 27560))) - char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 1, 34320))) - char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 2, 29380))) +def oath_skill_2020403(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 0, 27560))) + char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 1, 34320))) + char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380))) char.SetStatus(SpeedM=0.15) - char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(effectDamage, 3, 96590))) + char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 3, 96590))) # 誓约 - char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 4, 25200))) - char.equ_effect.append(EquEffect(name='地灵盖亚', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 5, 37800))) - char.equ_effect.append(EquEffect(name='暗灵诺特纳', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 6, 25200))) + char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 4, 25200))) + char.equ_effect.append(EquEffect(name='地灵盖亚', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 0, 37800))) + char.equ_effect.append(EquEffect(name='暗灵诺特纳', icon='/equipment/skill/29.png', cd=2, data=effect_damage(oathEffectDamage, 1, 25200))) pass @register -def oath_skill_2020501(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 0, 37800))) +def oath_skill_2020501(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 0, 37800))) if check_suit(char): # 原套装效果 - char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 1, 27560))) - char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 2, 34320))) - char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 3, 29380))) + char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 1, 27560))) + char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 2, 34320))) + char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 3, 29380))) char.SetStatus(SpeedM=0.15) - char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(effectDamage, 4, 96590))) + char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 4, 96590))) # 誓约追加69300%伤害 - char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(effectDamage, 5, 346450) + effect_damage(effectDamage, 6, 69300))) + char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(oathEffectDamage, 0, 346450) + effect_damage(oathEffectDamage, 1, 69300))) # 誓约效果 char.SetStatus(SkillAttack=0.019) pass @register -def oath_skill_2020502(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2020502(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): # 原套装效果 char.SetStatus(SpeedM=0.15) # 誓约效果 - char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(effectDamage, 0, 315000))) - char.equ_effect.append(EquEffect(name='心之女王', icon='/equipment/skill/130.png', cd=120, data=effect_damage(effectDamage, 1, 1732500))) + char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 0, 315000))) + char.equ_effect.append(EquEffect(name='心之女王', icon='/equipment/skill/130.png', cd=120, data=effect_damage(suitEffectDamage, 1, 1732500))) pass @register -def oath_skill_2020503(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 0, 27560))) - char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 1, 34320))) - char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 2, 29380))) +def oath_skill_2020503(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='火灵安珀', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 0, 27560))) + char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='/equipment/skill/29.png', cd=3, data=effect_damage(suitEffectDamage, 1, 34320))) + char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 2, 29380))) char.SetStatus(SpeedM=0.15) - char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(effectDamage, 3, 96590))) + char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 3, 96590))) # 誓约 - char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 4, 25200))) - char.equ_effect.append(EquEffect(name='地灵盖亚', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 5, 37800))) - char.equ_effect.append(EquEffect(name='暗灵诺特纳', icon='/equipment/skill/29.png', cd=2, data=effect_damage(effectDamage, 6, 25200))) - char.equ_effect.append(EquEffect(name='光灵卢切', icon='/equipment/skill/29.png', cd=3, data=effect_damage(effectDamage, 7, 37800))) + char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(suitEffectDamage, 4, 25200))) + char.equ_effect.append(EquEffect(name='地灵盖亚', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 0, 37800))) + char.equ_effect.append(EquEffect(name='暗灵诺特纳', icon='/equipment/skill/29.png', cd=2, data=effect_damage(oathEffectDamage, 1, 25200))) + char.equ_effect.append(EquEffect(name='光灵卢切', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 2, 37800))) pass @@ -643,7 +643,7 @@ def oath_skill_2020503(char: CharacterProperty,effectDamage: list[float] = []): # region 理想之黄金乡 @register -def oath_skill_2030101(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2030101(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): reinforce, reinforce_0, reinforce_1, reinforce_2 = char.GetReinforceSum() char.SetStatus(SkillRange=0.02 * min(reinforce // 11, 12)) # char.SetStatus(DamageReduce=0.01 * min(reinforce_0 // 5, 7)) @@ -662,18 +662,18 @@ def oath_skill_2030101(char: CharacterProperty,effectDamage: list[float] = []): char.SetStatus(Buffer=1500 * min((reinforce - 110) // 11, 2)) if reinforce < 88: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 0, 17000))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 0, 17000))) elif reinforce < 110: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 1, 18700))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 1, 18700))) elif reinforce < 132: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 2, 21250))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 2, 21250))) else: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 3, 25500))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 3, 25500))) pass @register -def oath_skill_2030102(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2030102(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): reinforce, reinforce_0, reinforce_1, reinforce_2 = char.GetReinforceSum() char.SetStatus(SkillRange=0.02 * min(reinforce // 11, 12)) # char.SetStatus(DamageReduce=0.01 * min(reinforce_0 // 5, 7)) @@ -692,18 +692,18 @@ def oath_skill_2030102(char: CharacterProperty,effectDamage: list[float] = []): char.SetStatus(Buffer=1500 * min((reinforce - 110) // 11, 2)) if reinforce < 88: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 0, 17000))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 0, 17000))) elif reinforce < 110: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 1, 18700))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 1, 18700))) elif reinforce < 132: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 2, 21250))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 2, 21250))) else: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 3, 25500))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 3, 25500))) pass @register -def oath_skill_2030103(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2030103(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): reinforce, reinforce_0, reinforce_1, reinforce_2 = char.GetReinforceSum() char.SetStatus(SkillRange=0.02 * min(reinforce // 11, 12)) # char.SetStatus(DamageReduce=0.01 * min(reinforce_0 // 5, 7)) @@ -722,18 +722,18 @@ def oath_skill_2030103(char: CharacterProperty,effectDamage: list[float] = []): char.SetStatus(Buffer=1500 * min((reinforce - 110) // 11, 2)) if reinforce < 88: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 0, 17000))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 0, 17000))) elif reinforce < 110: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 1, 18700))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 1, 18700))) elif reinforce < 132: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 2, 21250))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 2, 21250))) else: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 3, 25500))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 3, 25500))) pass @register -def oath_skill_2030201(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2030201(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.07, SpeedM=0.07, SpeedR=0.07) reinforce, reinforce_0, reinforce_1, reinforce_2 = char.GetReinforceSum() char.SetStatus(SkillAttack=0.005 * min(reinforce // 11, 8)) @@ -757,14 +757,14 @@ def oath_skill_2030201(char: CharacterProperty,effectDamage: list[float] = []): char.SetStatus(Buffer=750 * min((reinforce - 110) // 11, 2)) if reinforce < 88: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 0, 17000))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 0, 17000))) elif reinforce < 110: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 1, 18700))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 1, 18700))) elif reinforce < 132: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 2, 21250))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 2, 21250))) else: # 132以上删除[淘金热] - # char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 3, 25500))) + # char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 3, 25500))) pass # 誓约效果 if reinforce >= 110: @@ -777,13 +777,13 @@ def oath_skill_2030201(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2030202(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2030202(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.132, SpeedA=0.16, SpeedM=0.16, SpeedR=0.16) pass @register -def oath_skill_2030203(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2030203(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): reinforce, reinforce_0, reinforce_1, reinforce_2 = char.GetReinforceSum() if reinforce >= 121: char.SetStatus(SkillAttack=0.1, SpeedA=0.2, SpeedM=0.2, SpeedR=0.2) @@ -791,7 +791,7 @@ def oath_skill_2030203(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2030301(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2030301(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.07, SpeedM=0.07, SpeedR=0.07) reinforce, reinforce_0, reinforce_1, reinforce_2 = char.GetReinforceSum() char.SetStatus(SkillAttack=0.005 * min(reinforce // 11, 10)) @@ -815,14 +815,14 @@ def oath_skill_2030301(char: CharacterProperty,effectDamage: list[float] = []): char.SetStatus(Buffer=750 * min((reinforce - 110) // 11, 2)) if reinforce < 88: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 0, 17000))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 0, 17000))) elif reinforce < 110: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 1, 18700))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 1, 18700))) elif reinforce < 132: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 2, 21250))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 2, 21250))) else: # 132以上删除[淘金热] - # char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 3, 25500))) + # char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 3, 25500))) pass # 誓约效果 if reinforce >= 110: @@ -835,23 +835,23 @@ def oath_skill_2030301(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2030302(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2030302(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.132, SpeedA=0.18, SpeedM=0.18, SpeedR=0.18) pass @register -def oath_skill_2030303(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2030303(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): reinforce, reinforce_0, reinforce_1, reinforce_2 = char.GetReinforceSum() if reinforce >= 121: char.SetStatus(SkillAttack=0.1, SpeedA=0.23, SpeedM=0.23, SpeedR=0.23) if reinforce >= 121: - char.equ_effect.append(EquEffect(name='黄金之王', icon='/equipment/skill/133.png', cd=240, data=effect_damage(effectDamage, 0, 1400000))) + char.equ_effect.append(EquEffect(name='黄金之王', icon='/equipment/skill/133.png', cd=240, data=effect_damage(suitEffectDamage, 0, 1400000))) pass @register -def oath_skill_2030401(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2030401(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.07, SpeedM=0.07, SpeedR=0.07) reinforce, reinforce_0, reinforce_1, reinforce_2 = char.GetReinforceSum() char.SetStatus(SkillAttack=0.005 * min(reinforce // 11, 11)) @@ -875,14 +875,14 @@ def oath_skill_2030401(char: CharacterProperty,effectDamage: list[float] = []): char.SetStatus(Buffer=750 * min((reinforce - 110) // 11, 2)) if reinforce < 88: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 0, 17000))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 0, 17000))) elif reinforce < 110: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 1, 18700))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 1, 18700))) elif reinforce < 132: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 2, 21250))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 2, 21250))) else: # 132以上删除[淘金热] - # char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 3, 25500))) + # char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 3, 25500))) pass # 誓约效果 if reinforce >= 110: @@ -895,25 +895,25 @@ def oath_skill_2030401(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2030402(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2030402(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.132, SpeedA=0.20, SpeedM=0.20, SpeedR=0.20) pass @register -def oath_skill_2030403(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2030403(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): reinforce, reinforce_0, reinforce_1, reinforce_2 = char.GetReinforceSum() if reinforce >= 121: char.SetStatus(SkillAttack=0.1, SpeedA=0.25, SpeedM=0.25, SpeedR=0.25) if reinforce >= 132: - char.equ_effect.append(EquEffect(name='理想成真', icon='/equipment/skill/133.png', cd=240, data=effect_damage(effectDamage, 0, 1400000) + effect_damage(effectDamage, 1, 3000000))) + char.equ_effect.append(EquEffect(name='理想成真', icon='/equipment/skill/133.png', cd=240, data=effect_damage(suitEffectDamage, 0, 1400000) + effect_damage(suitEffectDamage, 1, 3000000))) elif reinforce >= 121: - char.equ_effect.append(EquEffect(name='黄金之王', icon='/equipment/skill/133.png', cd=240, data=effect_damage(effectDamage, 2, 1400000))) + char.equ_effect.append(EquEffect(name='黄金之王', icon='/equipment/skill/133.png', cd=240, data=effect_damage(suitEffectDamage, 2, 1400000))) pass @register -def oath_skill_2030501(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2030501(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.07, SpeedM=0.07, SpeedR=0.07) reinforce, reinforce_0, reinforce_1, reinforce_2 = char.GetReinforceSum() char.SetStatus(SkillAttack=0.005 * min(reinforce // 11, 12)) @@ -937,14 +937,14 @@ def oath_skill_2030501(char: CharacterProperty,effectDamage: list[float] = []): char.SetStatus(Buffer=750 * min((reinforce - 110) // 11, 2)) if reinforce < 88: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 0, 17000))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 0, 17000))) elif reinforce < 110: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 1, 18700))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 1, 18700))) elif reinforce < 132: - char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 2, 21250))) + char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 2, 21250))) else: # 132以上删除[淘金热] - # char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(effectDamage, 3, 25500))) + # char.equ_effect.append(EquEffect(name='淘银热', icon='/equipment/suit/0.png', cd=10, data=effect_damage(suitEffectDamage, 3, 25500))) pass # 誓约效果 if reinforce >= 110: @@ -956,20 +956,20 @@ def oath_skill_2030501(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2030502(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2030502(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.132, SpeedA=0.22, SpeedM=0.22, SpeedR=0.22) pass @register -def oath_skill_2030503(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2030503(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): reinforce, reinforce_0, reinforce_1, reinforce_2 = char.GetReinforceSum() if reinforce >= 121: char.SetStatus(SkillAttack=0.1, SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) if reinforce >= 132: - char.equ_effect.append(EquEffect(name='理想成真', icon='/equipment/skill/133.png', cd=240, data=effect_damage(effectDamage, 0, 2000000))) + char.equ_effect.append(EquEffect(name='理想成真', icon='/equipment/skill/133.png', cd=240, data=effect_damage(suitEffectDamage, 0, 2000000))) elif reinforce >= 121: - char.equ_effect.append(EquEffect(name='黄金之王', icon='/equipment/skill/133.png', cd=240, data=effect_damage(effectDamage, 1, 1400000))) + char.equ_effect.append(EquEffect(name='黄金之王', icon='/equipment/skill/133.png', cd=240, data=effect_damage(suitEffectDamage, 1, 1400000))) pass @@ -979,60 +979,60 @@ def oath_skill_2030503(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2040101(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2040101(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if char.equ_options.get('1', 0) == 1: char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 0, 18250))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250))) elif char.equ_options.get('1', 0) == 0: char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.03) - char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(effectDamage, 1, 13900))) - char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(effectDamage, 2, 12950))) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 0, 18250))) + char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 1, 13900))) + char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 2, 12950))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250))) pass @register -def oath_skill_2040102(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2040102(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if char.equ_options.get('1', 0) == 1: char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 0, 18250))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250))) elif char.equ_options.get('1', 0) == 0: char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.03) - char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(effectDamage, 1, 13900))) - char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(effectDamage, 2, 12950))) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 0, 18250))) + char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 1, 13900))) + char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 2, 12950))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250))) pass @register -def oath_skill_2040103(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2040103(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if char.equ_options.get('1', 0) == 1: char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 0, 18250))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250))) elif char.equ_options.get('1', 0) == 0: char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.03) - char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(effectDamage, 1, 13900))) - char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(effectDamage, 2, 12950))) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 0, 18250))) + char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 1, 13900))) + char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 2, 12950))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250))) pass @register -def oath_skill_2040201(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2040201(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) if check_suit(char): if char.equ_options.get('1', 0) == 1: char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 0, 18250))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250))) elif char.equ_options.get('1', 0) == 0: char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.03) - char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(effectDamage, 1, 13900))) - char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(effectDamage, 2, 12950))) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 0, 18250))) + char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 1, 13900))) + char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 2, 12950))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250))) # 誓约追加效果 char.SetStatus(SkillAttack=0.025) # 技能范围 + 20% @@ -1040,13 +1040,13 @@ def oath_skill_2040201(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2040202(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2040202(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.03) - char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(effectDamage, 0, 13900))) - char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(effectDamage, 1, 12950))) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 2, 18250))) - char.equ_effect.append(EquEffect(name='龙王降世', icon='/equipment/suit/125.png', cd=60, data=effect_damage(effectDamage, 3, 510300))) + char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 0, 13900))) + char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 1, 12950))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 2, 18250))) + char.equ_effect.append(EquEffect(name='龙王降世', icon='/equipment/suit/125.png', cd=60, data=effect_damage(oathEffectDamage, 0, 510300))) for skill in char.skills: if skill.cube > 0: skill.skillDamage *= 1.07 @@ -1054,25 +1054,25 @@ def oath_skill_2040202(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2040203(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2040203(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.015 * 10) pass @register -def oath_skill_2040301(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2040301(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) if check_suit(char): if char.equ_options.get('1', 0) == 1: char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 0, 18250))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250))) elif char.equ_options.get('1', 0) == 0: char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.03) - char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(effectDamage, 1, 13900))) - char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(effectDamage, 2, 12950))) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 0, 18250))) + char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 1, 13900))) + char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 2, 12950))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250))) # 誓约追加效果 char.SetStatus(SkillAttack=0.025) # 技能范围 + 20% @@ -1080,13 +1080,13 @@ def oath_skill_2040301(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2040302(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2040302(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.03) - char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(effectDamage, 0, 13900))) - char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(effectDamage, 1, 12950))) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 2, 18250))) - char.equ_effect.append(EquEffect(name='龙王降世', icon='/equipment/suit/125.png', cd=60, data=effect_damage(effectDamage, 3, 510300))) + char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 0, 13900))) + char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 1, 12950))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 2, 18250))) + char.equ_effect.append(EquEffect(name='龙王降世', icon='/equipment/suit/125.png', cd=60, data=effect_damage(oathEffectDamage, 0, 510300))) for skill in char.skills: if skill.cube > 0: skill.skillDamage *= 1.1 @@ -1094,25 +1094,25 @@ def oath_skill_2040302(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2040303(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2040303(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.025 * 7) pass @register -def oath_skill_2040401(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2040401(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) if check_suit(char): if char.equ_options.get('1', 0) == 1: char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 0, 18250))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250))) elif char.equ_options.get('1', 0) == 0: char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.03) - char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(effectDamage, 1, 13900))) - char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(effectDamage, 2, 12950))) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 0, 18250))) + char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 1, 13900))) + char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 2, 12950))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250))) # 誓约追加效果 char.SetStatus(SkillAttack=0.025) # 技能范围 + 20% @@ -1120,38 +1120,38 @@ def oath_skill_2040401(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2040402(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2040402(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.03) - char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(effectDamage, 0, 13900))) - char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(effectDamage, 1, 12950))) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 2, 18250))) + char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 0, 13900))) + char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 1, 12950))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 2, 18250))) char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.1) - char.equ_effect.append(EquEffect(name='龙王降世', icon='/equipment/suit/125.png', cd=60, data=effect_damage(effectDamage, 3, 680400))) + char.equ_effect.append(EquEffect(name='龙王降世', icon='/equipment/suit/125.png', cd=60, data=effect_damage(oathEffectDamage, 0, 680400))) pass @register -def oath_skill_2040403(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2040403(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.035 * 7) pass @register -def oath_skill_2040501(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2040501(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.2, SpeedM=0.2, SpeedR=0.2) if check_suit(char): if char.equ_options.get('1', 0) == 1: char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 0, 18250))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250))) elif char.equ_options.get('1', 0) == 0: char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.03) - char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(effectDamage, 1, 13900))) - char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(effectDamage, 2, 12950))) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 0, 18250))) + char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 1, 13900))) + char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 2, 12950))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 0, 18250))) # 誓约追加效果 char.SetStatus(SkillAttack=0.025) # 技能范围 + 20% @@ -1159,20 +1159,20 @@ def oath_skill_2040501(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2040502(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2040502(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.03) - char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(effectDamage, 0, 13900))) - char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(effectDamage, 1, 12950))) - char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(effectDamage, 2, 18250))) + char.equ_effect.append(EquEffect(name='白龙强袭', icon='/equipment/suit/1.png', cd=3, data=effect_damage(suitEffectDamage, 0, 13900))) + char.equ_effect.append(EquEffect(name='黑龙横扫', icon='/equipment/suit/1.png', cd=4, data=effect_damage(suitEffectDamage, 1, 12950))) + char.equ_effect.append(EquEffect(name='应龙腾霄', icon='/equipment/suit/1.png', cd=10, data=effect_damage(suitEffectDamage, 2, 18250))) char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.1) - char.equ_effect.append(EquEffect(name='应龙降世', icon='/equipment/suit/125.png', cd=60, data=effect_damage(effectDamage, 3, 1020600))) + char.equ_effect.append(EquEffect(name='应龙降世', icon='/equipment/suit/125.png', cd=60, data=effect_damage(oathEffectDamage, 0, 1020600))) pass @register -def oath_skill_2040503(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2040503(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) char.SetStatus(SkillAttack=0.06 * 5) pass @@ -1184,7 +1184,7 @@ def oath_skill_2040503(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2050101(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2050101(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if char.equ_options.get('2', 0) == 0: char.SetStatus(SkillAttack=0.175) char.SetSkillCD(cd=0.3) @@ -1196,7 +1196,7 @@ def oath_skill_2050101(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2050102(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2050102(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if char.equ_options.get('2', 0) == 0: char.SetStatus(SkillAttack=0.175) char.SetSkillCD(cd=0.3) @@ -1208,7 +1208,7 @@ def oath_skill_2050102(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2050103(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2050103(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if char.equ_options.get('2', 0) == 0: char.SetStatus(SkillAttack=0.175) char.SetSkillCD(cd=0.3) @@ -1220,7 +1220,7 @@ def oath_skill_2050103(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2050201(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2050201(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetSkillCD(cd=0.1) char.SetStatus(EquEffectRatio=0.05) # 特效？ @@ -1236,21 +1236,21 @@ def oath_skill_2050201(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2050202(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2050202(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetSkillCD(cd=0.7) char.SetStatus(EquEffectRatio=0.195) pass @register -def oath_skill_2050203(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2050203(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetSkillCD(cd=-0.1) char.SetStatus(EquEffectRatio=-0.15, SkillAttack=0.42) pass @register -def oath_skill_2050301(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2050301(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetSkillCD(cd=0.1) char.SetStatus(EquEffectRatio=0.05) # 特效？ @@ -1266,21 +1266,21 @@ def oath_skill_2050301(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2050302(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2050302(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetSkillCD(cd=0.7) char.SetStatus(EquEffectRatio=0.195) pass @register -def oath_skill_2050303(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2050303(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetSkillCD(cd=-0.1) char.SetStatus(EquEffectRatio=-0.15, SkillAttack=0.42) pass @register -def oath_skill_2050401(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2050401(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetSkillCD(cd=0.1) char.SetStatus(EquEffectRatio=0.05) # 特效？ @@ -1296,21 +1296,21 @@ def oath_skill_2050401(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2050402(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2050402(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetSkillCD(cd=0.7) char.SetStatus(EquEffectRatio=0.195) pass @register -def oath_skill_2050403(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2050403(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetSkillCD(cd=-0.1) char.SetStatus(EquEffectRatio=-0.15, SkillAttack=0.42) pass @register -def oath_skill_2050501(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2050501(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetSkillCD(cd=0.1) char.SetStatus(EquEffectRatio=0.05) # 特效？ @@ -1326,14 +1326,14 @@ def oath_skill_2050501(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2050502(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2050502(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetSkillCD(cd=0.7) char.SetStatus(EquEffectRatio=0.195) pass @register -def oath_skill_2050503(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2050503(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetSkillCD(cd=-0.1) char.SetStatus(EquEffectRatio=-0.15, SkillAttack=0.42) pass @@ -1345,7 +1345,7 @@ def oath_skill_2050503(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2060101(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2060101(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.03) char.AddElementDB('火', 33, 1) char.AddElementDB('冰', 33, 1) @@ -1356,7 +1356,7 @@ def oath_skill_2060101(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2060102(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2060102(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.03) char.AddElementDB('火', 33, 1) char.AddElementDB('冰', 33, 1) @@ -1367,7 +1367,7 @@ def oath_skill_2060102(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2060103(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2060103(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.03) char.AddElementDB('火', 33, 1) char.AddElementDB('冰', 33, 1) @@ -1378,7 +1378,7 @@ def oath_skill_2060103(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2060201(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2060201(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(EquEffectRatio=0.01) if check_suit(char): # 原套装效果 @@ -1390,7 +1390,7 @@ def oath_skill_2060201(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2060202(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2060202(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(EquEffectRatio=0.075) char.SetStatus(SkillAttack=0.03) char.AddElementDB('火', 33, 1) @@ -1402,7 +1402,7 @@ def oath_skill_2060202(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2060203(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2060203(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(EquEffectRatio=0.075) char.SetStatus(SkillAttack=0.03) char.SetStatus(EquEffectRatio=0.19) @@ -1411,7 +1411,7 @@ def oath_skill_2060203(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2060301(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2060301(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.AddElementDB('火', 33, 1) char.AddElementDB('冰', 33, 1) char.AddElementDB('光', 33, 1) @@ -1427,7 +1427,7 @@ def oath_skill_2060301(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2060302(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2060302(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(EquEffectRatio=0.12) char.SetStatus(SkillAttack=0.03) char.AddElementDB('火', 33, 1) @@ -1439,7 +1439,7 @@ def oath_skill_2060302(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2060303(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2060303(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(EquEffectRatio=0.12) char.SetStatus(SkillAttack=0.03) char.SetStatus(EquEffectRatio=0.19) @@ -1448,7 +1448,7 @@ def oath_skill_2060303(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2060401(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2060401(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.AddElementDB('火', 33, 1) char.AddElementDB('冰', 33, 1) char.AddElementDB('光', 33, 1) @@ -1464,7 +1464,7 @@ def oath_skill_2060401(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2060402(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2060402(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(EquEffectRatio=0.17) char.SetStatus(SkillAttack=0.03) char.AddElementDB('火', 33, 1) @@ -1476,7 +1476,7 @@ def oath_skill_2060402(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2060403(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2060403(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(EquEffectRatio=0.17) char.SetStatus(SkillAttack=0.03) char.SetStatus(EquEffectRatio=0.19) @@ -1485,7 +1485,7 @@ def oath_skill_2060403(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2060501(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2060501(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.AddElementDB('火', 33, 1) char.AddElementDB('冰', 33, 1) char.AddElementDB('光', 33, 1) @@ -1501,7 +1501,7 @@ def oath_skill_2060501(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2060502(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2060502(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.03) char.SetStatus(EquEffectRatio=0.205) char.AddElementDB('火', 33, 1) @@ -1513,7 +1513,7 @@ def oath_skill_2060502(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2060503(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2060503(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(EquEffectRatio=0.205) char.SetStatus(SkillAttack=0.03) char.SetStatus(EquEffectRatio=0.19) @@ -1527,7 +1527,7 @@ def oath_skill_2060503(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2070101(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2070101(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if not char.buffer: char.SetSkillCD(50, 50, 0.7, []) char.SetSkillCD(85, 85, 0.6, []) @@ -1540,12 +1540,12 @@ def oath_skill_2070101(char: CharacterProperty,effectDamage: list[float] = []): for item in char.skills: if item.learnLv == 100: cd = item.getSkillCD() - char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(effectDamage, 0, 607200))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 607200))) pass @register -def oath_skill_2070102(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2070102(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if not char.buffer: char.SetSkillCD(50, 50, 0.7, []) char.SetSkillCD(85, 85, 0.6, []) @@ -1558,12 +1558,12 @@ def oath_skill_2070102(char: CharacterProperty,effectDamage: list[float] = []): for item in char.skills: if item.learnLv == 100: cd = item.getSkillCD() - char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(effectDamage, 0, 607200))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 607200))) pass @register -def oath_skill_2070103(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2070103(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if not char.buffer: char.SetSkillCD(50, 50, 0.7, []) char.SetSkillCD(85, 85, 0.6, []) @@ -1576,12 +1576,12 @@ def oath_skill_2070103(char: CharacterProperty,effectDamage: list[float] = []): for item in char.skills: if item.learnLv == 100: cd = item.getSkillCD() - char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(effectDamage, 0, 607200))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 607200))) pass @register -def oath_skill_2070201(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2070201(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetSkillRation(100, 100, 0.1) char.SetSkillRation(85, 85, 0.1) char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) @@ -1600,14 +1600,14 @@ def oath_skill_2070201(char: CharacterProperty,effectDamage: list[float] = []): for item in char.skills: if item.learnLv == 100: cd = item.getSkillCD() - char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(effectDamage, 0, 532630))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 532630))) # 誓约追加 char.SetStatus(SkillAttack=0.05, EquEffectRatio=0.065) pass @register -def oath_skill_2070202(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2070202(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if not char.buffer: char.SetSkillCD(50, 50, 0.7, []) char.SetSkillCD(85, 85, 0.6, []) @@ -1622,12 +1622,12 @@ def oath_skill_2070202(char: CharacterProperty,effectDamage: list[float] = []): if item.learnLv == 100: cd = item.getSkillCD() item.skillDamage *= 1.4 - char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(effectDamage, 0, 438410) * 1.4)) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 438410) * 1.4)) pass @register -def oath_skill_2070203(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2070203(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if not char.buffer: char.SetSkillCD(50, 50, 0.7, []) char.SetSkillCD(85, 85, 0.6, []) @@ -1639,12 +1639,12 @@ def oath_skill_2070203(char: CharacterProperty,effectDamage: list[float] = []): for item in char.skills: if item.learnLv == 85: cd = item.getSkillCD() - char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(effectDamage, 0, 242880))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 242880))) pass @register -def oath_skill_2070301(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2070301(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetSkillRation(100, 100, 0.1) char.SetSkillRation(85, 85, 0.1) char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) @@ -1663,14 +1663,14 @@ def oath_skill_2070301(char: CharacterProperty,effectDamage: list[float] = []): for item in char.skills: if item.learnLv == 100: cd = item.getSkillCD() - char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(effectDamage, 0, 532630))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 532630))) # 誓约追加 char.SetStatus(SkillAttack=0.05, EquEffectRatio=0.065) pass @register -def oath_skill_2070302(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2070302(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if not char.buffer: char.SetSkillCD(50, 50, 0.7, []) char.SetSkillCD(85, 85, 0.6, []) @@ -1685,12 +1685,12 @@ def oath_skill_2070302(char: CharacterProperty,effectDamage: list[float] = []): if item.learnLv == 100: cd = item.getSkillCD() item.skillDamage *= 1.55 - char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(effectDamage, 0, 438410) * 1.55)) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 438410) * 1.55)) pass @register -def oath_skill_2070303(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2070303(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if not char.buffer: char.SetSkillCD(50, 50, 0.7, []) char.SetSkillCD(85, 85, 0.7, []) @@ -1702,12 +1702,12 @@ def oath_skill_2070303(char: CharacterProperty,effectDamage: list[float] = []): for item in char.skills: if item.learnLv == 85: cd = item.getSkillCD() - char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(effectDamage, 0, 242880))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 242880))) pass @register -def oath_skill_2070401(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2070401(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if not char.buffer: char.SetSkillCD(50, 50, 0.1, []) char.SetSkillCD(85, 85, 0.2, []) @@ -1729,14 +1729,14 @@ def oath_skill_2070401(char: CharacterProperty,effectDamage: list[float] = []): for item in char.skills: if item.learnLv == 100: cd = item.getSkillCD() - char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(effectDamage, 0, 532630))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 532630))) # 誓约追加 char.SetStatus(SkillAttack=0.05, EquEffectRatio=0.065) pass @register -def oath_skill_2070402(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2070402(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if not char.buffer: char.SetSkillCD(50, 50, 0.7, []) char.SetSkillCD(85, 85, 0.6, []) @@ -1751,12 +1751,12 @@ def oath_skill_2070402(char: CharacterProperty,effectDamage: list[float] = []): if item.learnLv == 100: cd = item.getSkillCD() item.skillDamage *= 2 - char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(effectDamage, 0, 438410) * 2)) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 438410) * 2)) pass @register -def oath_skill_2070403(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2070403(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if not char.buffer: char.SetSkillCD(50, 50, 0.7, []) char.SetSkillCD(85, 85, 0.7, []) @@ -1770,12 +1770,12 @@ def oath_skill_2070403(char: CharacterProperty,effectDamage: list[float] = []): for item in char.skills: if item.learnLv == 85: cd = item.getSkillCD() - char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(effectDamage, 0, 242880))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 242880))) pass @register -def oath_skill_2070501(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2070501(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if not char.buffer: char.SetSkillCD(50, 50, 0.1, []) char.SetSkillCD(85, 85, 0.2, []) @@ -1798,14 +1798,14 @@ def oath_skill_2070501(char: CharacterProperty,effectDamage: list[float] = []): for item in char.skills: if item.learnLv == 100: cd = item.getSkillCD() - char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(effectDamage, 0, 532630))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 532630))) # 誓约追加 char.SetStatus(SkillAttack=0.05, EquEffectRatio=0.065) pass @register -def oath_skill_2070502(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2070502(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if not char.buffer: char.SetSkillCD(50, 50, 0.7, []) char.SetSkillCD(85, 85, 0.6, []) @@ -1820,12 +1820,12 @@ def oath_skill_2070502(char: CharacterProperty,effectDamage: list[float] = []): if item.learnLv == 100: cd = item.getSkillCD() item.skillDamage *= 2 * 1.2 - char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(effectDamage, 0, 438410) * 1.2 * 2)) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 438410) * 1.2 * 2)) pass @register -def oath_skill_2070503(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2070503(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if not char.buffer: char.SetSkillCD(50, 50, 0.7, []) char.SetSkillCD(85, 85, 0.7, []) @@ -1845,7 +1845,7 @@ def oath_skill_2070503(char: CharacterProperty,effectDamage: list[float] = []): if item.learnLv == 100: cd = item.getSkillCD() # item.skillDamage *= 2 - char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(effectDamage, 0, 242880))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(suitEffectDamage, 0, 242880))) pass @@ -1855,36 +1855,36 @@ def oath_skill_2070503(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2080101(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(effectDamage, 0, 305500))) - char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(effectDamage, 1, 98350))) +def oath_skill_2080101(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 0, 305500))) + char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 1, 98350))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) pass @register -def oath_skill_2080102(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(effectDamage, 0, 305500))) - char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(effectDamage, 1, 98350))) +def oath_skill_2080102(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 0, 305500))) + char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 1, 98350))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) pass @register -def oath_skill_2080103(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(effectDamage, 0, 305500))) - char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(effectDamage, 1, 98350))) +def oath_skill_2080103(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 0, 305500))) + char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 1, 98350))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) pass @register -def oath_skill_2080201(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(effectDamage, 0, 17010))) +def oath_skill_2080201(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(suitEffectDamage, 0, 17010))) if check_suit(char): # 原套装效果 - char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(effectDamage, 1, 305500))) - char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(effectDamage, 2, 98350))) + char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 1, 305500))) + char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(oathEffectDamage, 0, 98350))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) # 誓约追加 char.SetStatus(SkillAttack=0.035) @@ -1892,26 +1892,26 @@ def oath_skill_2080201(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2080202(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(effectDamage, 0, 305500))) +def oath_skill_2080202(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 0, 305500))) pass @register -def oath_skill_2080203(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(effectDamage, 0, 170100))) - char.equ_effect.append(EquEffect(name='地壳裂痕', icon='/equipment/suit/6.png', cd=30, data=effect_damage(effectDamage, 1, 132300))) +def oath_skill_2080203(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(suitEffectDamage, 0, 170100))) + char.equ_effect.append(EquEffect(name='地壳裂痕', icon='/equipment/suit/6.png', cd=30, data=effect_damage(suitEffectDamage, 1, 132300))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) pass @register -def oath_skill_2080301(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(effectDamage, 0, 22680))) +def oath_skill_2080301(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(suitEffectDamage, 0, 22680))) if check_suit(char): # 原套装效果 - char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(effectDamage, 1, 305500))) - char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(effectDamage, 2, 98350))) + char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 1, 305500))) + char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(oathEffectDamage, 0, 98350))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) # 誓约追加 char.SetStatus(SkillAttack=0.035) @@ -1919,26 +1919,26 @@ def oath_skill_2080301(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2080302(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(effectDamage, 0, 305500))) +def oath_skill_2080302(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 0, 305500))) pass @register -def oath_skill_2080303(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(effectDamage, 0, 255150))) - char.equ_effect.append(EquEffect(name='地壳爆裂', icon='/equipment/suit/6.png', cd=30, data=effect_damage(effectDamage, 1, 198450))) +def oath_skill_2080303(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(suitEffectDamage, 0, 255150))) + char.equ_effect.append(EquEffect(name='地壳爆裂', icon='/equipment/suit/6.png', cd=30, data=effect_damage(suitEffectDamage, 1, 198450))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) pass @register -def oath_skill_2080401(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(effectDamage, 0, 28350))) +def oath_skill_2080401(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(suitEffectDamage, 0, 28350))) if check_suit(char): # 原套装效果 - char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(effectDamage, 1, 305500))) - char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(effectDamage, 2, 98350))) + char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 1, 305500))) + char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(oathEffectDamage, 0, 98350))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) # 誓约追加 char.SetStatus(SkillAttack=0.035) @@ -1946,26 +1946,26 @@ def oath_skill_2080401(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2080402(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(effectDamage, 0, 305500))) +def oath_skill_2080402(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 0, 305500))) pass @register -def oath_skill_2080403(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(effectDamage, 0, 340200))) - char.equ_effect.append(EquEffect(name='大地震', icon='/equipment/suit/6.png', cd=30, data=effect_damage(effectDamage, 1, 264600))) +def oath_skill_2080403(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(suitEffectDamage, 0, 340200))) + char.equ_effect.append(EquEffect(name='大地震', icon='/equipment/suit/6.png', cd=30, data=effect_damage(suitEffectDamage, 1, 264600))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) pass @register -def oath_skill_2080501(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(effectDamage, 0, 34020))) +def oath_skill_2080501(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(suitEffectDamage, 0, 34020))) if check_suit(char): # 原套装效果 - char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(effectDamage, 1, 305500))) - char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(effectDamage, 2, 98350))) + char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 1, 305500))) + char.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(oathEffectDamage, 0, 98350))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) # 誓约追加 char.SetStatus(SkillAttack=0.035) @@ -1973,17 +1973,17 @@ def oath_skill_2080501(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2080502(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2080502(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): # 原套装效果 - char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(effectDamage, 0, 305500))) + char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 0, 305500))) char.SetStatus(SpeedM=0.1 + 0.1, SpeedA=0.1 + 0.1, SpeedR=0.1 + 0.1) pass @register -def oath_skill_2080503(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='巨型陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(effectDamage, 0, 425250))) - char.equ_effect.append(EquEffect(name='熔岩爆炸', icon='/equipment/suit/6.png', cd=30, data=effect_damage(effectDamage, 1, 330750))) +def oath_skill_2080503(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='巨型陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(suitEffectDamage, 0, 425250))) + char.equ_effect.append(EquEffect(name='熔岩爆炸', icon='/equipment/suit/6.png', cd=30, data=effect_damage(suitEffectDamage, 1, 330750))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) pass @@ -1994,167 +1994,167 @@ def oath_skill_2080503(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2090101(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(effectDamage, 0, 12900))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(effectDamage, 1, 24050))) - char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(effectDamage, 2, 416700))) - char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(effectDamage, 3, 295370))) +def oath_skill_2090101(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050))) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(suitEffectDamage, 2, 416700))) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(suitEffectDamage, 3, 295370))) pass @register -def oath_skill_2090102(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(effectDamage, 0, 12900))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(effectDamage, 1, 24050))) - char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(effectDamage, 2, 416700))) - char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(effectDamage, 3, 295370))) +def oath_skill_2090102(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050))) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(suitEffectDamage, 2, 416700))) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(suitEffectDamage, 3, 295370))) pass @register -def oath_skill_2090103(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(effectDamage, 0, 12900))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(effectDamage, 1, 24050))) - char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(effectDamage, 2, 416700))) - char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(effectDamage, 3, 295370))) +def oath_skill_2090103(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050))) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(suitEffectDamage, 2, 416700))) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(suitEffectDamage, 3, 295370))) pass @register -def oath_skill_2090201(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2090201(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if check_suit(char): # 原套装效果 - char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(effectDamage, 0, 12900))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(effectDamage, 1, 24050))) - char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(effectDamage, 2, 416700))) - char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(effectDamage, 3, 295370))) + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050))) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(suitEffectDamage, 2, 416700))) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(suitEffectDamage, 3, 295370))) # 誓约追加 char.SetStatus(SkillAttack=0.03) pass @register -def oath_skill_2090202(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(effectDamage, 0, 12900))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(effectDamage, 1, 24050))) +def oath_skill_2090202(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050))) char.SetStatus(SpeedA=0.10, SpeedM=0.10, SpeedR=0.10) - char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=120, data=effect_damage(effectDamage, 2, 416700) + effect_damage(effectDamage, 3, 150300))) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=120, data=effect_damage(suitEffectDamage, 2, 416700) + effect_damage(suitEffectDamage, 3, 150300))) pass @register -def oath_skill_2090203(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2090203(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): # 原套装效果 - char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(effectDamage, 0, 12900))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(effectDamage, 1, 24050))) + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050))) # 誓约追加 - char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=effect_damage(effectDamage, 2, 25200))) + char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=effect_damage(suitEffectDamage, 2, 25200))) pass @register -def oath_skill_2090301(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(effectDamage, 0, 183330))) +def oath_skill_2090301(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(suitEffectDamage, 0, 183330))) if check_suit(char): # 原套装效果 - char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(effectDamage, 1, 12900))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(effectDamage, 2, 24050))) - char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(effectDamage, 3, 416700))) - char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(effectDamage, 4, 295370))) + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 1, 12900))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 2, 24050))) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(suitEffectDamage, 3, 416700))) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(oathEffectDamage, 0, 295370))) # 誓约追加 char.SetStatus(SkillAttack=0.03) pass @register -def oath_skill_2090302(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(effectDamage, 0, 12900))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(effectDamage, 1, 24050))) +def oath_skill_2090302(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050))) char.SetStatus(SpeedA=0.10, SpeedM=0.10, SpeedR=0.10) - char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=120, data=effect_damage(effectDamage, 2, 416700) + effect_damage(effectDamage, 3, 292050))) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=120, data=effect_damage(suitEffectDamage, 2, 416700) + effect_damage(suitEffectDamage, 3, 292050))) pass @register -def oath_skill_2090303(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2090303(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): # 原套装效果 - char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(effectDamage, 0, 12900))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(effectDamage, 1, 24050))) + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050))) # 誓约追加 - char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=effect_damage(effectDamage, 2, 25200))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=effect_damage(effectDamage, 3, 94500))) + char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=effect_damage(suitEffectDamage, 2, 25200))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=effect_damage(suitEffectDamage, 3, 94500))) pass @register -def oath_skill_2090401(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(effectDamage, 0, 183330))) +def oath_skill_2090401(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(suitEffectDamage, 0, 183330))) if check_suit(char): # 原套装效果 - char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(effectDamage, 1, 12900))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(effectDamage, 2, 24050))) - char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(effectDamage, 3, 416700))) - char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(effectDamage, 4, 295370))) + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 1, 12900))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 2, 24050))) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(suitEffectDamage, 3, 416700))) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(oathEffectDamage, 0, 295370))) # 誓约追加 char.SetStatus(SkillAttack=0.03) pass @register -def oath_skill_2090402(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(effectDamage, 0, 12900))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(effectDamage, 1, 24050))) +def oath_skill_2090402(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050))) char.SetStatus(SpeedA=0.2, SpeedM=0.2, SpeedR=0.2) - char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=120, data=effect_damage(effectDamage, 2, 416700) + effect_damage(effectDamage, 3, 433800))) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=120, data=effect_damage(suitEffectDamage, 2, 416700) + effect_damage(suitEffectDamage, 3, 433800))) pass @register -def oath_skill_2090403(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2090403(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): # 原套装效果 - char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(effectDamage, 0, 12900))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(effectDamage, 1, 24050))) + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050))) # 誓约追加 - char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=effect_damage(effectDamage, 2, 25200))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=effect_damage(effectDamage, 3, 94500))) - char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=10, data=effect_damage(effectDamage, 4, 315000))) + char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=effect_damage(suitEffectDamage, 2, 25200))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=effect_damage(suitEffectDamage, 3, 94500))) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=10, data=effect_damage(oathEffectDamage, 0, 315000))) pass @register -def oath_skill_2090501(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='真：天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(effectDamage, 0, 281100))) +def oath_skill_2090501(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='真：天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(suitEffectDamage, 0, 281100))) if check_suit(char): # 原套装效果 - char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(effectDamage, 1, 12900))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(effectDamage, 2, 24050))) - char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(effectDamage, 3, 416700))) - char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(effectDamage, 4, 295370))) + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 1, 12900))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 2, 24050))) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=effect_damage(suitEffectDamage, 3, 416700))) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(oathEffectDamage, 0, 295370))) # 誓约追加 char.SetStatus(SkillAttack=0.03) pass @register -def oath_skill_2090502(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(effectDamage, 0, 12900))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(effectDamage, 1, 24050))) +def oath_skill_2090502(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050))) char.SetStatus(SpeedA=0.2, SpeedM=0.2, SpeedR=0.2) - char.equ_effect.append(EquEffect(name='末日黄昏', icon='/equipment/skill/117.png', cd=140, data=effect_damage(effectDamage, 2, 992250))) + char.equ_effect.append(EquEffect(name='末日黄昏', icon='/equipment/skill/117.png', cd=140, data=effect_damage(suitEffectDamage, 2, 992250))) pass @register -def oath_skill_2090503(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(effectDamage, 0, 12900))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(effectDamage, 1, 24050))) - char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=effect_damage(effectDamage, 2, 25200))) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=effect_damage(effectDamage, 3, 94500))) - char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=10, data=effect_damage(effectDamage, 4, 315000))) +def oath_skill_2090503(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=effect_damage(suitEffectDamage, 0, 12900))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=effect_damage(suitEffectDamage, 1, 24050))) + char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=effect_damage(suitEffectDamage, 2, 25200))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=effect_damage(suitEffectDamage, 3, 94500))) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=10, data=effect_damage(oathEffectDamage, 0, 315000))) - char.equ_effect.append(EquEffect(name='一击[超越]', icon='/equipment/suit/7.png', cd=1, data=effect_damage(effectDamage, 5, 25200) + effect_damage(effectDamage, 6, 11340))) - char.equ_effect.append(EquEffect(name='审判[超越]', icon='/equipment/suit/7.png', cd=5, data=effect_damage(effectDamage, 7, 94500) + effect_damage(effectDamage, 8, 42525))) - char.equ_effect.append(EquEffect(name='天罚[超越]', icon='/equipment/suit/7.png', cd=10, data=effect_damage(effectDamage, 9, 315000) + effect_damage(effectDamage, 10, 141750))) + char.equ_effect.append(EquEffect(name='一击[超越]', icon='/equipment/suit/7.png', cd=1, data=effect_damage(oathEffectDamage, 1, 25200) + effect_damage(oathEffectDamage, 2, 11340))) + char.equ_effect.append(EquEffect(name='审判[超越]', icon='/equipment/suit/7.png', cd=5, data=effect_damage(oathEffectDamage, 3, 94500) + effect_damage(oathEffectDamage, 4, 42525))) + char.equ_effect.append(EquEffect(name='天罚[超越]', icon='/equipment/suit/7.png', cd=10, data=effect_damage(oathEffectDamage, 5, 315000) + effect_damage(oathEffectDamage, 6, 141750))) pass @@ -2164,121 +2164,121 @@ def oath_skill_2090503(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2100101(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2100101(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.4) pass @register -def oath_skill_2100102(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2100102(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.4) pass @register -def oath_skill_2100103(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2100103(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.4) pass @register -def oath_skill_2100201(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2100201(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if check_suit(char): # 原套装效果 char.SetStatus(SkillAttack=0.4 + 0.1) # 誓约追加 char.SetStatus(SkillAttack=0.047) - char.equ_effect.append(EquEffect(name='狐狸', icon='/equipment/suit/8.png', cd=2, data=effect_damage(effectDamage, 0, 100))) + char.equ_effect.append(EquEffect(name='狐狸', icon='/equipment/suit/8.png', cd=2, data=effect_damage(oathEffectDamage, 0, 100))) else: char.SetStatus(SkillAttack=0.1) pass @register -def oath_skill_2100202(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='幻影攻击', icon='/equipment/suit/8.png', cd=1, data=effect_damage(effectDamage, 0, 9188))) - char.equ_effect.append(EquEffect(name='狐仙乱舞', icon='/equipment/suit/8.png', cd=6, data=effect_damage(effectDamage, 1, 55125))) +def oath_skill_2100202(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='幻影攻击', icon='/equipment/suit/8.png', cd=1, data=effect_damage(oathEffectDamage, 0, 9188))) + char.equ_effect.append(EquEffect(name='狐仙乱舞', icon='/equipment/suit/8.png', cd=6, data=effect_damage(oathEffectDamage, 1, 55125))) pass @register -def oath_skill_2100203(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2100203(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): pass @register -def oath_skill_2100301(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2100301(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if check_suit(char): # 原套装效果 char.SetStatus(SkillAttack=0.4+0.2) # 誓约追加 char.SetStatus(SkillAttack=0.081) - char.equ_effect.append(EquEffect(name='狐狸', icon='/equipment/suit/8.png', cd=2, data=effect_damage(effectDamage, 0, 100))) + char.equ_effect.append(EquEffect(name='狐狸', icon='/equipment/suit/8.png', cd=2, data=effect_damage(oathEffectDamage, 0, 100))) else: char.SetStatus(SkillAttack=0.2) pass @register -def oath_skill_2100302(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='幻影攻击', icon='/equipment/suit/8.png', cd=1, data=effect_damage(effectDamage, 0, 11025))) - char.equ_effect.append(EquEffect(name='狐仙乱舞', icon='/equipment/suit/8.png', cd=6, data=effect_damage(effectDamage, 1, 66150))) +def oath_skill_2100302(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='幻影攻击', icon='/equipment/suit/8.png', cd=1, data=effect_damage(oathEffectDamage, 0, 11025))) + char.equ_effect.append(EquEffect(name='狐仙乱舞', icon='/equipment/suit/8.png', cd=6, data=effect_damage(oathEffectDamage, 1, 66150))) pass @register -def oath_skill_2100303(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2100303(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): pass @register -def oath_skill_2100401(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2100401(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if check_suit(char): # 原套装效果 char.SetStatus(SkillAttack=0.4+0.3) # 誓约追加 char.SetStatus(SkillAttack=0.103) - char.equ_effect.append(EquEffect(name='狐狸', icon='/equipment/suit/8.png', cd=2, data=effect_damage(effectDamage, 0, 100))) + char.equ_effect.append(EquEffect(name='狐狸', icon='/equipment/suit/8.png', cd=2, data=effect_damage(oathEffectDamage, 0, 100))) else: char.SetStatus(SkillAttack=0.3) pass @register -def oath_skill_2100402(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='幻影攻击', icon='/equipment/suit/8.png', cd=1, data=effect_damage(effectDamage, 0, 12863))) - char.equ_effect.append(EquEffect(name='狐仙乱舞', icon='/equipment/suit/8.png', cd=6, data=effect_damage(effectDamage, 1, 77175))) +def oath_skill_2100402(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='幻影攻击', icon='/equipment/suit/8.png', cd=1, data=effect_damage(oathEffectDamage, 0, 12863))) + char.equ_effect.append(EquEffect(name='狐仙乱舞', icon='/equipment/suit/8.png', cd=6, data=effect_damage(oathEffectDamage, 1, 77175))) pass @register -def oath_skill_2100403(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2100403(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): pass @register -def oath_skill_2100501(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2100501(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if check_suit(char): # 原套装效果 char.SetStatus(SkillAttack=0.4+0.4) # 誓约追加 char.SetStatus(SkillAttack=0.121) - char.equ_effect.append(EquEffect(name='狐狸', icon='/equipment/suit/8.png', cd=2, data=effect_damage(effectDamage, 0, 100))) + char.equ_effect.append(EquEffect(name='狐狸', icon='/equipment/suit/8.png', cd=2, data=effect_damage(oathEffectDamage, 0, 100))) else: char.SetStatus(SkillAttack=0.4) pass @register -def oath_skill_2100502(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='幻影攻击', icon='/equipment/suit/8.png', cd=1, data=effect_damage(effectDamage, 0, 12863))) - char.equ_effect.append(EquEffect(name='狐仙乱舞', icon='/equipment/suit/8.png', cd=6, data=effect_damage(effectDamage, 1, 154350))) - char.equ_effect.append(EquEffect(name='爆破', icon='/equipment/suit/8.png', cd=7, data=effect_damage(effectDamage, 2, 12863))) +def oath_skill_2100502(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='幻影攻击', icon='/equipment/suit/8.png', cd=1, data=effect_damage(oathEffectDamage, 0, 12863))) + char.equ_effect.append(EquEffect(name='狐仙乱舞', icon='/equipment/suit/8.png', cd=6, data=effect_damage(oathEffectDamage, 1, 154350))) + char.equ_effect.append(EquEffect(name='爆破', icon='/equipment/suit/8.png', cd=7, data=effect_damage(oathEffectDamage, 2, 12863))) pass @register -def oath_skill_2100503(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2100503(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): pass @@ -2288,7 +2288,7 @@ def oath_skill_2100503(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2110101(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2110101(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if char.equ_options.get('3', 0) == 0: char.SetStatus(SkillAttack=0.181) else: @@ -2297,7 +2297,7 @@ def oath_skill_2110101(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2110102(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2110102(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if char.equ_options.get('3', 0) == 0: char.SetStatus(SkillAttack=0.181) else: @@ -2306,7 +2306,7 @@ def oath_skill_2110102(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2110103(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2110103(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if char.equ_options.get('3', 0) == 0: char.SetStatus(SkillAttack=0.181) else: @@ -2315,7 +2315,7 @@ def oath_skill_2110103(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2110201(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2110201(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if check_suit(char): if char.equ_options.get('3', 0) == 0: char.SetStatus(SkillAttack=0.181) @@ -2327,13 +2327,13 @@ def oath_skill_2110201(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2110202(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2110202(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.09, SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) pass @register -def oath_skill_2110203(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2110203(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if char.equ_options.get('3', 0) == 0: # char.SetStatus(SkillAttack=0.181) pass @@ -2343,7 +2343,7 @@ def oath_skill_2110203(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2110301(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2110301(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if check_suit(char): if char.equ_options.get('3', 0) == 0: char.SetStatus(SkillAttack=0.181) @@ -2354,13 +2354,13 @@ def oath_skill_2110301(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2110302(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2110302(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.11, SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) pass @register -def oath_skill_2110303(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2110303(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if char.equ_options.get('3', 0) == 0: # char.SetStatus(SkillAttack=0.181) pass @@ -2370,7 +2370,7 @@ def oath_skill_2110303(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2110401(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2110401(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) if check_suit(char): if char.equ_options.get('3', 0) == 0: @@ -2382,13 +2382,13 @@ def oath_skill_2110401(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2110402(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2110402(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.13, SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) pass @register -def oath_skill_2110403(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2110403(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if char.equ_options.get('3', 0) == 0: # char.SetStatus(SkillAttack=0.181) pass @@ -2398,7 +2398,7 @@ def oath_skill_2110403(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2110501(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2110501(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) if check_suit(char): if char.equ_options.get('3', 0) == 0: @@ -2410,13 +2410,13 @@ def oath_skill_2110501(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2110502(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2110502(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): char.SetStatus(SkillAttack=0.2, SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) pass @register -def oath_skill_2110503(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2110503(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if char.equ_options.get('3', 0) == 0: # char.SetStatus(SkillAttack=0.181) pass @@ -2431,144 +2431,144 @@ def oath_skill_2110503(char: CharacterProperty,effectDamage: list[float] = []): @register -def oath_skill_2120101(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2120101(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if char.equ_options.get('4', 0) == 0: - char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 0, 92125))) + char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 0, 92125))) char.SetStatus(SpeedM=0.25) else: - char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 1, 55000) + effect_damage(effectDamage, 2, 18700))) + char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 1, 55000) + effect_damage(oathEffectDamage, 2, 18700))) pass @register -def oath_skill_2120102(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2120102(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if char.equ_options.get('4', 0) == 0: - char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 0, 92125))) + char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 0, 92125))) char.SetStatus(SpeedM=0.25) else: - char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 1, 55000) + effect_damage(effectDamage, 2, 18700))) + char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 1, 55000) + effect_damage(oathEffectDamage, 2, 18700))) pass @register -def oath_skill_2120103(char: CharacterProperty,effectDamage: list[float] = []): +def oath_skill_2120103(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): if char.equ_options.get('4', 0) == 0: - char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 0, 92125))) + char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 0, 92125))) char.SetStatus(SpeedM=0.25) else: - char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 1, 55000) + effect_damage(effectDamage, 2, 18700))) + char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 1, 55000) + effect_damage(oathEffectDamage, 2, 18700))) pass @register -def oath_skill_2120201(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='自爆模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 0, 11340))) +def oath_skill_2120201(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='自爆模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 0, 11340))) if check_suit(char): # 原套装效果 if char.equ_options.get('4', 0) == 0: - char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 1, 92125))) + char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 1, 92125))) char.SetStatus(SpeedM=0.25) else: - char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 2, 55000) * 1.25 + effect_damage(effectDamage, 3, 18700) * 1.25)) + char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 2, 55000) * 1.25 + effect_damage(oathEffectDamage, 3, 18700) * 1.25)) # 誓约追加 char.SetStatus(SkillAttack=0.02) pass @register -def oath_skill_2120202(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='暴走模式', icon='/equipment/skill/57.png', cd=30, data=effect_damage(effectDamage, 0, 756000))) +def oath_skill_2120202(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='暴走模式', icon='/equipment/skill/57.png', cd=30, data=effect_damage(oathEffectDamage, 0, 756000))) char.SetStatus(SpeedA=0.25, SpeedM=0.25, SpeedR=0.25) pass @register -def oath_skill_2120203(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='火炮模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 0, 31185))) +def oath_skill_2120203(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='火炮模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 0, 31185))) pass @register -def oath_skill_2120301(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='自爆模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 0, 15120))) +def oath_skill_2120301(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='自爆模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 0, 15120))) if check_suit(char): # 原套装效果 if char.equ_options.get('4', 0) == 0: - char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 1, 92125))) + char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 1, 92125))) char.SetStatus(SpeedM=0.25) else: - char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 2, 55000) * 1.25 + effect_damage(effectDamage, 3, 18700) * 1.25)) + char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 2, 55000) * 1.25 + effect_damage(oathEffectDamage, 3, 18700) * 1.25)) # 誓约追加 char.SetStatus(SkillAttack=0.02) pass @register -def oath_skill_2120302(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='暴走模式', icon='/equipment/skill/57.png', cd=30, data=effect_damage(effectDamage, 0, 850500))) +def oath_skill_2120302(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='暴走模式', icon='/equipment/skill/57.png', cd=30, data=effect_damage(oathEffectDamage, 0, 850500))) char.SetStatus(SpeedA=0.25, SpeedM=0.25, SpeedR=0.25) pass @register -def oath_skill_2120303(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='火炮模式', icon='/equipment/skill/57.png', cd=0.5, data=effect_damage(effectDamage, 0, 31185))) +def oath_skill_2120303(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='火炮模式', icon='/equipment/skill/57.png', cd=0.5, data=effect_damage(oathEffectDamage, 0, 31185))) pass @register -def oath_skill_2120401(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='自爆模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 0, 18900))) +def oath_skill_2120401(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='自爆模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 0, 18900))) if check_suit(char): # 原套装效果 if char.equ_options.get('4', 0) == 0: - char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 1, 92125))) + char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 1, 92125))) char.SetStatus(SpeedM=0.25) else: - char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 2, 55000) * 1.25 + effect_damage(effectDamage, 3, 18700) * 1.25)) + char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 2, 55000) * 1.25 + effect_damage(oathEffectDamage, 3, 18700) * 1.25)) # 誓约追加 char.SetStatus(SkillAttack=0.02) pass @register -def oath_skill_2120402(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='暴走模式', icon='/equipment/skill/57.png', cd=30, data=effect_damage(effectDamage, 0, 945000))) +def oath_skill_2120402(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='暴走模式', icon='/equipment/skill/57.png', cd=30, data=effect_damage(oathEffectDamage, 0, 945000))) char.SetStatus(SpeedA=0.25, SpeedM=0.25, SpeedR=0.25) pass @register -def oath_skill_2120403(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='火炮模式', icon='/equipment/skill/57.png', cd=0.5, data=effect_damage(effectDamage, 0, 33495))) +def oath_skill_2120403(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='火炮模式', icon='/equipment/skill/57.png', cd=0.5, data=effect_damage(oathEffectDamage, 0, 33495))) pass @register -def oath_skill_2120501(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='自爆模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 0, 22680))) +def oath_skill_2120501(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='自爆模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 0, 22680))) if check_suit(char): # 原套装效果 if char.equ_options.get('4', 0) == 0: - char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 1, 92125))) + char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 1, 92125))) char.SetStatus(SpeedM=0.25) else: - char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(effectDamage, 2, 55000) * 1.25 + effect_damage(effectDamage, 3, 18700) * 1.25)) + char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=effect_damage(oathEffectDamage, 2, 55000) * 1.25 + effect_damage(oathEffectDamage, 3, 18700) * 1.25)) # 誓约追加 char.SetStatus(SkillAttack=0.02) pass @register -def oath_skill_2120502(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='暴走模式', icon='/equipment/skill/57.png', cd=30, data=effect_damage(effectDamage, 0, 1134000))) +def oath_skill_2120502(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='暴走模式', icon='/equipment/skill/57.png', cd=30, data=effect_damage(oathEffectDamage, 0, 1134000))) char.SetStatus(SpeedA=0.25, SpeedM=0.25, SpeedR=0.25) pass @register -def oath_skill_2120503(char: CharacterProperty,effectDamage: list[float] = []): - char.equ_effect.append(EquEffect(name='火炮模式', icon='/equipment/skill/57.png', cd=0.5, data=effect_damage(effectDamage, 0, 38115))) +def oath_skill_2120503(char: CharacterProperty, oathEffectDamage: list[float] = [], suitEffectDamage: list[float] = []): + char.equ_effect.append(EquEffect(name='火炮模式', icon='/equipment/skill/57.png', cd=0.5, data=effect_damage(oathEffectDamage, 0, 38115))) pass diff --git a/backend/openapi b/backend/openapi index c25c9057..27e2652d 160000 --- a/backend/openapi +++ b/backend/openapi @@ -1 +1 @@ -Subproject commit c25c905725c79ff86fc03e63eccb38099c6689ac +Subproject commit 27e2652dd04cffd522a29b6813bce57de6f6d084