5.9 commit

base/buff.py

@@ -15,6 +15,7 @@ class Buff:
     buff_stack: int = 1
 
     frame_shift: int = 0
+    second_shift: int = 0
     activate: bool = True
 
     max_stack: int = 1
@@ -30,6 +31,10 @@ class Buff:
         if self.gain_attributes is None:
             self.gain_attributes = {}
 
+    @property
+    def shifted(self):
+        return self.second_shift or self.frame_shift
+
     @property
     def buff_name(self):
         if not isinstance(self._buff_name, list):

base/skill.py

@@ -194,12 +194,12 @@ class BuffSkill(Skill):
 class DotSkill(Skill):
     def record(self, critical, parser):
         super().record(critical, parser)
-        bind_skill = self.bind_skill
-        if not parser.current_ticks[bind_skill]:
-            parser.current_stacks[bind_skill] = 0
-        parser.current_ticks[bind_skill] = self.tick
-        parser.current_stacks[bind_skill] = min(parser.current_stacks[bind_skill] + 1, self.max_stack)
-        parser.current_dot_snapshot[bind_skill] = parser.current_player_buffs.copy()
+        bind_skill = parser.current_school.skills[self.bind_skill]
+        if not parser.current_ticks[self.bind_skill]:
+            parser.current_stacks[self.bind_skill] = 0
+        parser.current_ticks[self.bind_skill] = bind_skill.tick
+        parser.current_stacks[self.bind_skill] = min(parser.current_stacks[self.bind_skill] + 1, bind_skill.max_stack)
+        parser.current_dot_snapshot[self.bind_skill] = parser.current_player_buffs.copy()
 
 
 class DotConsumeSkill(Skill):
@@ -336,7 +336,7 @@ class MagicalSkill(Skill):
         return damage, critical_damage, expected_damage, critical_strike
 
 
-class MixingSkill(Skill):
+class AdaptiveSkill(Skill):
     def __call__(self, attribute: Attribute):
         damage = init_result(
             self.damage_base, self.damage_rand,
@@ -348,12 +348,12 @@ class MixingSkill(Skill):
         damage = damage_addition_result(damage, attribute.damage_addition + self.skill_damage_addition)
         damage = overcome_result(damage, attribute.overcome,
                                  attribute.level_shield_base + attribute.shield_base,
-                                 attribute.magical_shield_gain + self.skill_shield_gain,
-                                 attribute.magical_shield_ignore,
+                                 attribute.strain_gain + self.skill_shield_gain,
+                                 attribute.shield_ignore,
                                  attribute.shield_constant)
 
-        critical_power_gain = attribute.physical_critical_power_gain + self.skill_critical_power
-        critical_damage = critical_result(damage, attribute.base_physical_critical_power, critical_power_gain)
+        critical_power_gain = attribute.critical_power_gain + self.skill_critical_power
+        critical_damage = critical_result(damage, attribute.base_critical_power, critical_power_gain)
 
         damage = level_reduction_result(damage, attribute.level_reduction)
         critical_damage = level_reduction_result(critical_damage, attribute.level_reduction)
@@ -361,9 +361,9 @@ class MixingSkill(Skill):
         critical_damage = strain_result(critical_damage, attribute.base_strain, attribute.strain_gain)
         damage = pve_addition_result(damage, attribute.pve_addition + self.skill_pve_addition)
         critical_damage = pve_addition_result(critical_damage, attribute.pve_addition + self.skill_pve_addition)
-        damage = vulnerable_result(damage, attribute.magical_vulnerable)
-        critical_damage = vulnerable_result(critical_damage, attribute.magical_vulnerable)
-        critical_strike = min(1, attribute.physical_critical_strike + self.skill_critical_strike / DECIMAL_SCALE)
+        damage = vulnerable_result(damage, attribute.vulnerable)
+        critical_damage = vulnerable_result(critical_damage, attribute.vulnerable)
+        critical_strike = min(1, attribute.critical_strike + self.skill_critical_strike / DECIMAL_SCALE)
 
         expected_damage = critical_strike * critical_damage + (1 - critical_strike) * damage
 
@@ -386,7 +386,7 @@ class MagicalDamage(MagicalSkill, Damage):
         return MAGICAL_ATTACK_POWER_COF(super().attack_power_cof + self.interval)
 
 
-class MixingDamage(MixingSkill, Damage):
+class MixingDamage(AdaptiveSkill, Damage):
     @Damage.attack_power_cof.getter
     def attack_power_cof(self):
         return MAGICAL_ATTACK_POWER_COF(super().attack_power_cof + self.interval)
@@ -404,7 +404,7 @@ class MagicalDotDamage(MagicalSkill, DotDamage):
         return MAGICAL_DOT_ATTACK_POWER_COF(super().attack_power_cof, self.interval)
 
 
-class MixingDotDamage(MixingSkill, DotDamage):
+class MixingDotDamage(AdaptiveSkill, DotDamage):
     @Damage.attack_power_cof.getter
     def attack_power_cof(self):
         return MAGICAL_DOT_ATTACK_POWER_COF(super().attack_power_cof, self.interval)

general/buffs/equipment.py

@@ -2,7 +2,7 @@ from base.buff import Buff
 
 GENERAL_BUFFS = {
     15455: {
-        "buff_name": "输出伤害波动",
+        "buff_name": "伤害波动",
         "gain_attributes": {
             "all_damage_addition": [10, 51]
         }

general/buffs/team.py

@@ -1,6 +1,13 @@
 from base.buff import Buff
 
 GENERAL_BUFFS = {
+    15413: {
+        "buff_name": "基础攻击",
+        "gain_attributes": {
+            "physical_attack_power_base": [0] * 8 + [371, 450, 495, 549],
+            "magical_attack_power_base": [0] * 8 + [442, 538, 591, 655]
+        }
+    },
     20938: {
         "buff_name": "左旋右转",
         "gain_attributes": {
@@ -13,6 +20,12 @@ GENERAL_BUFFS = {
             "all_damage_addition": 154
         }
     },
+    3465: {
+        "buff_name": "破甲",
+        "gain_attributes": {
+            "physical_shield_gain": -102
+        }
+    },
     23107: {
         "buff_name": "号令三军",
         "gain_attributes": {

general/gains/team.py

@@ -3,16 +3,27 @@ from typing import Dict
 from base.attribute import Attribute
 from base.buff import Buff
 from base.gain import Gain
+from base.skill import Skill
 from general.buffs.team import GENERAL_BUFFS
+from general.skills.team import GENERAL_SKILLS
 
 
 class RealTeamGain(Gain):
+    skill_ids = list(GENERAL_SKILLS)
     buff_ids = list(GENERAL_BUFFS)
 
+    def add_skills(self, skills: Dict[int, Skill]):
+        for skill_id in self.skill_ids:
+            skills[skill_id].activate = True
+
     def add_buffs(self, buffs: Dict[int, Buff]):
         for buff_id in self.buff_ids:
             buffs[buff_id].activate = True
 
+    def sub_skills(self, skills: Dict[int, Skill]):
+        for skill_id in self.skill_ids:
+            skills[skill_id].activate = False
+
     def sub_buffs(self, buffs: Dict[int, Buff]):
         for buff_id in self.buff_ids:
             buffs[buff_id].activate = False
@@ -180,10 +191,6 @@ class 疏狂(TeamGain):
 """ 药宗 """
 
 
-class 飘黄:
-    pass
-
-
 class 配伍(TeamGain):
     gain_attributes = {"all_major_gain": 10 * 5}
 
@@ -246,6 +253,5 @@ TEAM_GAINS = {
 
     "疏狂": 疏狂,
 
-    "飘黄": 飘黄,
     "配伍": 配伍,
 }

general/skills/team.py

@@ -1,8 +1,14 @@
 from typing import Dict
 
-from base.skill import PhysicalDamage, MagicalDamage, Skill, PureDamage
+from base.skill import PhysicalDamage, MagicalDamage, Skill, PureDamage, BuffSkill
 
 GENERAL_SKILLS: Dict[int, Skill | dict] = {
+    13778: {
+        "skill_class": BuffSkill,
+        "skill_name": "乘龙箭",
+        "bind_buff": 3465,
+        "duration": 128
+    },
     29535: {
         "skill_class": MagicalDamage,
         "skill_name": "逐云寒蕊",

parse_new_school.py

@@ -59,4 +59,4 @@ class Parser:
 
 if __name__ == '__main__':
     parser = Parser()
-    parser(r"new.jcl")
+    parser(r"qi_chun.jcl")

schools/bei_ao_jue/skills.py

@@ -26,11 +26,9 @@ SKILLS: Dict[int, Skill | dict] = {
         skill_id: {
             "skill_class": PhysicalDamage,
             "skill_name": "雷走风切",
-            "damage_base": [35, 45, 55, 70, 85, 100, 115, 130, 145, 175],
-            "damage_rand": [5, 5, 5, 5, 5, 10, 10, 10, 10, 15],
-            "attack_power_cof": [45 * 0.8 * 0.7] +
-                                [(16 + (i - 1) * 17) * 0.8 * 0.7 for i in range(2, 10)] +
-                                [224 * 0.8 * 0.7],
+            "damage_base": 175,
+            "damage_rand": 15,
+            "attack_power_cof": 224 * 0.8 * 0.7,
         } for skill_id in (16599, 16631)
     },
     11447: {
@@ -40,13 +38,13 @@ SKILLS: Dict[int, Skill | dict] = {
         "attack_power_cof": [50] +
                             [50 + (i - 1) * 25 for i in range(2, 10)] +
                             [280],
-        "interval": 48
+        "interval": 48,
+        "tick": 8
     },
     17060: {
         "skill_class": DotSkill,
         "skill_name": "闹须弥",
         "bind_skill": 11447,
-        "tick": 8
     },
     16933: {
         "skill_class": PhysicalDamage,
@@ -270,7 +268,6 @@ SKILLS: Dict[int, Skill | dict] = {
         "attack_power_cof": [60 * 1.45 * 1.1 * 0.7] +
                             [(60 + (i - 1) * 10) * 1.45 * 1.1 * 0.7 for i in range(2, 10)] +
                             [160 * 1.45 * 0.9 * 1.1 * 0.7],
-        # "weapon_damage_cof": 1024 * 1.45 * 0.25
     },
     37458: {
         "skill_class": PhysicalDamage,
@@ -291,15 +288,14 @@ SKILLS: Dict[int, Skill | dict] = {
         "skill_name": "背水沉舟(DOT)",
         "damage_base": 25,
         "attack_power_cof": 380,
-        "interval": 48
-
+        "interval": 48,
+        "max_stack": 3,
+        "tick": 6
     },
     26934: {
         "skill_class": DotSkill,
         "skill_name": "背水沉舟",
         "bind_skill": 19555,
-        "max_stack": 3,
-        "tick": 6
     }
 }
 

schools/bing_xin_jue/skills.py

@@ -26,14 +26,14 @@ SKILLS: Dict[int, Skill | dict] = {
         "skill_name": "急曲(DOT)",
         "damage_base": 100,
         "attack_power_cof": 114 * 1.1 * 0.9 * 1.1,
-        "interval": 48
+        "interval": 48,
+        "max_stack": 3,
+        "tick": 6
     },
     18716: {
         "skill_class": DotSkill,
         "skill_name": "急曲",
-        "bind_skill": 2920,
-        "max_stack": 3,
-        "tick": 6
+        "bind_skill": 2920
     },
     6559: {
         "skill_class": type("Mixing", (MagicalDamage, DotConsumeSkill), {}),
@@ -206,14 +206,14 @@ SKILLS: Dict[int, Skill | dict] = {
         "skill_name": "气吞长江(DOT)",
         "damage_base": 25,
         "attack_power_cof": 400 * 1.4,
-        "interval": 48
+        "interval": 48,
+        "max_stack": 3,
+        "tick": 10
     },
     25757: {
         "skill_class": DotSkill,
         "skill_name": "气吞长江",
         "bind_skill": 18512,
-        "max_stack": 3,
-        "tick": 10
     }
 }
 

schools/fen_shan_jing/attribute.py

@@ -3,19 +3,14 @@ from base.constant import *
 
 
 class FenShanJing(PhysicalAttribute):
-    AGILITY_TO_ATTACK_POWER = 1485 / BINARY_SCALE
-    AGILITY_TO_CRITICAL_STRIKE = 594 / BINARY_SCALE
+    AGILITY_TO_ATTACK_POWER = 1751 / BINARY_SCALE
 
     def __init__(self):
         super().__init__()
-        self.physical_attack_power_base += 3277
-        self.physical_critical_strike_base += 2929
-        self.pve_addition += 82
+        self.physical_attack_power_base += 3449
+        self.physical_overcome_base += 1526
+        self.pve_addition += 92
 
     @property
     def extra_physical_attack_power(self):
         return int(self.agility * self.AGILITY_TO_ATTACK_POWER)
-
-    @property
-    def extra_physical_critical_strike(self):
-        return int(self.agility * self.AGILITY_TO_CRITICAL_STRIKE)

schools/fen_shan_jing/buffs.py

@@ -4,27 +4,64 @@ from base.buff import Buff
 from general.buffs import GENERAL_BUFFS
 
 BUFFS: Dict[int, Buff | dict] = {
-    16025: {
-        "buff_name": "雷引",
+    1428: {
+        "buff_name": "军啸",
         "activate": False,
         "gain_attributes": {
             "physical_critical_strike_gain": 400,
             "physical_critical_power_gain": 41
         }
     },
-    26857: {
-        "buff_name": "承契",
+    9052: {
+        "buff_name": "绝刀",
+        "gain_skills": {
+            13075: {
+                "skill_damage_addition": [205, 410, 614, 819] * 2
+            }
+        }
+    },
+    8244: {
+        "buff_name": "血怒",
+        "gain_attributes": {
+            "physical_attack_power_gain": 102
+        }
+    },
+    8627: {
+        "buff_name": "刀魂",
+        "gain_attributes": {
+            "physical_attack_power_gain": 154
+        }
+    },
+    17176: {
+        "buff_name": "分野",
         "gain_attributes": {
-            "all_damage_addition": 62
+            "all_damage_addition": 51
         }
     },
-    27099: {
-        "buff_name": "诸怀",
+    8267: {
+        "buff_name": "恋战",
+        "gain_attributes": {
+            "physical_critical_strike_gain": 300,
+        }
+    },
+    14309: {
+        "buff_name": "锋鸣",
+        "gain_attributes": {
+            "physical_overcome_gain": 154
+        }
+    },
+    27161: {
+        "buff_name": "血怒·惊涌",
         "gain_attributes": {
-            "all_shield_ignore": 205,
             "physical_attack_power_gain": 102
         }
     },
+    9889: {
+        "buff_name": "蔑视",
+        "gain_attributes": {
+            "all_shield_ignore": 512
+        }
+    },
 }
 
 for buff_id, detail in BUFFS.items():

schools/fen_shan_jing/gains.py

@@ -4,14 +4,16 @@ from base.gain import Gain
 
 
 GAINS = {
-    2568: CriticalSet(16025),
-    5438: damage_addition_recipe([35987], 102),
-    5461: damage_addition_recipe([36157], 51),
-    5462: damage_addition_recipe([35987], 51),
-    5463: critical_strike_recipe([36157], 500),
-    2572: Gain(),
-    2571: Gain(),
-    17470: Gain(),
-    17471: Gain(),
+    1923: CriticalSet(1428),
+    1932: damage_addition_recipe([13075], 102),
+    1933: damage_addition_recipe([19409], 102),
+    1937: damage_addition_recipe([13463], 51),
+    1938: damage_addition_recipe([13092], 51),
+    1934: critical_strike_recipe([13044], 500),
+    1936: critical_strike_recipe([13092, 8249], 500),
+    2408: Gain(),
+    1940: Gain(),
+    17447: Gain(),
+    17448: Gain(),
     **EQUIPMENT_GAINS,
 }

schools/fen_shan_jing/recipes.py

@@ -1,26 +1,58 @@
 from typing import Dict, List
 
 from base.gain import Gain
-from base.recipe import damage_addition_recipe, critical_strike_recipe, pve_addition_recipe
-
+from base.recipe import damage_addition_recipe, critical_strike_recipe
 
 RECIPE_GAINS: Dict[str, Dict[str, Gain]] = {
-    "劲风簇": {
-        "4%会心": critical_strike_recipe([35866], 400),
-        "3%伤害": damage_addition_recipe([35866], 31),
-        "3%会心": critical_strike_recipe([35866], 300),
-        "2%伤害": damage_addition_recipe([35866], 21)
+    "盾刀": {
+        "5%伤害": damage_addition_recipe([13044], 51),
+        "4%伤害": damage_addition_recipe([13044], 41),
+        "3%伤害": damage_addition_recipe([13044], 31),
+        "4%会心": critical_strike_recipe([13044], 400),
+        "3%会心": critical_strike_recipe([13044], 300),
+        "2%会心": critical_strike_recipe([13044], 200),
+    },
+    "盾压": {
+        "5%伤害": damage_addition_recipe([19409], 51),
+        "4%伤害": damage_addition_recipe([19409], 41),
+        "4%会心": critical_strike_recipe([19409], 400),
+        "3%会心": critical_strike_recipe([19409], 300),
+    },
+    "劫刀": {
+        "5%伤害": damage_addition_recipe([28479], 51),
+        "4%伤害": damage_addition_recipe([28479], 41),
+        "3%伤害": damage_addition_recipe([28479], 31),
+        "4%会心": critical_strike_recipe([28479], 400),
+        "3%会心": critical_strike_recipe([28479], 300),
+        "2%会心": critical_strike_recipe([28479], 200),
+    },
+    "斩刀": {
+        "5%伤害": damage_addition_recipe([13092], 41),
+        "4%伤害": damage_addition_recipe([13092], 31),
+        "3%伤害": damage_addition_recipe([13092], 21),
+        "4%会心": critical_strike_recipe([13092, 8249], 400),
+        "3%会心": critical_strike_recipe([13092, 8249], 300),
+        "2%会心": critical_strike_recipe([13092, 8249], 200),
+    },
+    "绝刀": {
+        "5%伤害": damage_addition_recipe([13075], 51),
+        "4%伤害": damage_addition_recipe([13075], 41),
+        "4%会心": critical_strike_recipe([13075], 400),
+        "3%会心": critical_strike_recipe([13075], 300),
     },
-    "饮羽簇": {
-        "15%伤害": pve_addition_recipe([35987], 154),
-        "4%会心": critical_strike_recipe([35987], 400),
-        "3%伤害": damage_addition_recipe([35987], 31),
-        "3%会心": critical_strike_recipe([35987], 300),
-        "2%伤害": damage_addition_recipe([35987], 21)
+    "盾飞": {
+        "4%伤害": damage_addition_recipe([13463], 41),
+        "3%伤害": damage_addition_recipe([13463], 31),
+        "3%会心": critical_strike_recipe([13463], 300),
+        "2%会心": critical_strike_recipe([13463], 200),
     },
 }
 
 RECIPES: Dict[str, List[str]] = {
-    "劲风簇": ["4%会心", "3%伤害", "3%会心", "2%伤害"],
-    "饮羽簇": ["15%伤害", "4%会心", "3%伤害", "3%会心", "2%伤害"],
+    "盾刀": ["5%伤害", "4%伤害", "4%会心", "3%伤害", "3%会心", "2%会心"],
+    "盾压": ["5%伤害", "4%伤害", "4%会心", "3%会心"],
+    "劫刀": ["4%伤害", "4%会心", "3%伤害", "3%会心", "2%伤害", "2%会心"],
+    "斩刀": ["5%伤害", "4%伤害", "4%会心", "3%伤害", "3%会心", "2%会心"],
+    "绝刀": ["5%伤害", "4%伤害", "4%会心", "3%会心"],
+    "盾飞": ["4%伤害", "3%伤害", "3%会心", "2%会心"],
 }

schools/fen_shan_jing/skills.py

@@ -1,152 +1,262 @@
 from typing import Dict
 
-from base.constant import DOT_DAMAGE_SCALE, FRAME_PER_SECOND
 from base.skill import Skill, DotSkill, DotConsumeSkill, PhysicalDamage, PhysicalDotDamage
 from general.skills import GENERAL_SKILLS
 
 SKILLS: Dict[int, Skill | dict] = {
-    36177: {
+    32745: {
         "skill_class": PhysicalDamage,
         "skill_name": "破",
         "surplus_cof": [
-            1048576 * (0.3 - 1),
-            1048576 * (0.3 - 1)
+            1048576 * (0.4 - 1),
+            1048576 * (0.55 * 0.33 - 1),
+            1048576 * (0.7 - 1),
+            1048576 * (0.8 * 0.33 - 1),
+            1048576 * (0.9 - 1),
         ]
     },
-    35894: {
+    13039: {
         "skill_class": PhysicalDamage,
-        "skill_name": "风矢",
+        "skill_name": "卷雪刀",
         "attack_power_cof": 16,
+        "weapon_damage_cof": 1024
+    },
+    **{
+        skill_id: {
+            "skill_class": PhysicalDamage,
+            "skill_name": "盾击",
+            "damage_base": [150, 180, 210, 240, 270, 300, 320, 340, 360, 380, 400, 420, 440, 460, 480, 520],
+            "damage_rand": [e * 0.1 for e in
+                            [50, 80, 100, 120, 140, 160, 180, 200, 240, 280, 320, 360, 400, 440, 480, 520]],
+            "damage_gain": 1 / 5,
+            "attack_power_cof": [16 * 1.05 * 1.05 * 1.1 * 1.1] * 4 +
+                                [(16 + (i - 4) * 5) * 1.05 * 1.05 * 1.1 * 1.1 for i in range(5, 16)] +
+                                [100 * 1.05 * 1.05 * 1.1 * 1.1],
+            "weapon_damage_cof": 1024,
+            "skill_shield_gain": -512,
+        } for skill_id in (13106, 13160, 13161)
+    },
+    19409: {
+        "skill_class": PhysicalDamage,
+        "skill_name": "盾压",
+        "damage_base": [30, 75, 90, 105, 120, 135, 150, 165, 180, 195, 210, 225, 240, 255, 270, 285, 300, 315, 330, 345,
+                        360, 375, 390, 405],
+        "damage_rand": [e * 0.1 for e in
+                        [20, 45, 60, 75, 90, 105, 120, 135, 150, 165, 180, 195, 210, 225, 240, 255, 270, 285, 300, 315,
+                         330, 345, 360, 375]],
+        "damage_gain": 1 / 2,
+        "attack_power_cof": [40 * 1.05 * 1.05 * 1.05 * 1.1] * 4 +
+                            [(40 + (i - 4) * 7) * 1.05 * 1.05 * 1.05 * 1.1 for i in range(5, 24)] +
+                            [190 * 1.05 * 1.05 * 1.05 * 1.1],
         "weapon_damage_cof": 1024,
-        "skill_damage_addition": 205
     },
-    35866: {
+    13099: {
         "skill_class": PhysicalDamage,
-        "skill_name": "劲风簇",
-        "damage_base": [35, 70, 105, 140, 157, 175, 193, 210, 228, 245, 263, 280, 298, 315, 333],
-        "damage_rand": 5,
-        "attack_power_cof": [25 * 0.9 * 0.9 * 0.95] * 3 +
-                            [(25 + (i - 4) * 10) * 0.9 * 0.9 * 0.95 for i in range(4, 15)] +
-                            [175 * 0.9 * 0.9 * 0.95],
-        "weapon_damage_cof": 1024
+        "skill_name": "盾猛",
+        "damage_base": [35, 75, 85, 95, 105, 115, 125, 135, 150, 165, 180, 195, 210, 225, 240, 255, 270, 285, 300, 315,
+                        330, 345, 360, 375, 390],
+        "damage_rand": [e * 0.1 for e in
+                        [35, 45, 55, 65, 75, 85, 95, 105, 120, 135, 150, 165, 180, 195, 210, 225, 240, 255, 270, 285,
+                         300, 315, 330, 345, 360]],
+        "damage_gain": 1 / 3,
+        "attack_power_cof": [40 * 1.05 * 1.05 * 1.05] * 4 +
+                            [(40 + (i - 4) * 4) * 1.05 * 1.05 * 1.05 for i in range(5, 25)] +
+                            [150 * 1.05 * 1.05 * 1.05],
+        "weapon_damage_cof": 1024,
+    },
+    13463: {
+        "skill_class": PhysicalDamage,
+        "skill_name": "盾飞",
+        "damage_base": [30, 45, 60, 75, 90, 105, 120, 135, 150, 165, 180, 195, 210, 225, 240, 255, 270, 300],
+        "damage_rand": [e * 0.1 for e in
+                        [20, 45, 60, 75, 90, 105, 120, 135, 150, 165, 180, 195, 210, 225, 240, 255, 270, 300]],
+        "damage_gain": 1 / 10,
+        "attack_power_cof": [16] * 4 +
+                            [16 + (i - 4) * 1 for i in range(5, 18)] +
+                            [35],
+        "weapon_damage_cof": 1024,
     },
-    35987: {
-        "skill_class": PhysicalDamage,
-        "skill_name": "饮羽簇",
-        "damage_base": [77, 154, 321, 308, 347, 385, 424, 462, 501, 539, 578, 616, 655, 693, 732],
-        "damage_rand": [5, 5, 5, 5, 5, 5, 5, 5, 10, 10, 10, 10, 10, 10, 10],
-        "attack_power_cof": [66 * 0.9 * 0.9 * 0.95 * 0.9 * 0.95] * 3 +
-                            [(66 + (i - 4) * 38) * 0.9 * 0.9 * 0.95 * 0.9 * 0.95 for i in range(4, 15)] +
-                            [552 * 0.9 * 0.9 * 0.95 * 0.9 * 0.95],
-        "weapon_damage_cof": 2048
-    },
-    36056: {
-        "skill_class": PhysicalDamage,
-        "skill_name": "践踏",
-        "damage_base": [16, 44, 72, 100, 128, 156, 184, 212, 240, 268, 296],
-        "damage_rand": 20,
-        "attack_power_cof": [70 * 1.05] * 2 +
-                            [(70 + (i - 3) * 58) * 1.05 for i in range(3, 11)] +
-                            [607 * 1.05],
-        "skill_damage_addition": 62
-    },
-    36057: {
-        "skill_class": PhysicalDamage,
-        "skill_name": "重击",
-        "damage_base": [16, 44, 72, 100, 128, 156, 184, 212, 240, 268, 296],
-        "damage_rand": 20,
-        "attack_power_cof": [33 * 1.05] * 2 +
-                            [(33 + (i - 3) * 26) * 1.05 for i in range(3, 11)] +
-                            [276 * 1.05],
-        "skill_damage_addition": 62
-    },
-    36111: {
-        "skill_class": PhysicalDamage,
-        "skill_name": "攻击",
-        "damage_base": [16, 44, 72, 100, 128, 156, 184, 212, 240, 268, 296],
-        "damage_rand": 20,
-        "attack_power_cof": [33 * 1.05] * 2 +
-                            [(33 + (i - 3) * 26) * 1.05 for i in range(3, 11)] +
-                            [276 * 1.05],
-        "skill_damage_addition": 62
-    },
-    36112: {
-        "skill_class": PhysicalDamage,
-        "skill_name": "攻击",
-        "damage_base": [48, 132, 216, 300, 384, 468, 552, 636, 720, 804, 296],
-        "damage_rand": 20,
-        "attack_power_cof": [99 * 1.05] * 2 +
-                            [(99 + (i - 3) * 26) * 1.05 for i in range(3, 11)] +
-                            [828 * 1.05],
-        "skill_damage_addition": 62
-    },
-    36113: {
-        "skill_class": PhysicalDamage,
-        "skill_name": "攻击",
-        "damage_base": [16, 44, 72, 100, 128, 156, 184, 212, 240, 268, 296],
-        "damage_rand": 20,
-        "attack_power_cof": [70 * 1.05] * 2 +
-                            [(70 + (i - 3) * 26) * 1.05 for i in range(3, 11)] +
-                            [607 * 1.05],
-        "skill_damage_addition": 62
-    },
-    36114: {
-        "skill_class": PhysicalDamage,
-        "skill_name": "攻击",
-        "damage_base": [16, 44, 72, 100, 128, 156, 184, 212, 240, 268, 296],
-        "damage_rand": 20,
-        "attack_power_cof": [23 * 1.05] * 2 +
-                            [(23 + (i - 3) * 26) * 1.05 for i in range(3, 11)] +
-                            [165 * 1.05],
-        "skill_damage_addition": 62
-    },
-    36157: {
-        "skill_class": PhysicalDamage,
-        "skill_name": "标鹄",
-        "damage_base": 30,
-        "damage_rand": 20,
-        "attack_power_cof": 512 * 1.15 * 0.9 * 0.95
-    },
-    26856: {
+    13044: {
+        "skill_class": PhysicalDamage,
+        "skill_name": "盾刀",
+        "damage_base": [31, 40, 45, 48, 55, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96,
+                        98, 102, 106, 110, 114, 118, 122, 126, 130],
+        "damage_rand": [5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 15, 15, 15, 15, 15, 15,
+                        15, 15, 15, 15, 15, 15, 15],
+        "attack_power_cof": [16 * 1.05 * 1.05 * 1.1] * 4 +
+                            [(16 + (i - 4) * 3) * 1.05 * 1.05 * 1.1 for i in range(5, 33)] +
+                            [100 * 1.05 * 1.05 * 1.1],
+        "weapon_damage_cof": 1024,
+    },
+    8249: {
         "skill_class": PhysicalDotDamage,
-        "skill_name": "贯穿(DOT)",
-        "damage_base": 32,
-        "attack_power_cof": 215 * 0.7 * 1.15 * 0.9 * 0.9 * 0.9,
-        "interval": FRAME_PER_SECOND * DOT_DAMAGE_SCALE / 4
-    },
-    36165: {
-        "skill_class": DotConsumeSkill,
-        "skill_name": "贯穿",
-        "bind_skill": 26856,
-        "tick": 3
-    },
-    35771: {
+        "skill_name": "流血(DOT)",
+        "damage_base": 47,
+        "attack_power_cof": [16 * 1.5 * 2 * 1.05 * 1.1] * 9 +
+                            [(16 + (i - 9) * 4) * 1.5 * 2 * 1.05 * 1.1 for i in range(10, 22)] +
+                            [70 * 1.5 * 2 * 1.05 * 1.1],
+        "interval": 32,
+        "tick": 13
+    },
+    29188: {
         "skill_class": DotSkill,
-        "skill_name": "贯穿",
-        "bind_skill": 26856,
-        "max_stack": 6,
-        "tick": 4
+        "skill_name": "流血",
+        "bind_skill": 8249
+    },
+    13075: {
+        "skill_class": PhysicalDamage,
+        "skill_name": "绝刀",
+        "damage_base": [240, 270, 300, 330, 350, 370, 390, 410, 430, 450, 470, 490, 510, 540, 570, 600, 630, 660, 690,
+                        720],
+        "damage_rand": [e * 0.1 for e in
+                        [80, 100, 120, 140, 160, 180, 200, 220, 240, 260, 280, 300, 320, 340, 360, 380, 400, 420, 440,
+                         500]],
+        "damage_gain": 1 / 4,
+        "attack_power_cof": [60 * 0.9 * 0.75 * 0.9 * 1.1 * 1.05 * 1.05 * 1.05 * 1.22 * 1.05 * 1.05 * 1.1 * 1.06] * 4 +
+                            [(60 + (i - 4) * 12) * 0.9 * 0.75 * 0.9 * 1.1 * 1.05 * 1.05 * 1.05 * 1.22 * 1.05 * 1.05 *
+                             1.1 * 1.06 for i in range(5, 20)] +
+                            [250 * 0.75 * 0.9 * 1.1 * 1.05 * 1.05 * 1.05 * 1.22 * 1.05 * 1.05 * 1.1 * 1.06],
+        "weapon_damage_cof": 1024,
     },
-    36453: {
+    13092: {
         "skill_class": PhysicalDamage,
-        "skill_name": "朝仪万汇",
-        "damage_base": 37,
-        "damage_rand": 5,
-        "attack_power_cof": 215
+        "skill_name": "斩刀",
+        "damage_base": [230, 260, 290, 320, 350, 380, 410, 440, 470, 510, 550, 580, 610, 640, 670, 700, 710, 720, 730,
+                        740, 750, 760],
+        "damage_rand": [e * 0.1 for e in
+                        [20, 45, 60, 75, 90, 105, 120, 135, 150, 165, 180, 195, 210, 225, 240, 255, 270, 285, 300, 315,
+                         330, 345]],
+        "damage_gain": 0.3,
+        "attack_power_cof": [50 * 0.9 * 0.85 * 1.05 * 1.1 * 1.15 * 1.15 * 1.05 * 1.1 * 1.1 * 1.06 * 1.2] * 4 +
+                            [(50 + (i - 4) * 10) * 0.9 * 0.85 * 1.05 * 1.1 * 1.15 * 1.15 * 1.05 * 1.1 * 1.1 * 1.06 * 1.2
+                             for i in range(5, 22)] +
+                            [250 * 0.9 * 0.85 * 1.05 * 1.1 * 1.15 * 1.15 * 1.05 * 1.1 * 1.1 * 1.06 * 1.2],
+        "weapon_damage_cof": 1024,
     },
-    36579: {
+    28479: {
         "skill_class": PhysicalDamage,
-        "skill_name": "劲风簇·神兵",
-        "damage_base": 20,
-        "damage_rand": 2,
-        "attack_power_cof": 60
+        "skill_name": "劫刀",
+        "damage_base": [e / 5 for e in
+                        [120, 150, 180, 210, 230, 250, 270, 290, 310, 330, 350, 370, 390, 400, 410, 420, 430, 440, 450,
+                         460, 470, 480, 490, 500, 510, 520, 530, 550]],
+        "damage_rand": [e * 0.1 for e in
+                        [80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 120, 130, 140, 150, 160, 170, 180, 190, 200,
+                         210, 220, 230, 240, 250, 260, 270, 280, 290]],
+        "attack_power_cof": [20 * 1.1 * 1.05 * 1.1 * 1.05 * 1.1 * 1.05 * 1.06] * 9 +
+                            [(20 + (i - 9) * 7) * 1.1 * 1.05 * 1.1 * 1.05 * 1.1 * 1.05 * 1.06
+                             for i in range(10, 28)] +
+                            [160 * 1.1 * 1.05 * 1.1 * 1.05 * 1.1 * 1.05 * 1.06],
+        "weapon_damage_cof": 1024,
+    },
+    36065: {
+        "skill_class": PhysicalDamage,
+        "skill_name": ["击破·援戈", "斩破·惊涌", "绝破·惊涌", "闪破·惊涌", "劫破·惊涌"],
+        "surplus_cof": [
+            1048576 * (0.697 * 0.5 * 1.2 - 1),
+            1048576 * (0.697 * 0.14 * 1.2 * 1.2 - 1),
+            1048576 * (0.697 * 0.14 * 1.2 * 1.2 - 1),
+            1048576 * (0.697 * 0.14 * 1.2 - 1),
+            1048576 * (0.697 * 0.14 * 1.2 - 1),
+        ]
+    },
+    36482: {
+        "skill_class": PhysicalDamage,
+        "skill_name": "援戈·血影",
+        "damage_base": 400 / 5,
+        "damage_rand": 150 * 0.1,
+        "attack_power_cof": 300 * 2.3 * 0.83 * 1.2,
+        "weapon_damage_cof": 1024
+    },
+    37253: {
+        "skill_class": PhysicalDamage,
+        "skill_name": "麾远",
+        "damage_base": 400 / 5,
+        "damage_rand": 150 * 0.1,
+        "attack_power_cof": 170 * 2,
+    },
+    34673: {
+        "skill_class": PhysicalDamage,
+        "skill_name": "业火焚城",
+        "attack_power_cof": 40,
+        "weapon_damage_cof": 1024
+    },
+    34674: {
+        "skill_class": PhysicalDamage,
+        "skill_name": "麟光甲寒",
+        "damage_base": 400 / 5,
+        "damage_rand": 150 * 0.1,
+        "attack_power_cof": 220 * 1.3 * 1.2,
+        "weapon_damage_cof": 1024
+    },
+    34714: {
+        "skill_class": PhysicalDamage,
+        "skill_name": "业火焚城·云盾",
+        "damage_base": 400 / 5,
+        "damage_rand": 150 * 0.1,
+        "attack_power_cof": 160 * 1.3,
+        "weapon_damage_cof": 1024
+    },
+    37448: {
+        "skill_class": PhysicalDamage,
+        "skill_name": "破·麟光",
+        "surplus_cof": 1048576 * (0.697 * 0.14 * 1.2 - 1)
+    },
+    30925: {
+        "skill_class": PhysicalDamage,
+        "skill_name": "阵云结晦",
+        "damage_base": 240,
+        "damage_rand": 80 * 0.1,
+        "damage_gain": 1.2 / 4,
+        "attack_power_cof": 80 * 2 * 1.5,
+        "weapon_damage_cof": 1024,
+        "skill_pve_addition": 614
+    },
+    30926: {
+        "skill_class": PhysicalDamage,
+        "skill_name": "月照连营",
+        "damage_base": 320,
+        "damage_rand": 120 * 0.1,
+        "damage_gain": 1.2 / 4,
+        "attack_power_cof": 100 * 2 * 1.5,
+        "weapon_damage_cof": 1024,
+        "skill_pve_addition": 614
+    },
+    30857: {
+        "skill_class": PhysicalDamage,
+        "skill_name": "雁门迢递",
+        "damage_base": [400, 460, 520, 580, 640, 700, 760],
+        "damage_rand": [e * 0.1 for e in [300, 320, 340, 360, 380, 400, 420]],
+        "damage_gain": 1.2 / 4,
+        "attack_power_cof": 120 * 2 * 1.5,
+        "weapon_damage_cof": 1024,
+        "skill_pve_addition": 614
+    },
+    30858: {
+        "skill_class": PhysicalDamage,
+        "skill_name": "绝国",
+        "damage_base": 24,
+        "damage_rand": 15 * 0.1,
+        "damage_gain": 1.2 / 4,
+        "attack_power_cof": [20 * (i + 1) * 1.2 * 1.3 for i in range(16)] +
+                            [40 * (i + 1) * 1.2 * 1.3 for i in range(16, 80)],
+        "weapon_damage_cof": 1024,
+    },
+    30859: {
+        "skill_class": PhysicalDamage,
+        "skill_name": "阵云绝",
+        "damage_base": 47,
+        "damage_rand": 28 * 0.1,
+        "damage_gain": 1.2 / 4,
+        "attack_power_cof": 80 * 1.2,
+        "weapon_damage_cof": 1024,
+        "skill_pve_addition": 614
     },
-    36580: {
+    25780: {
         "skill_class": PhysicalDamage,
-        "skill_name": "月弦激星",
+        "skill_name": "盾击·神兵",
         "damage_base": 20,
         "damage_rand": 2,
-        "attack_power_cof": 390
+        "attack_power_cof": 50
     }
 }
 

schools/fen_shan_jing/talents.py

@@ -1,95 +1,47 @@
 from typing import Dict
 
-from base.attribute import Attribute
 from base.gain import Gain
 from base.skill import Skill
 
 
-class 彤弓(Gain):
+class 分野(Gain):
     def add_skills(self, skills: Dict[int, Skill]):
-        skills[35866].skill_critical_strike += 1000
-        skills[35866].skill_critical_power += 102
+        skills[13075].skill_critical_strike += 1500
+        skills[13075].skill_critical_power += 200
 
     def sub_skills(self, skills: Dict[int, Skill]):
-        skills[35866].skill_critical_strike -= 1000
-        skills[35866].skill_critical_power -= 102
-
-
-class 素矰(Gain):
-    def add_skills(self, skills: Dict[int, Skill]):
-        skills[26856].attack_power_cof_gain *= 1.05
-
-    def sub_skills(self, skills: Dict[int, Skill]):
-        skills[26856].attack_power_cof_gain /= 1.05
-
-
-class 孰湖(Gain):
-    def add_skills(self, skills: Dict[int, Skill]):
-        for skill_id in (36056, 36057, 36111, 36112, 36113, 36114):
-            skills[skill_id].skill_damage_addition += 62
-
-    def sub_skills(self, skills: Dict[int, Skill]):
-        for skill_id in (36056, 36057, 36111, 36112, 36113, 36114):
-            skills[skill_id].skill_damage_addition -= 62
-
-
-class 桑柘(Gain):
-    def add_skills(self, skills: Dict[int, Skill]):
-        skills[35771].tick += 1
-
-    def sub_skills(self, skills: Dict[int, Skill]):
-        skills[35771].tick -= 1
-
-
-class 卢令(Gain):
-    def add_attribute(self, attribute: Attribute):
-        attribute.agility_gain += 102
-
-    def sub_attribute(self, attribute: Attribute):
-        attribute.agility_gain -= 102
-
-
-class 贯侯(Gain):
-    def add_skills(self, skills: Dict[int, Skill]):
-        skills[36157].skill_pve_addition += 205
-
-    def sub_skills(self, skills: Dict[int, Skill]):
-        skills[36157].skill_pve_addition -= 205
+        skills[13075].skill_critical_strike -= 1500
+        skills[13075].skill_critical_power -= 200
 
 
 TALENT_GAINS: Dict[int, Gain] = {
-    35715: 素矰("素矰"),
-    35714: 彤弓("彤弓"),
-    35718: Gain("棘矢"),
-    35719: 孰湖("孰湖"),
-    35721: Gain("襄尺"),
-    35725: Gain("长右"),
-    35729: Gain("鹿蜀"),
-    35736: 桑柘("桑柘"),
-    35733: Gain("诸怀"),
-    35737: Gain("于狩"),
-    35745: 卢令("卢令"),
-    35749: Gain("托月"),
-    35751: Gain("佩弦"),
-    35754: Gain("丛云隐月"),
-    35757: 贯侯("贯侯"),
-    35764: Gain("朝仪万汇"),
-    35761: Gain("朱厌")
+    13317: Gain("刀魂"),
+    13090: Gain("绝返"),
+    13087: 分野("分野"),
+    21281: Gain("血魄"),
+    22897: Gain("锋鸣"),
+    37239: Gain("麾远"),
+    34912: Gain("业火麟光"),
+    13126: Gain("恋战"),
+    36058: Gain("援戈"),
+    36205: Gain("惊涌"),
+    14838: Gain("蔑视"),
+    30769: Gain("阵云结晦")
 }
 
 TALENTS = [
-    [35715, 35714],
-    [35718, 35719],
-    [35721],
-    [35725],
-    [35729],
-    [35736, 35733],
-    [35737],
-    [35745],
-    [35749],
-    [35751, 35754],
-    [35757],
-    [35764, 35761]
+    [13317],
+    [13090],
+    [13087],
+    [21281],
+    [22897],
+    [37239],
+    [34912],
+    [13126],
+    [36058],
+    [36205],
+    [14838],
+    [30769]
 ]
 TALENT_DECODER = {talent_id: talent.gain_name for talent_id, talent in TALENT_GAINS.items()}
 TALENT_ENCODER = {v: k for k, v in TALENT_DECODER.items()}

schools/gu_feng_jue/skills.py

@@ -7,14 +7,14 @@ from general.skills import GENERAL_SKILLS
 
 class 横刀断浪流血(Skill):
     def record(self, critical, parser):
-        bind_skill = self.bind_skill
+        bind_skill = parser.current_school.skills(self.bind_skill)
         bind_buff = self.bind_buff
-        parser.current_ticks[bind_skill] = self.tick
-        parser.current_stacks[bind_skill] = self.max_stack
+        parser.current_ticks[self.bind_skill] = bind_skill.tick
+        parser.current_stacks[self.bind_skill] = self.max_stack
         for level in range(self.max_stack):
             parser.current_target_buffs.pop((bind_buff, level + 1), None)
         parser.current_target_buffs[(bind_buff, self.max_stack)] = 1
-        parser.current_dot_snapshot[bind_skill] = parser.current_player_buffs.copy()
+        parser.current_dot_snapshot[self.bind_skill] = parser.current_player_buffs.copy()
 
 
 SKILLS: Dict[int, Skill | dict] = {
@@ -36,7 +36,8 @@ SKILLS: Dict[int, Skill | dict] = {
         "skill_name": "避实击虚",
         "damage_base": [35, 42, 45, 50, 55, 60],
         "damage_rand": 5,
-        "attack_power_cof": [80 * 0.9, 100 * 0.9 * 0.9, 120 * 0.9 * 0.9, 160 * 0.8 * 0.9, 160 * 0.9, 200 * 0.9]
+        "attack_power_cof": [80 * 0.9, 100 * 0.9 * 0.9, 120 * 0.9 * 0.9, 160 * 0.8 * 0.9, 160 * 0.9, 200 * 0.9],
+        "weapon_damage_cof": 1024,
     },
     32246: {
         "skill_class": PhysicalDamage,
@@ -168,6 +169,14 @@ SKILLS: Dict[int, Skill | dict] = {
                             [290],
         "weapon_damage_cof": 3072
     },
+    24443: {
+        "skill_class": PhysicalDotDamage,
+        "skill_name": "流血(DOT)",
+        "damage_base": 114,
+        "attack_power_cof": 100,
+        "interval": FRAME_PER_SECOND * DOT_DAMAGE_SCALE / 3,
+        "tick": 3
+    },
     **{
         skill_id: {
             "skill_class": 横刀断浪流血,
@@ -175,16 +184,8 @@ SKILLS: Dict[int, Skill | dict] = {
             "bind_skill": 24443,
             "bind_buff": -32513,
             "max_stack": i + 1,
-            "tick": 3
         } for i, skill_id in enumerate([32874, 32873, 32872, 32871, 32870, 32869])
     },
-    24443: {
-        "skill_class": PhysicalDotDamage,
-        "skill_name": "流血(DOT)",
-        "damage_base": 114,
-        "attack_power_cof": 100,
-        "interval": FRAME_PER_SECOND * DOT_DAMAGE_SCALE / 3
-    },
     32234: {
         "skill_class": PhysicalDamage,
         "skill_name": "横云断浪",

schools/gu_feng_jue/talents.py

@@ -42,12 +42,10 @@ class 放皓(Gain):
 
 class 涣衍(Gain):
     def add_skills(self, skills: Dict[int, Skill]):
-        for skill_id in (32874, 32873, 32872, 32871, 32870, 32869):
-            skills[skill_id].tick += 3
+        skills[24443].tick += 3
 
     def sub_skills(self, skills: Dict[int, Skill]):
-        for skill_id in (32874, 32873, 32872, 32871, 32870, 32869):
-            skills[skill_id].tick -= 3
+        skills[24443].tick -= 3
 
 
 class 涤瑕(Gain):

schools/hua_jian_you/skills.py

@@ -22,11 +22,10 @@ class DotConsumeSkill(Skill):
             new_status_tuple = status_tuple
         skill_id, skill_level, skill_stack = skill_tuple
         parser.current_ticks[skill_id] += 1
-        tick = min(parser.current_ticks[skill_id], self.tick)
+        tick = parser.current_ticks.pop(skill_id)
         parser.current_records[(skill_id, skill_level, skill_stack * tick)][new_status_tuple].append(
             parser.current_records[skill_tuple][status_tuple].pop()
         )
-        parser.current_ticks[skill_id] -= tick
 
 
 class GeneraConsumeSkill(DotConsumeSkill):
@@ -68,21 +67,20 @@ SKILLS: Dict[int, Skill | dict] = {
                             [(28 + (48 + (i - 9) * 9) * 0.9 * 1.25 * 1.15 * 1.05 * 1.1 * 1.05 * 1.15 * 1.1) * 1.05 *
                              1.05 * 1.05 for i in range(10, 19)] +
                             [(28 + 155 * 0.9 * 1.25 * 1.15 * 1.05 * 1.1 * 1.05 * 1.15 * 1.1) * 1.05 * 1.05 * 1.05],
-        "interval": 48
+        "interval": 48,
+        "tick": 6 + 1
     },
     **{
         skill_id: {
             "skill_class": DotSkill,
             "skill_name": "兰摧玉折",
-            "bind_skill": 711,
-            "tick": 6 + 1
+            "bind_skill": 711
         } for skill_id in (13848, 6136)  # 18730
     },
     6129: {
         "skill_class": DotConsumeSkill,
         "skill_name": "兰摧玉折",
         "bind_skill": 711,
-        "tick": 99,
         "bind_buff_levels": {5: 2, 6: 1}
     },
     714: {
@@ -93,21 +91,20 @@ SKILLS: Dict[int, Skill | dict] = {
                             [(48 + (i - 9) * 8) * 0.9 * 1.25 * 1.15 * 1.05 * 1.15 * 1.1 * 1.05 * 1.05 * 1.05 for i in
                              range(10, 24)] +
                             [175 * 0.9 * 1.25 * 1.15 * 1.05 * 1.15 * 1.1 * 1.05 * 1.05 * 1.05],
-        "interval": 48
+        "interval": 48,
+        "tick": 6 + 1
     },
     **{
         skill_id: {
             "skill_class": DotSkill,
             "skill_name": "钟林毓秀",
-            "bind_skill": 714,
-            "tick": 6 + 1
+            "bind_skill": 714
         } for skill_id in (285, 13847, 6135)
     },
     6126: {
         "skill_class": DotConsumeSkill,
         "skill_name": "钟林毓秀",
         "bind_skill": 714,
-        "tick": 99,
         "bind_buff_levels": {5: 2, 6: 1}
     },
     14941: {
@@ -129,21 +126,20 @@ SKILLS: Dict[int, Skill | dict] = {
                             [(64 + (i - 9) * 4) * 0.9 * 1.25 * 1.15 * 1.05 * 1.15 * 1.05 * 1.05 * 1.1 for i in
                              range(10, 29)] +
                             [161 * 0.9 * 1.25 * 1.15 * 1.05 * 1.15 * 1.05 * 1.05 * 1.1],
-        "interval": 48
+        "interval": 48,
+        "tick": 6 + 1
     },
     **{
         skill_id: {
             "skill_class": DotSkill,
             "skill_name": "商阳指",
-            "bind_skill": 666,
-            "tick": 6 + 1
+            "bind_skill": 666
         } for skill_id in (180, 6134)
     },
     6128: {
         "skill_class": DotConsumeSkill,
         "skill_name": "商阳指",
         "bind_skill": 666,
-        "tick": 99,
         "bind_buff_levels": {5: 2, 6: 1}
     },
     6693: {
@@ -184,22 +180,21 @@ SKILLS: Dict[int, Skill | dict] = {
         "skill_name": "快雪时晴(DOT)",
         "damage_base": 38,
         "attack_power_cof": (28 + 155 * 0.9 * 1.25 * 1.15 * 1.05 * 1.1 * 1.05 * 1.15 * 1.1) * 1.05 * 1.2 * 0.12,
-        "interval": 64
+        "interval": 64,
+        "tick": 7,
+        "max_stack": 6
     },
     **{
         skill_id: {
             "skill_class": DotSkill,
             "skill_name": "快雪时晴",
-            "bind_skill": 24158,
-            "tick": 7,
-            "max_stack": 6
+            "bind_skill": 24158
         } for skill_id in (32409, 32481)
     },
     32410: {
         "skill_class": DotConsumeSkill,
         "skill_name": "快雪时晴",
         "bind_skill": 24158,
-        "tick": 99,
         "bind_buff_levels": {2: 2, 3: 1}
     },
     601: {

schools/ling_hai_jue/skills.py

@@ -166,15 +166,14 @@ SKILLS: Dict[int, Skill | dict] = {
         "skill_name": "青冥(DOT)",
         "damage_base": 50,
         "attack_power_cof": 550,
-        "interval": 32
-
+        "interval": 32,
+        "max_stack": 6,
+        "tick": 6
     },
     25640: {
         "skill_class": DotSkill,
         "skill_name": "青冥",
-        "bind_skill": 18386,
-        "max_stack": 6,
-        "tick": 6
+        "bind_skill": 18386
     },
     25783: {
         "skill_class": PhysicalDamage,
@@ -188,15 +187,15 @@ SKILLS: Dict[int, Skill | dict] = {
         "skill_name": "御波驾澜(DOT)",
         "damage_base": 25,
         "attack_power_cof": 680,
-        "interval": 48
+        "interval": 48,
+        "max_stack": 3,
+        "tick": 6
 
     },
     26935: {
         "skill_class": DotSkill,
         "skill_name": "御波驾澜",
-        "bind_skill": 19557,
-        "max_stack": 3,
-        "tick": 6
+        "bind_skill": 19557
     }
 }
 

schools/mo_wen/skills.py

@@ -51,14 +51,14 @@ SKILLS: Dict[int, Skill | dict] = {
                             [(48 + (i - 9) * 7) * 1.1 * 1.05 * 1.05 * 1.05 * 1.12 * 1.05 * 1.1 * 1.05 for i in
                              range(10, 25)] +
                             [160 * 1.1 * 1.05 * 1.05 * 1.05 * 1.12 * 1.05 * 1.1 * 1.05],
-        "interval": 48
+        "interval": 48,
+        "tick": 6
     },
     **{
         skill_id: {
             "skill_class": DotSkill,
             "skill_name": "商",
-            "bind_skill": 9357,
-            "tick": 6
+            "bind_skill": 9357
         } for skill_id in (14287, 17788)
     },
     14311: {
@@ -81,14 +81,14 @@ SKILLS: Dict[int, Skill | dict] = {
                             [(48 + (i - 9) * 8) * 1.05 * 1.05 * 1.12 * 1.05 * 1.1 * 1.05 for i in
                              range(10, 25)] +
                             [180 * 1.05 * 1.05 * 1.12 * 1.05 * 1.1 * 1.05],
-        "interval": 48
+        "interval": 48,
+        "tick": 6
     },
     **{
         skill_id: {
             "skill_class": DotSkill,
             "skill_name": "角",
-            "bind_skill": 9361,
-            "tick": 6
+            "bind_skill": 9361
         } for skill_id in (14291, 17792)
     },
     14312: {
@@ -189,14 +189,14 @@ SKILLS: Dict[int, Skill | dict] = {
         "skill_name": "神兵·宫(DOT)",
         "damage_base": 58,
         "attack_power_cof": 360 * 1.1 * 1.05 * 1.05 * 1.05 * 1.35,
-        "interval": 48
+        "interval": 48,
+        "max_stack": 3,
+        "tick": 10
     },
     31005: {
         "skill_class": DotSkill,
         "skill_name": "神兵·宫",
-        "bind_skill": 23187,
-        "max_stack": 3,
-        "tick": 10
+        "bind_skill": 23187
     }
 }
 

schools/shan_hai_xin_jue/skills.py

@@ -112,7 +112,14 @@ SKILLS: Dict[int, Skill | dict] = {
         "skill_name": "贯穿(DOT)",
         "damage_base": 32,
         "attack_power_cof": 215 * 0.7 * 1.15 * 0.9 * 0.9 * 0.9,
-        "interval": FRAME_PER_SECOND * DOT_DAMAGE_SCALE / 4
+        "interval": FRAME_PER_SECOND * DOT_DAMAGE_SCALE / 4,
+        "max_stack": 6,
+        "tick": 4
+    },
+    35771: {
+        "skill_class": DotSkill,
+        "skill_name": "贯穿",
+        "bind_skill": 26856
     },
     36165: {
         "skill_class": DotConsumeSkill,
@@ -120,13 +127,6 @@ SKILLS: Dict[int, Skill | dict] = {
         "bind_skill": 26856,
         "tick": 3
     },
-    35771: {
-        "skill_class": DotSkill,
-        "skill_name": "贯穿",
-        "bind_skill": 26856,
-        "max_stack": 6,
-        "tick": 4
-    },
     36453: {
         "skill_class": PhysicalDamage,
         "skill_name": "朝仪万汇",

schools/shan_hai_xin_jue/talents.py

@@ -35,10 +35,10 @@ class 孰湖(Gain):
 
 class 桑柘(Gain):
     def add_skills(self, skills: Dict[int, Skill]):
-        skills[35771].tick += 1
+        skills[26856].tick += 1
 
     def sub_skills(self, skills: Dict[int, Skill]):
-        skills[35771].tick -= 1
+        skills[26856].tick -= 1
 
 
 class 卢令(Gain):

schools/tai_xu_jian_yi/buffs.py

@@ -22,6 +22,7 @@ BUFFS: Dict[int, Buff | dict] = {
     },
     2757: {
         "buff_name": "紫气东来",
+        "frame_shift": -1,
         "gain_attributes": {
             "physical_attack_power_gain": [256, 256, 512, 256],
             "magical_attack_power_gain": [256, 256, 512, 256],

schools/tai_xu_jian_yi/skills.py

@@ -25,14 +25,14 @@ SKILLS: Dict[int, Skill | dict] = {
         "skill_name": "叠刃(DOT)",
         "damage_base": 10,
         "attack_power_cof": 58 * 1.15 * 1.1 * 1.1,
-        "interval": 48
+        "interval": 48,
+        "max_stack": 5,
+        "tick": 8
     },
     600: {
         "skill_class": DotSkill,
         "skill_name": "叠刃",
-        "bind_skill": 748,
-        "max_stack": 5,
-        "tick": 8
+        "bind_skill": 748
     },
     **{
         skill_id: {
@@ -98,13 +98,13 @@ SKILLS: Dict[int, Skill | dict] = {
         "skill_name": "人剑合一(DOT)",
         "damage_base": 16,
         "attack_power_cof": 450,
-        "interval": 48
+        "interval": 48,
+        "tick": 4
     },
     37453: {
         "skill_class": DotSkill,
         "skill_name": "人剑合一",
-        "bind_skill": 889,
-        "tick": 4
+        "bind_skill": 889
     },
     21979: {
         "skill_class": PhysicalDamage,
@@ -148,14 +148,14 @@ SKILLS: Dict[int, Skill | dict] = {
         "skill_name": "万象归元(DOT)",
         "damage_base": 10,
         "attack_power_cof": 450,
-        "interval": 48
+        "interval": 48,
+        "max_stack": 3,
+        "tick": 10
     },
     30944: {
         "skill_class": DotSkill,
         "skill_name": "万象归元",
-        "bind_skill": 23170,
-        "max_stack": 3,
-        "tick": 10
+        "bind_skill": 23170
     }
 }
 

schools/tai_xu_jian_yi/talents.py

@@ -29,10 +29,10 @@ class 无意(Gain):
 
 class 裂云(Gain):
     def add_skills(self, skills: Dict[int, Skill]):
-        skills[600].max_stack += 2
+        skills[748].max_stack += 2
 
     def sub_skills(self, skills: Dict[int, Skill]):
-        skills[600].max_stack -= 2
+        skills[748].max_stack -= 2
 
 
 class 虚极(Gain):

schools/tian_luo_gui_dao/buffs.py

@@ -63,12 +63,12 @@ BUFFS = {
             } for skill_id in (3313, 36502, 30894, 30727)
         }
     },
-    24668: {
-        "buff_name": "杀机断魂",
-        "gain_attributes": {
-            "all_damage_addition": 103
-        }
-    }
+    # 24668: {
+    #     "buff_name": "杀机断魂",
+    #     "gain_attributes": {
+    #         "all_damage_addition": 103
+    #     }
+    # }
 }
 
 for buff_id, detail in BUFFS.items():

schools/tian_luo_gui_dao/skills.py

@@ -65,14 +65,14 @@ SKILLS: Dict[int, Skill | dict] = {
         "skill_class": MixingDotDamage,
         "skill_name": "化血(DOT)",
         "damage_base": 90,
-        "attack_power_cof": 140 * 1.3 * 1.05*2.0*1.1,
-        "interval": 48
+        "attack_power_cof": 140 * 1.3 * 1.05 * 2.0 * 1.1,
+        "interval": 48,
+        "tick": 16
     },
     21266: {
         "skill_class": DotSkill,
         "skill_name": "化血",
-        "bind_skill": 14611,
-        "tick": 16
+        "bind_skill": 14611
     },
     3105: {
         "skill_class": MixingDamage,

schools/tian_luo_gui_dao/talents.py

@@ -14,12 +14,16 @@ class 流星赶月(Gain):
         skills[3228].skill_critical_power -= 102
 
 
-class 疾根(Gain):
+class 杀机断魂(Gain):
     def add_skills(self, skills: Dict[int, Skill]):
-        skills[27560].tick += 1
+        for skill_id in (36502, 30894, 30727):
+            skills[skill_id].skill_damage_addition += 103 * 2 * 3
+        skills[3313].skill_damage_addition += 103 * 3
 
     def sub_skills(self, skills: Dict[int, Skill]):
-        skills[27560].tick -= 1
+        for skill_id in (36502, 30894, 30727):
+            skills[skill_id].skill_damage_addition -= 103 * 2 * 3
+        skills[3313].skill_damage_addition -= 103 * 3
 
 
 TALENT_GAINS: Dict[int, Gain] = {
@@ -30,7 +34,7 @@ TALENT_GAINS: Dict[int, Gain] = {
     37326: 流星赶月("流星赶月"),
     6451: Gain("聚精凝神"),
     18249: Gain("化血迷心"),
-    33134: Gain("杀机断魂"),
+    33134: 杀机断魂("杀机断魂"),
     6461: Gain("秋风散影"),
     37327: Gain("云合影从"),
     14856: Gain("曙色催寒"),

schools/wu_fang/skills.py

@@ -37,14 +37,14 @@ SKILLS: Dict[int, Skill | dict] = {
         "skill_name": "逆乱(DOT)",
         "damage_base": 95,
         "attack_power_cof": 90 * 1.5 * 0.8 * 1.05 * 1.1,
-        "interval": 32
+        "interval": 32,
+        "max_stack": 8,
+        "tick": 7
     },
     27560: {
         "skill_class": DotSkill,
         "skill_name": "逆乱",
-        "bind_skill": 20052,
-        "max_stack": 8,
-        "tick": 7
+        "bind_skill": 20052
     },
     27552: {
         "skill_class": MagicalDamage,

schools/wu_fang/talents.py

@@ -15,10 +15,10 @@ class 鸩羽(Gain):
 
 class 疾根(Gain):
     def add_skills(self, skills: Dict[int, Skill]):
-        skills[27560].tick += 1
+        skills[20052].tick += 1
 
     def sub_skills(self, skills: Dict[int, Skill]):
-        skills[27560].tick -= 1
+        skills[20052].tick -= 1
 
 
 TALENT_GAINS: Dict[int, Gain] = {

schools/yi_jin_jing/skills.py

@@ -79,7 +79,8 @@ SKILLS: Dict[int, Skill | dict] = {
         "skill_name": "横扫六合(DOT)",
         "damage_base": 45,
         "attack_power_cof": 70 * 1.2 * 1.65 * 1.15 * 1.15 * 1.05 * 1.25 * 1.1 * 1.1,
-        "interval": 32
+        "interval": 32,
+        "tick": 6 + 3
     },
     3810: {
         "skill_class": type("Mixing", (MagicalDamage, DotSkill), {}),
@@ -88,8 +89,7 @@ SKILLS: Dict[int, Skill | dict] = {
                         66, 68, 71, 73, 75, 36, 39, 41, 43, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
                         60, 61, 62, 63, 64, 66, 68, 71, 73, 75],
         "attack_power_cof": 70 * 1.2 * 1.65 * 1.15 * 1.15 * 1.05 * 1.25 * 1.1 * 1.1,
-        "bind_skill": 743,
-        "tick": 6 + 3
+        "bind_skill": 743
     },
     3848: {
         "skill_class": type("Mixing", (MagicalDamage, BuffSkill), {}),

schools/zi_xia_gong/__init__.py

@@ -7,4 +7,4 @@ from schools.zi_xia_gong.attribute import ZiXiaGong
 
 
 def prepare(self, player_id):
-    self.status[player_id][(17918, 1)] = 1
+    self.player_buffs[player_id][(17918, 1)] = 1

schools/zi_xia_gong/buffs.py

@@ -4,14 +4,6 @@ from base.buff import Buff
 from general.buffs import GENERAL_BUFFS
 
 BUFFS: Dict[int, Buff | dict] = {
-    375: {
-        "buff_name": "破苍穹",
-        "gain_attributes": {
-            "magical_critical_strike_gain": [300, 350, 400, 450, 0, 600, 700, 800, 900, 500, 500, 1000, 500, 1000],
-            "magical_critical_power_gain": [61, 71, 81, 82, 102, 122, 143, 163, 184, 102, 102, 204, 102, 204],
-            "all_shield_ignore": [0] * 12 + [614] * 2
-        }
-    },
     1439: {
         "buff_name": "气涌",
         "activate": False,
@@ -20,6 +12,14 @@ BUFFS: Dict[int, Buff | dict] = {
             "magical_critical_power_gain": 41
         }
     },
+    375: {
+        "buff_name": "破苍穹",
+        "gain_attributes": {
+            "magical_critical_strike_gain": [300, 350, 400, 450, 0, 600, 700, 800, 900, 500, 500, 1000, 500, 1000],
+            "magical_critical_power_gain": [61, 71, 81, 82, 102, 122, 143, 163, 184, 102, 102, 204, 102, 204],
+            "all_shield_ignore": [0] * 12 + [614] * 2
+        }
+    },
     1908: {
         "buff_name": "会神",
         "gain_attributes": {
@@ -28,6 +28,7 @@ BUFFS: Dict[int, Buff | dict] = {
     },
     2757: {
         "buff_name": "紫气东来",
+        "frame_shift": -1,
         "gain_attributes": {
             "physical_attack_power_gain": [256, 256, 512, 256],
             "magical_attack_power_gain": [256, 256, 512, 256],
@@ -36,7 +37,7 @@ BUFFS: Dict[int, Buff | dict] = {
         }
     },
     9966: {
-        "buff_name": "六合独尊加伤害实际表现",
+        "buff_name": "同尘",
         "gain_skills": {
             18670: {
                 "skill_damage_addition": [358, 716, 1075, 1433]
@@ -44,7 +45,7 @@ BUFFS: Dict[int, Buff | dict] = {
         }
     },
     # 12550: {
-    #     "buff_name": "气剑提升四象轮回伤害",
+    #     "buff_name": "跬步",
     #     "gain_skills": {
     #         896: {
     #             "skill_damage_addition": [40, 81, 122, 163, 204]
@@ -52,7 +53,7 @@ BUFFS: Dict[int, Buff | dict] = {
     #     }
     # },
     # 12551: {
-    #     "buff_name": "气剑提升两仪化形伤害",
+    #     "buff_name": "跬步",
     #     "gain_skills": {
     #         skill_id: {
     #             "skill_damage_addition": [40, 81, 122, 163, 204]
@@ -60,7 +61,7 @@ BUFFS: Dict[int, Buff | dict] = {
     #     }
     # },
     17918: {
-        "buff_name": "镇山河",
+        "buff_name": "破势",
         "gain_skills": {
             skill_id: {
                 "skill_pve_addition": 1331

schools/zi_xia_gong/gains.py

@@ -22,6 +22,6 @@ GAINS = {
     # 无界特效1
     17300: Gain(),
     # 无界特效2
-    17239: Gain(),
+    17312: Gain(),
     **EQUIPMENT_GAINS,
 }

schools/zi_xia_gong/skills.py

@@ -4,6 +4,23 @@ from base.skill import Skill, DotSkill, PhysicalDamage, MagicalDamage, MagicalDo
 from general.skills import GENERAL_SKILLS
 
 SKILLS: Dict[int, Skill | dict] = {
+    32813: {
+        "skill_class": MagicalDamage,
+        "skill_name": "破",
+        "surplus_cof": [
+            1024 * 1024 * (0.06 - 1),
+            1024 * 1024 * (0.30 - 1),
+            1024 * 1024 * (0.83 - 1),
+            1024 * 1024 * (0.60 - 1)
+        ]
+    },
+    18121: {
+        "skill_class": PhysicalDamage,
+        "skill_name": "三柴剑法",
+        "attack_power_cof": 16,
+        "weapon_damage_cof": 1024,
+        "skill_damage_addition": 205
+    },
     303: {
         "skill_class": MagicalDamage,
         "skill_name": "三才化生",
@@ -45,20 +62,6 @@ SKILLS: Dict[int, Skill | dict] = {
             "attack_power_cof": [(14 * i * 0.8) for i in range(1, 11)],
         } for skill_id in (6091, 6092, 6093, 6094, 6095, 6096, 6097, 6098, 6099, 6100)
     },
-    6424: {
-        "skill_class": MagicalDotDamage,
-        "skill_name": "气竭(DOT)",
-        "damage_base": 10,
-        "attack_power_cof": 229 * 1.7,
-        "interval": 48
-    },
-    18121: {
-        "skill_class": PhysicalDamage,
-        "skill_name": "三柴剑法",
-        "attack_power_cof": 16,
-        "weapon_damage_cof": 1024,
-        "skill_damage_addition": 205
-    },
     **{
         skill_id: {
             "skill_class": MagicalDamage,
@@ -81,6 +84,13 @@ SKILLS: Dict[int, Skill | dict] = {
         "damage_rand": 78,
         "attack_power_cof": 300 * 1.1 * 1.15 * 1.1 * 1.12
     },
+    36439: {
+        "skill_class": MagicalDamage,
+        "skill_name": "颠越苍穹击",
+        "damage_base": 1038,
+        "damage_rand": 104,
+        "attack_power_cof": 155 * 0.9
+    },
     25770: {
         "skill_class": MagicalDamage,
         "skill_name": "四象轮回·神兵",
@@ -88,30 +98,20 @@ SKILLS: Dict[int, Skill | dict] = {
         "damage_rand": 2,
         "attack_power_cof": 65
     },
-    32813: {
-        "skill_class": MagicalDamage,
-        "skill_name": "破",
-        "surplus_cof": [
-            1024 * 1024 * (0.06 - 1),
-            1024 * 1024 * (0.30 - 1),
-            1024 * 1024 * (0.83 - 1),
-            1024 * 1024 * (0.60 - 1)
-        ]
+    6424: {
+        "skill_class": MagicalDotDamage,
+        "skill_name": "气竭(DOT)",
+        "damage_base": 10,
+        "attack_power_cof": 229 * 1.7,
+        "interval": 48,
+        "max_stack": 3,
+        "tick": 10
     },
     33592: {
         "skill_class": DotSkill,
         "skill_name": "气竭",
-        "bind_skill": 6424,
-        "max_stack": 3,
-        "tick": 10
+        "bind_skill": 6424
     },
-    36439: {
-        "skill_class": MagicalDamage,
-        "skill_name": "颠越苍穹击",
-        "damage_base": 1038,
-        "damage_rand": 104,
-        "attack_power_cof": 155 * 0.9
-    }
 }
 
 for skill_id, detail in SKILLS.items():

schools/zi_xia_gong/talents.py

@@ -65,7 +65,7 @@ TALENT_GAINS: Dict[int, Gain] = {
     5846: Gain("无形"),
     23614: Gain("归元"),
     5819: Gain("同尘"),
-    18695: 跬步("跬步"),
+    18695: Gain("跬步"),
     32411: Gain("正气"),
     14834: Gain("抱阳"),
     18679: Gain("浮生"),

utils/damage.py

@@ -8,7 +8,6 @@ def defense_result(shield_base, shield_gain, shield_ignore, shield_constant):
     shield = shield_base
     shield += int(shield * shield_gain / BINARY_SCALE)
     shield -= int(shield * shield_ignore / BINARY_SCALE)
-    shield = max(0, shield)
     return int(shield * BINARY_SCALE / (shield + shield_constant))
 
 

utils/parser.py

@@ -4,7 +4,8 @@ from base.constant import FRAME_PER_SECOND
 from schools import *
 from utils.lua import parse
 
-FRAME_TYPE, PLAYER_ID_TYPE, PLAYER_NAME_TYPE, TARGET_ID_TYPE, PET_ID_TYPE = int, int, int, int, int
+FRAME_TYPE, SECOND_TYPE = int, int
+PLAYER_ID_TYPE, PLAYER_NAME_TYPE, TARGET_ID_TYPE, PET_ID_TYPE = int, int, int, int
 CASTER_ID_TYPE = PLAYER_ID_TYPE | PET_ID_TYPE
 SKILL_ID_TYPE, SKILL_LEVEL_TYPE, SKILL_STACK_TYPE, SKILL_CRITICAL_TYPE = int, int, int, bool
 SKILL_TYPE = Tuple[SKILL_ID_TYPE, SKILL_LEVEL_TYPE, SKILL_STACK_TYPE]
@@ -39,14 +40,17 @@ class Parser:
     current_caster: CASTER_ID_TYPE
     current_target: TARGET_ID_TYPE
     current_skill: SKILL_ID_TYPE
+
     current_frame: FRAME_TYPE
+    current_second: SECOND_TYPE
 
     id2name: Dict[PLAYER_ID_TYPE | TARGET_ID_TYPE, PLAYER_NAME_TYPE]
     name2id: Dict[PLAYER_NAME_TYPE, PLAYER_ID_TYPE | TARGET_ID_TYPE]
     pets: Dict[PET_ID_TYPE, PLAYER_ID_TYPE]
     records: Dict[PLAYER_ID_TYPE, Dict[TARGET_ID_TYPE, RECORD_TYPE]]
 
-    shift_buffs: Dict[FRAME_TYPE, Dict[PLAYER_ID_TYPE, Dict[BUFF_TYPE, BUFF_STACK_TYPE]]]
+    frame_shift_buffs: Dict[FRAME_TYPE, Dict[PLAYER_ID_TYPE, Dict[BUFF_TYPE, BUFF_STACK_TYPE]]]
+    second_shift_buffs: Dict[SECOND_TYPE, Dict[PLAYER_ID_TYPE, Dict[BUFF_TYPE, BUFF_STACK_TYPE]]]
     hidden_buffs: Dict[TARGET_ID_TYPE, Dict[PLAYER_ID_TYPE, Dict[BUFF_TYPE, FRAME_TYPE]]]
 
     player_buffs: Dict[PLAYER_ID_TYPE, Dict[BUFF_TYPE, BUFF_STACK_TYPE]]
@@ -127,6 +131,7 @@ class Parser:
 
     def reset(self):
         self.current_frame = 0
+        self.current_second = 0
 
         self.id2name = {}
         self.name2id = {}
@@ -135,7 +140,8 @@ class Parser:
         self.records = defaultdict(lambda: defaultdict(lambda: defaultdict(lambda: defaultdict(list))))
 
         self.hidden_buffs = defaultdict(lambda: defaultdict(dict))
-        self.shift_buffs = defaultdict(lambda: defaultdict(dict))
+        self.frame_shift_buffs = defaultdict(lambda: defaultdict(dict))
+        self.second_shift_buffs = defaultdict(lambda: defaultdict(dict))
 
         self.player_buffs = defaultdict(dict)
         self.target_buffs = defaultdict(lambda: defaultdict(dict))
@@ -219,16 +225,28 @@ class Parser:
         buff_id, buff_stack, buff_level = int(detail[4]), int(detail[5]), int(detail[8])
         if buff_id not in self.players[player_id].buffs:
             return
-
-        frame_shift = self.players[player_id].buffs[buff_id].frame_shift
-        if frame_shift:
-            self.shift_buffs[self.current_frame + frame_shift][player_id][(buff_id, buff_level)] = buff_stack
-
-    def parse_shift_status(self):
-        for frame in list(self.shift_buffs):
+        buff = self.players[player_id].buffs[buff_id]
+        if frame_shift := buff.frame_shift:
+            self.frame_shift_buffs[self.current_frame + frame_shift][player_id][(buff_id, buff_level)] = buff_stack
+        # elif second_shift := buff.second_shift:
+        #     self.second_shift_buffs[self.current_second + second_shift][player_id][(buff_id, buff_level)] = buff_stack
+
+    def parse_frame_shift_status(self):
+        for frame in list(self.frame_shift_buffs):
             if frame > self.current_frame:
                 break
-            for player_id, shift_buffs in self.shift_buffs.pop(frame).items():
+            for player_id, shift_buffs in self.frame_shift_buffs.pop(frame).items():
+                for buff, buff_stack in shift_buffs.items():
+                    if buff_stack:
+                        self.player_buffs[player_id][buff] = buff_stack
+                    else:
+                        self.player_buffs[player_id].pop(buff, None)
+
+    def parse_second_shift_status(self):
+        for second in list(self.second_shift_buffs):
+            if second > self.current_second:
+                break
+            for player_id, shift_buffs in self.second_shift_buffs.pop(second).items():
                 for buff, buff_stack in shift_buffs.items():
                     if buff_stack:
                         self.player_buffs[player_id][buff] = buff_stack
@@ -337,13 +355,19 @@ class Parser:
 
         for row in rows:
             self.current_frame = int(row[1])
+            # self.current_second = int(row[3])
             if row[4] == "13":
                 self.parse_shift_buff(row[-1])
 
         for row in rows:
-            self.current_frame = int(row[1])
-            self.parse_shift_status()
-            self.parse_hidden_buffs()
+            if (current_frame := int(row[1])) != self.current_frame:
+                self.current_frame = current_frame
+                self.parse_frame_shift_status()
+                self.parse_hidden_buffs()
+            # if (current_second := int(row[3])) != self.current_second:
+            #     self.current_second = current_second
+            #     self.parse_frame_shift_status()
+
             if row[4] == "8":
                 self.parse_pet(row[-1])
             elif row[4] == "13":