Spaces:

AngoHF
/

Formulator

Runtime error

App Files Files Community

AngoHF commited on May 5, 2024

Commit

dace851

1 Parent(s): 3a1196e

5.5 commit

Browse files

Files changed (33) hide show

base/buff.py +1 -0
base/skill.py +17 -10
general/skills.py +3 -3
get_assets.py +16 -16
parse_new_school.py +3 -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 +21 -9
schools/bei_ao_jue/__init__.py +4 -0
schools/bing_xin_jue/__init__.py +11 -0
schools/bing_xin_jue/attribute.py +20 -0
schools/bing_xin_jue/buffs.py +72 -0
schools/bing_xin_jue/gains.py +17 -0
schools/bing_xin_jue/recipes.py +29 -0
schools/bing_xin_jue/skills.py +209 -0
schools/bing_xin_jue/talents.py +60 -0
schools/gu_feng_jue/__init__.py +4 -0
schools/ling_hai_jue/__init__.py +4 -0
schools/ling_hai_jue/buffs.py +1 -0
schools/shan_hai_xin_jue/__init__.py +4 -0
schools/tai_xu_jian_yi/__init__.py +4 -0
schools/tai_xu_jian_yi/skills.py +35 -16
schools/tai_xu_jian_yi/talents.py +6 -3
schools/tian_luo_gui_dao/__init__.py +4 -0
schools/wu_fang/__init__.py +4 -0
schools/wu_fang/buffs.py +1 -0
schools/wu_fang/skills.py +1 -1
utils/parser.py +20 -19

base/buff.py CHANGED Viewed

@@ -14,6 +14,7 @@ class Buff:
     buff_level: int = 0
     buff_stack: int = 1
     activate: bool = True
     stackable: bool = True

     buff_level: int = 0
     buff_stack: int = 1
+    frame_shift: int = 0
     activate: bool = True
     stackable: bool = True

base/skill.py CHANGED Viewed

@@ -168,7 +168,7 @@ class Skill:
         else:
             self._skill_shield_gain = [skill_shield_gain]
-    def record(self, skill_level, skill_stack, critical, parser):
         pass
     def __call__(self, attribute: Attribute):
@@ -184,8 +184,8 @@ class BuffConsumeSkill(Skill):
 class DotSkill(Skill):
-    def record(self, skill_level, skill_stack, critical, parser):
-        super().record(skill_level, skill_stack, critical, parser)
         bind_skill = self.bind_skill
         if not parser.current_ticks[bind_skill]:
             parser.current_stacks[bind_skill] = 0
@@ -195,10 +195,12 @@ class DotSkill(Skill):
 class DotConsumeSkill(Skill):
-    def record(self, skill_level, skill_stack, critical, parser):
-        super().record(skill_level, skill_stack, critical, parser)
         bind_skill = self.bind_skill
-        skill_tuple, status_tuple = parser.current_last_dot[bind_skill]
         skill_id, skill_level, skill_stack = skill_tuple
         parser.current_ticks[skill_id] += 1
         tick = min(parser.current_ticks[skill_id], self.tick)
@@ -321,8 +323,9 @@ class MixingSkill(Skill):
 class Damage(Skill):
-    def record(self, skill_level, skill_stack, critical, parser):
-        super().record(skill_level, skill_stack, critical, parser)
         skill_tuple = (self.skill_id, skill_level, skill_stack)
         status_tuple = parser.available_status(self.skill_id)
         parser.current_records[skill_tuple][status_tuple].append(
@@ -332,8 +335,8 @@ class Damage(Skill):
 class DotDamage(Damage):
-    def record(self, skill_level, skill_stack, critical, parser):
-        skill_tuple, status_tuple = super().record(skill_level, skill_stack, critical, parser)
         parser.current_last_dot[self.skill_id] = (skill_tuple, status_tuple)
         parser.current_ticks[self.skill_id] -= 1
@@ -342,6 +345,10 @@ class PetDamage(Damage):
     pass
 class PhysicalDamage(PhysicalSkill, Damage):
     @Damage.attack_power_cof.getter
     def attack_power_cof(self):

         else:
             self._skill_shield_gain = [skill_shield_gain]
+    def record(self, skill_level, critical, parser):
         pass
     def __call__(self, attribute: Attribute):
 class DotSkill(Skill):
+    def record(self, skill_level, critical, parser):
+        super().record(skill_level, critical, parser)
         bind_skill = self.bind_skill
         if not parser.current_ticks[bind_skill]:
             parser.current_stacks[bind_skill] = 0
 class DotConsumeSkill(Skill):
+    def record(self, skill_level, critical, parser):
+        super().record(skill_level, critical, parser)
         bind_skill = self.bind_skill
+        if not (last_dot := parser.current_last_dot.pop(bind_skill, None)):
+            return
+        skill_tuple, status_tuple = last_dot
         skill_id, skill_level, skill_stack = skill_tuple
         parser.current_ticks[skill_id] += 1
         tick = min(parser.current_ticks[skill_id], self.tick)
 class Damage(Skill):
+    def record(self, skill_level, critical, parser):
+        super().record(skill_level, critical, parser)
+        skill_stack = parser.current_stacks[self.skill_id]
         skill_tuple = (self.skill_id, skill_level, skill_stack)
         status_tuple = parser.available_status(self.skill_id)
         parser.current_records[skill_tuple][status_tuple].append(
 class DotDamage(Damage):
+    def record(self, skill_level, critical, parser):
+        skill_tuple, status_tuple = super().record(skill_level, critical, parser)
         parser.current_last_dot[self.skill_id] = (skill_tuple, status_tuple)
         parser.current_ticks[self.skill_id] -= 1
     pass
+class PureDamage(PureSkill, Damage):
+    pass
 class PhysicalDamage(PhysicalSkill, Damage):
     @Damage.attack_power_cof.getter
     def attack_power_cof(self):

general/skills.py CHANGED Viewed

@@ -1,6 +1,6 @@
 from typing import Dict
-from base.skill import PhysicalDamage, MagicalDamage, Skill, PureSkill
 GENERAL_SKILLS: Dict[int, Skill | dict] = {
     29535: {
@@ -48,12 +48,12 @@ GENERAL_SKILLS: Dict[int, Skill | dict] = {
         "attack_power_cof": [50, 100]
     },
     37562: {
-        "skill_class": PureSkill,
         "skill_name": "昆吾·弦刃",
         "damage_base": 145300
     },
     37561: {
-        "skill_class": PureSkill,
         "skill_name": "刃凌",
         "damage_base": 96900,
     },

 from typing import Dict
+from base.skill import PhysicalDamage, MagicalDamage, Skill, PureDamage
 GENERAL_SKILLS: Dict[int, Skill | dict] = {
     29535: {
         "attack_power_cof": [50, 100]
     },
     37562: {
+        "skill_class": PureDamage,
         "skill_name": "昆吾·弦刃",
         "damage_base": 145300
     },
     37561: {
+        "skill_class": PureDamage,
         "skill_name": "刃凌",
         "damage_base": 96900,
     },

get_assets.py CHANGED Viewed

@@ -353,19 +353,19 @@ if __name__ == '__main__':
     if not os.path.exists(ENCHANTS_DIR):
         os.makedirs(ENCHANTS_DIR)
-    # for pos in tqdm(POSITION_MAP):
-    #     json.dump(
-    #         get_equips_list(pos),
-    #         open(os.path.join(EQUIPMENTS_DIR, pos), "w", encoding="utf-8"), ensure_ascii=False
-    #     )
-    #     json.dump(
-    #         get_enchants_list(pos),
-    #         open(os.path.join(ENCHANTS_DIR, pos), "w", encoding="utf-8"), ensure_ascii=False
-    #     )
-    # json.dump(
-    #     get_secondary_weapons(), open(os.path.join(EQUIPMENTS_DIR, "secondary_weapon"), "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)

     if not os.path.exists(ENCHANTS_DIR):
         os.makedirs(ENCHANTS_DIR)
+    for pos in tqdm(POSITION_MAP):
+        json.dump(
+            get_equips_list(pos),
+            open(os.path.join(EQUIPMENTS_DIR, pos), "w", encoding="utf-8"), ensure_ascii=False
+        )
+        json.dump(
+            get_enchants_list(pos),
+            open(os.path.join(ENCHANTS_DIR, pos), "w", encoding="utf-8"), ensure_ascii=False
+        )
+    json.dump(
+        get_secondary_weapons(), open(os.path.join(EQUIPMENTS_DIR, "secondary_weapon"), "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

@@ -23,6 +23,8 @@ class Parser:
         detail = row.strip("{}").split(",")
         skill_id, skill_level, critical = int(detail[4]), int(detail[5]), detail[6] == "true"
         if skill_id not in self.skills:
             self.skills[skill_id] = []
         if skill_level not in self.skills[skill_id]:
@@ -57,4 +59,4 @@ class Parser:
 if __name__ == '__main__':
     parser = Parser()
-    parser("new.jcl")

         detail = row.strip("{}").split(",")
         skill_id, skill_level, critical = int(detail[4]), int(detail[5]), detail[6] == "true"
+        # if not sum(parse(row)[-1].values()):
+        #     return
         if skill_id not in self.skills:
             self.skills[skill_id] = []
         if skill_level not in self.skills[skill_id]:
 if __name__ == '__main__':
     parser = Parser()
+    parser(r"new.jcl")

qt/assets/equipments/belt CHANGED Viewed