diff --git a/backend/core/basic/character.py b/backend/core/basic/character.py index fbafe3aa..d31876c5 100644 --- a/backend/core/basic/character.py +++ b/backend/core/basic/character.py @@ -409,6 +409,13 @@ class Character(CharacterProperty): """获取技能名字""" return [skill.name for skill in self.skills if (type == 'all' or skill.type == type) and (damage == 'all' or skill.damage == damage)] + def GetWeaponType(self) -> str: + """获取武器类型""" + weapon = self.charEquipInfo["武器"].equInfo + if weapon is None: + return None + else: + return weapon.itemDetailType # endregion # region 计算相关 diff --git a/backend/core/basic/skill.py b/backend/core/basic/skill.py index 1084f7ee..e799bb04 100644 --- a/backend/core/basic/skill.py +++ b/backend/core/basic/skill.py @@ -171,6 +171,9 @@ class ActiveSkill(Skill): power = getattr(self, f'power{i}', None) if power is None: setattr(self, f'power{i}', 1) + dataplus = getattr(self, f'dataplus{i}', None) + if dataplus is None: + setattr(self, f'dataplus{i}', 0) def skillInfo(self, mode: str | None = None): if mode is not None: @@ -191,12 +194,13 @@ class ActiveSkill(Skill): keys = [key.replace("data","") for key in dir(self) if key.startswith('data')] for i in keys: data = getattr(self, f'data{i}', []) + dataplus = getattr(self, f'dataplus{i}', 0) if len(data) == 0: break if lv < len(data): hit = getattr(self, f'hit{i}', 1) power = getattr(self, f'power{i}', 1) - res += hit * power * data[lv] + res += hit * power * (data[lv] + dataplus) return res def getWeaponCDRatio(self): diff --git a/backend/core/character/GF/mage_male/glacial_master.py b/backend/core/character/GF/mage_male/glacial_master.py index bdb4681e..5772c87f 100644 --- a/backend/core/character/GF/mage_male/glacial_master.py +++ b/backend/core/character/GF/mage_male/glacial_master.py @@ -174,7 +174,10 @@ class Skill10(PassiveSkill): data0 = [0, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120]# noqa: E501 - associate = [{"type":"*skillRation","data":data0,"skills":["冰魄剑"]}] + associate = [ + {"type":"*skillRation","data":data0,"skills":["冰魄剑"]}, + {"type":"+hit1","data":[0] + [-1]*maxLv,"skills":["冰魄剑"],"ratio":1}, + ] # 冰魄锤击 아이스 빅 해머 diff --git a/backend/core/character/GF/swordman_male/asura.py b/backend/core/character/GF/swordman_male/asura.py index 52a21b42..c6d5b262 100644 --- a/backend/core/character/GF/swordman_male/asura.py +++ b/backend/core/character/GF/swordman_male/asura.py @@ -374,6 +374,8 @@ class Skill17(ActiveSkill): elif self.currentMode == "闪枪": pre = self.char.GetSkillByName("爆炎 · 波动剑") return 4.9 * pre.getSkillCD() / pre.cd + elif self.currentMode == "平X": + return 1.0 else: return super().getSkillCD() # 极冰 · 裂波剑 극파동검 빙인 diff --git a/backend/core/character/GF/swordman_male/weapon_master.py b/backend/core/character/GF/swordman_male/weapon_master.py index 1777a7a1..9c8859a8 100644 --- a/backend/core/character/GF/swordman_male/weapon_master.py +++ b/backend/core/character/GF/swordman_male/weapon_master.py @@ -3,6 +3,17 @@ from core.basic.skill import PassiveSkill, ActiveSkill, characterLv from core.basic.character import Character +class ActiveSkill(ActiveSkill): + totalhit = 0 + """总hit""" + thrustcount = 0 + """刺伤层数""" + swordnum = 0 + """穿云刺落剑数""" + + def skillInfo(self, mode = None): + return super().skillInfo(mode) + (self.swordnum,self.totalhit,self.thrustcount,) + # 疾影手 신속한 무기 교체 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/dcd536f1674630f01fc9667bb202b851?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 class Skill0(PassiveSkill): @@ -10,7 +21,7 @@ class Skill0(PassiveSkill): learnLv = 1 masterLv = 1 maxLv = 1 - position = 0 #TODO + position = 9 #TODO rangeLv = 1 data0 = [0, 50]# noqa: E501 @@ -25,19 +36,21 @@ class Skill0(PassiveSkill): # 基础精通 기본기 숙련 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/5a56514f35cf0270ae8d6c65f8fefd78?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill0(ActiveSkill): +class Skill1(ActiveSkill): name = '基础精通' icon = '$common$name' learnLv = 1 masterLv = characterLv maxLv = 200 - position = 0 + position = 1 rangeLv = 1 damage = False type = 'passive' data0 = [0, 150, 158.7, 167.3, 176, 184.5, 193.2, 201.8, 210.5, 219.2, 227.7, 236.4, 245, 253.7, 262.2, 270.9, 284.3, 297.6, 311, 324.3, 337.7, 350.9, 364.2, 377.6, 390.9, 404.3, 417.6, 431, 444.3, 457.7, 471, 484.2, 497.6, 510.9, 524.3, 537.6, 551, 564.3, 577.7, 591, 604.4, 617.7, 630.9, 644.3, 657.6, 671, 684.3, 697.7, 711, 724.4, 737.7, 751.1, 764.3, 777.6, 791, 804.3, 817.7, 831, 844.4, 857.7, 871.1, 884.4, 897.8, 911, 924.3, 937.7, 951, 964.4, 977.7, 991.1, 1004.4, 1017.8, 1031.1, 1044.5, 1057.7, 1071, 1084.4, 1097.7, 1111.1, 1124.4, 1137.8, 1151.1, 1164.5, 1177.8, 1191, 1204.4, 1217.7, 1231.1, 1244.4, 1257.8, 1271.1, 1284.5, 1297.8, 1311.2, 1324.5, 1337.7, 1351.1, 1364.4, 1377.8, 1391.1, 1404.5, 1417.8, 1431.2, 1444.5, 1457.9, 1471.2, 1484.6, 1497.9, 1511.3, 1524.6, 1538, 1551.3, 1564.7, 1578, 1591.4, 1604.7, 1618.1, 1631.4, 1644.8, 1658.1, 1671.5, 1684.8, 1698.2, 1711.5, 1724.9, 1738.2, 1751.6, 1764.9, 1778.3, 1791.6, 1805, 1818.3, 1831.7, 1845, 1858.4, 1871.7, 1885.1, 1898.4, 1911.8, 1925.1, 1938.5, 1951.8, 1965.2, 1978.5, 1991.9, 2005.2, 2018.6, 2031.9, 2045.3, 2058.6, 2072, 2085.3, 2098.7, 2112, 2125.4, 2138.7, 2152.1, 2165.4, 2178.8, 2192.1, 2205.5, 2218.8, 2232.2, 2245.5, 2258.9, 2272.2, 2285.6, 2298.9, 2312.3, 2325.6, 2339, 2352.3, 2365.7, 2379, 2392.4, 2405.7, 2419.1, 2432.4, 2445.8, 2459.1, 2472.5, 2485.8, 2499.2, 2512.5, 2525.9, 2539.2, 2552.6, 2565.9, 2579.3, 2592.6, 2606, 2619.3, 2632.7, 2646, 2659.4, 2672.7, 2686.1, 2699.4, 2712.8, 2726.1, 2739.5]# noqa: E501 + associate = [{"type":"*skillRation","data":[i-100 if i>0 else 0 for i in data0],"skills":["里 · 鬼剑术","空中连斩"]}] + # 空中连斩 공중 연속 베기 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/78bd107acd474518b606be1e4fd38239?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 class Skill2(ActiveSkill): @@ -45,94 +58,63 @@ class Skill2(ActiveSkill): learnLv = 5 masterLv = 1 maxLv = 11 - position = 0 #todo + position = 10 #todo rangeLv = 1 mp = [5, 7] + # 两刀，实际第二刀才出伤害 为了统计hit data0 = [0, 195, 209, 221, 234, 247, 260, 275, 286, 299, 312, 326]# noqa: E501 - data1 = [0, 144, 154, 163, 173, 182, 192, 202, 211, 221, 230, 240]# noqa: E501 + hit0 = 2 + power0 = 0.5 + + # 太刀 + data1 = [i - 100 if i > 100 else i for i in data0] + hit1 = 2 + power1 = 1 + + def skillInfo(self, mode = None): + if self.char.GetWeaponType() == '太刀': + self.hit0 = 0 + else: + self.hit1 = 0 + return super().skillInfo(mode) - def effect(self, old , new): - pass # 光剑精通 광검 마스터리 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/717f1e2104fe4b796f800352fa143ecc?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill16(PassiveSkill): +class Skill3(PassiveSkill): name = "光剑精通" learnLv = 15 - masterLv = 30 + masterLv = 10 maxLv = 40 - position = 0 #TODO + position = 2 rangeLv = 3 data0 = [0, 9.5, 11, 12.5, 14, 15.5, 17, 18.5, 20, 21.5, 23, 24.5, 26, 27.5, 29, 30.5, 32, 33.5, 35, 36.5, 38, 39.5, 41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61, 63, 65, 67, 69, 71, 73, 75, 77]# noqa: E501 - hit0 = 1 #TODO - - data1 = [0, 2.5, 3.8, 5, 6.3, 7.6, 8.8, 10.1, 11.3, 12.6, 13.9, 15.1, 16.4, 17.6, 18.9, 20.2, 21.4, 22.7, 23.9, 25.2, 26.5, 27.7, 29, 30.2, 31.5, 32.8, 34, 35.3, 36.5, 37.8, 39.1, 40.3, 41.6, 42.8, 44.1, 45.4, 46.6, 47.9, 49.1, 50.4, 51.7]# noqa: E501 - hit1 = 1 #TODO - - data2 = [0, 0.6, 0.9, 1.2, 1.5, 1.8, 2.1, 2.4, 2.7, 3, 3.3, 3.6, 3.9, 4.2, 4.5, 4.8, 5.1, 5.4, 5.7, 6, 6.3, 6.6, 6.9, 7.2, 7.5, 7.8, 8.1, 8.4, 8.7, 9, 9.3, 9.6, 9.9, 10.2, 10.5, 10.8, 11.1, 11.4, 11.7, 12, 12.3]# noqa: E501 - hit2 = 1 #TODO - - data3 = [0, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50]# noqa: E501 - hit3 = 1 #TODO - - data4 = [0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100]# noqa: E501 - hit4 = 1 #TODO - - data5 = [0, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5]# noqa: E501 - hit5 = 1 #TODO - - data6 = [0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5]# noqa: E501 - hit6 = 1 #TODO - - data7 = [0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14]# noqa: E501 - hit7 = 1 #TODO - - data8 = [0, 556, 583, 603, 626, 654, 676, 697, 727, 748, 769, 795, 820, 841, 868, 889, 914, 936, 961, 982, 1009, 1032, 1055, 1075, 1103, 1126, 1148, 1176, 1199, 1221, 1244, 1272, 1292, 1317, 1338, 1365, 1386, 1386, 1721, 1746, 1777]# noqa: E501 - hit8 = 1 #TODO - - data9 = [0, 123, 125, 127, 129, 132, 134, 136, 138, 141, 143, 145, 147, 150, 152, 154, 156, 159, 161, 163, 165, 168, 170, 172, 175, 177, 179, 181, 183, 186, 188, 190, 193, 195, 197, 199, 201, 204, 206, 208, 211]# noqa: E501 - hit9 = 1 #TODO - - data10 = [0, 30.6, 31.6, 32.6, 33.6, 34.8, 35.8, 36.8, 37.8, 39, 40, 41, 42.2, 43.2, 44.2, 45.2, 46.4, 47.4, 48.4, 49.4, 50.6, 51.6, 52.6, 53.6, 54.8, 55.8, 56.8, 57.8, 59, 60, 61, 62.2, 63.2, 64.2, 65.2, 66.4, 67.4, 68.4, 69.4, 70.6, 71.6]# noqa: E501 - hit10 = 1 #TODO - - data11 = [0, 9.3, 9.5, 9.6, 9.7, 9.9, 10, 10.1, 10.3, 10.4, 10.5, 10.7, 10.8, 10.9, 11.1, 11.2, 11.3, 11.5, 11.6, 11.7, 11.9, 12, 12.1, 12.3, 12.4, 12.5, 12.7, 12.8, 12.9, 13.1, 13.2, 13.3, 13.4, 13.6, 13.7, 13.8, 14, 14.1, 14.3, 14.4, 14.5]# noqa: E501 - hit11 = 1 #TODO - - data12 = [0, 21, 21, 22, 22, 22, 22, 23, 23, 23, 24, 24, 24, 24, 25, 25, 25, 25, 26, 26, 26, 26, 27, 27, 27, 28, 28, 28, 28, 29, 29, 29, 29, 30, 30, 30, 30, 31, 31, 31, 33]# noqa: E501 - hit12 = 1 #TODO - - data13 = [0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100]# noqa: E501 - hit13 = 1 #TODO - - data14 = [0, 15.7, 15.8, 15.9, 15.9, 16, 16.1, 16.1, 16.2, 16.3, 16.4, 16.4, 16.5, 16.6, 16.7, 16.7, 16.8, 16.9, 16.9, 17, 17.1, 17.2, 17.2, 17.3, 17.4, 17.4, 17.5, 17.6, 17.7, 17.7, 17.8, 17.9, 17.9, 18, 18.1, 18.2, 18.2, 18.3, 18.4, 18.5, 18.5]# noqa: E501 - hit14 = 1 #TODO - - data15 = [0, 35, 35, 35, 35, 36, 36, 36, 36, 36, 36, 36, 37, 37, 37, 37, 37, 37, 37, 38, 38, 38, 38, 38, 38, 38, 39, 39, 39, 39, 39, 39, 39, 40, 40, 40, 40, 40, 40, 40, 41]# noqa: E501 - hit15 = 1 #TODO data16 = [0, 16.8, 18.3, 19.8, 21.3, 22.8, 24.3, 25.8, 27.3, 28.8, 30.3, 31.8, 33.3, 34.8, 36.3, 37.8, 39.3, 40.8, 42.3, 43.8, 45.3, 46.8, 48.3, 50.3, 52.3, 54.3, 56.3, 58.3, 60.3, 62.3, 64.3, 66.3, 68.3, 70.3, 72.3, 74.3, 76.3, 78.3, 80.3, 82.3, 84.3]# noqa: E501 - hit16 = 1 #TODO - - data17 = [0, 1.4, 3.1, 4.6, 6, 7.5, 9, 10.6, 12.1, 13.6, 15.1, 16.5, 18.1, 19.6, 21.1, 22.6, 24.2, 25.7, 27.1, 28.6, 30.2, 31.7, 33.2, 34.7, 36.3, 37.7, 39.2, 40.7, 42.2, 43.8, 45.3, 46.8, 48.2, 49.8, 51.3, 52.8, 54.3, 55.9, 57.4, 58.8, 60.3]# noqa: E501 - hit17 = 1 #TODO - - data18 = [0, 0.3, 0.6, 0.9, 1.2, 1.5, 1.8, 2.1, 2.4, 2.7, 3, 3.3, 3.6, 3.9, 4.2, 4.5, 4.8, 5.1, 5.4, 5.7, 6, 6.3, 6.6, 6.9, 7.2, 7.5, 7.8, 8.1, 8.4, 8.7, 9, 9.3, 9.6, 9.9, 10.2, 10.5, 10.8, 11.1, 11.4, 11.7, 12]# noqa: E501 - hit18 = 1 #TODO + def effect(self, old, new): + weapon = self.char.GetWeaponType() + if weapon != "光剑": + return + data = self.data0 + if weapon.categorize == "传世武器": + data = self.data16 + self.associate = [{type:"$*PAtkP","data":data}] + return super().effect(old, new) # 三段斩 단공참 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/f2fb27162beb0b87a7cb9af7900e95f2?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill17(ActiveSkill): +class Skill4(ActiveSkill): name = "三段斩" learnLv = 15 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 3 #TODO rangeLv = 2 cd = 6 mp = [12, 120] + damage = False data0 = [0, 889, 980, 1070, 1160, 1250, 1341, 1431, 1521, 1611, 1702, 1792, 1882, 1972, 2062, 2153, 2243, 2333, 2423, 2514, 2604, 2694, 2784, 2875, 2965, 3055, 3145, 3235, 3326, 3416, 3506, 3596, 3687, 3777, 3867, 3957, 4048, 4138, 4228, 4318, 4408, 4499, 4589, 4679, 4769, 4860, 4950, 5040, 5130, 5221, 5311, 5401, 5491, 5581, 5672, 5762, 5852, 5942, 6033, 6123, 6213, 6303, 6394, 6484, 6574, 6664, 6754, 6845, 6935, 7025, 7115]# noqa: E501 hit0 = 1 #TODO @@ -152,315 +134,275 @@ class Skill17(ActiveSkill): # 短剑精通 소검 마스터리 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/01c3a2fb793d293a25ed8dc7a0d70c1a?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill18(PassiveSkill): +class Skill5(PassiveSkill): name = "短剑精通" learnLv = 15 - masterLv = 30 + masterLv = 1 maxLv = 40 + line = 10 position = 0 #TODO rangeLv = 3 data0 = [0, 16.8, 18.3, 19.8, 21.3, 22.8, 24.3, 25.8, 27.3, 28.8, 30.3, 31.8, 33.3, 34.8, 36.3, 37.8, 39.3, 40.8, 42.3, 43.8, 45.3, 46.8, 48.3, 50.3, 52.3, 54.3, 56.3, 58.3, 60.3, 62.3, 64.3, 66.3, 68.3, 70.3, 72.3, 74.3, 76.3, 78.3, 80.3, 82.3, 84.3]# noqa: E501 - hit0 = 1 #TODO - - data1 = [0, 1.2, 2.6, 3.9, 5.1, 6.4, 7.7, 9, 10.3, 11.6, 12.9, 14.1, 15.4, 16.7, 18, 19.3, 20.6, 21.9, 23.1, 24.4, 25.7, 27, 28.3, 29.6, 30.9, 32.1, 33.4, 34.7, 36, 37.3, 38.6, 39.9, 41.1, 42.4, 43.7, 45, 46.3, 47.6, 48.9, 50.1, 51.4]# noqa: E501 - hit1 = 1 #TODO - - data2 = [0, 0.3, 0.6, 0.9, 1.2, 1.5, 1.8, 2.1, 2.4, 2.7, 3, 3.3, 3.6, 3.9, 4.2, 4.5, 4.8, 5.1, 5.4, 5.7, 6, 6.3, 6.6, 6.9, 7.2, 7.5, 7.8, 8.1, 8.4, 8.7, 9, 9.3, 9.6, 9.9, 10.2, 10.5, 10.8, 11.1, 11.4, 11.7, 12]# noqa: E501 - hit2 = 1 #TODO + # [里 · 鬼剑术]剑气攻击力 data3 = [0, 445, 459, 472, 486, 499, 510, 525, 537, 552, 563, 574, 590, 601, 618, 627, 639, 655, 666, 681, 693, 705, 719, 731, 746, 758, 770, 784, 797, 812, 823, 836, 850, 863, 876, 889, 900, 916, 926, 942, 953]# noqa: E501 - hit3 = 1 #TODO - - data4 = [0, 234, 240, 245, 250, 255, 260, 266, 271, 276, 281, 286, 292, 297, 303, 308, 314, 319, 323, 329, 334, 340, 345, 349, 355, 360, 366, 371, 375, 382, 387, 393, 397, 403, 408, 413, 419, 423, 429, 434, 439]# noqa: E501 - hit4 = 1 #TODO - - data5 = [0, 58.9, 61.1, 63.2, 65.3, 67.4, 69.5, 71.6, 73.7, 75.8, 77.9, 80, 82.1, 84.2, 86.3, 88.4, 90.5, 92.6, 94.7, 96.8, 98.9, 101.1, 103.2, 105.3, 107.4, 109.5, 111.6, 113.7, 115.8, 117.9, 120, 122.1, 124.2, 126.3, 128.4, 130.5, 132.6, 134.7, 136.8, 138.9, 141.1]# noqa: E501 - hit5 = 1 #TODO - - data6 = [0, 1.5, 1.5, 1.6, 1.6, 1.6, 1.6, 1.7, 1.7, 1.7, 1.8, 1.8, 1.8, 1.9, 1.9, 1.9, 2, 2, 2, 2, 2.1, 2.1, 2.1, 2.2, 2.2, 2.2, 2.3, 2.3, 2.3, 2.4, 2.4, 2.4, 2.5, 2.5, 2.5, 2.6, 2.6, 2.6, 2.6, 2.7, 2.7]# noqa: E501 - hit6 = 1 #TODO - - data7 = [0, 0, 0, 69.4, 70.1, 70.8, 71.5, 72.2, 72.9, 73.6, 74.3, 75, 75.7, 76.4, 77.1, 77.8, 78.5, 79.2, 79.9, 80.6, 81.3, 82, 82.7, 83.4, 84.1, 84.8, 85.5, 86.2, 86.9, 87.6, 88.3, 89, 89.7, 90.4, 91.1, 91.8, 92.5, 93.2, 93.9, 94.6, 95.3]# noqa: E501 - hit7 = 1 #TODO - - data8 = [0, 0, 0, 35.1, 36, 36.9, 37.8, 38.7, 39.6, 40.5, 41.4, 42.3, 43.2, 44.1, 45, 45.9, 46.8, 47.7, 48.6, 49.5, 50.4, 51.3, 52.2, 53.1, 54, 54.9, 55.8, 56.7, 57.6, 58.5, 59.4, 60.3, 61.2, 62.1, 63, 63.9, 64.8, 65.7, 66.6, 67.5, 68.4]# noqa: E501 - hit8 = 1 #TODO - - data9 = [0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100]# noqa: E501 - hit9 = 1 #TODO - - data10 = [0, 27.2, 27.7, 28.2, 28.7, 29.2, 29.7, 30.2, 30.7, 31.2, 31.7, 32.2, 32.7, 33.2, 33.7, 34.2, 34.7, 35.2, 35.7, 36.2, 36.7, 37.2, 37.7, 38.2, 38.7, 39.2, 39.7, 40.2, 40.7, 41.2, 41.7, 42.2, 42.7, 43.2, 43.7, 44.2, 44.7, 45.2, 45.7, 46.2, 46.7]# noqa: E501 - hit10 = 1 #TODO - - data11 = [0, 0, 0, 0, 0, 0, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45]# noqa: E501 - hit11 = 1 #TODO - - data12 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25]# noqa: E501 - hit12 = 1 #TODO data13 = [0, 16.8, 18.3, 19.8, 21.3, 22.8, 24.3, 25.8, 27.3, 28.8, 30.3, 31.8, 33.3, 34.8, 36.3, 37.8, 39.3, 40.8, 42.3, 43.8, 45.3, 46.8, 48.3, 50.3, 52.3, 54.3, 56.3, 58.3, 60.3, 62.3, 64.3, 66.3, 68.3, 70.3, 72.3, 74.3, 76.3, 78.3, 80.3, 82.3, 84.3]# noqa: E501 - hit13 = 1 #TODO - data14 = [0, 1.4, 3.1, 4.6, 6, 7.5, 9, 10.6, 12.1, 13.6, 15.1, 16.5, 18.1, 19.6, 21.1, 22.6, 24.2, 25.7, 27.1, 28.6, 30.2, 31.7, 33.2, 34.7, 36.3, 37.7, 39.2, 40.7, 42.2, 43.8, 45.3, 46.8, 48.2, 49.8, 51.3, 52.8, 54.3, 55.9, 57.4, 58.8, 60.3]# noqa: E501 - hit14 = 1 #TODO - data15 = [0, 0.3, 0.6, 0.9, 1.2, 1.5, 1.8, 2.1, 2.4, 2.7, 3, 3.3, 3.6, 3.9, 4.2, 4.5, 4.8, 5.1, 5.4, 5.7, 6, 6.3, 6.6, 6.9, 7.2, 7.5, 7.8, 8.1, 8.4, 8.7, 9, 9.3, 9.6, 9.9, 10.2, 10.5, 10.8, 11.1, 11.4, 11.7, 12]# noqa: E501 - hit15 = 1 #TODO + def effect(self, old, new): + weapon = self.char.GetWeaponType() + if weapon != "短剑": + return + data = self.data0 + if weapon.categorize == "传世武器": + data = self.data13 + self.associate = [ + {type:"$*PAtkP","data":data}, + {type:"+dataplus0","data":self.data3,"skills":["里 · 鬼剑术"],"ratio":1}, + ] + return super().effect(old, new) # 太刀精通 도 마스터리 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/8f73f243041c2d27739fe7696f02bf9b?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill19(PassiveSkill): +class Skill6(ActiveSkill): name = "太刀精通" learnLv = 15 - masterLv = 30 + masterLv = 1 maxLv = 40 - position = 0 #TODO + line = 10 + position = 1 #TODO rangeLv = 3 - + type = "passive" + # 物理攻击力增加 data0 = [0, 9.2, 10.7, 12.2, 13.7, 15.2, 16.7, 18.2, 19.7, 21.2, 22.7, 24.2, 25.7, 27.2, 28.7, 30.2, 31.7, 33.2, 34.7, 36.2, 37.7, 39.2, 40.7, 42.7, 44.7, 46.7, 48.7, 50.7, 52.7, 54.7, 56.7, 58.7, 60.7, 62.7, 64.7, 66.7, 68.7, 70.7, 72.7, 74.7, 76.7]# noqa: E501 - hit0 = 1 #TODO + hit0 = 0 - data1 = [0, 1.3, 2.8, 4.1, 5.4, 6.8, 8.2, 9.6, 10.9, 12.3, 13.7, 15, 16.4, 17.7, 19.1, 20.5, 21.9, 23.3, 24.5, 25.9, 27.3, 28.7, 30.1, 31.4, 32.8, 34.1, 35.5, 36.9, 38.2, 39.6, 41, 42.4, 43.7, 45, 46.4, 47.8, 49.2, 50.6, 52, 53.2, 54.6]# noqa: E501 - hit1 = 1 #TODO - - data2 = [0, 0.3, 0.6, 0.9, 1.2, 1.5, 1.8, 2.1, 2.4, 2.7, 3, 3.3, 3.6, 3.9, 4.2, 4.5, 4.8, 5.1, 5.4, 5.7, 6, 6.3, 6.6, 6.9, 7.2, 7.5, 7.8, 8.1, 8.4, 8.7, 9, 9.3, 9.6, 9.9, 10.2, 10.5, 10.8, 11.1, 11.4, 11.7, 12]# noqa: E501 - hit2 = 1 #TODO - - data3 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 37, 38, 38, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, 47, 48, 48, 49, 49, 50, 50, 51, 51, 52, 52]# noqa: E501 - hit3 = 1 #TODO - - data4 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3, 3.3]# noqa: E501 - hit4 = 1 #TODO + # 刺伤几率 + data4 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 37, 38, 38, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, 47, 48, 48, 49, 49, 50, 50, 51, 51, 52, 52] + # 刺伤爆炸伤害(下限) data5 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2638, 2803, 2968, 3134, 3295, 3460, 3621, 3789, 3953, 4117, 4279, 4448, 4609, 4778, 4936, 5104, 5264, 5430, 5597, 5759, 5925, 6087, 6250, 6419, 6580, 6749, 6909, 7078, 7243, 7407, 7574]# noqa: E501 - hit5 = 1 #TODO + # 刺伤爆炸伤害(上限) data6 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 18328, 19469, 20609, 21749, 22890, 24030, 25169, 26311, 27452, 28590, 29732, 30873, 32012, 33154, 34291, 35432, 36571, 37713, 38852, 39992, 41133, 42274, 43412, 44554, 45696, 46834, 47976, 49114, 50256, 51398, 52536]# noqa: E501 - hit6 = 1 #TODO - - data7 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 13, 13, 13, 14, 14, 14, 14, 14, 15, 15, 16, 16, 18, 18, 18, 19, 19, 19, 19, 19]# noqa: E501 - hit7 = 1 #TODO + # [空中连斩]附加攻击力 data8 = [0, 63, 68, 72, 76, 79, 84, 87, 93, 96, 99, 104, 107, 111, 115, 120, 123, 127, 131, 134, 138, 143, 147, 150, 155, 159, 161, 166, 171, 174, 177, 183, 186, 190, 196, 198, 202, 204, 209, 214, 219]# noqa: E501 - hit8 = 1 #TODO + # [空中连斩]对刺伤状态增加攻击力 data9 = [0, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150]# noqa: E501 - hit9 = 1 #TODO + # 传世武器物攻增加 data10 = [0, 16.8, 18.3, 19.8, 21.3, 22.8, 24.3, 25.8, 27.3, 28.8, 30.3, 31.8, 33.3, 34.8, 36.3, 37.8, 39.3, 40.8, 42.3, 43.8, 45.3, 46.8, 48.3, 50.3, 52.3, 54.3, 56.3, 58.3, 60.3, 62.3, 64.3, 66.3, 68.3, 70.3, 72.3, 74.3, 76.3, 78.3, 80.3, 82.3, 84.3]# noqa: E501 - hit10 = 1 #TODO - data11 = [0, 1.4, 3.1, 4.6, 6, 7.5, 9, 10.6, 12.1, 13.6, 15.1, 16.5, 18.1, 19.6, 21.1, 22.6, 24.2, 25.7, 27.1, 28.6, 30.2, 31.7, 33.2, 34.7, 36.3, 37.7, 39.2, 40.7, 42.2, 43.8, 45.3, 46.8, 48.2, 49.8, 51.3, 52.8, 54.3, 55.9, 57.4, 58.8, 60.3]# noqa: E501 - hit11 = 1 #TODO - - data12 = [0, 0.3, 0.6, 0.9, 1.2, 1.5, 1.8, 2.1, 2.4, 2.7, 3, 3.3, 3.6, 3.9, 4.2, 4.5, 4.8, 5.1, 5.4, 5.7, 6, 6.3, 6.6, 6.9, 7.2, 7.5, 7.8, 8.1, 8.4, 8.7, 9, 9.3, 9.6, 9.9, 10.2, 10.5, 10.8, 11.1, 11.4, 11.7, 12]# noqa: E501 - hit12 = 1 #TODO + def effect(self, old, new): + weapon = self.char.GetWeaponType() + if weapon != "太刀": + return + data = self.data0 + if weapon.categorize == "传世武器": + data = self.data10 + self.associate = [ + {type:"$*PAtkP","data":data}, + {type:"*power1","data":[i-100 if i>100 else 0 for i in self.data9],"skills":["空中连斩"]}, + ] + return super().effect(old, new) + def getSkillDate(self, lv = 0): + # 刺伤期望伤害 (17层引爆上限) / 17 (17层结算1次爆炸) * 刺伤触发几率 + return self.data6[lv] * 1 / 17 * self.data4[lv] / 100 + def getSkillCD(self): + return 1.0 # 巨剑精通 대검 마스터리 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/8c2379737c5acc935c1731f67f607655?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill20(PassiveSkill): +class Skill7(PassiveSkill): name = "巨剑精通" learnLv = 15 - masterLv = 30 + masterLv = 1 maxLv = 40 + line = 10 position = 0 #TODO rangeLv = 3 data0 = [0, 14.4, 15.9, 17.4, 18.9, 20.4, 21.9, 23.4, 24.9, 26.4, 27.9, 29.4, 30.9, 32.4, 33.9, 35.4, 36.9, 38.4, 39.9, 41.4, 42.9, 44.4, 45.9, 47.9, 49.9, 51.9, 53.9, 55.9, 57.9, 59.9, 61.9, 63.9, 65.9, 67.9, 69.9, 71.9, 73.9, 75.9, 77.9, 79.9, 81.9]# noqa: E501 hit0 = 1 #TODO - data1 = [0, 1.4, 3.1, 4.6, 6, 7.5, 9, 10.6, 12.1, 13.6, 15.1, 16.5, 18.1, 19.6, 21.1, 22.6, 24.2, 25.7, 27.1, 28.6, 30.2, 31.7, 33.2, 34.7, 36.3, 37.7, 39.2, 40.7, 42.2, 43.8, 45.3, 46.8, 48.2, 49.8, 51.3, 52.8, 54.3, 55.9, 57.4, 58.8, 60.3]# noqa: E501 - hit1 = 1 #TODO - - data2 = [0, 0.3, 0.6, 0.9, 1.2, 1.5, 1.8, 2.1, 2.4, 2.7, 3, 3.3, 3.6, 3.9, 4.2, 4.5, 4.8, 5.1, 5.4, 5.7, 6, 6.3, 6.6, 6.9, 7.2, 7.5, 7.8, 8.1, 8.4, 8.7, 9, 9.3, 9.6, 9.9, 10.2, 10.5, 10.8, 11.1, 11.4, 11.7, 12]# noqa: E501 - hit2 = 1 #TODO - - data3 = [0, 656, 695, 729, 763, 802, 835, 873, 908, 942, 980, 1014, 1048, 1087, 1121, 1153, 1194, 1226, 1264, 1299, 1332, 1370, 1405, 1439, 1478, 1511, 1549, 1584, 1618, 1656, 1690, 1724, 1762, 1797, 1830, 1869, 1903, 1940, 1976, 2008, 2046]# noqa: E501 - hit3 = 1 #TODO - - data4 = [0, 47.2, 48.8, 50.5, 52.2, 53.9, 55.6, 57.3, 58.9, 60.6, 62.3, 64, 65.7, 67.4, 69.1, 70.7, 72.4, 74.1, 75.8, 77.5, 79.2, 80.8, 82.5, 84.2, 85.9, 87.6, 89.3, 90.9, 92.6, 94.3, 96, 97.7, 99.4, 101.1, 102.7, 104.4, 106.1, 107.8, 109.5, 111.2, 112.8]# noqa: E501 - hit4 = 1 #TODO - - data5 = [0, 1.3, 1.4, 1.4, 1.4, 1.4, 1.5, 1.5, 1.5, 1.6, 1.6, 1.6, 1.6, 1.7, 1.7, 1.7, 1.8, 1.8, 1.8, 1.9, 1.9, 1.9, 1.9, 2, 2, 2, 2, 2.1, 2.1, 2.1, 2.2, 2.2, 2.2, 2.3, 2.3, 2.3, 2.3, 2.4, 2.4, 2.4, 2.4]# noqa: E501 - hit5 = 1 #TODO - - data6 = [0, 340, 358, 375, 394, 411, 429, 451, 465, 483, 506, 519, 540, 559, 573, 595, 612, 635, 648, 666, 689, 701, 724, 742, 760, 778, 796, 813, 831, 854, 868, 885, 908, 920, 943, 961, 975, 997, 1014, 1036, 1050]# noqa: E501 - hit6 = 1 #TODO - - data7 = [0, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520, 520]# noqa: E501 - hit7 = 1 #TODO - - data8 = [0, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, 130]# noqa: E501 - hit8 = 1 #TODO + # [里 · 鬼剑术]额外附加 + data3 = [0, 656, 695, 729, 763, 802, 835, 873, 908, 942, 980, 1014, 1048, 1087, 1121, 1153, 1194, 1226, 1264, 1299, 1332, 1370, 1405, 1439, 1478, 1511, 1549, 1584, 1618, 1656, 1690, 1724, 1762, 1797, 1830, 1869, 1903, 1940, 1976, 2008, 2046] data9 = [0, 16.8, 18.3, 19.8, 21.3, 22.8, 24.3, 25.8, 27.3, 28.8, 30.3, 31.8, 33.3, 34.8, 36.3, 37.8, 39.3, 40.8, 42.3, 43.8, 45.3, 46.8, 48.3, 50.3, 52.3, 54.3, 56.3, 58.3, 60.3, 62.3, 64.3, 66.3, 68.3, 70.3, 72.3, 74.3, 76.3, 78.3, 80.3, 82.3, 84.3]# noqa: E501 hit9 = 1 #TODO - data10 = [0, 1.4, 3.1, 4.6, 6, 7.5, 9, 10.6, 12.1, 13.6, 15.1, 16.5, 18.1, 19.6, 21.1, 22.6, 24.2, 25.7, 27.1, 28.6, 30.2, 31.7, 33.2, 34.7, 36.3, 37.7, 39.2, 40.7, 42.2, 43.8, 45.3, 46.8, 48.2, 49.8, 51.3, 52.8, 54.3, 55.9, 57.4, 58.8, 60.3]# noqa: E501 - hit10 = 1 #TODO - - data11 = [0, 0.3, 0.6, 0.9, 1.2, 1.5, 1.8, 2.1, 2.4, 2.7, 3, 3.3, 3.6, 3.9, 4.2, 4.5, 4.8, 5.1, 5.4, 5.7, 6, 6.3, 6.6, 6.9, 7.2, 7.5, 7.8, 8.1, 8.4, 8.7, 9, 9.3, 9.6, 9.9, 10.2, 10.5, 10.8, 11.1, 11.4, 11.7, 12]# noqa: E501 - hit11 = 1 #TODO + def effect(self, old, new): + weapon = self.char.GetWeaponType() + if weapon != "巨剑": + return + data = self.data0 + if weapon.categorize == "传世武器": + data = self.data9 + self.associate = [ + {type:"$*PAtkP","data":data}, + {type:"+dataplus0","data":self.data3,"skills":["里 · 鬼剑术"],"ratio":1}, + ] + return super().effect(old, new) # 钝器精通 둔기 마스터리 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/9cb6f9ed646fa87f9b7680a42ce83d1a?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill21(PassiveSkill): +class Skill8(PassiveSkill): name = "钝器精通" learnLv = 15 - masterLv = 30 + masterLv = 1 maxLv = 40 - position = 0 #TODO + line = 10 + position = 1 #TODO rangeLv = 3 data0 = [0, 11.3, 12.8, 14.3, 15.8, 17.3, 18.8, 20.3, 21.8, 23.3, 24.8, 26.3, 27.8, 29.3, 30.8, 32.3, 33.8, 35.3, 36.8, 38.3, 39.8, 41.3, 42.8, 44.8, 46.8, 48.8, 50.8, 52.8, 54.8, 56.8, 58.8, 60.8, 62.8, 64.8, 66.8, 68.8, 70.8, 72.8, 74.8, 76.8, 78.8]# noqa: E501 hit0 = 1 #TODO - data1 = [0, 1.4, 2.9, 4.4, 5.8, 7.3, 8.7, 10.2, 11.7, 13.2, 14.6, 16, 17.5, 18.9, 20.4, 21.9, 23.4, 24.8, 26.2, 27.7, 29.1, 30.6, 32.1, 33.6, 35, 36.4, 37.9, 39.3, 40.8, 42.3, 43.8, 45.2, 46.6, 48.1, 49.6, 51, 52.5, 54, 55.4, 56.8, 58.3]# noqa: E501 - hit1 = 1 #TODO - - data2 = [0, 0.4, 0.8, 1.2, 1.6, 2, 2.4, 2.8, 3.2, 3.6, 4, 4.4, 4.8, 5.2, 5.6, 6, 6.4, 6.8, 7.2, 7.6, 8, 8.4, 8.8, 9.2, 9.6, 10, 10.4, 10.8, 11.2, 11.6, 12, 12.4, 12.8, 13.2, 13.6, 14, 14.4, 14.8, 15.2, 15.6, 16]# noqa: E501 - hit2 = 1 #TODO - - data3 = [0, 505, 515, 524, 534, 544, 553, 562, 571, 581, 590, 600, 610, 619, 629, 638, 647, 656, 666, 676, 685, 695, 704, 714, 724, 733, 742, 751, 761, 770, 780, 790, 799, 809, 818, 827, 836, 846, 856, 865, 875]# noqa: E501 - hit3 = 1 #TODO - - data4 = [0, 1112, 1153, 1197, 1239, 1282, 1325, 1366, 1409, 1452, 1495, 1536, 1579, 1622, 1663, 1707, 1749, 1791, 1834, 1876, 1919, 1962, 2003, 2046, 2089, 2132, 2173, 2216, 2259, 2301, 2344, 2386, 2428, 2472, 2513, 2556, 2599, 2640, 2683, 2726, 2769]# noqa: E501 - hit4 = 1 #TODO - - data5 = [0, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300]# noqa: E501 - hit5 = 1 #TODO - - data6 = [0, 556, 586, 616, 646, 675, 705, 735, 765, 794, 824, 854, 884, 914, 943, 973, 1003, 1033, 1063, 1092, 1122, 1152, 1182, 1212, 1241, 1271, 1301, 1331, 1361, 1390, 1420, 1450, 1480, 1510, 1539, 1569, 1599, 1629, 1658, 1688, 1718]# noqa: E501 - hit6 = 1 #TODO - - data7 = [0, 1618, 1686, 1756, 1824, 1894, 1964, 2032, 2103, 2171, 2241, 2311, 2379, 2449, 2517, 2587, 2657, 2726, 2795, 2863, 2934, 3003, 3072, 3142, 3211, 3280, 3349, 3419, 3488, 3557, 3626, 3697, 3765, 3834, 3903, 3973, 4043, 4111, 4181, 4250, 4319]# noqa: E501 - hit7 = 1 #TODO - - data8 = [0, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30]# noqa: E501 - hit8 = 1 #TODO - data9 = [0, 16.8, 18.3, 19.8, 21.3, 22.8, 24.3, 25.8, 27.3, 28.8, 30.3, 31.8, 33.3, 34.8, 36.3, 37.8, 39.3, 40.8, 42.3, 43.8, 45.3, 46.8, 48.3, 50.3, 52.3, 54.3, 56.3, 58.3, 60.3, 62.3, 64.3, 66.3, 68.3, 70.3, 72.3, 74.3, 76.3, 78.3, 80.3, 82.3, 84.3]# noqa: E501 - hit9 = 1 #TODO - data10 = [0, 1.4, 3.1, 4.6, 6, 7.5, 9, 10.6, 12.1, 13.6, 15.1, 16.5, 18.1, 19.6, 21.1, 22.6, 24.2, 25.7, 27.1, 28.6, 30.2, 31.7, 33.2, 34.7, 36.3, 37.7, 39.2, 40.7, 42.2, 43.8, 45.3, 46.8, 48.2, 49.8, 51.3, 52.8, 54.3, 55.9, 57.4, 58.8, 60.3]# noqa: E501 - hit10 = 1 #TODO - - data11 = [0, 0.3, 0.6, 0.9, 1.2, 1.5, 1.8, 2.1, 2.4, 2.7, 3, 3.3, 3.6, 3.9, 4.2, 4.5, 4.8, 5.1, 5.4, 5.7, 6, 6.3, 6.6, 6.9, 7.2, 7.5, 7.8, 8.1, 8.4, 8.7, 9, 9.3, 9.6, 9.9, 10.2, 10.5, 10.8, 11.1, 11.4, 11.7, 12]# noqa: E501 - hit11 = 1 #TODO + def effect(self, old, new): + weapon = self.char.GetWeaponType() + if weapon != "钝器": + return + data = self.data0 + if weapon.categorize == "传世武器": + data = self.data9 + self.associate = [{type:"$*PAtkP","data":data},] + return super().effect(old, new) # 武器奥义 무기의 극의 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/8ee0099656df08a0b39225f8a21d514b?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill23(PassiveSkill): +class Skill9(PassiveSkill): name = "武器奥义" learnLv = 15 masterLv = 20 maxLv = 30 - position = 0 #TODO + position = 1 rangeLv = 3 + associate = [{"type":"+lv","data":[i for i in range(0, maxLv + 2)],"ratio":1}] #TODO + # 光剑掌握 광검 사용 가능 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/bb34e8854a93fd250347a1c64119f7ab?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill24(PassiveSkill): +class Skill10(PassiveSkill): name = "光剑掌握" learnLv = 15 masterLv = 10 maxLv = 20 - position = 0 #TODO + position = 9 #TODO rangeLv = 3 data0 = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]# noqa: E501 - hit0 = 1 #TODO data1 = [0, 1.5, 3, 4.5, 6, 7.5, 9, 10.5, 12, 13.5, 15, 16.5, 18, 19.5, 21, 22.5, 24, 25.5, 27, 28.5, 30]# noqa: E501 - hit1 = 1 #TODO + + associate = [ + {"type":"*cdReduce","data":data0,"exceptSkills":['极 · 鬼剑术 (暴风式)', '万剑归宗', '万剑极诣·开天斩']}, + ] # 里 · 鬼剑术 리 귀검술 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/51a08fd0c90f0a5276cd552047fac93d?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill27(ActiveSkill): +class Skill11(ActiveSkill): name = "里 · 鬼剑术" learnLv = 15 masterLv = 1 maxLv = 11 - position = 0 #TODO + position = 4 #TODO rangeLv = 15 mp = [6, 140] + icon = "$char/里鬼剑术" + thrusthit = 8 - data0 = [0, 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 30]# noqa: E501 - hit0 = 1 #TODO + @property + def swordnum(self): + list = {'短剑': 3, '光剑': 3, '巨剑': 2, '钝器': 4, '太刀': 4} + return list.get(self.char.GetWeaponType(), 3) + + ratio = [0, 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 30]# noqa: E501 + + basic = { + '短剑': (1 + 1 + 1) * 100, + '光剑': (1.433 + 1.707 + 2.235)* 100, + # 巨剑第二下蓄力5.2 + '巨剑': (3.027 + 2.301 * 5.2) * 100, + '太刀': (1.415 + 1.688 + 1.942 + 2.225) * 2, + # 钝器第三下眩晕率极高,眩晕了就是3倍里鬼 + '钝器': (2.301 + 2.923 + 1.801 * 3 + 4.366) * 100, + } + + def getSkillDate(self, lv = 0): + if lv == 0: + return 0 + weapon = self.char.GetWeaponType() + basic = self.basic.get(weapon, 3) + ratio = self.ratio[self.lv] / 100 + 1 + data = basic * ratio + self.dataplus0 + return data # 流心 류심 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/c5a2956d8ed3af1746ed2f76ca971a09?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill29(ActiveSkill): +class Skill12(ActiveSkill): name = "流心" learnLv = 20 masterLv = 1 maxLv = 1 - position = 0 #TODO + position = 6 #TODO rangeLv = 2 cd = 1 mp = [20, 20] + damage = False + # 流心 : 刺 류심 충 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/2a0a39184de92acf1c1375e00b77404c?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill30(ActiveSkill): +class Skill13(ActiveSkill): name = "流心 : 刺" learnLv = 20 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 4 #TODO rangeLv = 2 cd = 8 mp = [30, 280] + thrusthit = 4 data0 = [0, 4325, 4762, 5204, 5642, 6081, 6523, 6956, 7395, 7837, 8282, 8719, 9158, 9600, 10039, 10477, 10914, 11349, 11791, 12230, 12667, 13109, 13544, 13986, 14425, 14867, 15307, 15747, 16181, 16616, 17054, 17498, 17938, 18377, 18817, 19254, 19686, 20125, 20567, 21005, 21447, 21891, 22328, 22763, 23203, 23639, 24079, 24519, 24958, 25396, 25835, 26274, 26714, 27152, 27591, 28028, 28465, 28905, 29345, 29784, 30224, 30665, 31103, 31538, 31979, 32419, 32858, 33296, 33733, 34170, 34610]# noqa: E501 - hit0 = 1 #TODO + hit0 = 2 - data1 = [0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2]# noqa: E501 - hit1 = 1 #TODO + def getSkillDate(self, lv = 0): + weapon = self.char.GetWeaponType() + if weapon == "光剑" or weapon == "太刀": + self.hit0 = 4 + self.power0 = 0.63 + elif weapon == "巨剑" or weapon == "短剑": + self.hit0 = 3 + elif weapon == "钝器": + self.power0 = 1.25 - data2 = [0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100]# noqa: E501 - hit2 = 1 #TODO + def getWeaponCDRatio(self): + return 1.0 + # 额外刺伤概率 data3 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87]# noqa: E501 - hit3 = 1 #TODO - + # 额外刺伤层数 data4 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2]# noqa: E501 - hit4 = 1 #TODO - - data5 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3]# noqa: E501 - hit5 = 1 #TODO - - data6 = [0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4]# noqa: E501 - hit6 = 1 #TODO - - data7 = [0, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63]# noqa: E501 - hit7 = 1 #TODO - - data8 = [0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25]# noqa: E501 - hit8 = 1 #TODO - - data9 = [0, 33, 35, 36, 38, 40, 41, 43, 44, 46, 48, 49, 51, 53, 54, 56, 57, 59, 61, 62, 64, 66, 67, 69, 71, 72, 74, 75, 77, 79, 80, 82, 84, 85, 87, 88, 90, 92, 93, 95, 97, 98, 100, 101, 103, 105, 106, 108, 110, 111, 113, 115, 116, 118, 119, 121, 123, 124, 126, 128, 129, 131, 132, 134, 136, 137, 139, 141, 142, 144, 145]# noqa: E501 - hit9 = 1 #TODO - - data10 = [0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3]# noqa: E501 - hit10 = 1 #TODO - - data11 = [0, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121]# noqa: E501 - hit11 = 1 #TODO # 无我剑气 검기상인 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/c47b66efd27845ef14954928ea2f95c8?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill32(PassiveSkill): +class Skill14(PassiveSkill): name = "无我剑气" learnLv = 20 masterLv = 5 maxLv = 15 - position = 0 #TODO + position = 9 #TODO rangeLv = 3 data0 = [0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30]# noqa: E501 @@ -468,12 +410,12 @@ class Skill32(PassiveSkill): # 破极兵刃 오버드라이브 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/762c4e6d030eaf0abbfe1fec2b298574?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill35(ActiveSkill): +class Skill15(ActiveSkill): name = "破极兵刃" learnLv = 25 masterLv = 10 maxLv = 20 - position = 0 #TODO + position = 2 #TODO rangeLv = 3 cd = 5 mp = [271, 2570] @@ -490,12 +432,12 @@ class Skill35(ActiveSkill): # 流心 : 跃 류심 쾌 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/9dc8438e4572d39243c97da31c113acc?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill36(ActiveSkill): +class Skill16(ActiveSkill): name = "流心 : 跃" learnLv = 25 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 5 #TODO rangeLv = 2 cd = 8 mp = [30, 350] @@ -503,6 +445,9 @@ class Skill36(ActiveSkill): data0 = [0, 12011, 13229, 14445, 15664, 16883, 18105, 19327, 20546, 21763, 22981, 24200, 25420, 26639, 27858, 29080, 30297, 31515, 32732, 33952, 35171, 36390, 37609, 38825, 40045, 41266, 42486, 43699, 44923, 46141, 47355, 48576, 49796, 51014, 52234, 53453, 54664, 55886, 57101, 58325, 59548, 60765, 61982, 63201, 64418, 65635, 66859, 68075, 69294, 70514, 71732, 72950, 74169, 75390, 76609, 77826, 79043, 80262, 81486, 82705, 83924, 85145, 86358, 87576, 88794, 90013, 91236, 92455, 93672, 94892, 96111]# noqa: E501 hit0 = 1 #TODO + def getWeaponCDRatio(self): + return 1.0 + data1 = [0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2]# noqa: E501 hit1 = 1 #TODO @@ -542,12 +487,12 @@ class Skill36(ActiveSkill): # 逆转反击 이면 뒤집기 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/c9664191611af31142e052dfaef84530?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill37(ActiveSkill): +class Skill17(ActiveSkill): name = "逆转反击" learnLv = 30 masterLv = 20 maxLv = 30 - position = 0 #TODO + position = 2 #TODO rangeLv = 3 cd = [15, 14.7, 14.4, 14.2, 13.9, 13.6, 13.3, 13.1, 12.8, 12.5, 12.2, 12, 11.7, 11.4, 11.1, 10.9, 10.6, 10.3, 10, 9.8, 9.5, 9.2, 8.9, 8.7, 8.4, 8.1, 7.8, 7.6, 7.3, 7] mp = [10, 84] @@ -564,12 +509,12 @@ class Skill37(ActiveSkill): # 破军升龙击 차지 크래시 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/28b583c75a49103a1d8aabf799c000a4?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill38(ActiveSkill): +class Skill18(ActiveSkill): name = "破军升龙击" learnLv = 30 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 4 #TODO rangeLv = 2 cd = 10 mp = [70, 700] @@ -613,16 +558,19 @@ class Skill38(ActiveSkill): # 流心 : 升 류심 승 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/3fb8395ae3b81bd608e0c4223a8eb534?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill39(ActiveSkill): +class Skill19(ActiveSkill): name = "流心 : 升" learnLv = 30 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 7 #TODO rangeLv = 2 cd = 8 mp = [50, 490] + def getWeaponCDRatio(self): + return 1.0 + data0 = [0, 7137, 7861, 8592, 9313, 10039, 10764, 11485, 12211, 12934, 13656, 14387, 15113, 15832, 16556, 17279, 18010, 18731, 19455, 20184, 20907, 21627, 22358, 23078, 23803, 24528, 25254, 25979, 26702, 27421, 28150, 28876, 29597, 30325, 31049, 31773, 32496, 33218, 33949, 34672, 35392, 36117, 36842, 37572, 38296, 39017, 39741, 40467, 41188, 41912, 42643, 43367, 44090, 44812, 45540, 46262, 46981, 47719, 48440, 49161, 49885, 50611, 51333, 52059, 52782, 53509, 54233, 54954, 55680, 56404, 57130]# noqa: E501 hit0 = 1 #TODO @@ -647,12 +595,12 @@ class Skill39(ActiveSkill): # 流心 : 狂 류심 강 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/5806440d21e7546d50007a5ba11f8024?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill40(ActiveSkill): +class Skill20(ActiveSkill): name = "流心 : 狂" learnLv = 30 masterLv = 10 maxLv = 20 - position = 0 #TODO + position = 6 #TODO rangeLv = 3 cd = 5 mp = [20, 168] @@ -669,15 +617,17 @@ class Skill40(ActiveSkill): data3 = [0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24]# noqa: E501 hit3 = 1 #TODO + def getWeaponCDRatio(self): + return 1.0 # 拔刀斩 발도 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/cfacda0647b9a0f595df2c2aad30c18d?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill41(ActiveSkill): +class Skill21(ActiveSkill): name = "拔刀斩" learnLv = 35 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 5 #TODO rangeLv = 2 cube = 1 cd = 15 @@ -722,12 +672,12 @@ class Skill41(ActiveSkill): # 猛龙断空斩 맹룡단공참 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/669f1428193f61f9d92c743b72438c4d?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill42(ActiveSkill): +class Skill22(ActiveSkill): name = "猛龙断空斩" learnLv = 40 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 3 #TODO rangeLv = 2 cube = 1 cd = 20 @@ -748,12 +698,12 @@ class Skill42(ActiveSkill): # 破军斩龙击 차지 버스트 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/2c9d9a36c8401bddff6cdb80fab8dc24?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill43(ActiveSkill): +class Skill23(ActiveSkill): name = "破军斩龙击" learnLv = 40 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 4 #TODO rangeLv = 2 cube = 1 cd = 25 @@ -792,80 +742,88 @@ class Skill43(ActiveSkill): # 幻影剑舞 환영검무 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/8510294202d0e042dd29a2422fc6770d?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill44(ActiveSkill): +class Skill24(ActiveSkill): name = "幻影剑舞" learnLv = 45 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 6 #TODO rangeLv = 2 cube = 2 cd = 45 mp = [360, 3024] + # 短剑 增加剑气攻击力 剑气多端次数 + # 太刀 额外刺伤 + # 太刀 光剑 增加斩击次数 减少斩击攻击力 + # 巨剑 增加斩击攻击力 + # 钝器 删除剑气 发射冲击波 冲击波是剑气的 + + # 斩击攻击力 data0 = [0, 1577, 1742, 1904, 2064, 2222, 2387, 2541, 2703, 2867, 3021, 3183, 3344, 3510, 3669, 3825, 3987, 4151, 4313, 4470, 4631, 4790, 4950, 5112, 5274, 5435, 5592, 5754, 5918, 6077, 6236, 6396, 6554, 6719, 6876, 7037, 7203, 7356, 7518, 7683, 7841, 8001, 8159, 8324, 8483, 8642, 8804, 8966, 9120, 9285, 9449, 9608, 9770, 9927, 10091, 10250, 10409, 10569, 10728, 10890, 11049, 11213, 11373, 11535, 11694, 11855, 12014, 12173, 12335, 12492, 12651]# noqa: E501 hit0 = 1 #TODO - + # 基础斩击次数 data1 = [0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10]# noqa: E501 hit1 = 1 #TODO - + # 基础斩击次数 data2 = [0, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12]# noqa: E501 hit2 = 1 #TODO - + # 剑气攻击力 data3 = [0, 3719, 5459, 5975, 6494, 7007, 7511, 8033, 8547, 9066, 9563, 10062, 10602, 11109, 11619, 12120, 12650, 13163, 13674, 14175, 14705, 15213, 15726, 16235, 16754, 17262, 17772, 18279, 18803, 19314, 19817, 20333, 20841, 21360, 21872, 22377, 22896, 23411, 23927, 24429, 24941, 25472, 25971, 26486, 26982, 27527, 28028, 28542, 29040, 29568, 30083, 30642, 31155, 31670, 32187, 32703, 33224, 33741, 34242, 34757, 35280, 35793, 36302, 36825, 37338, 37857, 38373, 38886, 39408, 39920, 40437]# noqa: E501 hit3 = 1 #TODO - + # 剑气攻击力 data4 = [0, 6329, 6968, 7611, 8252, 8894, 9540, 10179, 10823, 11465, 12104, 12753, 13386, 14027, 14679, 15315, 15960, 16601, 17240, 17885, 18525, 19167, 19814, 20453, 21093, 21735, 22377, 23015, 23660, 24305, 24948, 25590, 26231, 26873, 27515, 28152, 28802, 29441, 30080, 30726, 31368, 32009, 32649, 33287, 33935, 34578, 35222, 35862, 36503, 37145, 37787, 38429, 39071, 39714, 40355, 40992, 41643, 42282, 42920, 43565, 44205, 44850, 45488, 46131, 46778, 47417, 48060, 48704, 49343, 49985, 50630]# noqa: E501 hit4 = 1 #TODO - + # 剑气多段次数 data5 = [0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2]# noqa: E501 hit5 = 1 #TODO - + # 剑气多段次数 data6 = [0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3]# noqa: E501 hit6 = 1 #TODO - + # 短剑 斩击攻击力减少率 data7 = [0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10]# noqa: E501 hit7 = 1 #TODO + # 短剑 剑气攻击力 data8 = [0, 3719, 5459, 5975, 6494, 7007, 7511, 8033, 8547, 9066, 9563, 10062, 10602, 11109, 11619, 12120, 12650, 13163, 13674, 14175, 14705, 15213, 15726, 16235, 16754, 17262, 17772, 18279, 18803, 19314, 19817, 20333, 20841, 21360, 21872, 22377, 22896, 23411, 23927, 24429, 24941, 25472, 25971, 26486, 26982, 27527, 28028, 28542, 29040, 29568, 30083, 30642, 31155, 31670, 32187, 32703, 33224, 33741, 34242, 34757, 35280, 35793, 36302, 36825, 37338, 37857, 38373, 38886, 39408, 39920, 40437]# noqa: E501 hit8 = 1 #TODO - + # 短剑 剑气攻击力 data9 = [0, 7596, 8363, 9134, 9905, 10677, 11445, 12216, 12986, 13752, 14525, 15297, 16064, 16838, 17610, 18377, 19149, 19923, 20694, 21462, 22232, 23003, 23774, 24543, 25317, 26081, 26856, 27624, 28392, 29163, 29942, 30704, 31478, 32247, 33014, 33791, 34556, 35325, 36098, 36872, 37638, 38412, 39180, 39954, 40722, 41493, 42261, 43035, 43805, 44574, 45341, 46115, 46884, 47657, 48426, 49196, 49965, 50739, 51506, 52278, 53054, 53819, 54591, 55361, 56136, 56901, 57674, 58440, 59210, 59984, 60759]# noqa: E501 hit9 = 1 #TODO - + # 短剑 剑气多段次数 data10 = [0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3]# noqa: E501 hit10 = 1 #TODO - + # 短剑 剑气多段次数 data11 = [0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4]# noqa: E501 hit11 = 1 #TODO - + # 太刀 光剑 7级精通后 斩击次数 data12 = [0, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20]# noqa: E501 hit12 = 1 #TODO - + # 太刀 光剑 7级精通后 斩击次数 data13 = [0, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24]# noqa: E501 hit13 = 1 #TODO - + # 太刀 光剑 7级精通后 剑气攻击力减少率 data14 = [0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25]# noqa: E501 hit14 = 1 #TODO - + # 太刀刺伤效果 几率 data15 = [0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 34, 35, 35]# noqa: E501 hit15 = 1 #TODO - + # 太刀刺伤效果数 data16 = [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]# noqa: E501 hit16 = 1 #TODO - + # 太刀刺伤效果持续时间 data17 = [0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2]# noqa: E501 hit17 = 1 #TODO - + # 光剑感点几率 data18 = [0, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88]# noqa: E501 hit18 = 1 #TODO - + # 光剑感点伤害 data19 = [0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3]# noqa: E501 hit19 = 1 #TODO - + # 巨剑 斩击攻击力增加率 data20 = [0, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50]# noqa: E501 hit20 = 1 #TODO - + # 钝器 冲击波攻击力 data21 = [0, 26579, 29276, 31974, 34667, 37362, 40062, 42756, 45456, 48155, 50849, 53544, 56243, 58937, 61634, 64328, 67026, 69722, 72417, 75116, 77816, 80513, 83211, 85901, 88599, 91298, 93993, 96690, 99387, 102078, 104777, 107474, 110171, 112865, 115565, 118263, 120962, 123654, 126350, 129051, 131741, 134439, 137139, 139830, 142530, 145227, 147918, 150618, 153317, 156015, 158708, 161406, 164103, 166800, 169499, 172191, 174885, 177581, 180281, 182976, 185673, 188372, 191067, 193763, 196461, 199158, 201854, 204554, 207246, 209942, 212642]# noqa: E501 hit21 = 1 #TODO @@ -875,12 +833,12 @@ class Skill44(ActiveSkill): # 极 · 鬼剑术 (斩铁式) 극 귀검술 : 참철식 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/5152480fdde81362575a488d4cec4af9?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill45(PassiveSkill): +class Skill25(PassiveSkill): name = "极 · 鬼剑术 (斩铁式)" learnLv = 48 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 4 #TODO rangeLv = 3 data0 = [0, 4.5, 6.5, 8.5, 10.5, 12.5, 14.5, 16.5, 18.5, 20.5, 22.5, 24.5, 26.5, 28.5, 30.5, 32.5, 34.5, 36.5, 38.5, 40.5, 42.5, 44.5, 46.5, 48.5, 50.5, 52.5, 54.5, 56.5, 58.5, 60.5, 62.5, 64.5, 66.5, 68.5, 70.5, 72.5, 74.5, 76.5, 78.5, 80.5, 82.5, 84.5, 86.5, 88.5, 90.5, 92.5, 94.5, 96.5, 98.5, 100.5, 102.5]# noqa: E501 @@ -889,12 +847,12 @@ class Skill45(PassiveSkill): # 极 · 鬼剑术 (暴风式) 극 귀검술 : 폭풍식 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/4f2e001e9a19eb7bae50ad1840dfb329?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill46(ActiveSkill): +class Skill26(ActiveSkill): name = "极 · 鬼剑术 (暴风式)" learnLv = 50 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 6 #TODO rangeLv = 5 cube = 5 cd = 145 @@ -915,12 +873,12 @@ class Skill46(ActiveSkill): # 极 · 神剑术 (流星落) 극 귀검술 : 유성락 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/0c262dac3ec41ff79e359ada9c7a7faf?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill47(ActiveSkill): +class Skill27(ActiveSkill): name = "极 · 神剑术 (流星落)" learnLv = 60 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 3 #TODO rangeLv = 2 cube = 1 cd = 35 @@ -956,12 +914,12 @@ class Skill47(ActiveSkill): # 破空拔刀斩 극초발도 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/2ba299855fc22192cba4f73db75e9d0e?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill48(ActiveSkill): +class Skill28(ActiveSkill): name = "破空拔刀斩" learnLv = 70 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 #TODO rangeLv = 2 cube = 2 cd = 50 @@ -1000,12 +958,12 @@ class Skill48(ActiveSkill): # 神影手 신기의 손놀림 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/0fc47245af1f21c3e9217d03aa9fff0a?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill49(PassiveSkill): +class Skill29(PassiveSkill): name = "神影手" learnLv = 70 masterLv = 1 maxLv = 1 - position = 0 #TODO + position = 10 #TODO rangeLv = 1 data0 = [0, 45]# noqa: E501 @@ -1023,12 +981,12 @@ class Skill49(PassiveSkill): # 极 · 神剑术 (破空斩) 극 귀검술 : 심검 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/b501ae53638d33a32351904f31cb6aa3?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill50(ActiveSkill): +class Skill30(ActiveSkill): name = "极 · 神剑术 (破空斩)" learnLv = 75 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 #TODO rangeLv = 2 cube = 3 cd = 35 @@ -1082,12 +1040,12 @@ class Skill50(ActiveSkill): # 极 · 神剑术 극한의 경지 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/3af805da8505fe6234a95b535610f064?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill51(PassiveSkill): +class Skill31(PassiveSkill): name = "极 · 神剑术" learnLv = 75 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 4 #TODO rangeLv = 3 data0 = [0, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120, 122]# noqa: E501 @@ -1165,12 +1123,12 @@ class Skill51(PassiveSkill): # 极 · 神剑术 (瞬斩) 극 발검술 : 섬단 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/d8ff976e2aaa4720272a5175d1eb9126?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill52(ActiveSkill): +class Skill32(ActiveSkill): name = "极 · 神剑术 (瞬斩)" learnLv = 80 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 #TODO rangeLv = 2 cube = 5 cd = 50 @@ -1194,12 +1152,12 @@ class Skill52(ActiveSkill): # 万剑归宗 이기어검술 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/0f638da961acf7958ac6070b7aaed013?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill53(ActiveSkill): +class Skill33(ActiveSkill): name = "万剑归宗" learnLv = 85 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 4 #TODO rangeLv = 5 cube = 10 cd = 180 @@ -1220,12 +1178,12 @@ class Skill53(ActiveSkill): # 无形剑意 무형지경 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/7ec521d063d2190e1fcc5bd229af9bcf?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill54(PassiveSkill): +class Skill34(PassiveSkill): name = "无形剑意" learnLv = 95 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 #TODO rangeLv = 3 data0 = [0, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118]# noqa: E501 @@ -1288,12 +1246,12 @@ class Skill54(PassiveSkill): # 极 · 神剑术 (无形斩) 극 발검술 : 무형참 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/0113c8b1306ca76d208f83f2d093dd62?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill55(ActiveSkill): +class Skill35(ActiveSkill): name = "极 · 神剑术 (无形斩)" learnLv = 95 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 7 #TODO rangeLv = 2 cube = 7 cd = 60 @@ -1314,12 +1272,12 @@ class Skill55(ActiveSkill): # 万剑极诣·开天斩 천제극섬 # https://api.neople.co.kr/df/skills/41f1cdc2ff58bb5fdc287be0db2a8df3/8b08f9504167a9c0f3a1d29d71b7943e?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill56(ActiveSkill): +class Skill36(ActiveSkill): name = "万剑极诣·开天斩" learnLv = 100 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 #TODO rangeLv = 5 cube = 15 cd = 290 diff --git a/backend/core/character/adventure.py b/backend/core/character/adventure.py index 0e57b830..b5ef91ff 100644 --- a/backend/core/character/adventure.py +++ b/backend/core/character/adventure.py @@ -7,7 +7,7 @@ adv = [ 'name': 'swordman_male', 'title': '鬼剑士(男)', 'children': [ - {'id': 0, 'name': 'weapon_master', 'title': '极诣·剑魂', 'open': False}, + {'id': 0, 'name': 'weapon_master', 'title': '极诣·剑魂', 'open': False, 'class': 'GF.swordman_male.weapon_master'}, {'id': 1, 'name': 'soul_bender', 'title': '极诣·鬼泣', 'open': True, 'class': 'GF.swordman_male.soul_bender'}, {'id': 2, 'name': 'berserker', 'title': '极诣·狂战士', 'open': True, 'class': 'GF.swordman_male.berserker'}, {'id': 3, 'name': 'asura', 'title': '极诣·阿修罗', 'open': True, 'class': 'GF.swordman_male.asura'},