diff --git a/backend/core/equipment/version_0/oathSuitSkill.py b/backend/core/equipment/version_0/oathSuitSkill.py index 5741e4a3..b7da0488 100644 --- a/backend/core/equipment/version_0/oathSuitSkill.py +++ b/backend/core/equipment/version_0/oathSuitSkill.py @@ -1968,73 +1968,129 @@ def oath_skill_2080503(char: CharacterProperty): @register def oath_skill_2090101(char: CharacterProperty): - char.equ_effect.append(EquEffect(name='突破', icon='/equipment/skill/0.png', cd=8, data=10200)) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=19000)) - char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=329400)) - char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=233500)) + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=12900)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=24050)) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=416700)) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=295370)) pass @register def oath_skill_2090102(char: CharacterProperty): - char.equ_effect.append(EquEffect(name='突破', icon='/equipment/skill/0.png', cd=8, data=10200)) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=19000)) - char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=329400)) - char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=233500)) + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=12900)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=24050)) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=416700)) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=295370)) pass @register def oath_skill_2090103(char: CharacterProperty): - char.equ_effect.append(EquEffect(name='突破', icon='/equipment/skill/0.png', cd=8, data=10200)) - char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=19000)) - char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=329400)) - char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=233500)) + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=12900)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=24050)) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=416700)) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=295370)) pass @register def oath_skill_2090201(char: CharacterProperty): + if check_suit(char): + # 原套装效果 + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=12900)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=24050)) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=416700)) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=295370)) + # 誓约追加 + char.SetStatus(SkillAttack=0.03) pass @register def oath_skill_2090202(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=12900)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=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=416700 + 150300)) pass @register def oath_skill_2090203(char: CharacterProperty): + # 原套装效果 + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=12900)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=24050)) + # 誓约追加 + char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=25200)) pass @register def oath_skill_2090301(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=183330)) + if check_suit(char): + # 原套装效果 + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=12900)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=24050)) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=416700)) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=295370)) + # 誓约追加 + char.SetStatus(SkillAttack=0.03) pass @register def oath_skill_2090302(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=12900)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=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=416700 + 292050)) pass @register def oath_skill_2090303(char: CharacterProperty): + # 原套装效果 + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=12900)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=24050)) + # 誓约追加 + char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=25200)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=94500)) pass @register def oath_skill_2090401(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=183330)) + if check_suit(char): + # 原套装效果 + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=12900)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=24050)) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=416700)) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=295370)) + # 誓约追加 + char.SetStatus(SkillAttack=0.03) pass @register def oath_skill_2090402(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=12900)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=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=416700 + 433800)) pass @register def oath_skill_2090403(char: CharacterProperty): + # 原套装效果 + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=12900)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=24050)) + # 誓约追加 + char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=25200)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=94500)) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=10, data=315000)) pass @@ -2043,22 +2099,28 @@ def oath_skill_2090501(char: CharacterProperty): char.equ_effect.append(EquEffect(name='真：天罚', icon='/equipment/suit/7.png', cd=20, data=281100)) if check_suit(char): # 原套装效果 - char.equ_effect.append(EquEffect(name='入阵', icon='/equipment/skill/0.png', cd=8, data=10200)) - char.equ_effect.append(EquEffect(name='追踪', icon='/equipment/skill/1.png', cd=15, data=19000)) - char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=329400)) - char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=233500)) + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=12900)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=24050)) + char.equ_effect.append(EquEffect(name='降临', icon='/equipment/skill/3.png', cd=140, data=416700)) + char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=20, data=295370)) + # 誓约追加 + char.SetStatus(SkillAttack=0.03) pass @register def oath_skill_2090502(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=12900)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=24050)) char.SetStatus(SpeedA=0.2, SpeedM=0.2, SpeedR=0.2) - char.equ_effect.append(EquEffect(name='诸神黄昏', icon='/equipment/skill/117.png', cd=120, data=992250)) + char.equ_effect.append(EquEffect(name='末日黄昏', icon='/equipment/skill/117.png', cd=140, data=992250)) pass @register def oath_skill_2090503(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='破阵', icon='/equipment/skill/0.png', cd=8, data=12900)) + char.equ_effect.append(EquEffect(name='审判', icon='/equipment/skill/1.png', cd=15, data=24050)) char.equ_effect.append(EquEffect(name='一击', icon='/equipment/suit/7.png', cd=1, data=25200)) char.equ_effect.append(EquEffect(name='审判', icon='/equipment/suit/7.png', cd=5, data=94500)) char.equ_effect.append(EquEffect(name='天罚', icon='/equipment/suit/7.png', cd=10, data=315000)) @@ -2076,26 +2138,38 @@ def oath_skill_2090503(char: CharacterProperty): @register def oath_skill_2100101(char: CharacterProperty): + char.SetStatus(SkillAttack=0.4) pass @register def oath_skill_2100102(char: CharacterProperty): + char.SetStatus(SkillAttack=0.4) pass @register def oath_skill_2100103(char: CharacterProperty): + char.SetStatus(SkillAttack=0.4) pass @register def oath_skill_2100201(char: CharacterProperty): + char.SetStatus(SkillAttack=0.1) + if check_suit(char): + # 原套装效果 + char.SetStatus(SkillAttack=0.4) + # 誓约追加 + char.SetStatus(SkillAttack=0.047) + char.equ_effect.append(EquEffect(name='狐狸', icon='/equipment/suit/8.png', cd=2, data=100)) pass @register def oath_skill_2100202(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='幻影攻击', icon='/equipment/suit/8.png', cd=1, data=9188)) + char.equ_effect.append(EquEffect(name='狐仙乱舞', icon='/equipment/suit/8.png', cd=6, data=55125)) pass @@ -2106,11 +2180,20 @@ def oath_skill_2100203(char: CharacterProperty): @register def oath_skill_2100301(char: CharacterProperty): + char.SetStatus(SkillAttack=0.2) + if check_suit(char): + # 原套装效果 + char.SetStatus(SkillAttack=0.4) + # 誓约追加 + char.SetStatus(SkillAttack=0.081) + char.equ_effect.append(EquEffect(name='狐狸', icon='/equipment/suit/8.png', cd=2, data=100)) pass @register def oath_skill_2100302(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='幻影攻击', icon='/equipment/suit/8.png', cd=1, data=11025)) + char.equ_effect.append(EquEffect(name='狐仙乱舞', icon='/equipment/suit/8.png', cd=6, data=66150)) pass @@ -2121,11 +2204,20 @@ def oath_skill_2100303(char: CharacterProperty): @register def oath_skill_2100401(char: CharacterProperty): + char.SetStatus(SkillAttack=0.3) + if check_suit(char): + # 原套装效果 + char.SetStatus(SkillAttack=0.4) + # 誓约追加 + char.SetStatus(SkillAttack=0.103) + char.equ_effect.append(EquEffect(name='狐狸', icon='/equipment/suit/8.png', cd=2, data=100)) pass @register def oath_skill_2100402(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='幻影攻击', icon='/equipment/suit/8.png', cd=1, data=12863)) + char.equ_effect.append(EquEffect(name='狐仙乱舞', icon='/equipment/suit/8.png', cd=6, data=77175)) pass @@ -2148,9 +2240,9 @@ def oath_skill_2100501(char: CharacterProperty): @register def oath_skill_2100502(char: CharacterProperty): - char.equ_effect.append(EquEffect(name='幻影狐狸', icon='/equipment/suit/8.png', cd=1, data=12863)) - char.equ_effect.append(EquEffect(name='狐狸乱舞', icon='/equipment/suit/8.png', cd=6, data=154350)) - char.equ_effect.append(EquEffect(name='狐狸乱舞', icon='/equipment/suit/8.png', cd=7, data=12863)) + char.equ_effect.append(EquEffect(name='幻影攻击', icon='/equipment/suit/8.png', cd=1, data=12863)) + char.equ_effect.append(EquEffect(name='狐仙乱舞', icon='/equipment/suit/8.png', cd=6, data=154350)) + char.equ_effect.append(EquEffect(name='爆破', icon='/equipment/suit/8.png', cd=7, data=12863)) pass @@ -2166,67 +2258,117 @@ def oath_skill_2100503(char: CharacterProperty): @register def oath_skill_2110101(char: CharacterProperty): + if char.equ_options.get('3', 0) == 0: + char.SetStatus(SkillAttack=0.181) + else: + char.SetStatus(SkillAttack=0.08, SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) pass @register def oath_skill_2110102(char: CharacterProperty): + if char.equ_options.get('3', 0) == 0: + char.SetStatus(SkillAttack=0.181) + else: + char.SetStatus(SkillAttack=0.08, SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) pass @register def oath_skill_2110103(char: CharacterProperty): + if char.equ_options.get('3', 0) == 0: + char.SetStatus(SkillAttack=0.181) + else: + char.SetStatus(SkillAttack=0.08, SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) pass @register def oath_skill_2110201(char: CharacterProperty): + if check_suit(char): + if char.equ_options.get('3', 0) == 0: + char.SetStatus(SkillAttack=0.181) + else: + char.SetStatus(SkillAttack=0.08, SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) + char.SetStatus(SkillAttack=0.025) + pass pass @register def oath_skill_2110202(char: CharacterProperty): + char.SetStatus(SkillAttack=0.09, SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) pass @register def oath_skill_2110203(char: CharacterProperty): + if char.equ_options.get('3', 0) == 0: + # char.SetStatus(SkillAttack=0.181) + pass + else: + char.SetStatus(SkillAttack=0.12) pass @register def oath_skill_2110301(char: CharacterProperty): + if check_suit(char): + if char.equ_options.get('3', 0) == 0: + char.SetStatus(SkillAttack=0.181) + else: + char.SetStatus(SkillAttack=0.08, SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) + char.SetStatus(SkillAttack=0.025) pass @register def oath_skill_2110302(char: CharacterProperty): + char.SetStatus(SkillAttack=0.11, SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) pass @register def oath_skill_2110303(char: CharacterProperty): + if char.equ_options.get('3', 0) == 0: + # char.SetStatus(SkillAttack=0.181) + pass + else: + char.SetStatus(SkillAttack=0.14) pass @register def oath_skill_2110401(char: CharacterProperty): + char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) + if check_suit(char): + if char.equ_options.get('3', 0) == 0: + char.SetStatus(SkillAttack=0.181) + else: + char.SetStatus(SkillAttack=0.08, SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) + char.SetStatus(SkillAttack=0.025) pass @register def oath_skill_2110402(char: CharacterProperty): + char.SetStatus(SkillAttack=0.13, SpeedA=0.3, SpeedM=0.3, SpeedR=0.3) pass @register def oath_skill_2110403(char: CharacterProperty): + if char.equ_options.get('3', 0) == 0: + # char.SetStatus(SkillAttack=0.181) + pass + else: + char.SetStatus(SkillAttack=0.16, SpeedA=0.15, SpeedM=0.15, SpeedR=0.15) pass @register def oath_skill_2110501(char: CharacterProperty): - char.SetStatus(SkillAttack=0.1) + char.SetStatus(SpeedA=0.1, SpeedM=0.1, SpeedR=0.1) if check_suit(char): if char.equ_options.get('3', 0) == 0: char.SetStatus(SkillAttack=0.181) @@ -2259,61 +2401,115 @@ def oath_skill_2110503(char: CharacterProperty): @register def oath_skill_2120101(char: CharacterProperty): + if char.equ_options.get('4', 0) == 0: + char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=92125)) + char.SetStatus(SpeedM=0.25) + else: + char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=55000 + 18700)) pass @register def oath_skill_2120102(char: CharacterProperty): + if char.equ_options.get('4', 0) == 0: + char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=92125)) + char.SetStatus(SpeedM=0.25) + else: + char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=55000 + 18700)) pass @register def oath_skill_2120103(char: CharacterProperty): + if char.equ_options.get('4', 0) == 0: + char.equ_effect.append(EquEffect(name='普通模式', icon='/equipment/skill/57.png', cd=1, data=92125)) + char.SetStatus(SpeedM=0.25) + else: + char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=55000 + 18700)) pass @register def oath_skill_2120201(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='自爆模式', icon='/equipment/skill/57.png', cd=1, data=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=92125)) + char.SetStatus(SpeedM=0.25) + else: + char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=55000 * 1.25 + 18700 * 1.25)) + # 誓约追加 + char.SetStatus(SkillAttack=0.02) pass @register def oath_skill_2120202(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='暴走模式', icon='/equipment/skill/57.png', cd=30, data=756000)) + char.SetStatus(SpeedA=0.25, SpeedM=0.25, SpeedR=0.25) pass @register def oath_skill_2120203(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='火炮模式', icon='/equipment/skill/57.png', cd=1, data=31185)) pass @register def oath_skill_2120301(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='自爆模式', icon='/equipment/skill/57.png', cd=1, data=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=92125)) + char.SetStatus(SpeedM=0.25) + else: + char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=55000 * 1.25 + 18700 * 1.25)) + # 誓约追加 + char.SetStatus(SkillAttack=0.02) pass @register def oath_skill_2120302(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='暴走模式', icon='/equipment/skill/57.png', cd=30, data=850500)) + char.SetStatus(SpeedA=0.25, SpeedM=0.25, SpeedR=0.25) pass @register def oath_skill_2120303(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='火炮模式', icon='/equipment/skill/57.png', cd=0.5, data=31185)) pass @register def oath_skill_2120401(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='自爆模式', icon='/equipment/skill/57.png', cd=1, data=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=92125)) + char.SetStatus(SpeedM=0.25) + else: + char.equ_effect.append(EquEffect(name='追击模式', icon='/equipment/skill/57.png', cd=1, data=55000 * 1.25 + 18700 * 1.25)) + # 誓约追加 + char.SetStatus(SkillAttack=0.02) pass @register def oath_skill_2120402(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='暴走模式', icon='/equipment/skill/57.png', cd=30, data=945000)) + char.SetStatus(SpeedA=0.25, SpeedM=0.25, SpeedR=0.25) pass @register def oath_skill_2120403(char: CharacterProperty): + char.equ_effect.append(EquEffect(name='火炮模式', icon='/equipment/skill/57.png', cd=0.5, data=33495)) pass @@ -2334,14 +2530,14 @@ def oath_skill_2120501(char: CharacterProperty): @register def oath_skill_2120502(char: CharacterProperty): - char.equ_effect.append(EquEffect(name='暴走模式', icon='/equipment/skill/57.png', cd=30, data=756000)) + char.equ_effect.append(EquEffect(name='暴走模式', icon='/equipment/skill/57.png', cd=30, data=1134000)) char.SetStatus(SpeedA=0.25, SpeedM=0.25, SpeedR=0.25) pass @register def oath_skill_2120503(char: CharacterProperty): - char.equ_effect.append(EquEffect(name='火炮模式', icon='/equipment/skill/57.png', cd=1, data=31185)) + char.equ_effect.append(EquEffect(name='火炮模式', icon='/equipment/skill/57.png', cd=0.5, data=38115)) pass diff --git a/backend/dataFiles/dcalc_0.db b/backend/dataFiles/dcalc_0.db index f8ef38c3..c0b55a2a 100644 Binary files a/backend/dataFiles/dcalc_0.db and b/backend/dataFiles/dcalc_0.db differ