diff --git a/backend/core/basic/character.py b/backend/core/basic/character.py
index 46f93aea..8439dae5 100644
--- a/backend/core/basic/character.py
+++ b/backend/core/basic/character.py
@@ -13,6 +13,18 @@ from .formula import 增幅计算, 强化技攻, 武器强化计算, 精通计
from .roleinfo import CharacterEquipInfo, get_key_by_value
# from .property import 精通计算, 角色基础, CharacterInfo
+class Jade:
+ ElementIncrease:float
+ '''属性增幅'''
+ AttackP:float
+ '''攻击强化%'''
+ SkillAttack:float
+ '''技能攻击力%'''
+
+ def __init__(self) -> None:
+ self.ElementIncrease = 0.0
+ self.AttackP = 0.0
+ self.SkillAttack = 0.0
class Character:
# region 角色属性
@@ -83,6 +95,9 @@ class Character:
MonsterInfo: dict[str, float]
+ JadeInfo: 'Jade'
+ """辟邪玉加成"""
+
Buffer: float
"""增益量"""
@@ -109,8 +124,6 @@ class Character:
"""装备效果列表"""
# region 角色属性
- 输出类型: str = '物理'
-
buffer: bool = False
# endregion
@@ -123,9 +136,8 @@ class Character:
武器选项: list[str] = []
输出类型选项: list[str] = []
防具精通属性: list[str] = []
- 类型 = ''
- 输出类型: str = '物理'
+ 输出类型: str = '物理百分比'
# endregion
@@ -186,8 +198,9 @@ class Character:
self.BufferP = 1.0
self.Attack = 0
self.AttackP = 1.0
- self.ElementIncrease = 0
+ self.ElementIncrease = 1.0
self.equs = {}
+ self.JadeInfo = Jade()
pass
# region 角色属性设置
@@ -305,7 +318,7 @@ class Character:
self.HitP += 命中率 + kwargs.get('HitP', 0)
self.Hit += 命中 + kwargs.get('Hit', 0)
self.Attack += 攻击强化 + kwargs.get('Attack', 0)
- self.AttackP += 攻击强化P + kwargs.get('AttackP', 0)
+ self.AttackP += 攻击强化P + kwargs.get('AttackP', 1.0)
self.Buffer += 增益量 + kwargs.get('Buffer', 0)
self.BufferP += 增益量P + kwargs.get('BufferP', 0)
pass
@@ -401,9 +414,9 @@ class Character:
def getBasicInos(self):
res = []
attrs = []
- if self.输出类型 == '物理':
+ if self.输出类型.includes('物理'):
attrs = ['STR', 'PSTR', 'AtkP', 'PAtkP', 'CriticalPP', 'CriticalP']
- if self.输出类型 == '魔法':
+ if self.输出类型.includes('魔法'):
attrs = ['INT', 'PINT', 'AtkM', 'PAtkM', 'CriticalMP', 'CriticalM']
for attr in attrs + ['PDamage', 'PDamageC', 'PDamageB', 'SpeedA', 'SpeedM', 'SpeedR']:
temp = getattr(CharacterInfo, attr)
@@ -561,27 +574,73 @@ class Character:
# 附魔计算
# 技能计算
- skill = self.GetSkillByName('G-35L感电手雷')
- print(skill.getSkillDate(skill.lv), skill.skillDamage, skill.skillRation)
- #
-
- self.calc_damage_ration()
- return
+ skillInfos = []
+ for i in self.skills:
+ if i.damage and i.lv > 0:
+ temp = i.skillInfo()
+ skillInfos.append({
+ "name":i.name,
+ "icon":i.icon,
+ "lv":i.lv,
+ "data":temp[0],
+ "ratio":temp[1],
+ "cd":temp[2],
+ })
+ ratios = self.calc_damage_ration()
+ ratio_char_skill = ratios[0] * ratios[1] * ratios[2] * ratios[3] * ratios[4] * ratios[5] * ratios[6] * ratios[7] * ratios[8] * ratios[9] / 10000
+ ratuio_equ_skill = ratios[0] * ratios[1] * ratios[3] * ratios[4] * ratios[6] * ratios[7] * ratios[8] * ratios[9] / 10000
+ for i in skillInfos:
+ i["damage"] = ratio_char_skill * i["data"] * i["ratio"]
+ for i in self.equ_effect:
+ skillInfos.append({
+ "name": i.name,
+ "icon": i.icon,
+ "lv": 0,
+ "data": i.data,
+ "ratio": 10.0,
+ "cd": i.cd,
+ "damage": ratuio_equ_skill * i.data * 10,
+ })
+ return {
+ "skills": skillInfos
+ }
# 技能影响角色的属性，如属强、抗性等
def calc_damage_ration(self):
"""计算最终属性"""
# 计算最终属性
- print(self.AtkI, self.PAtkI)
- # 角色基础属性
- # 角色装备属性
- # 角色技能属性
- # 角色增益属性
- # 角色套装属性
- # 角色徽章属性
- # 角色附魔属性
- # 角色辟邪玉属性
- pass
+ # 力/智 攻击力 攻击力%(特效不吃这部分)
+ attrs = []
+ if self.输出类型 == '物理百分比':
+ attrs.extend(['STR', 'AtkP','PAtkP'])
+ if self.输出类型 == '魔法百分比':
+ attrs.extend(['INT', 'AtkM','PAtkM'])
+ if self.输出类型 == '物理固伤':
+ attrs.extend(['STR', 'AtkI', 'PAtkI'])
+ if self.输出类型 == '魔法固伤':
+ attrs.extend(['INT', 'AtkI', 'PAtkI'])
+ # 力智系数
+ ratio_0 : float = getattr(self, attrs[0]) / 250 + 1
+ # 物理/魔法/独立攻击力
+ ratio_1 : float = getattr(self, attrs[1])
+ # 技能 物理/魔法/独立攻击力%
+ ratio_2 : float = getattr(self, attrs[2])
+ # 属强系数
+ ratio_3 = max(self.ElementDB.values()) * 0.0045 + 1.05
+ # 暴击系数
+ ratio_4 = 1.5
+ # BUFF系数
+ ratio_5 = self.buff
+ # 技攻系数
+ ratio_6 = self.SkillAttack + self.JadeInfo.SkillAttack
+ # 攻击强化
+ ratio_7 = 1 + self.Attack * (self.AttackP + self.JadeInfo.AttackP)
+ # 防御系数
+ monster_defense = 506109
+ ratio_8 = (1 - monster_defense / (monster_defense + 200 * 100))
+ # 杂项 斗神、宠物技能、队友增幅等(技能的属性增幅归属到这部分，因为会加成到特效部分，修复后修改为技能攻击力计算)
+ ratio_9 = 1.0 * self.ElementIncrease
+ return (ratio_0, ratio_1, ratio_2, ratio_3, ratio_4, ratio_5, ratio_6, ratio_7, ratio_8, ratio_9)
# endregion
diff --git a/backend/core/basic/formula.py b/backend/core/basic/formula.py
index 24f8ccee..7827ba1f 100644
--- a/backend/core/basic/formula.py
+++ b/backend/core/basic/formula.py
@@ -2,8 +2,8 @@
# region
def 强化技攻(强化等级:int, 强化类型:int, 部位:str):
- 增幅技攻 = [0] * 10 + [0.2, 0.4, 0.7, 1.0, 1.2, 1.4, 1.6, 1.8, 2.0, 2.2, 2.4]
- 强化技攻 = [0] * 12 + [0.4, 0.7, 1.0, 1.2, 1.4, 1.6, 1.8, 2.0, 2.2]
+ 增幅技攻 = [0] * 10 + [0.2, 0.4, 0.7, 1.0, 1.2, 1.4, 1.6, 1.8, 2.0, 2.2, 2.4,2.6,2.8,3.0,3.2,3.4,3.6,3.8,4.0,4.2]
+ 强化技攻 = [0] * 12 + [0.4, 0.7, 1.0, 1.2, 1.4, 1.6, 1.8, 2.0, 2.2, 2.4,2.6,2.8,3.0,3.2,3.4,3.6,3.8,4.0,4.2]
if 强化类型 == 0:
if 部位 not in ['武器', '耳环']:
return 0
diff --git a/backend/core/basic/skill.py b/backend/core/basic/skill.py
index fe3e33b4..b128cf6a 100644
--- a/backend/core/basic/skill.py
+++ b/backend/core/basic/skill.py
@@ -56,8 +56,9 @@ class Skill:
*skillRation 乘算技能面板倍率
*cdReduce 乘算技能冷却缩减
$*PATK 乘算角色物理攻击
- ~直接走type对应的函数名称 传参为old,new,data,skills
+ ~直接走type对应的函数名称 传参为old,new,data,skills,exceptSkills
skills: 关联技能 默认 '*'
+ exceptSkills: 例外技能 默认[]
"""
def __init__(self, char):
@@ -99,18 +100,20 @@ class Skill:
type = assoc.get('type', '*skillRation')
skills = assoc.get('skills', '*')
data = assoc.get('data', [0] * self.maxLv)
+ exceptSkills = assoc.get('exceptSkills', [])
if type[0] not in ['*', '+', '$']:
if self.precondition():
- getattr(self, type)(old, new, data, skills)
+ getattr(self, type)(old, new, data, skills,exceptSkills)
continue
if self.precondition():
- self._apply_association(type, old, new, data, skills)
+ self._apply_association(type, old, new, data, skills,exceptSkills)
def precondition(self):
"""effect的前置条件"""
return True
- def _apply_association(self, type, old, new, data, skills):
+ def _apply_association(self, type, old, new, data, skills, exceptSkills
+ ):
if type.startswith('$*'):
value = (1 + data[new] / 100) / (1 + data[old] / 100)
eval(f'self.char.SetStatus({type[2:]}={value})')
@@ -121,6 +124,8 @@ class Skill:
if skills == '*':
skills = self.char.GetSkillNames('all', True)
for name in skills:
+ if name in exceptSkills:
+ continue
skill = self.char.GetSkillByName(name)
if skill is not None:
self._update_skill_attribute(skill,type, old, new, data)
diff --git a/backend/core/character/GF/gunner_female/spitfire_female.py b/backend/core/character/GF/gunner_female/spitfire_female.py
index 8166378d..b5d255ed 100644
--- a/backend/core/character/GF/gunner_female/spitfire_female.py
+++ b/backend/core/character/GF/gunner_female/spitfire_female.py
@@ -62,7 +62,8 @@ class Skill3(PassiveSkill):
rangeLv = 3
data0 = [0, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48] # noqa: E501
- associate = [{'data': data0, 'type': '$*PAtkI'}]
+ data1 = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30]
+ associate = [{'data': data0, 'type': '$*PAtkI'},{'data': data1, 'type': '*cdReduce', 'exceptSkills': ['EMP磁暴','决战之日','终解·制空霸权']}]
# def precondition(self):
# weapon = self.char.charEquipInfo['武器'].equInfo
@@ -187,12 +188,7 @@ class Skill11(ActiveSkill):
cd = 20
mp = [150, 1232]
- data0 = [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
- data1 = [0, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15]# noqa: E501
- data2 = [0, 21240, 23396, 25550, 27705, 29861, 32015, 34170, 36324, 38480, 40635, 42789, 44945, 47099, 49254, 51411, 53564, 55719, 57873, 60029, 62186, 64338, 66495, 68648, 70803, 72960, 75113, 77270, 79422, 81579, 83735, 85887, 88044, 90197, 92354, 94509, 96663, 98819, 100971, 103128, 105284, 107438, 109593, 111746, 113903, 116058, 118212, 120368, 122522, 124677, 126833, 128987, 131142, 133296, 135452, 137607, 139761, 141917, 144071, 146226, 148382, 150536, 152691, 154845, 157001, 159156, 161310, 163466, 165620, 167775, 169932]# noqa: E501
- data3 = [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
- data4 = [0, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60]# noqa: E501
- data5 = [0, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60]# noqa: E501
+ data0 = [0, 21240, 23396, 25550, 27705, 29861, 32015, 34170, 36324, 38480, 40635, 42789, 44945, 47099, 49254, 51411, 53564, 55719, 57873, 60029, 62186, 64338, 66495, 68648, 70803, 72960, 75113, 77270, 79422, 81579, 83735, 85887, 88044, 90197, 92354, 94509, 96663, 98819, 100971, 103128, 105284, 107438, 109593, 111746, 113903, 116058, 118212, 120368, 122522, 124677, 126833, 128987, 131142, 133296, 135452, 137607, 139761, 141917, 144071, 146226, 148382, 150536, 152691, 154845, 157001, 159156, 161310, 163466, 165620, 167775, 169932]# noqa: E501
# 聚合弹 버스터 샷
@@ -224,10 +220,9 @@ class Skill13(ActiveSkill):
mp = [200, 1812]
data0 = [0, 24704, 27209, 29712, 32217, 34727, 37232, 39737, 42245, 44751, 47256, 49761, 52266, 54776, 57281, 59786, 62292, 64800, 67304, 69809, 72317, 74822, 77328, 79833, 82340, 84845, 87353, 89859, 92364, 94869, 97377, 99881, 102389, 104894, 107399, 109908, 112413, 114917, 117428, 119933, 122436, 124941, 127446, 129956, 132461, 134966, 137472, 139980, 142485, 144990, 147494, 150005, 152508, 155013, 157521, 160026, 162533, 165041, 167546, 170049, 172557, 175062, 177569, 180074, 182582, 185088, 187593, 190098, 192603, 195110, 197618]# noqa: E501
- data1 = [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
- data2 = [0, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]# noqa: E501
- data3 = [0, 129, 137, 152, 162, 177, 188, 203, 213, 228, 239, 252, 267, 278, 293, 303, 318, 329, 344, 353, 368, 380, 393, 408, 419, 434, 444, 458, 468, 483, 497, 509, 522, 534, 551, 560, 573, 584, 599, 612, 624, 638, 650, 663, 674, 689, 702, 714, 728, 740, 753, 765, 776, 789, 801, 818, 830, 843, 855, 869, 881, 891, 905, 917, 933, 944, 959, 971, 984, 995, 1007]# noqa: E501
- data4 = [0, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120]# noqa: E501
+ hit0 = 1
+ data1 = [0, 129, 137, 152, 162, 177, 188, 203, 213, 228, 239, 252, 267, 278, 293, 303, 318, 329, 344, 353, 368, 380, 393, 408, 419, 434, 444, 458, 468, 483, 497, 509, 522, 534, 551, 560, 573, 584, 599, 612, 624, 638, 650, 663, 674, 689, 702, 714, 728, 740, 753, 765, 776, 789, 801, 818, 830, 843, 855, 869, 881, 891, 905, 917, 933, 944, 959, 971, 984, 995, 1007]# noqa: E501
+ hit1 = 15
# 镭射狙击 록 온 서포트
@@ -244,10 +239,7 @@ class Skill14(ActiveSkill):
mp = [400, 3360]
data0 = [0, 8405, 9257, 10109, 10962, 11816, 12669, 13520, 14373, 15227, 16079, 16935, 17786, 18639, 19493, 20345, 21198, 22050, 22902, 23756, 24609, 25460, 26313, 27167, 28020, 28871, 29724, 30578, 31430, 32283, 33135, 33987, 34841, 35694, 36545, 37398, 38252, 39105, 39957, 40809, 41663, 42515, 43368, 44220, 45075, 45929, 46781, 47634, 48485, 49338, 50192, 51045, 51899, 52749, 53603, 54456, 55308, 56160, 57014, 57866, 58719, 59573, 60423, 61277, 62130, 62984, 63834, 64688, 65541, 66393, 67247]# noqa: E501
- data1 = [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, 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
- 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
- data3 = [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
- 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, 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
+ hit0 = 5
# 弹药强化 병기강화
@@ -280,10 +272,13 @@ class Skill16(ActiveSkill):
mp = [880, 7392]
data0 = [0, 21013, 25886, 30758, 35632, 40504, 45376, 50249, 55123, 59995, 64867, 69741, 74613, 79486, 84358, 89232, 94104, 98977, 103851, 108723, 113595, 118467, 123341, 128214, 133086, 137958, 142832, 147704, 152577, 157451, 162323, 167195, 172068, 176942, 181814, 186686, 191560, 196432, 201305, 206177, 211051, 215923, 220796, 225670, 230542, 235414, 240286, 245160, 250033, 254905, 259777]# noqa: E501
+ hit0 = 1
data1 = [0, 21013, 25886, 30758, 35632, 40504, 45376, 50249, 55123, 59995, 64867, 69741, 74613, 79486, 84358, 89232, 94104, 98977, 103851, 108723, 113595, 118467, 123341, 128214, 133086, 137958, 142832, 147704, 152577, 157451, 162323, 167195, 172068, 176942, 181814, 186686, 191560, 196432, 201305, 206177, 211051, 215923, 220796, 225670, 230542, 235414, 240286, 245160, 250033, 254905, 259777]# noqa: E501
+ hit1 = 1
data2 = [0, 1049, 1293, 1537, 1781, 2025, 2268, 2512, 2754, 2998, 3242, 3486, 3730, 3974, 4218, 4462, 4704, 4948, 5191, 5435, 5679, 5923, 6167, 6409, 6653, 6897, 7141, 7385, 7628, 7872, 8114, 8358, 8602, 8846, 9090, 9334, 9578, 9822, 10064, 10308, 10551, 10795, 11039, 11283, 11527, 11769, 12013, 12257, 12501, 12745, 12988]# noqa: E501
- data3 = [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]# noqa: E501
- data4 = [0, 21013, 25886, 30758, 35632, 40504, 45376, 50249, 55123, 59995, 64867, 69741, 74613, 79486, 84358, 89232, 94104, 98977, 103851, 108723, 113595, 118467, 123341, 128214, 133086, 137958, 142832, 147704, 152577, 157451, 162323, 167195, 172068, 176942, 181814, 186686, 191560, 196432, 201305, 206177, 211051, 215923, 220796, 225670, 230542, 235414, 240286, 245160, 250033, 254905, 259777]# noqa: E501
+ hit2 = 20
+ data3 = [0, 21013, 25886, 30758, 35632, 40504, 45376, 50249, 55123, 59995, 64867, 69741, 74613, 79486, 84358, 89232, 94104, 98977, 103851, 108723, 113595, 118467, 123341, 128214, 133086, 137958, 142832, 147704, 152577, 157451, 162323, 167195, 172068, 176942, 181814, 186686, 191560, 196432, 201305, 206177, 211051, 215923, 220796, 225670, 230542, 235414, 240286, 245160, 250033, 254905, 259777]# noqa: E501
+ hit3 = 1
# G-61重力手雷 G-61 중력류탄
@@ -299,12 +294,10 @@ class Skill17(ActiveSkill):
cd = 20
mp = [400, 1120]
- data0 = [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]# noqa: E501
- data1 = [0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]# noqa: E501
- data2 = [0, 518, 572, 624, 678, 728, 780, 834, 888, 941, 993, 1046, 1097, 1151, 1202, 1256, 1308, 1362, 1416, 1466, 1518, 1572, 1625, 1679, 1730, 1781, 1835, 1889, 1941, 1994, 2046, 2100, 2151, 2202, 2256, 2309, 2363, 2417, 2469, 2519, 2573, 2625, 2679, 2733, 2784, 2835, 2889, 2942, 2994, 3047, 3101]# noqa: E501
- data3 = [0, 15578, 17159, 18741, 20321, 21903, 23483, 25065, 26643, 28224, 29805, 31386, 32964, 34547, 36126, 37709, 39290, 40871, 42452, 44030, 45612, 47192, 48774, 50352, 51933, 53514, 55095, 56675, 58257, 59835, 61418, 62999, 64580, 66161, 67739, 69321, 70901, 72483, 74063, 75645, 77222, 78804, 80384, 81966, 83546, 85128, 86708, 88287, 89870, 91449, 93032]# noqa: E501
- data4 = [0, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120]# noqa: E501
- data5 = [0, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120]# noqa: E501
+ data0 = [0, 518, 572, 624, 678, 728, 780, 834, 888, 941, 993, 1046, 1097, 1151, 1202, 1256, 1308, 1362, 1416, 1466, 1518, 1572, 1625, 1679, 1730, 1781, 1835, 1889, 1941, 1994, 2046, 2100, 2151, 2202, 2256, 2309, 2363, 2417, 2469, 2519, 2573, 2625, 2679, 2733, 2784, 2835, 2889, 2942, 2994, 3047, 3101]# noqa: E501
+ hit0 = 29
+ data1 = [0, 15578, 17159, 18741, 20321, 21903, 23483, 25065, 26643, 28224, 29805, 31386, 32964, 34547, 36126, 37709, 39290, 40871, 42452, 44030, 45612, 47192, 48774, 50352, 51933, 53514, 55095, 56675, 58257, 59835, 61418, 62999, 64580, 66161, 67739, 69321, 70901, 72483, 74063, 75645, 77222, 78804, 80384, 81966, 83546, 85128, 86708, 88287, 89870, 91449, 93032]# noqa: E501
+ hit1 = 1
# 超真空弹 : 切利 초진공탄 : 첼리
@@ -321,11 +314,11 @@ class Skill18(ActiveSkill):
mp = [800, 1680]
data0 = [0, 246, 272, 296, 320, 347, 372, 396, 420, 447, 473, 497, 521, 546, 573, 597, 623, 647, 671, 698, 723, 747, 771, 798, 824, 848, 872, 897, 924, 948, 972, 998, 1022, 1049, 1074, 1098, 1122, 1148, 1175, 1199, 1223, 1248, 1275, 1299, 1323, 1349, 1373, 1400, 1424, 1449, 1473]# noqa: E501
- data1 = [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]# noqa: E501
- data2 = [0, 987, 1088, 1188, 1287, 1388, 1488, 1589, 1689, 1790, 1890, 1989, 2090, 2190, 2291, 2391, 2492, 2591, 2691, 2792, 2892, 2993, 3093, 3194, 3291, 3392, 3492, 3593, 3695, 3795, 3893, 3993, 4094, 4194, 4295, 4395, 4494, 4595, 4695, 4796, 4896, 4997, 5097, 5196, 5297, 5397, 5498, 5598, 5699, 5798, 5898]# noqa: E501
- data3 = [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, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5]# noqa: E501
- data4 = [0, 39519, 43530, 47537, 51548, 55557, 59565, 63575, 67584, 71594, 75602, 79611, 83622, 87632, 91640, 95649, 99659, 103668, 107676, 111686, 115697, 119706, 123714, 127724, 131733, 135741, 139751, 143760, 147771, 151778, 155789, 159798, 163808, 167816, 171825, 175835, 179846, 183852, 187863, 191873, 195882, 199890, 203900, 207909, 211917, 215927, 219938, 223947, 227955, 231965, 235974]# noqa: E501
- data5 = [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]# noqa: E501
+ hit0 = 20
+ data1 = [0, 987, 1088, 1188, 1287, 1388, 1488, 1589, 1689, 1790, 1890, 1989, 2090, 2190, 2291, 2391, 2492, 2591, 2691, 2792, 2892, 2993, 3093, 3194, 3291, 3392, 3492, 3593, 3695, 3795, 3893, 3993, 4094, 4194, 4295, 4395, 4494, 4595, 4695, 4796, 4896, 4997, 5097, 5196, 5297, 5397, 5498, 5598, 5699, 5798, 5898]# noqa: E501
+ hit1 = 5
+ data2 = [0, 39519, 43530, 47537, 51548, 55557, 59565, 63575, 67584, 71594, 75602, 79611, 83622, 87632, 91640, 95649, 99659, 103668, 107676, 111686, 115697, 119706, 123714, 127724, 131733, 135741, 139751, 143760, 147771, 151778, 155789, 159798, 163808, 167816, 171825, 175835, 179846, 183852, 187863, 191873, 195882, 199890, 203900, 207909, 211917, 215927, 219938, 223947, 227955, 231965, 235974]# noqa: E501
+ hit2 = 1
# 制空掌握 증명의 열쇠
@@ -356,8 +349,7 @@ class Skill20(ActiveSkill):
mp = [160, 1600]
data0 = [0, 14086, 15516, 16944, 18372, 19802, 21230, 22660, 24090, 25518, 26948, 28378, 29806, 31236, 32665, 34094, 35523, 36953, 38381, 39810, 41238, 42668, 44097, 45526, 46955, 48384, 49813, 51243, 52671, 54101, 55531, 56959, 58389, 59819, 61246, 62675, 64104, 65533, 66963, 68391, 69821, 71251, 72679, 74109, 75537, 76967, 78396, 79825, 81255, 82684, 84111]# noqa: E501
- data1 = [0, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6]# noqa: E501
- 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]# noqa: E501
+ hit0 = 6
# 光子霰雷发射器 포토빌라이저
@@ -374,8 +366,7 @@ class Skill21(ActiveSkill):
mp = [800, 6000]
data0 = [0, 12572, 13850, 15124, 16400, 17675, 18952, 20227, 21502, 22778, 24053, 25330, 26605, 27881, 29156, 30432, 31708, 32983, 34259, 35533, 36809, 38085, 39362, 40636, 41912, 43187, 44464, 45739, 47014, 48290, 49565, 50842, 52117, 53393, 54668, 55945, 57220, 58496, 59771, 61045, 62323, 63597, 64873, 66148, 67425, 68700, 69976, 71251, 72526, 73803, 75078]# noqa: E501
- data1 = [0, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8]# noqa: E501
- 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]# noqa: E501
+ hit0 = 8
# 决战之日 디-데이
@@ -392,6 +383,7 @@ class Skill22(ActiveSkill):
mp = [2500, 8000]
data0 = [0, 5644, 6954, 8263, 9573, 10881, 12190, 13500, 14808, 16117, 17427, 18736, 20044, 21354, 22664, 23973, 25281, 26591, 27900, 29208, 30518, 31827, 33137, 34445, 35754, 37064, 38373, 39681, 40991, 42301, 43608, 44918, 46228, 47537, 48845, 50155, 51464, 52772, 54082, 55391, 56701, 58009, 59318, 60628, 61938, 63245, 64555, 65865, 67172, 68482, 69792]# noqa: E501
+ hit0 = 40
# 单兵推进器-02X 니트로 모터-02X
@@ -424,8 +416,8 @@ class Skill24(ActiveSkill):
cd = 30
mp = [400, 3000]
- data0 = [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]# noqa: E501
- data1 = [0, 95173, 104828, 114483, 124139, 133794, 143449, 153104, 162760, 172415, 182070, 191726, 201380, 211036, 220691, 230347, 240001, 249657, 259313, 268967, 278623, 288278, 297933, 307588, 317244, 326899, 336554, 346210, 355865, 365520, 375175, 384831, 394486, 404141, 413796, 423452, 433107, 442762, 452418, 462072, 471728, 481383, 491038, 500693, 510349, 520004, 529659, 539315, 548970, 558625, 568280]# noqa: E501
+ data0 = [0, 95173, 104828, 114483, 124139, 133794, 143449, 153104, 162760, 172415, 182070, 191726, 201380, 211036, 220691, 230347, 240001, 249657, 259313, 268967, 278623, 288278, 297933, 307588, 317244, 326899, 336554, 346210, 355865, 365520, 375175, 384831, 394486, 404141, 413796, 423452, 433107, 442762, 452418, 462072, 471728, 481383, 491038, 500693, 510349, 520004, 529659, 539315, 548970, 558625, 568280]# noqa: E501
+ hit0 = 1
# 终解·制空霸权 데피니트 솔루션
@@ -442,9 +434,9 @@ class Skill25(ActiveSkill):
mp = [4028, 8056]
data0 = [0, 28558, 35180, 41802, 48424, 55046, 61670, 68292, 74914, 81536, 88157, 94781, 101403, 108025, 114647, 121269, 127891, 134515, 141137, 147759, 154380, 161002, 167624, 174248, 180870, 187492, 194114, 200736, 207360, 213982, 220604, 227225, 233847, 240469, 247093, 253715, 260337, 266959, 273581, 280203, 286827, 293448, 300070, 306692, 313314, 319936, 326560, 333182, 339804, 346426, 353048]# noqa: E501
- data1 = [0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7]# noqa: E501
- data2 = [0, 93290, 114923, 136555, 158188, 179822, 201454, 223087, 244719, 266352, 287984, 309618, 331251, 352883, 374515, 396148, 417780, 439414, 461047, 482679, 504312, 525944, 547578, 569211, 590843, 612475, 634108, 655740, 677374, 699007, 720639, 742272, 763904, 785537, 807171, 828803, 850436, 872068, 893700, 915334, 936967, 958599, 980232, 1001864, 1023497, 1045131, 1066763, 1088396, 1110028, 1131660, 1153293]# noqa: E501
- data3 = [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, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5]# noqa: E501
+ hit0 = 7
+ data1 = [0, 93290, 114923, 136555, 158188, 179822, 201454, 223087, 244719, 266352, 287984, 309618, 331251, 352883, 374515, 396148, 417780, 439414, 461047, 482679, 504312, 525944, 547578, 569211, 590843, 612475, 634108, 655740, 677374, 699007, 720639, 742272, 763904, 785537, 807171, 828803, 850436, 872068, 893700, 915334, 936967, 958599, 980232, 1001864, 1023497, 1045131, 1066763, 1088396, 1110028, 1131660, 1153293]# noqa: E501
+ hit1 = 5
@@ -459,9 +451,9 @@ class classChange(Character):
# 用来筛CP武器的
# self.转职 = '弹药专家(女)'
self.武器选项 = ['手弩', '步枪','左轮枪','自动手枪','手炮']
- self.输出类型选项 = ['魔法固伤', '物理固伤']
+ self.输出类型选项 = ['物理固伤','魔法固伤']
+ self.输出类型 = '物理固伤'
self.防具精通属性 = ['智力', '力量']
- self.类型 = '魔法固伤'
self.武器类型 = '手弩'
self.防具类型 = '皮甲'
self.buff = 1.84
diff --git a/backend/core/equipment/version_0/suit.py b/backend/core/equipment/version_0/suit.py
index cc2c0e94..fb8fd089 100644
--- a/backend/core/equipment/version_0/suit.py
+++ b/backend/core/equipment/version_0/suit.py
@@ -404,7 +404,7 @@ def suit_32(char: Character):
"""
char.equ_effect.append(EquEffect(name='火灵安珀', icon='', cd=2, data=19200))
char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='', cd=3, data=24000))
- char.equ_effect.append(EquEffect(name='元素释放', icon='', cd=15, data=80400))
+ char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=15, data=80400))
pass
@@ -524,7 +524,7 @@ def suit_37(char: Character):
char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='', cd=3, data=24000))
char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='', cd=2, data=19200))
char.SetStatus(SpeedM=0.15)
- char.equ_effect.append(EquEffect(name='元素释放', icon='', cd=15, data=118200))
+ char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=15, data=118200))
pass
@@ -608,7 +608,6 @@ def suit_40(char: Character):
一被击时，精灵之魂- 5（冷却时间1秒）
- 元素释放伤害量:118,200%
"""
- print("~~~~~~")
suit_37(char)
pass
@@ -671,7 +670,7 @@ def suit_42(char: Character):
char.equ_effect.append(EquEffect(name='水灵阿库娅', icon='', cd=3, data=24000))
char.equ_effect.append(EquEffect(name='风灵希尔珂', icon='', cd=2, data=19200))
char.SetStatus(SpeedM=0.15)
- char.equ_effect.append(EquEffect(name='元素释放', icon='', cd=10, data=181920))
+ char.equ_effect.append(EquEffect(name='元素释放', icon='/equipment/skill/29.png', cd=10, data=181920))
char.equ_effect.append(EquEffect(name='精灵女王提泰妮娅', icon='', cd=5, data=47520))
pass
diff --git a/frontend/src/pages/Character/Forge/components/equipment.vue b/frontend/src/pages/Character/Forge/components/equipment.vue
index 901190b1..02f93bf6 100644
--- a/frontend/src/pages/Character/Forge/components/equipment.vue
+++ b/frontend/src/pages/Character/Forge/components/equipment.vue
@@ -157,7 +157,7 @@ export default defineComponent({
强化
- {renderList(32, (i) => (
+ {renderList(31, (i) => (
{i - 1}
))}
diff --git a/images/equipment/skill/0.png b/images/equipment/skill/0.png
new file mode 100644
index 00000000..bcd7169a
Binary files /dev/null and b/images/equipment/skill/0.png differ
diff --git a/images/equipment/skill/1.png b/images/equipment/skill/1.png
new file mode 100644
index 00000000..fd9aa99a
Binary files /dev/null and b/images/equipment/skill/1.png differ
diff --git a/images/equipment/skill/10.png b/images/equipment/skill/10.png
new file mode 100644
index 00000000..e0e907f1
Binary files /dev/null and b/images/equipment/skill/10.png differ
diff --git a/images/equipment/skill/11.png b/images/equipment/skill/11.png
new file mode 100644
index 00000000..3a4cf372
Binary files /dev/null and b/images/equipment/skill/11.png differ
diff --git a/images/equipment/skill/12.png b/images/equipment/skill/12.png
new file mode 100644
index 00000000..d112fe45
Binary files /dev/null and b/images/equipment/skill/12.png differ
diff --git a/images/equipment/skill/13.png b/images/equipment/skill/13.png
new file mode 100644
index 00000000..74519cb1
Binary files /dev/null and b/images/equipment/skill/13.png differ
diff --git a/images/equipment/skill/14.png b/images/equipment/skill/14.png
new file mode 100644
index 00000000..dfe1e5c6
Binary files /dev/null and b/images/equipment/skill/14.png differ
diff --git a/images/equipment/skill/15.png b/images/equipment/skill/15.png
new file mode 100644
index 00000000..6c85d9cb
Binary files /dev/null and b/images/equipment/skill/15.png differ
diff --git a/images/equipment/skill/16.png b/images/equipment/skill/16.png
new file mode 100644
index 00000000..6474ae76
Binary files /dev/null and b/images/equipment/skill/16.png differ
diff --git a/images/equipment/skill/17.png b/images/equipment/skill/17.png
new file mode 100644
index 00000000..9f004e98
Binary files /dev/null and b/images/equipment/skill/17.png differ
diff --git a/images/equipment/skill/18.png b/images/equipment/skill/18.png
new file mode 100644
index 00000000..e0e907f1
Binary files /dev/null and b/images/equipment/skill/18.png differ
diff --git a/images/equipment/skill/19.png b/images/equipment/skill/19.png
new file mode 100644
index 00000000..e0e907f1
Binary files /dev/null and b/images/equipment/skill/19.png differ
diff --git a/images/equipment/skill/2.png b/images/equipment/skill/2.png
new file mode 100644
index 00000000..e0e907f1
Binary files /dev/null and b/images/equipment/skill/2.png differ
diff --git a/images/equipment/skill/20.png b/images/equipment/skill/20.png
new file mode 100644
index 00000000..4a7918e0
Binary files /dev/null and b/images/equipment/skill/20.png differ
diff --git a/images/equipment/skill/21.png b/images/equipment/skill/21.png
new file mode 100644
index 00000000..e0e907f1
Binary files /dev/null and b/images/equipment/skill/21.png differ
diff --git a/images/equipment/skill/22.png b/images/equipment/skill/22.png
new file mode 100644
index 00000000..e0e907f1
Binary files /dev/null and b/images/equipment/skill/22.png differ
diff --git a/images/equipment/skill/23.png b/images/equipment/skill/23.png
new file mode 100644
index 00000000..e0e907f1
Binary files /dev/null and b/images/equipment/skill/23.png differ
diff --git a/images/equipment/skill/24.png b/images/equipment/skill/24.png
new file mode 100644
index 00000000..e0e907f1
Binary files /dev/null and b/images/equipment/skill/24.png differ
diff --git a/images/equipment/skill/25.png b/images/equipment/skill/25.png
new file mode 100644
index 00000000..e0e907f1
Binary files /dev/null and b/images/equipment/skill/25.png differ
diff --git a/images/equipment/skill/26.png b/images/equipment/skill/26.png
new file mode 100644
index 00000000..77af3c78
Binary files /dev/null and b/images/equipment/skill/26.png differ
diff --git a/images/equipment/skill/27.png b/images/equipment/skill/27.png
new file mode 100644
index 00000000..df25824e
Binary files /dev/null and b/images/equipment/skill/27.png differ
diff --git a/images/equipment/skill/28.png b/images/equipment/skill/28.png
new file mode 100644
index 00000000..e0e907f1
Binary files /dev/null and b/images/equipment/skill/28.png differ
diff --git a/images/equipment/skill/29.png b/images/equipment/skill/29.png
new file mode 100644
index 00000000..7f1c2ed4
Binary files /dev/null and b/images/equipment/skill/29.png differ
diff --git a/images/equipment/skill/3.png b/images/equipment/skill/3.png
new file mode 100644
index 00000000..8b166ab2
Binary files /dev/null and b/images/equipment/skill/3.png differ
diff --git a/images/equipment/skill/30.png b/images/equipment/skill/30.png
new file mode 100644
index 00000000..eaee721e
Binary files /dev/null and b/images/equipment/skill/30.png differ
diff --git a/images/equipment/skill/31.png b/images/equipment/skill/31.png
new file mode 100644
index 00000000..d94a4f43
Binary files /dev/null and b/images/equipment/skill/31.png differ
diff --git a/images/equipment/skill/32.png b/images/equipment/skill/32.png
new file mode 100644
index 00000000..5849542d
Binary files /dev/null and b/images/equipment/skill/32.png differ
diff --git a/images/equipment/skill/33.png b/images/equipment/skill/33.png
new file mode 100644
index 00000000..14b05bd9
Binary files /dev/null and b/images/equipment/skill/33.png differ
diff --git a/images/equipment/skill/34.png b/images/equipment/skill/34.png
new file mode 100644
index 00000000..0b6d51e9
Binary files /dev/null and b/images/equipment/skill/34.png differ
diff --git a/images/equipment/skill/35.png b/images/equipment/skill/35.png
new file mode 100644
index 00000000..323cdbb5
Binary files /dev/null and b/images/equipment/skill/35.png differ
diff --git a/images/equipment/skill/36.png b/images/equipment/skill/36.png
new file mode 100644
index 00000000..e0e907f1
Binary files /dev/null and b/images/equipment/skill/36.png differ
diff --git a/images/equipment/skill/37.png b/images/equipment/skill/37.png
new file mode 100644
index 00000000..909743f0
Binary files /dev/null and b/images/equipment/skill/37.png differ
diff --git a/images/equipment/skill/38.png b/images/equipment/skill/38.png
new file mode 100644
index 00000000..61ee7158
Binary files /dev/null and b/images/equipment/skill/38.png differ
diff --git a/images/equipment/skill/39.png b/images/equipment/skill/39.png
new file mode 100644
index 00000000..76e2924a
Binary files /dev/null and b/images/equipment/skill/39.png differ
diff --git a/images/equipment/skill/4.png b/images/equipment/skill/4.png
new file mode 100644
index 00000000..c43e93c4
Binary files /dev/null and b/images/equipment/skill/4.png differ
diff --git a/images/equipment/skill/40.png b/images/equipment/skill/40.png
new file mode 100644
index 00000000..46996d92
Binary files /dev/null and b/images/equipment/skill/40.png differ
diff --git a/images/equipment/skill/41.png b/images/equipment/skill/41.png
new file mode 100644
index 00000000..5943f7eb
Binary files /dev/null and b/images/equipment/skill/41.png differ
diff --git a/images/equipment/skill/42.png b/images/equipment/skill/42.png
new file mode 100644
index 00000000..b1941de2
Binary files /dev/null and b/images/equipment/skill/42.png differ
diff --git a/images/equipment/skill/43.png b/images/equipment/skill/43.png
new file mode 100644
index 00000000..86277948
Binary files /dev/null and b/images/equipment/skill/43.png differ
diff --git a/images/equipment/skill/44.png b/images/equipment/skill/44.png
new file mode 100644
index 00000000..04d73981
Binary files /dev/null and b/images/equipment/skill/44.png differ
diff --git a/images/equipment/skill/45.png b/images/equipment/skill/45.png
new file mode 100644
index 00000000..e0e907f1
Binary files /dev/null and b/images/equipment/skill/45.png differ
diff --git a/images/equipment/skill/46.png b/images/equipment/skill/46.png
new file mode 100644
index 00000000..d550f7b7
Binary files /dev/null and b/images/equipment/skill/46.png differ
diff --git a/images/equipment/skill/47.png b/images/equipment/skill/47.png
new file mode 100644
index 00000000..5ef04155
Binary files /dev/null and b/images/equipment/skill/47.png differ
diff --git a/images/equipment/skill/48.png b/images/equipment/skill/48.png
new file mode 100644
index 00000000..5a4152b1
Binary files /dev/null and b/images/equipment/skill/48.png differ
diff --git a/images/equipment/skill/49.png b/images/equipment/skill/49.png
new file mode 100644
index 00000000..138c0abc
Binary files /dev/null and b/images/equipment/skill/49.png differ
diff --git a/images/equipment/skill/5.png b/images/equipment/skill/5.png
new file mode 100644
index 00000000..522e879f
Binary files /dev/null and b/images/equipment/skill/5.png differ
diff --git a/images/equipment/skill/50.png b/images/equipment/skill/50.png
new file mode 100644
index 00000000..9778f3ce
Binary files /dev/null and b/images/equipment/skill/50.png differ
diff --git a/images/equipment/skill/51.png b/images/equipment/skill/51.png
new file mode 100644
index 00000000..6476a75a
Binary files /dev/null and b/images/equipment/skill/51.png differ
diff --git a/images/equipment/skill/52.png b/images/equipment/skill/52.png
new file mode 100644
index 00000000..ccdb4771
Binary files /dev/null and b/images/equipment/skill/52.png differ
diff --git a/images/equipment/skill/53.png b/images/equipment/skill/53.png
new file mode 100644
index 00000000..d60d4a68
Binary files /dev/null and b/images/equipment/skill/53.png differ
diff --git a/images/equipment/skill/54.png b/images/equipment/skill/54.png
new file mode 100644
index 00000000..96b31b8d
Binary files /dev/null and b/images/equipment/skill/54.png differ
diff --git a/images/equipment/skill/55.png b/images/equipment/skill/55.png
new file mode 100644
index 00000000..cc784d6a
Binary files /dev/null and b/images/equipment/skill/55.png differ
diff --git a/images/equipment/skill/56.png b/images/equipment/skill/56.png
new file mode 100644
index 00000000..25ecc9c3
Binary files /dev/null and b/images/equipment/skill/56.png differ
diff --git a/images/equipment/skill/57.png b/images/equipment/skill/57.png
new file mode 100644
index 00000000..9c861082
Binary files /dev/null and b/images/equipment/skill/57.png differ
diff --git a/images/equipment/skill/58.png b/images/equipment/skill/58.png
new file mode 100644
index 00000000..893be45f
Binary files /dev/null and b/images/equipment/skill/58.png differ
diff --git a/images/equipment/skill/59.png b/images/equipment/skill/59.png
new file mode 100644
index 00000000..a23bb9d1
Binary files /dev/null and b/images/equipment/skill/59.png differ
diff --git a/images/equipment/skill/6.png b/images/equipment/skill/6.png
new file mode 100644
index 00000000..a998c0da
Binary files /dev/null and b/images/equipment/skill/6.png differ
diff --git a/images/equipment/skill/60.png b/images/equipment/skill/60.png
new file mode 100644
index 00000000..2b46f871
Binary files /dev/null and b/images/equipment/skill/60.png differ
diff --git a/images/equipment/skill/61.png b/images/equipment/skill/61.png
new file mode 100644
index 00000000..00f2d69f
Binary files /dev/null and b/images/equipment/skill/61.png differ
diff --git a/images/equipment/skill/62.png b/images/equipment/skill/62.png
new file mode 100644
index 00000000..68f62ba8
Binary files /dev/null and b/images/equipment/skill/62.png differ
diff --git a/images/equipment/skill/63.png b/images/equipment/skill/63.png
new file mode 100644
index 00000000..6e80884a
Binary files /dev/null and b/images/equipment/skill/63.png differ
diff --git a/images/equipment/skill/64.png b/images/equipment/skill/64.png
new file mode 100644
index 00000000..1bac2827
Binary files /dev/null and b/images/equipment/skill/64.png differ
diff --git a/images/equipment/skill/7.png b/images/equipment/skill/7.png
new file mode 100644
index 00000000..fb1b5366
Binary files /dev/null and b/images/equipment/skill/7.png differ
diff --git a/images/equipment/skill/8.png b/images/equipment/skill/8.png
new file mode 100644
index 00000000..e0e907f1
Binary files /dev/null and b/images/equipment/skill/8.png differ
diff --git a/images/equipment/skill/9.png b/images/equipment/skill/9.png
new file mode 100644
index 00000000..2228a6b0
Binary files /dev/null and b/images/equipment/skill/9.png differ