1

backend/core/character/GF/thief/rogue.py

@@ -1,5 +1,5 @@
 # ddc49e9ad1ff72a00b53c6cff5b1e920
-from core.basic.skill import PassiveSkill, ActiveSkill, get_data
+from core.basic.skill import PassiveSkill, ActiveSkill, get_data, _get_skill_damage_suffixes, _get_skill_dataplus_suffixes
 from core.basic.character import Character
 
 prefix = 'thief/rogue/cn/skillDetail'
@@ -14,8 +14,7 @@ class ActiveSkill(ActiveSkill):
 
     def getSkillData(self, lv: int = 0):
         res = 0
-        keys = [key.replace('data', '') for key in dir(self) if key.startswith('data') and not key.startswith('dataplus')]
-        for i in keys:
+        for i in _get_skill_damage_suffixes(self.__class__):
             data = getattr(self, f'data{i}', [])
             plus = getattr(self, f'plus{i}', 0)
             if len(data) == 0:
@@ -25,8 +24,7 @@ class ActiveSkill(ActiveSkill):
                 power = getattr(self, f'power{i}', 1)
                 group = getattr(self, f'group{i}', 'normal')
                 res += hit * power * (data[lv] + plus) * (self.endpower if group == 'end' else 1)
-        keys = [key.replace('dataplus', '') for key in dir(self) if key.startswith('dataplus')]
-        for i in keys:
+        for i in _get_skill_dataplus_suffixes(self.__class__):
             data = getattr(self, f'dataplus{i}', 0)
             hit = getattr(self, f'hitplus{i}', 1)
             power = getattr(self, f'powerplus{i}', 1)