diff --git a/backend/core/equipment/version_0/oathSuitSkill.py b/backend/core/equipment/version_0/oathSuitSkill.py index 63e881ea..4243befd 100644 --- a/backend/core/equipment/version_0/oathSuitSkill.py +++ b/backend/core/equipment/version_0/oathSuitSkill.py @@ -450,7 +450,7 @@ def oath_skill_2020101(char: CharacterProperty, oathEffectDamage: list[float] = 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(suitEffectDamage, 3, 346450))) + char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450))) pass @@ -460,7 +460,7 @@ def oath_skill_2020102(char: CharacterProperty, oathEffectDamage: list[float] = 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(suitEffectDamage, 3, 346450))) + char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450))) pass @@ -470,22 +470,22 @@ def oath_skill_2020103(char: CharacterProperty, oathEffectDamage: list[float] = 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(suitEffectDamage, 3, 346450))) + char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450))) pass @register 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))) + char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 0, 37800))) if check_suit(char): # 原套装效果 - 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.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(suitEffectDamage, 4, 96590))) + char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 3, 96590))) # 誓约追加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.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450) + effect_damage(oathEffectDamage, 1, 69300))) # 誓约效果 char.SetStatus(SkillAttack=0.019) pass @@ -495,10 +495,10 @@ def oath_skill_2020201(char: CharacterProperty, oathEffectDamage: 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(suitEffectDamage, 0, 146318))) + char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(oathEffectDamage, 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))) + char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450))) pass @@ -510,22 +510,22 @@ def oath_skill_2020203(char: CharacterProperty, oathEffectDamage: list[float] = char.SetStatus(SpeedM=0.15) 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(suitEffectDamage, 4, 25200))) + char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(oathEffectDamage, 0, 25200))) pass @register 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))) + char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 0, 37800))) if check_suit(char): # 原套装效果 - 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.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(suitEffectDamage, 4, 96590))) + char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 3, 96590))) # 誓约追加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.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450) + effect_damage(oathEffectDamage, 1, 69300))) # 誓约效果 char.SetStatus(SkillAttack=0.019) pass @@ -536,9 +536,9 @@ def oath_skill_2020302(char: CharacterProperty, oathEffectDamage: list[float] = # 原套装效果 char.SetStatus(SpeedM=0.15) # 誓约效果 - 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))) + char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(oathEffectDamage, 0, 196875))) + 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, 4, 346450))) pass @@ -550,23 +550,23 @@ def oath_skill_2020303(char: CharacterProperty, oathEffectDamage: list[float] = char.SetStatus(SpeedM=0.15) 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(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, 0, 25200))) + char.equ_effect.append(EquEffect(name='地灵盖亚', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 1, 37800))) pass @register 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))) + char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 0, 37800))) if check_suit(char): # 原套装效果 - 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.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(suitEffectDamage, 4, 96590))) + char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 3, 96590))) # 誓约追加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.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450) + effect_damage(oathEffectDamage, 1, 69300))) # 誓约效果 char.SetStatus(SkillAttack=0.019) pass @@ -577,8 +577,8 @@ def oath_skill_2020402(char: CharacterProperty, oathEffectDamage: list[float] = # 原套装效果 char.SetStatus(SpeedM=0.15) # 誓约效果 - 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))) + char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(oathEffectDamage, 0, 261923))) + char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450))) pass @@ -590,24 +590,24 @@ def oath_skill_2020403(char: CharacterProperty, oathEffectDamage: list[float] = char.SetStatus(SpeedM=0.15) 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(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=2, data=effect_damage(oathEffectDamage, 0, 25200))) + char.equ_effect.append(EquEffect(name='地灵盖亚', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 1, 37800))) + char.equ_effect.append(EquEffect(name='暗灵诺特纳', icon='/equipment/skill/29.png', cd=2, data=effect_damage(oathEffectDamage, 2, 25200))) pass @register 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))) + char.equ_effect.append(EquEffect(name='精灵战士奥伯龙', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 0, 37800))) if check_suit(char): # 原套装效果 - 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.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(suitEffectDamage, 4, 96590))) + char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(suitEffectDamage, 3, 96590))) # 誓约追加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.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/17.png', cd=10, data=effect_damage(suitEffectDamage, 4, 346450) + effect_damage(oathEffectDamage, 1, 69300))) # 誓约效果 char.SetStatus(SkillAttack=0.019) pass @@ -618,8 +618,8 @@ def oath_skill_2020502(char: CharacterProperty, oathEffectDamage: list[float] = # 原套装效果 char.SetStatus(SpeedM=0.15) # 誓约效果 - 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))) + char.equ_effect.append(EquEffect(name='三位一体提泰妮娅', icon='/equipment/skill/29.png', cd=5, data=effect_damage(oathEffectDamage, 0, 315000))) + char.equ_effect.append(EquEffect(name='心之女王', icon='/equipment/skill/130.png', cd=120, data=effect_damage(oathEffectDamage, 1, 1732500))) pass @@ -631,10 +631,10 @@ def oath_skill_2020503(char: CharacterProperty, oathEffectDamage: list[float] = char.SetStatus(SpeedM=0.15) 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(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))) + char.equ_effect.append(EquEffect(name='电灵斯帕克', icon='/equipment/skill/29.png', cd=2, data=effect_damage(oathEffectDamage, 0, 25200))) + char.equ_effect.append(EquEffect(name='地灵盖亚', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 1, 37800))) + char.equ_effect.append(EquEffect(name='暗灵诺特纳', icon='/equipment/skill/29.png', cd=2, data=effect_damage(oathEffectDamage, 2, 25200))) + char.equ_effect.append(EquEffect(name='光灵卢切', icon='/equipment/skill/29.png', cd=3, data=effect_damage(oathEffectDamage, 3, 37800))) pass @@ -846,7 +846,7 @@ def oath_skill_2030303(char: CharacterProperty, oathEffectDamage: list[float] = 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(suitEffectDamage, 0, 1400000))) + char.equ_effect.append(EquEffect(name='黄金之王', icon='/equipment/skill/133.png', cd=240, data=effect_damage(oathEffectDamage, 0, 1400000))) pass @@ -906,9 +906,9 @@ def oath_skill_2030403(char: CharacterProperty, oathEffectDamage: list[float] = 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(suitEffectDamage, 0, 1400000) + effect_damage(suitEffectDamage, 1, 3000000))) + char.equ_effect.append(EquEffect(name='理想成真', icon='/equipment/skill/133.png', cd=240, data=effect_damage(oathEffectDamage, 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(suitEffectDamage, 2, 1400000))) + char.equ_effect.append(EquEffect(name='黄金之王', icon='/equipment/skill/133.png', cd=240, data=effect_damage(oathEffectDamage, 0, 1400000))) pass @@ -967,9 +967,9 @@ def oath_skill_2030503(char: CharacterProperty, oathEffectDamage: list[float] = 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(suitEffectDamage, 0, 2000000))) + char.equ_effect.append(EquEffect(name='理想成真', icon='/equipment/skill/133.png', cd=240, data=effect_damage(oathEffectDamage, 1, 2000000))) elif reinforce >= 121: - char.equ_effect.append(EquEffect(name='黄金之王', icon='/equipment/skill/133.png', cd=240, data=effect_damage(suitEffectDamage, 1, 1400000))) + char.equ_effect.append(EquEffect(name='黄金之王', icon='/equipment/skill/133.png', cd=240, data=effect_damage(oathEffectDamage, 0, 1400000))) pass @@ -1043,9 +1043,9 @@ def oath_skill_2040201(char: CharacterProperty, oathEffectDamage: 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(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/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.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: @@ -1083,9 +1083,9 @@ def oath_skill_2040301(char: CharacterProperty, oathEffectDamage: 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(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/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.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: @@ -1123,9 +1123,9 @@ def oath_skill_2040401(char: CharacterProperty, oathEffectDamage: 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(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/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(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(oathEffectDamage, 0, 680400))) @@ -1162,9 +1162,9 @@ def oath_skill_2040501(char: CharacterProperty, oathEffectDamage: 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(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/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(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(oathEffectDamage, 0, 1020600))) @@ -1600,7 +1600,7 @@ def oath_skill_2070201(char: CharacterProperty, oathEffectDamage: 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(suitEffectDamage, 0, 532630))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 532630))) # 誓约追加 char.SetStatus(SkillAttack=0.05, EquEffectRatio=0.065) pass @@ -1622,7 +1622,7 @@ def oath_skill_2070202(char: CharacterProperty, oathEffectDamage: 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(suitEffectDamage, 0, 438410) * 1.4)) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 438410) * 1.4)) pass @@ -1639,7 +1639,7 @@ def oath_skill_2070203(char: CharacterProperty, oathEffectDamage: 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(suitEffectDamage, 0, 242880))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 242880))) pass @@ -1663,7 +1663,7 @@ def oath_skill_2070301(char: CharacterProperty, oathEffectDamage: 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(suitEffectDamage, 0, 532630))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 532630))) # 誓约追加 char.SetStatus(SkillAttack=0.05, EquEffectRatio=0.065) pass @@ -1685,7 +1685,7 @@ def oath_skill_2070302(char: CharacterProperty, oathEffectDamage: 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(suitEffectDamage, 0, 438410) * 1.55)) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 438410) * 1.55)) pass @@ -1702,7 +1702,7 @@ def oath_skill_2070303(char: CharacterProperty, oathEffectDamage: 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(suitEffectDamage, 0, 242880))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 242880))) pass @@ -1729,7 +1729,7 @@ def oath_skill_2070401(char: CharacterProperty, oathEffectDamage: 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(suitEffectDamage, 0, 532630))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 532630))) # 誓约追加 char.SetStatus(SkillAttack=0.05, EquEffectRatio=0.065) pass @@ -1751,7 +1751,7 @@ def oath_skill_2070402(char: CharacterProperty, oathEffectDamage: 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(suitEffectDamage, 0, 438410) * 2)) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 438410) * 2)) pass @@ -1770,7 +1770,7 @@ def oath_skill_2070403(char: CharacterProperty, oathEffectDamage: 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(suitEffectDamage, 0, 242880))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 242880))) pass @@ -1798,7 +1798,7 @@ def oath_skill_2070501(char: CharacterProperty, oathEffectDamage: 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(suitEffectDamage, 0, 532630))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 532630))) # 誓约追加 char.SetStatus(SkillAttack=0.05, EquEffectRatio=0.065) pass @@ -1820,7 +1820,7 @@ def oath_skill_2070502(char: CharacterProperty, oathEffectDamage: 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(suitEffectDamage, 0, 438410) * 1.2 * 2)) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 438410) * 1.2 * 2)) pass @@ -1845,7 +1845,7 @@ def oath_skill_2070503(char: CharacterProperty, oathEffectDamage: 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(suitEffectDamage, 0, 242880))) + char.equ_effect.append(EquEffect(name='能量释放', icon='/equipment/suit/4.png', cd=cd, data=effect_damage(oathEffectDamage, 0, 242880))) pass @@ -1856,35 +1856,35 @@ def oath_skill_2070503(char: CharacterProperty, oathEffectDamage: list[float] = @register 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.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(suitEffectDamage, 0, 98350))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) pass @register 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.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(suitEffectDamage, 0, 98350))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) pass @register 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.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(suitEffectDamage, 0, 98350))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) pass @register 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))) + char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(oathEffectDamage, 0, 17010))) if check_suit(char): # 原套装效果 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.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 0, 98350))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) # 誓约追加 char.SetStatus(SkillAttack=0.035) @@ -1893,25 +1893,25 @@ def oath_skill_2080201(char: CharacterProperty, oathEffectDamage: list[float] = @register 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))) + char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 1, 305500))) pass @register 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.equ_effect.append(EquEffect(name='陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(oathEffectDamage, 1, 170100))) + char.equ_effect.append(EquEffect(name='地壳裂痕', icon='/equipment/suit/6.png', cd=30, data=effect_damage(oathEffectDamage, 0, 132300))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) pass @register 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))) + char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(oathEffectDamage, 0, 22680))) if check_suit(char): # 原套装效果 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.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 0, 98350))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) # 誓约追加 char.SetStatus(SkillAttack=0.035) @@ -1920,25 +1920,25 @@ def oath_skill_2080301(char: CharacterProperty, oathEffectDamage: list[float] = @register 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))) + char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 1, 305500))) pass @register 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.equ_effect.append(EquEffect(name='陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(oathEffectDamage, 1, 255150))) + char.equ_effect.append(EquEffect(name='地壳爆裂', icon='/equipment/suit/6.png', cd=30, data=effect_damage(oathEffectDamage, 0, 198450))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) pass @register 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))) + char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(oathEffectDamage, 0, 28350))) if check_suit(char): # 原套装效果 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.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 0, 98350))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) # 誓约追加 char.SetStatus(SkillAttack=0.035) @@ -1947,25 +1947,25 @@ def oath_skill_2080401(char: CharacterProperty, oathEffectDamage: list[float] = @register 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))) + char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 1, 305500))) pass @register 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.equ_effect.append(EquEffect(name='陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(oathEffectDamage, 1, 340200))) + char.equ_effect.append(EquEffect(name='大地震', icon='/equipment/suit/6.png', cd=30, data=effect_damage(oathEffectDamage, 0, 264600))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) pass @register 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))) + char.equ_effect.append(EquEffect(name='灾害', icon='/equipment/suit/5.png', cd=3, data=effect_damage(oathEffectDamage, 0, 34020))) if check_suit(char): # 原套装效果 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.equ_effect.append(EquEffect(name='暴风雪', icon='/equipment/suit/6.png', cd=5, data=effect_damage(suitEffectDamage, 0, 98350))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) # 誓约追加 char.SetStatus(SkillAttack=0.035) @@ -1975,15 +1975,15 @@ def oath_skill_2080501(char: CharacterProperty, oathEffectDamage: list[float] = @register 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(suitEffectDamage, 0, 305500))) + char.equ_effect.append(EquEffect(name='狂澜怒涛', icon='/equipment/skill/54.png', cd=60, data=effect_damage(suitEffectDamage, 1, 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, 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.equ_effect.append(EquEffect(name='巨型陨石冲击', icon='/equipment/skill/129.png', cd=120, data=effect_damage(oathEffectDamage, 1, 425250))) + char.equ_effect.append(EquEffect(name='熔岩爆炸', icon='/equipment/suit/6.png', cd=30, data=effect_damage(oathEffectDamage, 0, 330750))) char.SetStatus(SpeedM=0.1, SpeedA=0.1, SpeedR=0.1) pass @@ -2048,19 +2048,19 @@ def oath_skill_2090203(char: CharacterProperty, oathEffectDamage: 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=1, data=effect_damage(oathEffectDamage, 0, 25200))) pass @register 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))) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(oathEffectDamage, 0, 183330))) if check_suit(char): # 原套装效果 - 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.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 @@ -2081,20 +2081,20 @@ def oath_skill_2090303(char: CharacterProperty, oathEffectDamage: 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=1, data=effect_damage(oathEffectDamage, 0, 25200))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=effect_damage(oathEffectDamage, 1, 94500))) pass @register 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))) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(oathEffectDamage, 0, 183330))) if check_suit(char): # 原套装效果 - 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.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 @@ -2115,21 +2115,21 @@ def oath_skill_2090403(char: CharacterProperty, oathEffectDamage: 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(oathEffectDamage, 0, 25200))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=effect_damage(oathEffectDamage, 1, 94500))) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=10, data=effect_damage(oathEffectDamage, 2, 315000))) pass @register 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))) + char.equ_effect.append(EquEffect(name='真：天罚', icon='/equipment/suit/7.png', cd=20, data=effect_damage(oathEffectDamage, 0, 281100))) if check_suit(char): # 原套装效果 - 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.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 @@ -2140,7 +2140,7 @@ def oath_skill_2090502(char: CharacterProperty, oathEffectDamage: 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(suitEffectDamage, 2, 992250))) + char.equ_effect.append(EquEffect(name='末日黄昏', icon='/equipment/skill/117.png', cd=140, data=effect_damage(oathEffectDamage, 0, 992250))) pass @@ -2148,13 +2148,13 @@ def oath_skill_2090502(char: CharacterProperty, oathEffectDamage: list[float] = 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(oathEffectDamage, 0, 25200))) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=effect_damage(oathEffectDamage, 1, 94500))) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=10, data=effect_damage(oathEffectDamage, 2, 315000))) - 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))) + char.equ_effect.append(EquEffect(name='一击[超越]', icon='/equipment/suit/7.png', cd=1, data=effect_damage(oathEffectDamage, 0, 25200) + effect_damage(oathEffectDamage, 2, 11340))) + char.equ_effect.append(EquEffect(name='审判[超越]', icon='/equipment/suit/7.png', cd=5, data=effect_damage(oathEffectDamage, 1, 94500) + effect_damage(oathEffectDamage, 4, 42525))) + char.equ_effect.append(EquEffect(name='天罚[超越]', icon='/equipment/suit/7.png', cd=10, data=effect_damage(oathEffectDamage, 2, 315000) + effect_damage(oathEffectDamage, 6, 141750))) pass diff --git a/backend/dataFiles/dcalc_0.db b/backend/dataFiles/dcalc_0.db index 2ca8c7c3..7334f102 100644 Binary files a/backend/dataFiles/dcalc_0.db and b/backend/dataFiles/dcalc_0.db differ