Spaces:

AngoHF
/

Formulator

Runtime error

App Files Files Community

ango commited on May 10, 2024

Commit

dbae951

1 Parent(s): effe13f

5.10 commit

Browse files

Files changed (23) hide show

base/buff.py +1 -1
base/skill.py +11 -4
general/skills/team.py +2 -2
parse_new_school.py +1 -1
qt/assets/equipments/belt +0 -0
qt/assets/equipments/hat +0 -0
qt/assets/equipments/jacket +0 -0
qt/assets/equipments/primary_weapon +0 -0
qt/assets/equipments/ring +1 -1
qt/assets/equipments/shoes +0 -0
qt/assets/equipments/wrist +0 -0
schools/__init__.py +9 -1
schools/tai_xu_jian_yi/buffs.py +1 -1
schools/yi_jin_jing/skills.py +5 -5
schools/yin_long_jue/__init__.py +10 -0
schools/yin_long_jue/attribute.py +21 -0
schools/yin_long_jue/buffs.py +81 -0
schools/yin_long_jue/gains.py +19 -0
schools/yin_long_jue/recipes.py +63 -0
schools/yin_long_jue/skills.py +307 -0
schools/yin_long_jue/talents.py +70 -0
schools/zi_xia_gong/buffs.py +1 -1
utils/damage.py +2 -2

base/buff.py CHANGED Viewed

@@ -23,7 +23,7 @@ class Buff:
     gain_skills: Dict[int, ATTR_DICT] = None
     gain_attributes: ATTR_DICT = None
-    SNAPSHOT_ATTRS = ["attack_power", "critical_strike", "critical_power", "strain", "damage_addition"]
     def __post_init__(self):
         if self.gain_skills is None:

     gain_skills: Dict[int, ATTR_DICT] = None
     gain_attributes: ATTR_DICT = None
+    SNAPSHOT_ATTRS = ["attack_power", "critical_strike", "critical_power", "strain", "damage_addition", "pve_addition"]
     def __post_init__(self):
         if self.gain_skills is None:

base/skill.py CHANGED Viewed

@@ -38,6 +38,7 @@ class Skill:
     global_damage_factor: float = 1.
     skill_damage_addition: int = 0
     skill_pve_addition: int = 0
     _skill_shield_gain: Union[List[int], int] = 0
     skill_critical_strike: int = 0
@@ -178,7 +179,7 @@ class Skill:
         return 0
-class BuffSkill(Skill):
     def record(self, critical, parser):
         super().record(critical, parser)
         if self.bind_buff not in parser.current_school.buffs:
@@ -277,7 +278,9 @@ class PhysicalSkill(Skill):
             self.surplus_cof, attribute.surplus
         ) * self.skill_stack * self.global_damage_factor * attribute.global_damage_factor
-        damage = damage_addition_result(damage, attribute.physical_damage_addition + self.skill_damage_addition)
         damage = overcome_result(damage, attribute.physical_overcome,
                                  attribute.level_shield_base + attribute.physical_shield_base,
                                  attribute.physical_shield_gain + self.skill_shield_gain,
@@ -311,7 +314,9 @@ class MagicalSkill(Skill):
             self.surplus_cof, attribute.surplus
         ) * self.skill_stack * self.global_damage_factor * attribute.global_damage_factor
-        damage = damage_addition_result(damage, attribute.magical_damage_addition + self.skill_damage_addition)
         damage = overcome_result(damage, attribute.magical_overcome,
                                  attribute.level_shield_base + attribute.magical_shield_base,
                                  attribute.magical_shield_gain + self.skill_shield_gain,
@@ -345,7 +350,9 @@ class AdaptiveSkill(Skill):
             self.surplus_cof, attribute.surplus
         ) * self.skill_stack * self.global_damage_factor * attribute.global_damage_factor
-        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.strain_gain + self.skill_shield_gain,

     global_damage_factor: float = 1.
     skill_damage_addition: int = 0
+    extra_damage_addition: int = 0
     skill_pve_addition: int = 0
     _skill_shield_gain: Union[List[int], int] = 0
     skill_critical_strike: int = 0
         return 0
+class HiddenBuffSkill(Skill):
     def record(self, critical, parser):
         super().record(critical, parser)
         if self.bind_buff not in parser.current_school.buffs:
             self.surplus_cof, attribute.surplus
         ) * self.skill_stack * self.global_damage_factor * attribute.global_damage_factor
+        damage = damage_addition_result(
+            damage, attribute.physical_damage_addition + self.skill_damage_addition, self.extra_damage_addition
+        )
         damage = overcome_result(damage, attribute.physical_overcome,
                                  attribute.level_shield_base + attribute.physical_shield_base,
                                  attribute.physical_shield_gain + self.skill_shield_gain,
             self.surplus_cof, attribute.surplus
         ) * self.skill_stack * self.global_damage_factor * attribute.global_damage_factor
+        damage = damage_addition_result(
+            damage, attribute.magical_damage_addition + self.skill_damage_addition, self.extra_damage_addition
+        )
         damage = overcome_result(damage, attribute.magical_overcome,
                                  attribute.level_shield_base + attribute.magical_shield_base,
                                  attribute.magical_shield_gain + self.skill_shield_gain,
             self.surplus_cof, attribute.surplus
         ) * self.skill_stack * self.global_damage_factor * attribute.global_damage_factor
+        damage = damage_addition_result(
+            damage, attribute.damage_addition + self.skill_damage_addition, self.extra_damage_addition
+        )
         damage = overcome_result(damage, attribute.overcome,
                                  attribute.level_shield_base + attribute.shield_base,
                                  attribute.strain_gain + self.skill_shield_gain,

general/skills/team.py CHANGED Viewed

@@ -1,10 +1,10 @@
 from typing import Dict
-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

 from typing import Dict
+from base.skill import PhysicalDamage, MagicalDamage, Skill, PureDamage, HiddenBuffSkill
 GENERAL_SKILLS: Dict[int, Skill | dict] = {
     13778: {
+        "skill_class": HiddenBuffSkill,
         "skill_name": "乘龙箭",
         "bind_buff": 3465,
         "duration": 128

parse_new_school.py CHANGED Viewed

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

 if __name__ == '__main__':
     parser = Parser()
+    parser(r"ling_xue.jcl")

qt/assets/equipments/belt CHANGED Viewed