diff --git a/backend/core/character/GF/swordman_female/sword_master.py b/backend/core/character/GF/swordman_female/sword_master.py
index f2276159..2c26bf05 100644
--- a/backend/core/character/GF/swordman_female/sword_master.py
+++ b/backend/core/character/GF/swordman_female/sword_master.py
@@ -127,6 +127,7 @@ class Skill6(ActiveSkill):
cd = 5
mp = [94, 1029]
uuid = "ade01c1d6afc8a05055225045e89fe49"
+ hasUP = False
# 火
data1 = [0, 203, 220, 242, 261, 283, 300, 323, 342, 364, 381, 403, 422, 448, 463, 487, 504, 527, 543, 568, 587, 609, 626, 648, 667, 691, 709, 730, 748, 771, 789, 811, 830, 852, 871, 890, 912, 932, 952, 971, 992, 1012, 1034, 1053, 1073, 1094, 1114, 1131, 1155, 1175, 1196, 1213, 1235, 1253, 1279, 1294, 1318, 1335, 1359, 1374, 1400, 1418, 1440, 1459, 1479, 1498, 1522, 1541, 1561, 1580, 1602]# noqa: E501
@@ -182,9 +183,13 @@ class Skill8(PassiveSkill):
{"type":"*skillRation","data":data1,"weapon":["短剑"]},
{"type":"+power_sub","data":data2,"skills":["魔剑奥义"],"weapon":["短剑"]},
{"type":"+power_sub","data":data2,"skills":["魔剑奥义"],"weapon":["短剑"]},
- {"type":"+powerplus1","data":data2,"skills":["飓风魔剑"],"weapon":["短剑"]},
{"type":"*skillRation","data":data3,"skills":["魔剑奥义"],"weapon":["短剑"]},
{"type":"*cdReduce","data":data4,"skills":["魔剑奥义"],"weapon":["短剑"]},
+ # 飓风魔剑的奥义部分 在短精的情况下 才存在副刀
+ {"type":"+powerplus1","data":data2,"skills":["飓风魔剑"],"weapon":["短剑"]},
+ # fix 飓风魔剑的奥义部分 可以享受到短剑精通的加成
+ {"type":"*ratioplus0","data":data3,"skills":["飓风魔剑"],"weapon":["短剑"]},
+ {"type":"*ratioplus1","data":data3,"skills":["飓风魔剑"],"weapon":["短剑"]},
]
# 血影之太刀精通 쾌속의 도 마스터리
@@ -405,6 +410,7 @@ class Skill19(ActiveSkill):
position = 3 #TODO
rangeLv = 2
uuid = "bb34e8854a93fd250347a1c64119f7ab"
+ hasUP = False
type = "passive"
@@ -476,7 +482,18 @@ class Skill21(ActiveSkill):
cd = 15
mp = [110, 924]
uuid = "cfacda0647b9a0f595df2c2aad30c18d"
-
+ vps = [
+ {
+ "name": "瞬影闪光斩",
+ "desc": "攻击时间减少
恢复[驭剑术]强制中断次数",
+ "explain": "[瞬影三绝斩]
更加迅速地攻击敌人
- 聚集力量时间减
- 单次动作瞬间释放所有剑气
剑气命中敌人时， 恢复[驭剑术]使用次数
- 每道剑气最多可恢复1次"
+ },
+ {
+ "name": "瞬影断魂斩",
+ "desc": "范围增加
赋予速度增益效果",
+ "explain": "[瞬影三绝斩]
不再发射剑气， 集中精神后， 斩击所有被赋予魂标志的敌人
[斩魂术]
锁定范围和增益效果加强
- 适用范围 +10%
- 效果持续期间所有速度 +10%"
+ }
+ ]
# 火光 剑气本体伤害
data0 = [0, 5526, 6086, 6650, 7211, 7773, 8331, 8892, 9452, 10014, 10574, 11138, 11694, 12257, 12818, 13379, 13940, 14502, 15060, 15621, 16184, 16743, 17306, 17865, 18428, 18987, 19548, 20109, 20669, 21230, 21792, 22352, 22914, 23472, 24035, 24599, 25157, 25719, 26277, 26838, 27399, 27962, 28521, 29085, 29643, 30204, 30764, 31326, 31884, 32447, 33008, 33572, 34131, 34689, 35252, 35811, 36374, 36935, 37496, 38055, 38616, 39176, 39738, 40299, 40860, 41420, 41981, 42545, 43103, 43664, 44225]# noqa: E501
hit0 = 3
@@ -511,7 +528,18 @@ class Skill22(ActiveSkill):
cd = 15
mp = [110, 924]
uuid = "9cb6f9ed646fa87f9b7680a42ce83d1a"
-
+ vps = [
+ {
+ "name": "破空剑舞",
+ "desc": "施放时间减少
[驭剑术]连击强化",
+ "explain": "[破军旋舞斩]
改为原地快速斩击虚空
- 删除移动功能
- 删除斩击攻击
沿挥剑的轨迹生成残影
- 变更为单次攻击
- 总攻击力相同
生成轨迹过程中施放[驭剑术]时， 立即生成残影攻击敌人"
+ },
+ {
+ "name": "圆月旋舞斩",
+ "desc": "蓄气时间减少
移动距离增加
施加霸体护甲",
+ "explain": "[破军旋舞斩]
凭借饱满的意志发动强化的[破军旋舞斩]
始终以最大蓄气发动
- 攻击范围 +35%
- 移动距离额外增加
承受突进中的伤害
- 技能施放过程中进入霸体状态
巨剑精通效果适用期间， 施放中所受伤害 -40%"
+ }
+ ]
data0 = [0, 4448, 5156, 5867, 6573, 7284, 7994, 8700, 9411, 10121, 10829, 11538, 12248, 12957, 13668, 14375, 15084, 15794, 16503, 17211, 17922, 18629, 19338, 20048, 20756, 21467, 22175, 22884, 23594, 24302, 25014, 25722, 26430, 27140, 27846, 28559, 29267, 29975, 30684, 31392, 32103, 32811, 33522, 34230, 34940, 35649, 36360, 37068, 37776, 38484, 39194, 39902, 40613, 41321, 42030, 42740, 43448, 44159, 44868, 45576, 46286, 46994, 47706, 48413, 49121, 49830, 50538, 51249, 51957, 52668, 53376]# noqa: E501
hit0 = 3
@@ -534,7 +562,18 @@ class Skill23(ActiveSkill):
cd = 20
mp = [50, 840]
uuid = "d085127b0edd719782bd618d5688f4a1"
-
+ vps = [
+ {
+ "name": "精神集中",
+ "desc": "所受伤害减少
强化[驭剑术]恢复功能",
+ "explain": "[雷鸣千军破]
通过强烈的意志力集中精神， 减少集中精神时的所受伤害
- 所受伤害 -50%
- 集中精神持续时间 : 最长3秒
集中精神过程中， 强化[驭剑术]强制中断次数恢复功能
- 额外增加恢复速度
- 施放时， 立即开始恢复[驭剑术]强制中断次数
[驭剑术]
强制中断[驭剑术]施放该技能时不消耗[驭剑术]强制中断次数"
+ },
+ {
+ "name": "双重冲击",
+ "desc": "可多次发动
施放速度增加
范围增加",
+ "explain": "[雷鸣千军破]
变更为可填充2次的技能
- 每次填充冷却时间 : 10秒
- 单次攻击力 -50%
施放速度和范围增加
- 施放速度 + 50%
- 攻击范围 20%"
+ }
+ ]
data0 = [0, 5664, 6237, 6812, 7386, 7962, 8537, 9111, 9687, 10262, 10835, 11409, 11985, 12558, 13133, 13709, 14283, 14856, 15431, 16007, 16580, 17154, 17732, 18306, 18879, 19454, 20030, 20604, 21177, 21753, 22328, 22901, 23475, 24051, 24626, 25199, 25775, 26351, 26925, 27498, 28074, 28649, 29222, 29798, 30372, 30947, 31520, 32096, 32670, 33245, 33819, 34394, 34968, 35543, 36119, 36693, 37268, 37841, 38417, 38991, 39566, 40140, 40715, 41289, 41862, 42438, 43013, 43587, 44163, 44738, 45312]# noqa: E501
hit0 = 2
@@ -546,6 +585,9 @@ class Skill23(ActiveSkill):
if weapon[0] == "钝器":
self.hit0 = 0
+ def vp_2(self):
+ self.cd = 10
+ self.skillRation *= 0.5
# 恶即斩 악즉참
# https://api.neople.co.kr/df/skills/1645c45aabb008c98406b3a16447040d/8ee0099656df08a0b39225f8a21d514b?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0
@@ -560,7 +602,18 @@ class Skill24(ActiveSkill):
cd = 40
mp = [120, 2024]
uuid = "8ee0099656df08a0b39225f8a21d514b"
-
+ vps = [
+ {
+ "name": "没有休息时间",
+ "desc": "蓄气时间减少
[驭剑术]连击强化",
+ "explain": "[恶即斩]
以强韧的意志缩短时间进行攻击
- 始终以最大蓄气发动
连续斩击过程中使用[驭剑术]强制中断时
- 留下残影继续攻击"
+ },
+ {
+ "name": "传说的再临",
+ "desc": "范围增加
变更为单次攻击",
+ "explain": "[恶即斩]
删除蓄气、 前冲、 连续攻击
挥动誓约之剑雷沃汀， 对前方大范围发动一次斩击
- 变更为单次攻击
- 总攻击力相同
- 以最大蓄气发动"
+ }
+ ]
data0 = [0, 1802, 1986, 2171, 2349, 2535, 2720, 2900, 3083, 3266, 3449, 3633, 3813, 3999, 4181, 4364, 4545, 4731, 4913, 5096, 5279, 5462, 5645, 5826, 6011, 6194, 6375, 6560, 6741, 6926, 7109, 7292, 7475, 7658, 7839, 8024, 8207, 8388, 8573, 8754, 8937, 9120, 9305, 9488, 9671, 9852, 10037, 10220, 10401, 10586, 10767, 10950, 11133, 11316, 11501, 11684, 11864, 12048, 12231, 12413, 12597, 12779, 12962, 13145, 13328, 13511, 13694, 13875, 14061, 14243, 14426]# noqa: E501
hit0 = 15 # 不连按为13
@@ -621,7 +674,18 @@ class Skill27(ActiveSkill):
cd = 30
mp = [400, 1500]
uuid = "0fc47245af1f21c3e9217d03aa9fff0a"
-
+ vps = [
+ {
+ "name": "穿云刃",
+ "desc": "攻击时间减少
突进功能强化",
+ "explain": "[裂刃天冲]
不再向上挥砍， 而是用魔法剑向前突进
- 删除刺击和升空多段攻击
- 突进过程中接触敌人时停止
与敌人接触或突进结束时， 魔法剑会爆炸攻击敌人
- 将删除的攻击力合算在魔剑爆炸攻击中
- 总攻击力相同
突进功能强化
- 按向前方向键时增加前冲范围
- 前冲过程中按上/下方向键， 可以进行Y轴移动"
+ },
+ {
+ "name": "龙腾",
+ "desc": "追加聚集敌人
攻击次数增加",
+ "explain": "[裂刃天冲]
魔法剑将周围的敌人聚集起来， 并在聚集后立即引发爆炸
- 删除升空多段攻击
爆炸的同时产生魔力风暴， 持续攻击敌人
- 将删除的攻击力合算在魔力风暴中
- 总攻击力相同
- 风暴持续时间 : 3秒"
+ }
+ ]
data0 = [0, 6551, 7217, 7880, 8544, 9212, 9875, 10539, 11205, 11870, 12536, 13202, 13862, 14526, 15192, 15857, 16523, 17186, 17852, 18518, 19182, 19845, 20513, 21176, 21840, 22503, 23169, 23835, 24500, 25163, 25829, 26493, 27158, 27822, 28490, 29153, 29817, 30480, 31148, 31811, 32474, 33138, 33804, 34470, 35135, 35801, 36464, 37130, 37794, 38456, 39122]# noqa: E501
hit0 = 1 #TODO
@@ -647,7 +711,18 @@ class Skill28(ActiveSkill):
cd = 50
mp = [800, 1680]
uuid = "5197b141332a65a89d452adf227c2f30"
-
+ vps = [
+ {
+ "name": "落剑阵",
+ "desc": "施放时间减少
范围增加",
+ "explain": "[极 · 驭剑术 (幻剑阵)]
展开魔法阵后， 不再进行移动攻击， 而是落下强化魔剑
- 删除移动攻击和强控敌人效果
强化魔剑与地面碰撞时爆炸， 攻击更大的范围
- 将删除的攻击力合算至爆炸攻击力
- 爆炸次数 : 4次
- 总攻击力相同"
+ },
+ {
+ "name": "领域展开",
+ "desc": "无敌强化
追踪",
+ "explain": "[极 · 驭剑术 (幻剑阵)]
展开魔法阵时， 立即用魔力保护自身
- 施放时立即进入无敌状态
最后攻击追踪敌人
- 追踪魔法阵内最强敌人落下"
+ }
+ ]
data0 = [0, 7775, 8562, 9353, 10139, 10931, 11718, 12507, 13296, 14085, 14874, 15663, 16454, 17241, 18029, 18819, 19607, 20397, 21185, 21977, 22763, 23552, 24341, 25130, 25917, 26706, 27495, 28281, 29070, 29862, 30650, 31440, 32228, 33017, 33806, 34592, 35384, 36171, 36963, 37751, 38541, 39329, 40116, 40907, 41696, 42485, 43274, 44063, 44852, 45639, 46427]# noqa: E501
hit0 = 4
@@ -668,7 +743,18 @@ class Skill29(ActiveSkill):
cd = 25
mp = [580, 4500]
uuid = "e5c09f9132a48dc1d695968592cc5878"
-
+ vps = [
+ {
+ "name": "利刃暴风雨",
+ "desc": "追加聚集敌人
下调层数条件",
+ "explain": "[飓风魔剑]
施放时立即向前发射魔剑
- 删除技能键蓄力操作
魔剑命中敌人时展开魔力风暴攻击敌人
- 飓风多段攻击次数增加
- 总攻击力相同
- 魔力风暴会将敌人吸附到风暴中心
[魔剑奥义]保存次数上限 -2次
- 每消耗1个魔剑层数， 伤害增加率额外 +2%"
+ },
+ {
+ "name": "审判魔剑",
+ "desc": "攻击力和冷却时间增加
追加强制控制功能
范围增加",
+ "explain": "[飓风魔剑]
基本冷却时间变更为50秒
总攻击力 + 100%
不再发射属性魔剑， 而是将魔力注入剑中挥动， 召唤究极魔剑雷沃汀
- 删除多段攻击
- 删除魔力风暴攻击
撕裂空间后降落的雷沃汀会强制控制命中的敌人， 并在地面上生成裂缝
- 强制控制时间 : 1秒
随后裂缝会发生爆炸， 对裂缝上的所有敌人造成伤害
- 将删除的攻击力合算在爆炸攻击中
- 总攻击力相同
增加魔剑层数强化效果
- 每层雷沃汀和裂缝大小 +7%"
+ }
+ ]
data0 = [0, 609, 672, 733, 795, 854, 917, 978, 1040, 1103, 1165, 1227, 1289, 1350, 1412, 1473, 1537, 1598, 1659, 1721, 1784, 1844, 1906, 1968, 2030, 2091, 2153, 2216, 2276, 2338, 2401, 2463, 2525, 2588, 2649, 2711, 2773, 2833, 2894, 2956, 3019, 3081, 3143, 3205, 3266, 3328, 3390, 3453, 3515, 3575, 3637]# noqa: E501
hit0 = 40
@@ -678,22 +764,36 @@ class Skill29(ActiveSkill):
magicHit = 5
magicPower = 0.03
+ # 魔剑奥义部分 默认暗火
dataplus0 = 0
hitplus0 = 5
powerplus0 = 1
+ ratioplus0 = 1
dataplus1 = 0
hitplus1 = 5
powerplus1 = 0
+ ratioplus1 = 1
def setMode(self, mode: str | None = None):
self.power0 *= 1 + self.magicHit * self.magicPower
self.power1 *= 1 + self.magicHit * self.magicPower
self.hitplus0 = self.hitplus1 = self.magicHit
+ self.powerplus0 = self.powerplus0 * self.ratioplus0
+ self.powerplus1 = self.powerplus1 * self.ratioplus1
+ # 暗魔剑部分的特殊逻辑
self.dataplus2 = self.dataplus0
self.hitplus2 = 10
- self.powerplus2 = 0.09 + self.lv / 100
+ self.powerplus2 = (0.09 + self.lv / 100) * self.ratioplus0
+ def vp_1(self):
+ self.magicHit = 3
+ self.magicPower = 0.05
+
+ def vp_2(self):
+ self.skillRation *= 2
+ self.cd = 50
+ pass
# 帝皇盟约 고대의 맹약
# https://api.neople.co.kr/df/skills/1645c45aabb008c98406b3a16447040d/e0daa922b19cdc35de879e938361464e?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0
@@ -726,7 +826,18 @@ class Skill31(ActiveSkill):
cd = 45
mp = [800, 6000]
uuid = "7f80b887a09e88e2c4728c898bd73654"
-
+ vps = [
+ {
+ "name": "绝地召唤",
+ "desc": "攻击时间减少
可以在其他动作中施放。",
+ "explain": "[极 · 驭剑术 (破剑阵)]
爆炸强化
- 魔剑爆炸次数减少
- 总攻击力相同
强制中断[驭剑术]施放时， 效果变更
- 不会中断正在施放的技能
- 在前方落下强化魔剑， 立即引发强化爆炸"
+ },
+ {
+ "name": "弹身术",
+ "desc": "范围增加
追踪",
+ "explain": "[极 · 驭剑术 (破剑阵)]
在更大范围内召唤魔剑
快速移动到召唤魔剑范围内最强敌人的背后进行攻击
- 斩击次数 -1次
所有魔剑同时爆炸， 对范围内敌人造成伤害
- 总攻击力相同"
+ }
+ ]
data0 = [0, 1027, 1130, 1235, 1339, 1443, 1547, 1651, 1756, 1860, 1963, 2068, 2171, 2276, 2381, 2483, 2588, 2693, 2797, 2901, 3006, 3109, 3213, 3318, 3421, 3526, 3631, 3733, 3838, 3943, 4046, 4151, 4254, 4358, 4463, 4568, 4671, 4775, 4880, 4983, 5088, 5193, 5295, 5400, 5504, 5608, 5713, 5817, 5921, 6025, 6129]# noqa: E501
hit0 = 2
@@ -843,4 +954,4 @@ class classChange(Character):
self.职业 = '驭剑士'
- super().__init__(equVersion, __name__)
\ No newline at end of file
+ super().__init__(equVersion, __name__)