dev

backend/core/character/GF/fighter_male/brawler_male.py

@@ -73,24 +73,6 @@ class Skill9(ActiveSkill):
     hit0 = 1
 
 
-# 蹲伏 크라우치
-# https://api.neople.co.kr/df/skills/ca0f0e0e9e1d55b5f9955b03d9dd213c/9dda3f4a849dba1a288dd65e116860f2?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0
-class Skill12(ActiveSkill):
-    name = "蹲伏"
-    learnLv = 10
-    masterLv = 1
-    maxLv = 11
-    position = 5
-    rangeLv = 1
-    cd = 3
-    mp = [3, 4]
-    uuid = "9dda3f4a849dba1a288dd65e116860f2"
-
-    data0 = [0, 2, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3]# noqa: E501
-
-    damage = False
-
-
 # 钢筋铁骨 철금강
 # https://api.neople.co.kr/df/skills/ca0f0e0e9e1d55b5f9955b03d9dd213c/c9664191611af31142e052dfaef84530?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0
 class Skill13(PassiveSkill):
@@ -195,6 +177,10 @@ class Skill21(ActiveSkill):
     data0 = [0, 3084, 3397, 3709, 4022, 4335, 4648, 4961, 5274, 5587, 5899, 6212, 6525, 6838, 7151, 7464, 7776, 8089, 8402, 8715, 9028, 9341, 9653, 9966, 10279, 10592, 10905, 11218, 11531, 11843, 12156, 12469, 12782, 13095, 13408, 13720, 14033, 14346, 14659, 14972, 15285, 15598, 15910, 16223, 16536, 16849, 17162, 17475, 17787, 18100, 18413, 18726, 19039, 19352, 19665, 19977, 20290, 20603, 20916, 21229, 21542, 21854, 22167, 22480, 22793, 23106, 23419, 23732, 24044, 24357, 24670]# noqa: E501
     hit0 = 1
 
+    # 双重投掷部分
+    data1 = data0
+    hit1 = 1
+    power0 = 0
 
 # 毒瓶投掷 독병 투척
 # https://api.neople.co.kr/df/skills/ca0f0e0e9e1d55b5f9955b03d9dd213c/762c4e6d030eaf0abbfe1fec2b298574?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0
@@ -209,14 +195,13 @@ class Skill22(ActiveSkill):
     mp = [50, 420]
     uuid = "762c4e6d030eaf0abbfe1fec2b298574"
 
-    # 不强化-瓶子伤害；双重投掷打两次，用power体现
+    # 常规-瓶子伤害
     data0 = [0, 966, 1124, 1273, 1428, 1581, 1737, 1896, 2047, 2202, 2353, 2516, 2664, 2817, 2973, 3126, 3281, 3436, 3587, 3745, 3900, 4053, 4209, 4359, 4512, 4666, 4821, 4978, 5137, 5284, 5442, 5596, 5753, 5908, 6060, 6210, 6366, 6523, 6676, 6831, 6984, 7138, 7290, 7444, 7601, 7757, 7912, 8061, 8214, 8371, 8531, 8682, 8833, 8988, 9146, 9299, 9455, 9608, 9761, 9914, 10069, 10220, 10382, 10532, 10688, 10841, 10996, 11147, 11303, 11456, 11614]# noqa: E501
     hit0 = 1
 
-    # 不强化-瓶子异常伤害；双重投掷打两次，不会被双重投掷减少第二次伤害，用power体现
+    # 常规-瓶子异常伤害；双重投掷打两次，不会被双重投掷减少第二次伤害
     data1 = [0, 1017, 1178, 1340, 1501, 1668, 1828, 1992, 2156, 2317, 2474, 2637, 2807, 2960, 3126, 3286, 3449, 3607, 3774, 3936, 4097, 4262, 4425, 4588, 4748, 4911, 5069, 5234, 5394, 5559, 5715, 5882, 6045, 6207, 6370, 6531, 6696, 6853, 7021, 7182, 7344, 7500, 7670, 7830, 7987, 8155, 8315, 8476, 8638, 8804, 8966, 9127, 9287, 9455, 9615, 9775, 9940, 10103, 10263, 10421, 10588, 10746, 10914, 11076, 11237, 11398, 11558, 11725, 11885, 12050, 12209]# noqa: E501
     hit1 = 1
-    power1 = 2
 
     # 强化-瓶子伤害
     data2 = [0, 3434, 3971, 4522, 5068, 5615, 6164, 6710, 7254, 7800, 8349, 8896, 9442, 9993, 10538, 11086, 11630, 12179, 12719, 13272, 13821, 14362, 14918, 15456, 16002, 16548, 17097, 17644, 18188, 18741, 19290, 19830, 20378, 20925, 21473, 22018, 22569, 23106, 23661, 24203, 24750, 25298, 25845, 26391, 26936, 27489, 28035, 28575, 29126, 29674, 30219, 30767, 31316, 31865, 32404, 32951, 33497, 34049, 34593, 35139, 35690, 36230, 36778, 37322, 37876, 38423, 38969, 39516, 40064, 40608, 41150]# noqa: E501
@@ -225,14 +210,23 @@ class Skill22(ActiveSkill):
     # 投掷冷却时间，非装填时间
     data3 = [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
 
-    mode = ['不强化','强化']
+    # 双重投掷部分
+    data4 = data3
+    hit4 = 1
+    power4 = 0
+    # 不会被双重投掷减少第二次伤害
+    data5 = data1
+    hit5 = 1
+    power5 = 0
+
+    mode = ['常规','强化']
 
     def setMode(self, mode):
-        if mode == "不强化":
+        if mode == "常规":
-            self.hit0 = self.hit1 = 1
+            self.hit0 = self.hit1 = self.hit4 = self.hit5 = 1
             self.hit2 = 0
         elif mode == "强化":
-            self.hit0 = self.hit1 = 0
+            self.hit0 = self.hit1 = self.hit4 = self.hit5 = 0
             self.hit1 = 1
 
 
@@ -311,11 +305,13 @@ class Skill26(ActiveSkill):
     data4 = [0, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40]# noqa: E501
 
     associate = [
-        {"type":"+power0","data":[100-i if i > 0 else i for i in data2],"skills":["抛沙"]},
+        {"type":"+power1","data":[100-i if i > 0 else i for i in data2],"skills":["抛沙"]},
-        {"type":"+power0","data":[100-i if i > 0 else i for i in data4],"skills":["毒瓶投掷"]},
+        {"type":"+power4","data":[100-i if i > 0 else i for i in data4],"skills":["毒瓶投掷"]},
-        {"type":"+power0","data":[100-i if i > 0 else i for i in data3],"skills":["毒针投掷"]},
+        {"type":"+power5","data":[0]+[100]*maxLv,"skills":["毒瓶投掷"]},
-        {"type":"+power0","data":[100-i if i > 0 else i for i in data4],"skills":["砖块投掷"]},
+        {"type":"+power5","data":[100-i if i > 0 else i for i in data3],"skills":["毒针投掷"]},
-        {"type":"+power1","data":[100-i if i > 0 else i for i in data4],"skills":["砖块投掷"]},
+        {"type":"+power6","data":[0] + [200]*maxLv,"skills":["毒针投掷"]},
+        {"type":"+power5","data":[100-i if i > 0 else i for i in data4],"skills":["砖块投掷"]},
+        {"type":"+power6","data":[100-i if i > 0 else i for i in data4],"skills":["砖块投掷"]},
     ]
 
 
@@ -351,17 +347,15 @@ class Skill30(ActiveSkill):
     rangeLv = 2
     cd = 6
     mp = [50, 420]
-    uuid = "38612d8f2561edc2eb68d5057a837bfa"  #图标国服不一致，可能有更新
+    uuid = "38612d8f2561edc2eb68d5057a837bfa"
 
-    # 不强化-毒针伤害；双重投掷打两次，用power体现
+    # 常规-毒针伤害
     data0 = [0, 806, 887, 967, 1051, 1134, 1212, 1294, 1372, 1459, 1542, 1622, 1707, 1785, 1868, 1946, 2035, 2113, 2191, 2273, 2353, 2438, 2519, 2601, 2681, 2766, 2848, 2934, 3016, 3096, 3174, 3257, 3339, 3422, 3500, 3584, 3664, 3747, 3827, 3912, 3993, 4075, 4153, 4240, 4318, 4403, 4480, 4564, 4644, 4726, 4809, 4891, 4972, 5054, 5136, 5219, 5302, 5384, 5466, 5549, 5627, 5709, 5792, 5872, 5955, 6037, 6117, 6198, 6278, 6366, 6445]# noqa: E501
     hit0 = 1
 
-    # 不强化-毒针异常伤害；双重投掷打两次，不会被双重投掷减少第二次伤害，直接用hit体现；
+    # 常规-毒针异常伤害
-    # 第二次投出的是闪电针，伤害为第一次出血针的2倍，所以总共按3计算
     data1 = [0, 706, 772, 843, 916, 986, 1057, 1134, 1200, 1273, 1340, 1416, 1486, 1559, 1625, 1702, 1770, 1843, 1916, 1986, 2059, 2130, 2202, 2271, 2343, 2409, 2487, 2553, 2623, 2700, 2769, 2842, 2914, 2984, 3057, 3130, 3198, 3271, 3339, 3408, 3485, 3553, 3624, 3699, 3767, 3845, 3913, 3985, 4056, 4131, 4197, 4269, 4337, 4410, 4480, 4554, 4626, 4699, 4767, 4842, 4913, 4983, 5054, 5129, 5194, 5268, 5335, 5409, 5479, 5550, 5625]# noqa: E501
     hit1 = 1
-    power1 = 3
 
     # 强化-毒针伤害
     data2 = [0, 641, 707, 770, 836, 901, 966, 1034, 1093, 1161, 1226, 1292, 1358, 1420, 1482, 1552, 1618, 1680, 1748, 1809, 1878, 1943, 2004, 2072, 2139, 2202, 2270, 2329, 2397, 2458, 2524, 2598, 2657, 2722, 2788, 2853, 2916, 2982, 3045, 3116, 3179, 3240, 3306, 3371, 3441, 3500, 3568, 3633, 3699, 3762, 3827, 3891, 3959, 4024, 4088, 4153, 4218, 4281, 4350, 4412, 4476, 4546, 4607, 4677, 4738, 4802, 4865, 4932, 4998, 5063, 5131]# noqa: E501
@@ -373,15 +367,23 @@ class Skill30(ActiveSkill):
 
     # 投掷冷却时间，非装填时间
     data4 = [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
+    # 双重投掷部分
+    data5 = data0
+    hit5 = 1
+    power5 = 0
+    # 双重投掷 第二次投出的是闪电针，伤害为第一次出血针的2倍，所以总共按3计算
+    data6 = data1
+    hit6 = 1
+    power6 = 0
 
-    mode = ['不强化','强化']
+    mode = ['常规','强化']
 
     def setMode(self, mode):
-        if mode == "不强化":
+        if mode == "常规":
-            self.hit0 = self.hit1 = 1
+            self.hit0 = self.hit1 = self.hit5 = self.hit6 = 1
             self.hit2 = self.hit3 = 0
         elif mode == "强化":
-            self.hit0 = self.hit1 = 0
+            self.hit0 = self.hit1 = self.hit5 = self.hit6 = 0
             self.hit2 = self.hit3 = 4
 
 
@@ -411,7 +413,7 @@ class Skill32(ActiveSkill):
     uuid = "8c2379737c5acc935c1731f67f607655"
 
     data0 = [0, 2069, 2279, 2489, 2699, 2909, 3119, 3328, 3538, 3748, 3958, 4168, 4378, 4588, 4798, 5008, 5218, 5428, 5637, 5847, 6057, 6267, 6477, 6687, 6897, 7107, 7317, 7527, 7736, 7946, 8156, 8366, 8576, 8786, 8996, 9206, 9416, 9626, 9835, 10045, 10255, 10465, 10675, 10885, 11095, 11305, 11515, 11725, 11935, 12144, 12354, 12564, 12774, 12984, 13194, 13404, 13614, 13824, 14034, 14243, 14453, 14663, 14873, 15083, 15293, 15503, 15713, 15923, 16133, 16342, 16552]# noqa: E501
-    hit0 = 1 
+    hit0 = 3
 
 
 # 旋风腿 질풍각
@@ -449,11 +451,11 @@ class Skill34(ActiveSkill):
     mp = [50, 420]
     uuid = "bc11d28c04e01923a093d65752c55516"
 
-    # 不强化-砖块伤害；双重投掷打两次，用power体现
+    # 常规-砖块伤害；双重投掷打两次，用power体现
     data0 = [0, 2105, 2322, 2538, 2752, 2966, 3181, 3397, 3609, 3823, 4036, 4248, 4459, 4677, 4891, 5103, 5319, 5535, 5746, 5967, 6180, 6389, 6603, 6814, 7031, 7252, 7466, 7677, 7895, 8106, 8318, 8534, 8743, 8959, 9178, 9392, 9608, 9821, 10030, 10246, 10458, 10673, 10888, 11103, 11317, 11529, 11745, 11958, 12172, 12386, 12592, 12813, 13030, 13245, 13456, 13675, 13887, 14105, 14316, 14521, 14741, 14960, 15171, 15387, 15603, 15812, 16029, 16240, 16456, 16667, 16883]# noqa: E501
     hit0 = 1
 
-    # 不强化-砖块碎片伤害；双重投掷打两次，用power体现
+    # 常规-砖块碎片伤害；双重投掷打两次，用power体现
     data1 = [0, 1595, 1753, 1912, 2074, 2239, 2402, 2560, 2722, 2885, 3041, 3206, 3368, 3529, 3694, 3850, 4012, 4175, 4337, 4496, 4656, 4816, 4981, 5139, 5302, 5466, 5634, 5794, 5952, 6113, 6278, 6438, 6601, 6761, 6921, 7084, 7249, 7404, 7570, 7733, 7895, 8051, 8213, 8376, 8539, 8701, 8860, 9018, 9180, 9340, 9501, 9666, 9829, 9993, 10149, 10312, 10474, 10634, 10797, 10958, 11118, 11281, 11443, 11611, 11769, 11929, 12092, 12250, 12418, 12575, 12735]# noqa: E501
     hit1 = 1
 
@@ -464,14 +466,24 @@ class Skill34(ActiveSkill):
     # 投掷冷却时间，非装填时间
     data3 = [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
 
-    mode = ['不强化','强化']
+    # 双重投掷部分
+    data4 = data0
+    hit4 = 1
+    power4 = 0
+    # 双重投掷
+    data5 = data1
+    hit5 = 1
+    power5 = 0
+
+
+    mode = ['常规','强化']
 
     def setMode(self, mode):
-        if mode == "不强化":
+        if mode == "常规":
-            self.hit0 = self.hit1 = 1
+            self.hit0 = self.hit1 = self.hit4 = self.hit5 = 1
             self.hit2 = 0
         elif mode == "强化":
-            self.hit0 = self.hit1 = 0
+            self.hit0 = self.hit1 = self.hit4 = self.hit5 = 0
             self.hit2 = 1
 
 
@@ -563,8 +575,9 @@ class Skill38(PassiveSkill):
     data3 = [0, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20]# noqa: E501
 
     associate = [
-        {"data":data0,"skills":["伏虎霸王拳"]},
+        {"data":[i - 100 if i >0 else i for i in data0],"skills":["伏虎霸王拳"]},
-        {"type":"+power0","data":[i*3 if i > 0 else i for i in data0],"skills":["伏虎霸王拳"]}
+        {"type":"+hit0","data":[0,-200],"skills":["伏虎霸王拳"]},
+        {"data":[i * 3 if i > 0 else i for i in data0],"skills":["伏虎霸王拳"]}
     ]
 
 
@@ -826,7 +839,7 @@ class Skill48(ActiveSkill):
     data3 = [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]# noqa: E501
 
     associate = [
-        {"type":"+skillRation","data":[i*3 if i > 0 else i for i in data3],"skills":["燃火轰天炮"]}
+        {"type":"*skillRation","data":[i*3 if i > 0 else i for i in data3],"skills":["燃火轰天炮"]}
     ]
 
 
@@ -860,10 +873,10 @@ class Skill49(ActiveSkill):
     data4 = [0, 3569, 3929, 4293, 4655, 5017, 5381, 5741, 6104, 6466, 6827, 7190, 7552, 7914, 8276, 8636, 8999, 9363, 9726, 10087, 10450, 10810, 11173, 11535, 11896, 12260, 12621, 12983, 13344, 13707, 14067, 14432, 14796, 15155, 15518, 15881, 16242, 16603, 16966, 17328, 17691, 18053, 18414, 18776, 19138, 19500, 19863, 20226, 20587, 20950, 21312]# noqa: E501
     hit4 = 5
 
-    mode = ['不强化','强化']
+    mode = ['常规','强化']
 
     def setMode(self, mode):
-        if mode == "不强化":
+        if mode == "常规":
             self.hit0 = 5
             self.hit1 = 1
             self.hit2 = self.hit3 = self.hit4 = 0