Spaces:

AngoHF
/

Formulator

Runtime error

App Files Files Community

AngoHF commited on May 7, 2024

Commit

c255694

1 Parent(s): 1467c05

5.7 commit

Browse files

Files changed (44) hide show

base/attribute.py +1 -0
base/buff.py +55 -11
base/constant.py +5 -1
base/recipe.py +14 -0
base/skill.py +31 -12
general/buffs.py +1 -1
general/gains/team.py +1 -1
get_assets.py +4 -0
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
qt/components/bonuses.py +1 -3
schools/__init__.py +18 -2
schools/bei_ao_jue/buffs.py +1 -1
schools/bing_xin_jue/buffs.py +1 -1
schools/gu_feng_jue/buffs.py +6 -1
schools/hua_jian_you/__init__.py +10 -0
schools/hua_jian_you/attribute.py +20 -0
schools/hua_jian_you/buffs.py +81 -0
schools/hua_jian_you/gains.py +18 -0
schools/hua_jian_you/recipes.py +35 -0
schools/hua_jian_you/skills.py +243 -0
schools/hua_jian_you/talents.py +56 -0
schools/ling_hai_jue/buffs.py +1 -1
schools/mo_wen/__init__.py +10 -0
schools/mo_wen/attribute.py +21 -0
schools/mo_wen/buffs.py +64 -0
schools/mo_wen/gains.py +16 -0
schools/mo_wen/recipes.py +43 -0
schools/mo_wen/skills.py +209 -0
schools/mo_wen/talents.py +65 -0
schools/shan_hai_xin_jue/buffs.py +1 -1
schools/tai_xu_jian_yi/buffs.py +1 -1
schools/tian_luo_gui_dao/buffs.py +1 -1
schools/wu_fang/buffs.py +1 -1
schools/yi_jin_jing/buffs.py +1 -1
schools/yi_jin_jing/skills.py +3 -3
utils/analyzer.py +10 -2
utils/parser.py +21 -12

base/attribute.py CHANGED Viewed

@@ -285,6 +285,7 @@ class Minor:
     magical_damage_addition: int = 0
     pve_addition: int = 0
     """ Minor Function """

     magical_damage_addition: int = 0
     pve_addition: int = 0
+    global_damage_factor: float = 1.
     """ Minor Function """

base/buff.py CHANGED Viewed

@@ -10,7 +10,7 @@ ATTR_DICT = Dict[str, Union[List[int], int]]
 @dataclass
 class Buff:
     buff_id: int
-    buff_name: str
     buff_level: int = 0
     buff_stack: int = 1
@@ -31,6 +31,23 @@ class Buff:
         if self.gain_attributes is None:
             self.gain_attributes = {}
     @property
     def display_name(self):
         return f"{self.buff_name}#{self.buff_id}-{self.buff_level}-{self.buff_stack}"
@@ -40,16 +57,24 @@ class Buff:
             value = values[self.buff_level - 1]
         else:
             value = values
         if self.stackable:
-            return value * self.buff_stack
-        else:
-            return value
     def add_all(self, attribute: Attribute, skill: Skill):
         for attr, values in self.gain_attributes.items():
             setattr(attribute, attr, getattr(attribute, attr) + self.value(values))
         for attr, values in self.gain_skills.get(skill.skill_id, {}).items():
-            setattr(skill, attr, getattr(skill, attr) + self.value(values))
     def add_dot(self, attribute: Attribute, skill: Skill, snapshot: bool = True):
         for attr, values in self.gain_attributes.items():
@@ -57,18 +82,29 @@ class Buff:
                 setattr(attribute, attr, getattr(attribute, attr) + self.value(values))
             elif not snapshot and all(snapshot_attr not in attr for snapshot_attr in self.SNAPSHOT_ATTRS):
                 setattr(attribute, attr, getattr(attribute, attr) + self.value(values))
         for attr, values in self.gain_skills.get(skill.skill_id, {}).items():
             if snapshot and any(snapshot_attr in attr for snapshot_attr in self.SNAPSHOT_ATTRS):
-                setattr(skill, attr, getattr(skill, attr) + self.value(values))
             elif not snapshot and all(snapshot_attr not in attr for snapshot_attr in self.SNAPSHOT_ATTRS):
-                setattr(skill, attr, getattr(skill, attr) + self.value(values))
     def sub_all(self, attribute: Attribute, skill: Skill):
         for attr, values in self.gain_attributes.items():
             setattr(attribute, attr, getattr(attribute, attr) - self.value(values))
         for attr, values in self.gain_skills.get(skill.skill_id, {}).items():
-            setattr(skill, attr, getattr(skill, attr) - self.value(values))
     def sub_dot(self, attribute: Attribute, skill: Skill, snapshot: bool = True):
         for attr, values in self.gain_attributes.items():
@@ -78,6 +114,14 @@ class Buff:
                 setattr(attribute, attr, getattr(attribute, attr) - self.value(values))
         for attr, values in self.gain_skills.get(skill.skill_id, {}).items():
             if snapshot and any(snapshot_attr in attr for snapshot_attr in self.SNAPSHOT_ATTRS):
-                setattr(skill, attr, getattr(skill, attr) - self.value(values))
             elif not snapshot and all(snapshot_attr not in attr for snapshot_attr in self.SNAPSHOT_ATTRS):
-                setattr(skill, attr, getattr(skill, attr) - self.value(values))

 @dataclass
 class Buff:
     buff_id: int
+    _buff_name: Union[List[str], str] = ""
     buff_level: int = 0
     buff_stack: int = 1
         if self.gain_attributes is None:
             self.gain_attributes = {}
+    @property
+    def buff_name(self):
+        if not isinstance(self._buff_name, list):
+            return ""
+        if self.buff_level > len(self._buff_name):
+            return self._buff_name[-1]
+        else:
+            return self._buff_name[self.buff_level - 1]
+    @buff_name.setter
+    def buff_name(self, buff_name):
+        if isinstance(buff_name, list):
+            self._buff_name = buff_name
+        else:
+            self._buff_name = [buff_name]
     @property
     def display_name(self):
         return f"{self.buff_name}#{self.buff_id}-{self.buff_level}-{self.buff_stack}"
             value = values[self.buff_level - 1]
         else:
             value = values
         if self.stackable:
+            value = value * self.buff_stack
+        if isinstance(value, float):
+            value = 1 + value
+        return value
     def add_all(self, attribute: Attribute, skill: Skill):
         for attr, values in self.gain_attributes.items():
             setattr(attribute, attr, getattr(attribute, attr) + self.value(values))
         for attr, values in self.gain_skills.get(skill.skill_id, {}).items():
+            value = self.value(values)
+            if isinstance(value, float):
+                setattr(skill, attr, getattr(skill, attr) * self.value(values))
+            else:
+                setattr(skill, attr, getattr(skill, attr) + self.value(values))
     def add_dot(self, attribute: Attribute, skill: Skill, snapshot: bool = True):
         for attr, values in self.gain_attributes.items():
                 setattr(attribute, attr, getattr(attribute, attr) + self.value(values))
             elif not snapshot and all(snapshot_attr not in attr for snapshot_attr in self.SNAPSHOT_ATTRS):
                 setattr(attribute, attr, getattr(attribute, attr) + self.value(values))
         for attr, values in self.gain_skills.get(skill.skill_id, {}).items():
             if snapshot and any(snapshot_attr in attr for snapshot_attr in self.SNAPSHOT_ATTRS):
+                value = self.value(values)
+                if isinstance(value, float):
+                    setattr(skill, attr, getattr(skill, attr) * self.value(values))
+                else:
+                    setattr(skill, attr, getattr(skill, attr) + self.value(values))
             elif not snapshot and all(snapshot_attr not in attr for snapshot_attr in self.SNAPSHOT_ATTRS):
+                value = self.value(values)
+                if isinstance(value, float):
+                    setattr(skill, attr, getattr(skill, attr) * self.value(values))
+                else:
+                    setattr(skill, attr, getattr(skill, attr) + self.value(values))
     def sub_all(self, attribute: Attribute, skill: Skill):
         for attr, values in self.gain_attributes.items():
             setattr(attribute, attr, getattr(attribute, attr) - self.value(values))
         for attr, values in self.gain_skills.get(skill.skill_id, {}).items():
+            value = self.value(values)
+            if isinstance(value, float):
+                setattr(skill, attr, getattr(skill, attr) / self.value(values))
+            else:
+                setattr(skill, attr, getattr(skill, attr) - self.value(values))
     def sub_dot(self, attribute: Attribute, skill: Skill, snapshot: bool = True):
         for attr, values in self.gain_attributes.items():
                 setattr(attribute, attr, getattr(attribute, attr) - self.value(values))
         for attr, values in self.gain_skills.get(skill.skill_id, {}).items():
             if snapshot and any(snapshot_attr in attr for snapshot_attr in self.SNAPSHOT_ATTRS):
+                value = self.value(values)
+                if isinstance(value, float):
+                    setattr(skill, attr, getattr(skill, attr) / self.value(values))
+                else:
+                    setattr(skill, attr, getattr(skill, attr) - self.value(values))
             elif not snapshot and all(snapshot_attr not in attr for snapshot_attr in self.SNAPSHOT_ATTRS):
+                value = self.value(values)
+                if isinstance(value, float):
+                    setattr(skill, attr, getattr(skill, attr) / self.value(values))
+                else:
+                    setattr(skill, attr, getattr(skill, attr) - self.value(values))

base/constant.py CHANGED Viewed

@@ -66,5 +66,9 @@ def WEAPON_DAMAGE_COF(cof):
     return int(cof) / BINARY_SCALE
 def SURPLUS_COF(cof):
-    return ((int(cof) + int(cof < 0)) / BINARY_SCALE + BINARY_SCALE) / BINARY_SCALE * SURPLUS_SCALE

     return int(cof) / BINARY_SCALE
+def GLOBAL_DAMAGE_FACTOR(cof):
+    return ((int(cof) + int(cof < 0)) / BINARY_SCALE + BINARY_SCALE) / BINARY_SCALE
 def SURPLUS_COF(cof):
+    return GLOBAL_DAMAGE_FACTOR(cof) * SURPLUS_SCALE

base/recipe.py CHANGED Viewed

@@ -21,6 +21,16 @@ class IntervalRecipe(RecipeGain):
             skills[skill_id].interval -= self.value
 class DamageAdditionRecipe(RecipeGain):
     def add_skills(self, skills: Dict[int, Skill]):
         for skill_id in self.skill_ids:
@@ -55,6 +65,10 @@ def interval_recipe(skill_ids, value, name="减少运功时间"):
     return IntervalRecipe(name, skill_ids, value)
 def damage_addition_recipe(skill_ids, value, name="伤害增加"):
     return DamageAdditionRecipe(name, skill_ids, value)

             skills[skill_id].interval -= self.value
+class AttackPowerRecipe(RecipeGain):
+    def add_skills(self, skills: Dict[int, Skill]):
+        for skill_id in self.skill_ids:
+            skills[skill_id].attack_power_cof_gain *= self.value
+    def sub_skills(self, skills: Dict[int, Skill]):
+        for skill_id in self.skill_ids:
+            skills[skill_id].attack_power_cof_gain /= self.value
 class DamageAdditionRecipe(RecipeGain):
     def add_skills(self, skills: Dict[int, Skill]):
         for skill_id in self.skill_ids:
     return IntervalRecipe(name, skill_ids, value)
+def attack_power_recipe(skill_ids, value, name="系数增加"):
+    return AttackPowerRecipe(name, skill_ids, value)
 def damage_addition_recipe(skill_ids, value, name="伤害增加"):
     return DamageAdditionRecipe(name, skill_ids, value)

base/skill.py CHANGED Viewed

@@ -35,6 +35,8 @@ class Skill:
     surplus_cof_gain: float = 1.
     weapon_damage_cof_gain: float = 1.
     skill_damage_addition: int = 0
     skill_pve_addition: int = 0
     _skill_shield_gain: Union[List[int], int] = 0
@@ -151,7 +153,7 @@ class Skill:
             self._weapon_damage_cof = weapon_damage_cof
         else:
             self._weapon_damage_cof = [weapon_damage_cof]
     @property
     def skill_shield_gain(self):
         if not isinstance(self._skill_shield_gain, list):
@@ -237,6 +239,15 @@ class Damage(Skill):
         return skill_tuple, status_tuple
 class DotDamage(Damage):
     def record(self, skill_level, critical, parser):
         skill_tuple, status_tuple = super().record(skill_level, critical, parser)
@@ -269,7 +280,7 @@ class PhysicalSkill(Skill):
             self.attack_power_cof, attribute.physical_attack_power,
             self.weapon_damage_cof, attribute.weapon_damage,
             self.surplus_cof, attribute.surplus
-        ) * self.skill_stack
         damage = damage_addition_result(damage, attribute.physical_damage_addition + self.skill_damage_addition)
         damage = overcome_result(damage, attribute.physical_overcome,
@@ -303,7 +314,7 @@ class MagicalSkill(Skill):
             self.attack_power_cof, attribute.magical_attack_power,
             self.weapon_damage_cof, attribute.weapon_damage,
             self.surplus_cof, attribute.surplus
-        ) * self.skill_stack
         damage = damage_addition_result(damage, attribute.magical_damage_addition + self.skill_damage_addition)
         damage = overcome_result(damage, attribute.magical_overcome,
@@ -334,14 +345,14 @@ class MixingSkill(Skill):
     def __call__(self, attribute: Attribute):
         damage = init_result(
             self.damage_base, self.damage_rand,
-            self.attack_power_cof, attribute.magical_attack_power,
             self.weapon_damage_cof, attribute.weapon_damage,
             self.surplus_cof, attribute.surplus
-        ) * self.skill_stack
-        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,
                                  attribute.magical_shield_ignore,
                                  attribute.shield_constant)
@@ -364,10 +375,6 @@ class MixingSkill(Skill):
         return damage, critical_damage, expected_damage, critical_strike
-class PetDamage(Damage):
-    pass
 class PureDamage(PureSkill, Damage):
     pass
@@ -406,3 +413,15 @@ class MixingDotDamage(MixingSkill, DotDamage):
     @Damage.attack_power_cof.getter
     def attack_power_cof(self):
         return MAGICAL_DOT_ATTACK_POWER_COF(super().attack_power_cof, self.interval)

     surplus_cof_gain: float = 1.
     weapon_damage_cof_gain: float = 1.
+    global_damage_factor: float = 1.
     skill_damage_addition: int = 0
     skill_pve_addition: int = 0
     _skill_shield_gain: Union[List[int], int] = 0
             self._weapon_damage_cof = weapon_damage_cof
         else:
             self._weapon_damage_cof = [weapon_damage_cof]
     @property
     def skill_shield_gain(self):
         if not isinstance(self._skill_shield_gain, list):
         return skill_tuple, status_tuple
+class PetDamage(Damage):
+    def record(self, skill_level, critical, parser):
+        skill_tuple, status_tuple = super().record(skill_level, critical, parser)
+        pet_status_tuple = parser.available_status(self.skill_id, parser.current_caster)
+        parser.current_records[skill_tuple][pet_status_tuple].append(
+            parser.current_records[skill_tuple][status_tuple].pop()
+        )
 class DotDamage(Damage):
     def record(self, skill_level, critical, parser):
         skill_tuple, status_tuple = super().record(skill_level, critical, parser)
             self.attack_power_cof, attribute.physical_attack_power,
             self.weapon_damage_cof, attribute.weapon_damage,
             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,
             self.attack_power_cof, attribute.magical_attack_power,
             self.weapon_damage_cof, attribute.weapon_damage,
             self.surplus_cof, attribute.surplus
+        ) * self.skill_stack * self.global_damage_factor * attribute.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,
     def __call__(self, attribute: Attribute):
         damage = init_result(
             self.damage_base, self.damage_rand,
+            self.attack_power_cof, attribute.attack_power,
             self.weapon_damage_cof, attribute.weapon_damage,
             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.magical_shield_gain + self.skill_shield_gain,
                                  attribute.magical_shield_ignore,
                                  attribute.shield_constant)
         return damage, critical_damage, expected_damage, critical_strike
 class PureDamage(PureSkill, Damage):
     pass
     @Damage.attack_power_cof.getter
     def attack_power_cof(self):
         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):
+        return MAGICAL_ATTACK_POWER_COF(super().attack_power_cof + self.interval)

general/buffs.py CHANGED Viewed

@@ -24,7 +24,7 @@ GENERAL_BUFFS = {
 }
 for buff_id, detail in GENERAL_BUFFS.items():
-    GENERAL_BUFFS[buff_id] = Buff(buff_id, detail.pop("buff_name"))
     GENERAL_BUFFS[buff_id].activate = False
     for attr, value in detail.items():
         setattr(GENERAL_BUFFS[buff_id], attr, value)

 }
 for buff_id, detail in GENERAL_BUFFS.items():
+    GENERAL_BUFFS[buff_id] = Buff(buff_id)
     GENERAL_BUFFS[buff_id].activate = False
     for attr, value in detail.items():
         setattr(GENERAL_BUFFS[buff_id], attr, value)

general/gains/team.py CHANGED Viewed

@@ -31,7 +31,7 @@ class 袖气(TeamGain):
 class 左旋右转(TeamGain):
-    gain_attributes = {"surplus": 54}
 class 泠风解怀(TeamGain):

 class 左旋右转(TeamGain):
+    gain_attributes = {"surplus_base": 54}
 class 泠风解怀(TeamGain):

get_assets.py CHANGED Viewed

@@ -26,12 +26,14 @@ ATTR_TYPE_MAP = {
     "atMagicAttackPowerBase": "magical_attack_power_base",
     "atSolarAttackPowerBase": "magical_attack_power_base",
     "atLunarAttackPowerBase": "magical_attack_power_base",
     "atSolarAndLunarAttackPowerBase": "magical_attack_power_base",
     "atPoisonAttackPowerBase": "magical_attack_power_base",
     "atPhysicsOvercomeBase": "physical_overcome_base",
     "atMagicOvercome": "magical_overcome_base",
     "atSolarOvercomeBase": "magical_overcome_base",
     "atLunarOvercomeBase": "magical_overcome_base",
     "atSolarAndLunarOvercomeBase": "magical_overcome_base",
     "atPoisonOvercomeBase": "magical_overcome_base",
     "atAllTypeCriticalStrike": "all_critical_strike_base",
@@ -39,6 +41,7 @@ ATTR_TYPE_MAP = {
     "atMagicCriticalStrike": "magical_critical_strike_base",
     "atSolarCriticalStrike": "magical_critical_strike_base",
     "atLunarCriticalStrike": "magical_critical_strike_base",
     "atSolarAndLunarCriticalStrike": "magical_critical_strike_base",
     "atPoisonCriticalStrike": "magical_critical_strike_base",
     "atAllTypeCriticalDamagePowerBase": "all_critical_power_base",
@@ -46,6 +49,7 @@ ATTR_TYPE_MAP = {
     "atMagicCriticalDamagePowerBase": "magical_critical_power_base",
     "atSolarCriticalDamagePowerBase": "magical_critical_power_base",
     "atLunarCriticalDamagePowerBase": "magical_critical_power_base",
     "atSolarAndLunarCriticalDamagePowerBase": "magical_critical_power_base",
     "atPoisonCriticalDamagePowerBase": "magical_critical_power_base",
     "atSurplusValueBase": "surplus_base",

     "atMagicAttackPowerBase": "magical_attack_power_base",
     "atSolarAttackPowerBase": "magical_attack_power_base",
     "atLunarAttackPowerBase": "magical_attack_power_base",
+    "atNeutralAttackPowerBase": "magical_attack_power_base",
     "atSolarAndLunarAttackPowerBase": "magical_attack_power_base",
     "atPoisonAttackPowerBase": "magical_attack_power_base",
     "atPhysicsOvercomeBase": "physical_overcome_base",
     "atMagicOvercome": "magical_overcome_base",
     "atSolarOvercomeBase": "magical_overcome_base",
     "atLunarOvercomeBase": "magical_overcome_base",
+    "atNeutralOvercomeBase": "magical_overcome_base",
     "atSolarAndLunarOvercomeBase": "magical_overcome_base",
     "atPoisonOvercomeBase": "magical_overcome_base",
     "atAllTypeCriticalStrike": "all_critical_strike_base",
     "atMagicCriticalStrike": "magical_critical_strike_base",
     "atSolarCriticalStrike": "magical_critical_strike_base",
     "atLunarCriticalStrike": "magical_critical_strike_base",
+    "atNeutralCriticalStrike": "magical_critical_strike_base",
     "atSolarAndLunarCriticalStrike": "magical_critical_strike_base",
     "atPoisonCriticalStrike": "magical_critical_strike_base",
     "atAllTypeCriticalDamagePowerBase": "all_critical_power_base",
     "atMagicCriticalDamagePowerBase": "magical_critical_power_base",
     "atSolarCriticalDamagePowerBase": "magical_critical_power_base",
     "atLunarCriticalDamagePowerBase": "magical_critical_power_base",
+    "atNeutralCriticalDamagePowerBase": "magical_critical_power_base",
     "atSolarAndLunarCriticalDamagePowerBase": "magical_critical_power_base",
     "atPoisonCriticalDamagePowerBase": "magical_critical_power_base",
     "atSurplusValueBase": "surplus_base",

parse_new_school.py CHANGED Viewed

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

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

qt/assets/equipments/belt CHANGED Viewed