Spaces:

AngoHF
/

Formulator

Runtime error

App Files Files Community

AngoHF commited on May 12, 2024

Commit

a05a2de

1 Parent(s): 5fb9ac4

5.12 commit

Browse files

Files changed (27) hide show

base/recipe.py +31 -0
base/skill.py +62 -4
get_assets.py +1 -1
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/ao_xue_zhan_yi/skills.py +10 -17
schools/du_jing/__init__.py +10 -0
schools/du_jing/attribute.py +20 -0
schools/du_jing/buffs.py +82 -0
schools/du_jing/gains.py +18 -0
schools/du_jing/recipes.py +33 -0
schools/du_jing/skills.py +219 -0
schools/du_jing/talents.py +73 -0
schools/ling_hai_jue/buffs.py +3 -2
schools/ling_hai_jue/talents.py +9 -1
schools/mo_wen/skills.py +2 -2
schools/wu_fang/skills.py +30 -3
schools/wu_fang/talents.py +4 -2
utils/analyzer.py +8 -1
utils/parser.py +33 -14

base/recipe.py CHANGED Viewed

@@ -11,6 +11,15 @@ class RecipeGain(Gain):
         self.value = value
 class IntervalRecipe(RecipeGain):
     def add_skills(self, skills: Dict[int, Skill]):
         for skill_id in self.skill_ids:
@@ -41,6 +50,20 @@ class DamageAdditionRecipe(RecipeGain):
             skills[skill_id].skill_damage_addition -= self.value
 class CriticalStrikeRecipe(RecipeGain):
     def add_skills(self, skills: Dict[int, Skill]):
         for skill_id in self.skill_ids:
@@ -79,3 +102,11 @@ def critical_strike_recipe(skill_ids, value, name="会心增加"):
 def pve_addition_recipe(skill_ids, value, name="非侠伤害增加"):
     return PveAdditionRecipe(name, skill_ids, value)

         self.value = value
+class DoubleRecipeGain(Gain):
+    def __init__(self, gain_name, attack_skill_ids, damage_skill_ids, attack_value, damage_value):
+        super().__init__(gain_name)
+        self.attack_skill_ids = attack_skill_ids
+        self.damage_skill_ids = damage_skill_ids
+        self.attack_value = attack_value
+        self.damage_value = damage_value
 class IntervalRecipe(RecipeGain):
     def add_skills(self, skills: Dict[int, Skill]):
         for skill_id in self.skill_ids:
             skills[skill_id].skill_damage_addition -= self.value
+class DoubleAdditionRecipe(DoubleRecipeGain):
+    def add_skills(self, skills: Dict[int, Skill]):
+        for skill_id in self.attack_skill_ids:
+            skills[skill_id].attack_power_cof_gain *= self.attack_value
+        for skill_id in self.damage_skill_ids:
+            skills[skill_id].skill_damage_addition += self.damage_value
+    def sub_skills(self, skills: Dict[int, Skill]):
+        for skill_id in self.attack_skill_ids:
+            skills[skill_id].attack_power_cof_gain /= self.attack_value
+        for skill_id in self.damage_skill_ids:
+            skills[skill_id].skill_damage_addition /= self.damage_value
 class CriticalStrikeRecipe(RecipeGain):
     def add_skills(self, skills: Dict[int, Skill]):
         for skill_id in self.skill_ids:
 def pve_addition_recipe(skill_ids, value, name="非侠伤害增加"):
     return PveAdditionRecipe(name, skill_ids, value)
+def double_addition_recipe(
+        attack_power_skill_ids, damage_addition_skill_ids, attack_power_value, damage_addition_value, name="伤害增加"
+):
+    return DoubleAdditionRecipe(
+        name, attack_power_skill_ids, damage_addition_skill_ids, attack_power_value, damage_addition_value
+    )

base/skill.py CHANGED Viewed

@@ -39,7 +39,7 @@ class Skill:
     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
     skill_critical_power: int = 0
@@ -172,6 +172,23 @@ class Skill:
         else:
             self._skill_shield_gain = [skill_shield_gain]
     def record(self, critical, parser):
         pass
@@ -240,10 +257,45 @@ class Damage(Skill):
         return skill_tuple, status_tuple
-class PetDamage(Damage):
     pass
 class DotDamage(Damage):
     def record(self, critical, parser):
         skill_tuple, status_tuple = super().record(critical, parser)
@@ -355,7 +407,7 @@ class AdaptiveSkill(Skill):
         )
         damage = overcome_result(damage, attribute.overcome,
                                  attribute.level_shield_base + attribute.shield_base,
-                                 attribute.strain_gain + self.skill_shield_gain,
                                  attribute.shield_ignore,
                                  attribute.shield_constant)
@@ -417,12 +469,18 @@ class MixingDotDamage(AdaptiveSkill, DotDamage):
         return MAGICAL_DOT_ATTACK_POWER_COF(super().attack_power_cof, self.interval)
-class PhysicalPetDamage(PhysicalSkill, PetDamage):
     @Damage.attack_power_cof.getter
     def attack_power_cof(self):
         return PHYSICAL_ATTACK_POWER_COF(super().attack_power_cof + self.interval)
 class MagicalPetDamage(MagicalSkill, PetDamage):
     @Damage.attack_power_cof.getter
     def attack_power_cof(self):

     skill_damage_addition: int = 0
     extra_damage_addition: int = 0
+    _skill_pve_addition: Union[List[int], int] = 0
     _skill_shield_gain: Union[List[int], int] = 0
     skill_critical_strike: int = 0
     skill_critical_power: int = 0
         else:
             self._skill_shield_gain = [skill_shield_gain]
+    @property
+    def skill_pve_addition(self):
+        if not isinstance(self._skill_pve_addition, list):
+            return 0
+        if self.skill_level > len(self._skill_pve_addition):
+            return self._skill_pve_addition[-1]
+        else:
+            return self._skill_pve_addition[self.skill_level - 1]
+    @skill_pve_addition.setter
+    def skill_pve_addition(self, skill_pve_addition):
+        if isinstance(skill_pve_addition, list):
+            self._skill_pve_addition = skill_pve_addition
+        else:
+            self._skill_pve_addition = [skill_pve_addition]
     def record(self, critical, parser):
         pass
         return skill_tuple, status_tuple
+class NpcDamage(Damage):
     pass
+class PetDamage(Damage):
+    def __call__(self, attribute: Attribute):
+        attack_power = int(attribute.attack_power * 0.87 + attribute.surplus * 59 / 1664)
+        damage = init_result(
+            self.damage_base, self.damage_rand,
+            self.attack_power_cof, attack_power, 0, 0, 0, 0
+        ) * 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.shield_gain + self.skill_shield_gain,
+                                 0,
+                                 attribute.shield_constant)
+        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)
+        damage = strain_result(damage, attribute.base_strain, attribute.strain_gain)
+        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.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
+        return damage, critical_damage, expected_damage, critical_strike
 class DotDamage(Damage):
     def record(self, critical, parser):
         skill_tuple, status_tuple = super().record(critical, parser)
         )
         damage = overcome_result(damage, attribute.overcome,
                                  attribute.level_shield_base + attribute.shield_base,
+                                 attribute.shield_gain + self.skill_shield_gain,
                                  attribute.shield_ignore,
                                  attribute.shield_constant)
         return MAGICAL_DOT_ATTACK_POWER_COF(super().attack_power_cof, self.interval)
+class PhysicalNpcDamage(PhysicalSkill, NpcDamage):
     @Damage.attack_power_cof.getter
     def attack_power_cof(self):
         return PHYSICAL_ATTACK_POWER_COF(super().attack_power_cof + self.interval)
+class MagicalNpcDamage(MagicalSkill, NpcDamage):
+    @Damage.attack_power_cof.getter
+    def attack_power_cof(self):
+        return MAGICAL_ATTACK_POWER_COF(super().attack_power_cof + self.interval)
 class MagicalPetDamage(MagicalSkill, PetDamage):
     @Damage.attack_power_cof.getter
     def attack_power_cof(self):

get_assets.py CHANGED Viewed

@@ -370,4 +370,4 @@ if __name__ == '__main__':
     json.dump(
         get_weapon_enchants(), open(os.path.join(ENCHANTS_DIR, "secondary_weapon"), "w", encoding="utf-8")
     )
-    json.dump(get_stones_list(), open(STONES_DIR, "w", encoding="utf-8"), ensure_ascii=False)

     json.dump(
         get_weapon_enchants(), open(os.path.join(ENCHANTS_DIR, "secondary_weapon"), "w", encoding="utf-8")
     )
+    # json.dump(get_stones_list(), open(STONES_DIR, "w", encoding="utf-8"), ensure_ascii=False)

parse_new_school.py CHANGED Viewed

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

 if __name__ == '__main__':
     parser = Parser()
+    parser(r"2024-05-11-22-42-47-长安(15)-极境试炼木桩(24538).jcl")

qt/assets/equipments/belt CHANGED Viewed