diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0d20b64 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.pyc diff --git a/base/attribute.py b/base/attribute.py index d44fd6a..8e3a57d 100644 --- a/base/attribute.py +++ b/base/attribute.py @@ -1,6 +1,6 @@ -from base.constant import * -from base.expression import Ceil, Int, Max, Min -from tools.lua.enums import SKILL_KIND_TYPE +from .constant import * +from .expression import Ceil +from ..tools.lua.enums import SKILL_KIND_TYPE class BaseType: @@ -17,18 +17,26 @@ def kind_type(self): else: return SKILL_KIND_TYPE.NONE - def __init__(self, major_type: str = "", damage_type: str = "", critical_type: str = ""): + def __init__(self, major_type: str = '', damage_type: str = '', critical_type: str = ''): self.major_type = major_type self.damage_type = damage_type self.critical_type = critical_type def __getitem__(self, item): - if item in dir(self): + if hasattr(self, item) is True: return getattr(self, item) - raise KeyError + raise KeyError(item) def __setitem__(self, key, value): - if key in dir(self): + if hasattr(self, key) is False: + raise KeyError(key) + setattr(self, key, value) + + def safe_get(self, key: str): + return hasattr(self, key) and getattr(self, key) + + def safe_set(self, key: str, value): + if hasattr(self, key) is True: setattr(self, key, value) @@ -62,15 +70,18 @@ def base_vitality(self): @property def major_base(self): - return self[f"{self.major_type}_base"] + key = f'{self.major_type}_base' + return self.safe_get(key) @major_base.setter def major_base(self, value): - self[f"{self.major_type}_base"] = value + key = f'{self.major_type}_base' + self.safe_set(key, value) @property def base_major(self): - return self[f"base_{self.major_type}"] + key = f'base_{self.major_type}' + return self.safe_get(key) class MajorGain: @@ -84,27 +95,27 @@ class MajorGain: class Major(BaseMajor, MajorGain): @property def agility(self): - return Int(self.base_agility * (1 + self.agility_gain / BINARY_SCALE)) + return int(self.base_agility * (1 + self.agility_gain / BINARY_SCALE)) @property def strength(self): - return Int(self.base_strength * (1 + self.strength_gain / BINARY_SCALE)) + return int(self.base_strength * (1 + self.strength_gain / BINARY_SCALE)) @property def spirit(self): - return Int(self.base_spirit * (1 + self.spirit_gain / BINARY_SCALE)) + return int(self.base_spirit * (1 + self.spirit_gain / BINARY_SCALE)) @property def spunk(self): - return Int(self.base_spunk * (1 + self.spunk_gain / BINARY_SCALE)) + return int(self.base_spunk * (1 + self.spunk_gain / BINARY_SCALE)) @property def vitality(self): - return Int(self.base_vitality * (1 + self.vitality_gain / BINARY_SCALE)) + return int(self.base_vitality * (1 + self.vitality_gain / BINARY_SCALE)) @property def major(self): - return self[self.major_type] + return self.safe_get(self.major_type) class BaseAttackPower(Major): @@ -120,12 +131,12 @@ class BaseAttackPower(Major): @property def base_physical_attack_power(self): base_attack_power = self.physical_attack_power_base + self.all_attack_power_base - return base_attack_power + Int(self.strength * STRENGTH_TO_ATTACK_POWER) + return base_attack_power + int(self.strength * STRENGTH_TO_ATTACK_POWER) @property def base_magical_attack_power(self): base_attack_power = self.magical_attack_power_base + self.all_attack_power_base - return base_attack_power + Int(self.spunk * SPUNK_TO_ATTACK_POWER) + return base_attack_power + int(self.spunk * SPUNK_TO_ATTACK_POWER) @property def base_solar_attack_power(self): @@ -164,40 +175,41 @@ class ExtraAttackPower(Major): @property def extra_physical_attack_power(self): - extra_attack_power = Int(self.agility * self.agility_to_physical_attack_power / BINARY_SCALE) - extra_attack_power += Int(self.strength * self.strength_to_physical_attack_power / BINARY_SCALE) - extra_attack_power += Int(self.vitality * self.vitality_to_physical_attack_power / BINARY_SCALE) + extra_attack_power = int(self.agility * self.agility_to_physical_attack_power / BINARY_SCALE) + extra_attack_power += int(self.strength * self.strength_to_physical_attack_power / BINARY_SCALE) + extra_attack_power += int(self.vitality * self.vitality_to_physical_attack_power / BINARY_SCALE) return extra_attack_power @property def extra_solar_attack_power(self): - extra_attack_power = Int(self.spunk * self.spunk_to_solar_attack_power / BINARY_SCALE) - extra_attack_power += Int(self.spunk * self.spunk_to_solar_and_lunar_attack_power / BINARY_SCALE) - extra_attack_power += Int(self.vitality * self.vitality_to_solar_attack_power / BINARY_SCALE) + extra_attack_power = int(self.spunk * self.spunk_to_solar_attack_power / BINARY_SCALE) + extra_attack_power += int(self.spunk * self.spunk_to_solar_and_lunar_attack_power / BINARY_SCALE) + extra_attack_power += int(self.vitality * self.vitality_to_solar_attack_power / BINARY_SCALE) return extra_attack_power @property def extra_lunar_attack_power(self): - extra_attack_power = Int(self.spirit * self.spirit_to_lunar_attack_power / BINARY_SCALE) - extra_attack_power += Int(self.spunk * self.spunk_to_solar_and_lunar_attack_power / BINARY_SCALE) - extra_attack_power += Int(self.vitality * self.vitality_to_lunar_attack_power / BINARY_SCALE) + extra_attack_power = int(self.spirit * self.spirit_to_lunar_attack_power / BINARY_SCALE) + extra_attack_power += int(self.spunk * self.spunk_to_solar_and_lunar_attack_power / BINARY_SCALE) + extra_attack_power += int(self.vitality * self.vitality_to_lunar_attack_power / BINARY_SCALE) return extra_attack_power @property def extra_neutral_attack_power(self): - extra_attack_power = Int(self.spunk * self.spunk_to_neutral_attack_power / BINARY_SCALE) - extra_attack_power += Int(self.spirit * self.spirit_to_neutral_attack_power / BINARY_SCALE) + extra_attack_power = int(self.spunk * self.spunk_to_neutral_attack_power / BINARY_SCALE) + extra_attack_power += int(self.spirit * self.spirit_to_neutral_attack_power / BINARY_SCALE) return extra_attack_power @property def extra_poison_attack_power(self): - extra_attack_power = Int(self.spunk * self.spunk_to_poison_attack_power / BINARY_SCALE) - extra_attack_power += Int(self.spirit * self.spirit_to_poison_attack_power / BINARY_SCALE) + extra_attack_power = int(self.spunk * self.spunk_to_poison_attack_power / BINARY_SCALE) + extra_attack_power += int(self.spirit * self.spirit_to_poison_attack_power / BINARY_SCALE) return extra_attack_power @property def base_attack_power(self): - return self[f"base_{self.damage_type}_attack_power"] + key = f'base_{self.damage_type}_attack_power' + return self.safe_get(key) class AttackPowerGain(BaseType): @@ -223,39 +235,40 @@ def magical_attack_power_gain(self, value): @property def attack_power_gain(self): - return self[f"{self.damage_type}_attack_power_gain"] + key = f'{self.damage_type}_attack_power_gain' + return self.safe_get(key) class AttackPower(BaseAttackPower, ExtraAttackPower, AttackPowerGain): - @property def physical_attack_power(self): - attack_power = Int(self.base_physical_attack_power * (1 + self.physical_attack_power_gain / BINARY_SCALE)) + attack_power = int(self.base_physical_attack_power * (1 + self.physical_attack_power_gain / BINARY_SCALE)) return attack_power + self.extra_physical_attack_power @property def solar_attack_power(self): - attack_power = Int(self.base_solar_attack_power * (1 + self.solar_attack_power_gain / BINARY_SCALE)) + attack_power = int(self.base_solar_attack_power * (1 + self.solar_attack_power_gain / BINARY_SCALE)) return attack_power + self.extra_solar_attack_power @property def lunar_attack_power(self): - attack_power = Int(self.base_lunar_attack_power * (1 + self.lunar_attack_power_gain / BINARY_SCALE)) + attack_power = int(self.base_lunar_attack_power * (1 + self.lunar_attack_power_gain / BINARY_SCALE)) return attack_power + self.extra_lunar_attack_power @property def neutral_attack_power(self): - attack_power = Int(self.base_neutral_attack_power * (1 + self.neutral_attack_power_gain / BINARY_SCALE)) + attack_power = int(self.base_neutral_attack_power * (1 + self.neutral_attack_power_gain / BINARY_SCALE)) return attack_power + self.extra_neutral_attack_power @property def poison_attack_power(self): - attack_power = Int(self.base_poison_attack_power * (1 + self.poison_attack_power_gain / BINARY_SCALE)) + attack_power = int(self.base_poison_attack_power * (1 + self.poison_attack_power_gain / BINARY_SCALE)) return attack_power + self.extra_poison_attack_power @property def attack_power(self): - return self[f"{self.damage_type}_attack_power"] + key = f'{self.damage_type}_attack_power' + return self.safe_get(key) class BaseCriticalStrike(Major): @@ -270,21 +283,21 @@ class BaseCriticalStrike(Major): @property def critical_strike_base(self): - return self[f"{self.critical_type}_critical_strike_base"] + return self.safe_get(f'{self.critical_type}_critical_strike_base') @critical_strike_base.setter def critical_strike_base(self, value): - self[f"{self.critical_type}_critical_strike_base"] = value + return self.safe_set(f'{self.critical_type}_critical_strike_base', value) @property def base_physical_critical_strike(self): base_critical_strike = self.physical_critical_strike_base + self.all_critical_strike_base - return base_critical_strike + Int(self.agility * AGILITY_TO_CRITICAL_STRIKE / BINARY_SCALE) + return base_critical_strike + int(self.agility * AGILITY_TO_CRITICAL_STRIKE / BINARY_SCALE) @property def base_magical_critical_strike(self): base_critical_strike = self.magical_critical_strike_base + self.all_critical_strike_base - return base_critical_strike + Int(self.spirit * SPIRIT_TO_CRITICAL_STRIKE / BINARY_SCALE) + return base_critical_strike + int(self.spirit * SPIRIT_TO_CRITICAL_STRIKE / BINARY_SCALE) @property def base_solar_critical_strike(self): @@ -306,7 +319,8 @@ def base_poison_critical_strike(self): @property def base_critical_strike(self): - return self[f"base_{self.critical_type}_critical_strike"] + key = f'{self.critical_type}_critical_strike_base' + return self.safe_get(key) class ExtraCriticalStrike(Major): @@ -325,37 +339,37 @@ class ExtraCriticalStrike(Major): @property def extra_physical_critical_strike(self): - extra_critical_strike = Int(self.agility * self.agility_to_physical_critical_strike / BINARY_SCALE) - extra_critical_strike += Int(self.strength * self.strength_to_physical_critical_strike / BINARY_SCALE) - extra_critical_strike += Int(self.spunk * self.spunk_to_physical_critical_strike / BINARY_SCALE) + extra_critical_strike = int(self.agility * self.agility_to_physical_critical_strike / BINARY_SCALE) + extra_critical_strike += int(self.strength * self.strength_to_physical_critical_strike / BINARY_SCALE) + extra_critical_strike += int(self.spunk * self.spunk_to_physical_critical_strike / BINARY_SCALE) return extra_critical_strike @property def extra_magical_critical_strike(self): - extra_critical_strike = Int(self.vitality * self.vitality_to_magical_critical_strike / BINARY_SCALE) + extra_critical_strike = int(self.vitality * self.vitality_to_magical_critical_strike / BINARY_SCALE) return extra_critical_strike @property def extra_solar_critical_strike(self): - extra_critical_strike = Int(self.spunk * self.spunk_to_solar_critical_strike / BINARY_SCALE) - extra_critical_strike += Int(self.spunk * self.spunk_to_solar_and_lunar_critical_strike / BINARY_SCALE) + extra_critical_strike = int(self.spunk * self.spunk_to_solar_critical_strike / BINARY_SCALE) + extra_critical_strike += int(self.spunk * self.spunk_to_solar_and_lunar_critical_strike / BINARY_SCALE) return extra_critical_strike + self.extra_magical_critical_strike @property def extra_lunar_critical_strike(self): - extra_critical_strike = Int(self.spirit * self.spirit_to_lunar_critical_strike / BINARY_SCALE) - extra_critical_strike += Int(self.spunk * self.spunk_to_solar_and_lunar_critical_strike / BINARY_SCALE) + extra_critical_strike = int(self.spirit * self.spirit_to_lunar_critical_strike / BINARY_SCALE) + extra_critical_strike += int(self.spunk * self.spunk_to_solar_and_lunar_critical_strike / BINARY_SCALE) return extra_critical_strike + self.extra_magical_critical_strike @property def extra_neutral_critical_strike(self): - extra_critical_strike = Int(self.spirit * self.spirit_to_neutral_critical_strike / BINARY_SCALE) - extra_critical_strike += Int(self.spunk * self.spunk_to_neutral_critical_strike / BINARY_SCALE) + extra_critical_strike = int(self.spirit * self.spirit_to_neutral_critical_strike / BINARY_SCALE) + extra_critical_strike += int(self.spunk * self.spunk_to_neutral_critical_strike / BINARY_SCALE) return extra_critical_strike + self.extra_magical_critical_strike @property def extra_poison_critical_strike(self): - extra_critical_strike = Int(self.spirit * self.spirit_to_poison_critical_strike / BINARY_SCALE) + extra_critical_strike = int(self.spirit * self.spirit_to_poison_critical_strike / BINARY_SCALE) return extra_critical_strike + self.extra_magical_critical_strike @@ -382,38 +396,40 @@ def final_poison_critical_strike(self): @property def final_critical_strike(self): - return self[f"final_{self.critical_type}_critical_strike"] + key = f'final_{self.critical_type}_critical_strike' + return self.safe_get(key) class CriticalStrikePercent(FinalCriticalStrike): @property def physical_critical_strike_percent(self): critical_strike_percent = self.final_physical_critical_strike / CRITICAL_STRIKE_SCALE - return Int(critical_strike_percent * DECIMAL_SCALE) / DECIMAL_SCALE + return int(critical_strike_percent * DECIMAL_SCALE) / DECIMAL_SCALE @property def solar_critical_strike_percent(self): critical_strike_percent = self.final_solar_critical_strike / CRITICAL_STRIKE_SCALE - return Int(critical_strike_percent * DECIMAL_SCALE) / DECIMAL_SCALE + return int(critical_strike_percent * DECIMAL_SCALE) / DECIMAL_SCALE @property def lunar_critical_strike_percent(self): critical_strike_percent = self.final_lunar_critical_strike / CRITICAL_STRIKE_SCALE - return Int(critical_strike_percent * DECIMAL_SCALE) / DECIMAL_SCALE + return int(critical_strike_percent * DECIMAL_SCALE) / DECIMAL_SCALE @property def neutral_critical_strike_percent(self): critical_strike_percent = self.final_neutral_critical_strike / CRITICAL_STRIKE_SCALE - return Int(critical_strike_percent * DECIMAL_SCALE) / DECIMAL_SCALE + return int(critical_strike_percent * DECIMAL_SCALE) / DECIMAL_SCALE @property def poison_critical_strike_percent(self): critical_strike_percent = self.final_poison_critical_strike / CRITICAL_STRIKE_SCALE - return Int(critical_strike_percent * DECIMAL_SCALE) / DECIMAL_SCALE + return int(critical_strike_percent * DECIMAL_SCALE) / DECIMAL_SCALE @property def critical_strike_percent(self): - return self[f"{self.critical_type}_critical_strike_percent"] + key = f'{self.critical_type}_critical_strike_percent' + return self.safe_get(key) class CriticalStrikeRate(BaseType): @@ -425,7 +441,7 @@ class CriticalStrikeRate(BaseType): @property def critical_strike_rate(self): - return self[f"{self.critical_type}_critical_strike_rate"] + return self.safe_get(f'{self.critical_type}_critical_strike_rate') class CriticalStrike(CriticalStrikePercent, CriticalStrikeRate): @@ -456,7 +472,7 @@ def poison_critical_strike(self): @property def critical_strike(self): - return self[f"{self.critical_type}_critical_strike"] + return self.safe_get(f'{self.critical_type}_critical_strike') class BaseOvercome(Major): @@ -471,21 +487,21 @@ class BaseOvercome(Major): @property def overcome_base(self): - return self[f"{self.damage_type}_overcome_base"] + return self.safe_get(f'{self.damage_type}_overcome_base') @overcome_base.setter def overcome_base(self, value): - self[f"{self.damage_type}_overcome_base"] = value + self.safe_set(f'{self.damage_type}_overcome_base', value) @property def base_physical_overcome(self): base_overcome = self.physical_overcome_base + self.all_overcome_base - return base_overcome + Int(self.strength * STRENGTH_TO_OVERCOME) + return base_overcome + int(self.strength * STRENGTH_TO_OVERCOME) @property def base_magical_overcome(self): base_overcome = self.magical_overcome_base + self.all_overcome_base - return base_overcome + Int(self.spunk * SPUNK_TO_OVERCOME) + return base_overcome + int(self.spunk * SPUNK_TO_OVERCOME) @property def base_solar_overcome(self): @@ -507,7 +523,7 @@ def base_poison_overcome(self): @property def base_overcome(self): - return self[f"base_{self.damage_type}_overcome"] + return self.safe_get(f'base_{self.damage_type}_overcome') class ExtraOvercome(Major): @@ -521,14 +537,14 @@ class ExtraOvercome(Major): @property def extra_physical_overcome(self): - extra_overcome = Int(self.agility * self.agility_to_physical_overcome / BINARY_SCALE) - extra_overcome += Int(self.strength * self.strength_to_physical_overcome / BINARY_SCALE) - extra_overcome += Int(self.vitality * self.vitality_to_physical_overcome / BINARY_SCALE) + extra_overcome = int(self.agility * self.agility_to_physical_overcome / BINARY_SCALE) + extra_overcome += int(self.strength * self.strength_to_physical_overcome / BINARY_SCALE) + extra_overcome += int(self.vitality * self.vitality_to_physical_overcome / BINARY_SCALE) return extra_overcome @property def extra_magical_overcome(self): - extra_overcome = Int(self.vitality * self.vitality_to_magical_overcome / BINARY_SCALE) + extra_overcome = int(self.vitality * self.vitality_to_magical_overcome / BINARY_SCALE) return extra_overcome @property @@ -541,12 +557,12 @@ def extra_lunar_overcome(self): @property def extra_neutral_overcome(self): - extra_overcome = Int(self.spunk * self.spunk_to_neutral_overcome / BINARY_SCALE) + extra_overcome = int(self.spunk * self.spunk_to_neutral_overcome / BINARY_SCALE) return extra_overcome + self.extra_magical_overcome @property def extra_poison_overcome(self): - extra_overcome = Int(self.spirit * self.spirit_to_poison_overcome / BINARY_SCALE) + extra_overcome = int(self.spirit * self.spirit_to_poison_overcome / BINARY_SCALE) return extra_overcome + self.extra_magical_overcome @@ -561,63 +577,63 @@ class OvercomeGain: class FinalOvercome(BaseOvercome, ExtraOvercome, OvercomeGain): @property def final_physical_overcome(self): - final_overcome = Int(self.base_physical_overcome * (1 + self.physical_overcome_gain / BINARY_SCALE)) + final_overcome = int(self.base_physical_overcome * (1 + self.physical_overcome_gain / BINARY_SCALE)) return final_overcome + self.extra_physical_overcome @property def final_solar_overcome(self): - final_overcome = Int(self.base_solar_overcome * (1 + self.solar_overcome_gain / BINARY_SCALE)) + final_overcome = int(self.base_solar_overcome * (1 + self.solar_overcome_gain / BINARY_SCALE)) return final_overcome + self.extra_solar_overcome @property def final_lunar_overcome(self): - final_overcome = Int(self.base_lunar_overcome * (1 + self.lunar_overcome_gain / BINARY_SCALE)) + final_overcome = int(self.base_lunar_overcome * (1 + self.lunar_overcome_gain / BINARY_SCALE)) return final_overcome + self.extra_lunar_overcome @property def final_neutral_overcome(self): - final_overcome = Int(self.base_neutral_overcome * (1 + self.neutral_overcome_gain / BINARY_SCALE)) + final_overcome = int(self.base_neutral_overcome * (1 + self.neutral_overcome_gain / BINARY_SCALE)) return final_overcome + self.extra_neutral_overcome @property def final_poison_overcome(self): - final_overcome = Int(self.base_poison_overcome * (1 + self.poison_overcome_gain / BINARY_SCALE)) + final_overcome = int(self.base_poison_overcome * (1 + self.poison_overcome_gain / BINARY_SCALE)) return final_overcome + self.extra_poison_overcome @property def final_overcome(self): - return self[f"final_{self.damage_type}_overcome"] + return self.safe_get(f'final_{self.damage_type}_overcome') class Overcome(FinalOvercome): @property def physical_overcome(self): overcome = self.final_physical_overcome / OVERCOME_SCALE - return Int(overcome * BINARY_SCALE) / BINARY_SCALE + return int(overcome * BINARY_SCALE) / BINARY_SCALE @property def solar_overcome(self): overcome = self.final_solar_overcome / OVERCOME_SCALE - return Int(overcome * BINARY_SCALE) / BINARY_SCALE + return int(overcome * BINARY_SCALE) / BINARY_SCALE @property def lunar_overcome(self): overcome = self.final_lunar_overcome / OVERCOME_SCALE - return Int(overcome * BINARY_SCALE) / BINARY_SCALE + return int(overcome * BINARY_SCALE) / BINARY_SCALE @property def neutral_overcome(self): overcome = self.final_neutral_overcome / OVERCOME_SCALE - return Int(overcome * BINARY_SCALE) / BINARY_SCALE + return int(overcome * BINARY_SCALE) / BINARY_SCALE @property def poison_overcome(self): overcome = self.final_poison_overcome / OVERCOME_SCALE - return Int(overcome * BINARY_SCALE) / BINARY_SCALE + return int(overcome * BINARY_SCALE) / BINARY_SCALE @property def overcome(self): - return self[f"{self.damage_type}_overcome"] + return self.safe_get(f'{self.damage_type}_overcome') class BaseCriticalPower(BaseType): @@ -632,11 +648,11 @@ class BaseCriticalPower(BaseType): @property def critical_power_base(self): - return self[f"{self.critical_type}_critical_power_base"] + return self.safe_get(f'{self.critical_type}_critical_power_base') @critical_power_base.setter def critical_power_base(self, value): - self[f"{self.critical_type}_critical_power_base"] = value + self.safe_set(f'{self.critical_type}_critical_power_base', value) @property def base_physical_critical_power(self): @@ -666,38 +682,38 @@ def base_poison_critical_power(self): @property def base_critical_power(self): - return self[f"base_{self.critical_type}_critical_power"] + return self.safe_get(f'base_{self.critical_type}_critical_power') class CriticalPowerPercent(BaseCriticalPower): @property def physical_critical_power_percent(self): critical_power_percent = self.base_physical_critical_power / CRITICAL_POWER_SCALE - return Int(critical_power_percent * BINARY_SCALE) / BINARY_SCALE + return int(critical_power_percent * BINARY_SCALE) / BINARY_SCALE @property def solar_critical_power_percent(self): critical_power_percent = self.base_solar_critical_power / CRITICAL_POWER_SCALE - return Int(critical_power_percent * BINARY_SCALE) / BINARY_SCALE + return int(critical_power_percent * BINARY_SCALE) / BINARY_SCALE @property def lunar_critical_power_percent(self): critical_power_percent = self.base_lunar_critical_power / CRITICAL_POWER_SCALE - return Int(critical_power_percent * BINARY_SCALE) / BINARY_SCALE + return int(critical_power_percent * BINARY_SCALE) / BINARY_SCALE @property def neutral_critical_power_percent(self): critical_power_percent = self.base_neutral_critical_power / CRITICAL_POWER_SCALE - return Int(critical_power_percent * BINARY_SCALE) / BINARY_SCALE + return int(critical_power_percent * BINARY_SCALE) / BINARY_SCALE @property def poison_critical_power_percent(self): critical_power_percent = self.base_poison_critical_power / CRITICAL_POWER_SCALE - return Int(critical_power_percent * BINARY_SCALE) / BINARY_SCALE + return int(critical_power_percent * BINARY_SCALE) / BINARY_SCALE @property def critical_power_percent(self): - return self[f"{self.critical_type}_critical_power_percent"] + return self.safe_get(f'{self.critical_type}_critical_power_percent') class CriticalPowerRate(BaseType): @@ -739,36 +755,36 @@ class CriticalPower(CriticalPowerPercent, CriticalPowerRate): @property def physical_critical_power(self): critical_power = self.physical_critical_power_percent + self.physical_critical_power_rate / BINARY_SCALE - critical_power = Min(critical_power, MAX_CRITICAL_POWER) + critical_power = min(critical_power, MAX_CRITICAL_POWER) return critical_power + self.unlimit_critical_power_rate / BINARY_SCALE @property def solar_critical_power(self): critical_power = self.solar_critical_power_percent + self.solar_critical_power_rate / BINARY_SCALE - critical_power = Min(critical_power, MAX_CRITICAL_POWER) + critical_power = min(critical_power, MAX_CRITICAL_POWER) return critical_power + self.unlimit_critical_power_rate / BINARY_SCALE @property def lunar_critical_power(self): critical_power = self.lunar_critical_power_percent + self.lunar_critical_power_rate / BINARY_SCALE - critical_power = Min(critical_power, MAX_CRITICAL_POWER) + critical_power = min(critical_power, MAX_CRITICAL_POWER) return critical_power + self.unlimit_critical_power_rate / BINARY_SCALE @property def neutral_critical_power(self): critical_power = self.neutral_critical_power_percent + self.neutral_critical_power_rate / BINARY_SCALE - critical_power = Min(critical_power, MAX_CRITICAL_POWER) + critical_power = min(critical_power, MAX_CRITICAL_POWER) return critical_power + self.unlimit_critical_power_rate / BINARY_SCALE @property def poison_critical_power(self): critical_power = self.poison_critical_power_percent + self.poison_critical_power_rate / BINARY_SCALE - critical_power = Min(critical_power, MAX_CRITICAL_POWER) + critical_power = min(critical_power, MAX_CRITICAL_POWER) return critical_power + self.unlimit_critical_power_rate / BINARY_SCALE @property def critical_power(self): - return self[f"{self.critical_type}_critical_power"] + return self.safe_get(f'{self.critical_type}_critical_power') class BaseShield: @@ -812,12 +828,12 @@ class ExtraShield(Major): @property def extra_physical_shield(self): - extra_shield = Int(self.vitality * self.vitality_to_physical_shield / BINARY_SCALE) + extra_shield = int(self.vitality * self.vitality_to_physical_shield / BINARY_SCALE) return extra_shield + self.physical_shield_add @property def extra_magical_shield(self): - extra_shield = Int(self.vitality * self.vitality_to_magical_shield / BINARY_SCALE) + extra_shield = int(self.vitality * self.vitality_to_magical_shield / BINARY_SCALE) return extra_shield @property @@ -846,34 +862,38 @@ class ShieldGain(BaseType): @property def shield_gain(self): - return self[f"{self.damage_type}_shield_gain"] + return self.safe_get(f'{self.damage_type}_shield_gain') class Shield(BaseShield, ExtraShield, ShieldGain): @property def physical_shield(self): - final_shield = Int(self.base_physical_shield * (1 + self.physical_shield_gain / BINARY_SCALE)) - return Max(final_shield, 0) + self.extra_physical_shield + final_shield = int(self.base_physical_shield * (1 + self.physical_shield_gain / BINARY_SCALE)) + return max(final_shield, 0) + self.extra_physical_shield @property def solar_shield(self): - final_shield = Int(self.base_solar_shield * (1 + self.solar_shield_gain / BINARY_SCALE)) - return Max(final_shield, 0) + self.extra_magical_shield + final_shield = int(self.base_solar_shield * (1 + self.solar_shield_gain / BINARY_SCALE)) + return max(final_shield, 0) + self.extra_magical_shield @property def lunar_shield(self): - final_shield = Int(self.base_lunar_shield * (1 + self.lunar_shield_gain / BINARY_SCALE)) - return Max(final_shield, 0) + self.extra_magical_shield + final_shield = int(self.base_lunar_shield * (1 + self.lunar_shield_gain / BINARY_SCALE)) + return max(final_shield, 0) + self.extra_magical_shield @property def neutral_shield(self): - final_shield = Int(self.base_neutral_shield * (1 + self.neutral_shield_gain / BINARY_SCALE)) - return Max(final_shield, 0) + self.extra_magical_shield + final_shield = int(self.base_neutral_shield * (1 + self.neutral_shield_gain / BINARY_SCALE)) + return max(final_shield, 0) + self.extra_magical_shield @property def poison_shield(self): - final_shield = Int(self.base_poison_shield * (1 + self.poison_shield_gain / BINARY_SCALE)) - return Max(final_shield, 0) + self.extra_magical_shield + final_shield = int(self.base_poison_shield * (1 + self.poison_shield_gain / BINARY_SCALE)) + return max(final_shield, 0) + self.extra_magical_shield + + @property + def magical_shield(self): + return max(self.solar_shield, self.lunar_shield, self.neutral_shield, self.poison_shield) class DamageBase(BaseType): @@ -893,19 +913,19 @@ class DamageBase(BaseType): @property def damage_base(self): - return self[f"{self.damage_type}_damage_base"] + return self.safe_get(f'{self.damage_type}_damage_base') @damage_base.setter def damage_base(self, value): - self[f"{self.damage_type}_damage_base"] = value + self.safe_set(f'{self.damage_type}_damage_base', value) @property def damage_rand(self): - return self[f"{self.damage_type}_damage_rand"] + return self.safe_get(f'{self.damage_type}_damage_rand') @damage_rand.setter def damage_rand(self, value): - self[f"{self.damage_type}_damage_rand"] = value + self.safe_set(f'{self.damage_type}_damage_rand', value) class DamageCof(BaseType): @@ -924,7 +944,7 @@ class DamageCof(BaseType): @property def damage_cof(self): - return self[f"{self.damage_type}_damage_cof"] + return self.safe_get(f'{self.damage_type}_damage_cof') @property def physical_damage_scale(self): @@ -948,7 +968,7 @@ def poison_damage_scale(self): @property def damage_scale(self): - return self[f"{self.damage_type}_damage_scale"] + return self.safe_get(f'{self.damage_type}_damage_scale') @property def pve_damage_addition(self): @@ -966,7 +986,7 @@ class WeaponDamage: @property def weapon_damage(self): - return Int(self.weapon_damage_base * (1 + self.weapon_damage_gain / BINARY_SCALE)) + return int(self.weapon_damage_base * (1 + self.weapon_damage_gain / BINARY_SCALE)) class Haste: @@ -977,12 +997,12 @@ class Haste: @property def haste_percent(self): haste_percent = self.haste_base / HASTE_SCALE - return Int(haste_percent * BINARY_SCALE) / BINARY_SCALE + return int(haste_percent * BINARY_SCALE) / BINARY_SCALE @property def haste(self): haste = self.haste_percent + self.haste_rate / BINARY_SCALE - haste = Min(haste, MAX_HASTE) + haste = min(haste, MAX_HASTE) return haste + self.unlimit_haste_rate / BINARY_SCALE @@ -992,7 +1012,7 @@ class Surplus: @property def surplus(self): - return Int(self.surplus_base * (1 + self.surplus_gain / BINARY_SCALE)) + return int(self.surplus_base * (1 + self.surplus_gain / BINARY_SCALE)) class Strain: @@ -1002,12 +1022,12 @@ class Strain: @property def final_strain(self): - return Int(self.strain_base * (1 + self.strain_gain / BINARY_SCALE)) + return int(self.strain_base * (1 + self.strain_gain / BINARY_SCALE)) @property def strain_percent(self): strain_percent = self.final_strain / STRAIN_SCALE - return Int(strain_percent * BINARY_SCALE) / BINARY_SCALE + return int(strain_percent * BINARY_SCALE) / BINARY_SCALE @property def strain(self): @@ -1022,7 +1042,7 @@ class Dodge(Major): @property def extra_dodge(self): - extra_dodge = Int(self.vitality * self.vitality_to_dodge / BINARY_SCALE) + extra_dodge = int(self.vitality * self.vitality_to_dodge / BINARY_SCALE) return extra_dodge @property @@ -1032,7 +1052,7 @@ def final_dodge(self): @property def dodge_percent(self): dodge_percent = self.final_dodge / (self.final_dodge + DODGE_CONSTANT) - return Int(dodge_percent * DECIMAL_SCALE) / DECIMAL_SCALE + return int(dodge_percent * DECIMAL_SCALE) / DECIMAL_SCALE @property def dodge(self): @@ -1054,18 +1074,18 @@ class Parry(Major): @property def extra_parry(self): - extra_parry = Int(self.agility * self.agility_to_parry / BINARY_SCALE) - extra_parry += Int(self.vitality * self.vitality_to_parry / BINARY_SCALE) + extra_parry = int(self.agility * self.agility_to_parry / BINARY_SCALE) + extra_parry += int(self.vitality * self.vitality_to_parry / BINARY_SCALE) return extra_parry @property def final_parry(self): - return Int(self.parry_base * (1 + self.parry_gain / BINARY_SCALE)) + self.extra_parry + return int(self.parry_base * (1 + self.parry_gain / BINARY_SCALE)) + self.extra_parry @property def parry_percent(self): parry_percent = self.final_parry / (self.final_parry + PARRY_CONSTANT) - return Int(parry_percent * DECIMAL_SCALE) / DECIMAL_SCALE + return int(parry_percent * DECIMAL_SCALE) / DECIMAL_SCALE @property def parry(self): @@ -1073,13 +1093,13 @@ def parry(self): @property def extra_parry_value(self): - extra_parry_value = Int(self.agility * self.agility_to_parry_value / BINARY_SCALE) - extra_parry_value += Int(self.vitality * self.vitality_to_parry_value / BINARY_SCALE) + extra_parry_value = int(self.agility * self.agility_to_parry_value / BINARY_SCALE) + extra_parry_value += int(self.vitality * self.vitality_to_parry_value / BINARY_SCALE) return extra_parry_value @property def parry_value(self): - return Int(self.parry_value_base * (1 + self.parry_value_gain / BINARY_SCALE)) + self.extra_parry_value + return int(self.parry_value_base * (1 + self.parry_value_gain / BINARY_SCALE)) + self.extra_parry_value class TherapyPower(Major): @@ -1090,11 +1110,11 @@ class TherapyPower(Major): @property def extra_therapy_power(self): - return Int(self.spirit * self.spirit_to_therapy_power / BINARY_SCALE) + return int(self.spirit * self.spirit_to_therapy_power / BINARY_SCALE) @property def therapy_power(self): - therapy = Int(self.therapy_power_base * (1 + self.therapy_power_gain / BINARY_SCALE)) + therapy = int(self.therapy_power_base * (1 + self.therapy_power_gain / BINARY_SCALE)) return therapy + self.extra_therapy_power @@ -1112,21 +1132,20 @@ def base_max_life(self): @property def extra_max_life(self): - extra_max_life = Int(self.vitality * self.vitality_to_max_life / BINARY_SCALE) + extra_max_life = int(self.vitality * self.vitality_to_max_life / BINARY_SCALE) return extra_max_life + self.max_life_add @property def final_max_life(self): - max_life = Int(self.base_max_life * (1 + self.max_life_gain / BINARY_SCALE)) + max_life = int(self.base_max_life * (1 + self.max_life_gain / BINARY_SCALE)) return max_life + self.extra_max_life @property def max_life(self): - return Int(self.final_max_life * (1 + self.max_life_final_gain / BINARY_SCALE)) + return int(self.final_max_life * (1 + self.max_life_final_gain / BINARY_SCALE)) -class Mana(Major): - ... +class Mana(Major): ... class DecriticalPower: @@ -1136,16 +1155,23 @@ class DecriticalPower: @property def final_decritical_power(self): - return Int(self.decritical_power_base * (1 + self.decritical_power_gain / BINARY_SCALE)) + return int(self.decritical_power_base * (1 + self.decritical_power_gain / BINARY_SCALE)) + + @property + def decritical_power_percent_inner(self): + fval = self.final_decritical_power + total_val = fval + DECRITICAL_POWER_SCALE + decritical_power_percent = fval / total_val + return int(decritical_power_percent * BINARY_SCALE) / BINARY_SCALE @property def decritical_power_percent(self): - decritical_power_percent = self.final_decritical_power / DECRITICAL_POWER_SCALE - return Int(decritical_power_percent * DECIMAL_SCALE) / DECIMAL_SCALE + return int(self.decritical_power_percent_inner * DECIMAL_SCALE) / DECIMAL_SCALE @property def decritical_power(self): - return self.decritical_power_percent + self.decritical_power_rate / DECIMAL_SCALE + val = self.decritical_power_percent_inner + self.decritical_power_rate / BINARY_SCALE + return int(val * DECIMAL_SCALE) / DECIMAL_SCALE class Toughness: @@ -1155,12 +1181,12 @@ class Toughness: @property def final_toughness(self): - return Int(self.toughness_base * (1 + self.toughness_gain / BINARY_SCALE)) + return int(self.toughness_base * (1 + self.toughness_gain / BINARY_SCALE)) @property def toughness_percent(self): toughness_percent = self.final_toughness / TOUGHNESS_SCALE - return Int(toughness_percent * DECIMAL_SCALE) / DECIMAL_SCALE + return int(toughness_percent * DECIMAL_SCALE) / DECIMAL_SCALE @property def toughness(self): @@ -1205,7 +1231,7 @@ def move_state_damage_addition(self): @property def global_damage_scale(self): - return (Int(self.global_damage_factor) + (1 << 20)) / (1 << 20) + return (int(self.global_damage_factor) + (1 << 20)) / (1 << 20) @property def resist_critical_strike(self): @@ -1213,8 +1239,25 @@ def resist_critical_strike(self): class BaseAttribute( - AttackPower, CriticalStrike, Overcome, CriticalPower, Shield, DamageBase, DamageCof, - WeaponDamage, Haste, Surplus, Strain, Dodge, Parry, TherapyPower, Life, Mana, DecriticalPower, Toughness, Other + AttackPower, + CriticalStrike, + Overcome, + CriticalPower, + Shield, + DamageBase, + DamageCof, + WeaponDamage, + Haste, + Surplus, + Strain, + Dodge, + Parry, + TherapyPower, + Life, + Mana, + DecriticalPower, + Toughness, + Other, ): level: int = 0 diff --git a/base/constant.py b/base/constant.py index 7b120d4..ab237a0 100644 --- a/base/constant.py +++ b/base/constant.py @@ -1,4 +1,4 @@ -from base.expression import Variable +from .expression import Variable BINARY_SCALE = 1024 DECIMAL_SCALE = 10000 diff --git a/base/utils.py b/base/utils.py index f791118..6dffc0b 100644 --- a/base/utils.py +++ b/base/utils.py @@ -1,4 +1,4 @@ -from base.expression import Ceil, Expression, Int, Max, Min, Variable +from ....base.expression import Ceil, Expression, Int, Max, Min, Variable def get_variables(formula: str) -> dict[str, Variable]: diff --git a/gains/patches/skills.py b/gains/patches/skills.py index 3f1d43c..b61861d 100644 --- a/gains/patches/skills.py +++ b/gains/patches/skills.py @@ -1,4 +1,4 @@ -from base.expression import Variable +from ....base.expression import Variable def get_damage(): diff --git a/kungfus/__init__.py b/kungfus/__init__.py index a641205..50391e8 100644 --- a/kungfus/__init__.py +++ b/kungfus/__init__.py @@ -1,12 +1,12 @@ -from kungfus import ao_xue_zhan_yi, bei_ao_jue, gu_feng_jue, jing_yu_jue, xiao_chen_jue -from kungfus import bei_ao_jue_mobile -from kungfus import bing_xin_jue, du_jing, mo_wen, wu_fang, you_luo_yin, zi_xia_gong -from kungfus import bu_tian_jue, li_jing_yi_dao, ling_su, xiang_zhi, yun_chang_xin_jing -from kungfus import fen_shan_jin, ling_hai_jue, shan_hai_xin_jue, tai_xu_jian_yi, wen_shui_jue, yin_long_jue -from kungfus import fen_ying_sheng_jue, hua_jian_you, tai_xuan_jing, tian_luo_gui_dao, yi_jin_jing, zhou_tian_gong -from kungfus import ming_zun_liu_li_ti, tie_gu_yi, tie_lao_lv, xi_sui_jing -from kungfus import tai_xuan_jing_mobile, zhou_tian_gong_mobile -from kungfus import wu_fang_mobile, you_luo_yin_mobile, zi_xia_gong_mobile +from ..kungfus import ao_xue_zhan_yi, bei_ao_jue, gu_feng_jue, jing_yu_jue, xiao_chen_jue +from ..kungfus import bei_ao_jue_mobile +from ..kungfus import bing_xin_jue, du_jing, mo_wen, wu_fang, you_luo_yin, zi_xia_gong +from ..kungfus import bu_tian_jue, li_jing_yi_dao, ling_su, xiang_zhi, yun_chang_xin_jing +from ..kungfus import fen_shan_jin, ling_hai_jue, shan_hai_xin_jue, tai_xu_jian_yi, wen_shui_jue, yin_long_jue +from ..kungfus import fen_ying_sheng_jue, hua_jian_you, tai_xuan_jing, tian_luo_gui_dao, yi_jin_jing, zhou_tian_gong +from ..kungfus import ming_zun_liu_li_ti, tie_gu_yi, tie_lao_lv, xi_sui_jing +from ..kungfus import tai_xuan_jing_mobile, zhou_tian_gong_mobile +from ..kungfus import wu_fang_mobile, you_luo_yin_mobile, zi_xia_gong_mobile class Kungfu: diff --git a/kungfus/ao_xue_zhan_yi/__init__.py b/kungfus/ao_xue_zhan_yi/__init__.py index e004e04..344f502 100644 --- a/kungfus/ao_xue_zhan_yi/__init__.py +++ b/kungfus/ao_xue_zhan_yi/__init__.py @@ -1,7 +1,7 @@ -from kungfus.ao_xue_zhan_yi.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.ao_xue_zhan_yi.buffs import BUFFS -from kungfus.ao_xue_zhan_yi.dots import DOTS -from kungfus.ao_xue_zhan_yi.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.ao_xue_zhan_yi.recipes import RECIPES -from kungfus.ao_xue_zhan_yi.skills import SKILLS -from kungfus.ao_xue_zhan_yi.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/ao_xue_zhan_yi/patches/__init__.py b/kungfus/ao_xue_zhan_yi/patches/__init__.py index 7ba200f..54f24c9 100644 --- a/kungfus/ao_xue_zhan_yi/patches/__init__.py +++ b/kungfus/ao_xue_zhan_yi/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.ao_xue_zhan_yi.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.ao_xue_zhan_yi.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/bei_ao_jue/__init__.py b/kungfus/bei_ao_jue/__init__.py index 2c55107..344f502 100644 --- a/kungfus/bei_ao_jue/__init__.py +++ b/kungfus/bei_ao_jue/__init__.py @@ -1,7 +1,7 @@ -from kungfus.bei_ao_jue.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.bei_ao_jue.buffs import BUFFS -from kungfus.bei_ao_jue.dots import DOTS -from kungfus.bei_ao_jue.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.bei_ao_jue.recipes import RECIPES -from kungfus.bei_ao_jue.skills import SKILLS -from kungfus.bei_ao_jue.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/bei_ao_jue/patches/__init__.py b/kungfus/bei_ao_jue/patches/__init__.py index ccb1bc0..54f24c9 100644 --- a/kungfus/bei_ao_jue/patches/__init__.py +++ b/kungfus/bei_ao_jue/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.bei_ao_jue.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.bei_ao_jue.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/bei_ao_jue_mobile/__init__.py b/kungfus/bei_ao_jue_mobile/__init__.py index 37e99eb..344f502 100644 --- a/kungfus/bei_ao_jue_mobile/__init__.py +++ b/kungfus/bei_ao_jue_mobile/__init__.py @@ -1,7 +1,7 @@ -from kungfus.bei_ao_jue_mobile.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.bei_ao_jue_mobile.buffs import BUFFS -from kungfus.bei_ao_jue_mobile.dots import DOTS -from kungfus.bei_ao_jue_mobile.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.bei_ao_jue_mobile.recipes import RECIPES -from kungfus.bei_ao_jue_mobile.skills import SKILLS -from kungfus.bei_ao_jue_mobile.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/bei_ao_jue_mobile/patches/__init__.py b/kungfus/bei_ao_jue_mobile/patches/__init__.py index 292c480..54f24c9 100644 --- a/kungfus/bei_ao_jue_mobile/patches/__init__.py +++ b/kungfus/bei_ao_jue_mobile/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.bei_ao_jue_mobile.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.bei_ao_jue_mobile.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/bei_ao_jue_mobile/patches/skills.py b/kungfus/bei_ao_jue_mobile/patches/skills.py index 2f1e012..6d6de16 100644 --- a/kungfus/bei_ao_jue_mobile/patches/skills.py +++ b/kungfus/bei_ao_jue_mobile/patches/skills.py @@ -1,4 +1,4 @@ -from base.expression import Variable +from ....base.expression import Variable SKILLS = { **{ diff --git a/kungfus/bing_xin_jue/__init__.py b/kungfus/bing_xin_jue/__init__.py index 562d86b..344f502 100644 --- a/kungfus/bing_xin_jue/__init__.py +++ b/kungfus/bing_xin_jue/__init__.py @@ -1,7 +1,7 @@ -from kungfus.bing_xin_jue.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.bing_xin_jue.buffs import BUFFS -from kungfus.bing_xin_jue.dots import DOTS -from kungfus.bing_xin_jue.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.bing_xin_jue.recipes import RECIPES -from kungfus.bing_xin_jue.skills import SKILLS -from kungfus.bing_xin_jue.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/bing_xin_jue/patches/__init__.py b/kungfus/bing_xin_jue/patches/__init__.py index 75f0c0d..54f24c9 100644 --- a/kungfus/bing_xin_jue/patches/__init__.py +++ b/kungfus/bing_xin_jue/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.bing_xin_jue.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.bing_xin_jue.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/bu_tian_jue/__init__.py b/kungfus/bu_tian_jue/__init__.py index d0648ee..344f502 100644 --- a/kungfus/bu_tian_jue/__init__.py +++ b/kungfus/bu_tian_jue/__init__.py @@ -1,7 +1,7 @@ -from kungfus.bu_tian_jue.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.bu_tian_jue.buffs import BUFFS -from kungfus.bu_tian_jue.dots import DOTS -from kungfus.bu_tian_jue.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.bu_tian_jue.recipes import RECIPES -from kungfus.bu_tian_jue.skills import SKILLS -from kungfus.bu_tian_jue.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/bu_tian_jue/patches/__init__.py b/kungfus/bu_tian_jue/patches/__init__.py index 583c42b..54f24c9 100644 --- a/kungfus/bu_tian_jue/patches/__init__.py +++ b/kungfus/bu_tian_jue/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.bu_tian_jue.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.bu_tian_jue.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/du_jing/__init__.py b/kungfus/du_jing/__init__.py index 9d6b77f..344f502 100644 --- a/kungfus/du_jing/__init__.py +++ b/kungfus/du_jing/__init__.py @@ -1,7 +1,7 @@ -from kungfus.du_jing.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.du_jing.buffs import BUFFS -from kungfus.du_jing.dots import DOTS -from kungfus.du_jing.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.du_jing.recipes import RECIPES -from kungfus.du_jing.skills import SKILLS -from kungfus.du_jing.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/du_jing/patches/__init__.py b/kungfus/du_jing/patches/__init__.py index b1d36fb..54f24c9 100644 --- a/kungfus/du_jing/patches/__init__.py +++ b/kungfus/du_jing/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.du_jing.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.du_jing.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/fen_shan_jin/__init__.py b/kungfus/fen_shan_jin/__init__.py index 5434ba9..344f502 100644 --- a/kungfus/fen_shan_jin/__init__.py +++ b/kungfus/fen_shan_jin/__init__.py @@ -1,7 +1,7 @@ -from kungfus.fen_shan_jin.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.fen_shan_jin.buffs import BUFFS -from kungfus.fen_shan_jin.dots import DOTS -from kungfus.fen_shan_jin.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.fen_shan_jin.recipes import RECIPES -from kungfus.fen_shan_jin.skills import SKILLS -from kungfus.fen_shan_jin.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/fen_shan_jin/patches/__init__.py b/kungfus/fen_shan_jin/patches/__init__.py index 7b17a8c..54f24c9 100644 --- a/kungfus/fen_shan_jin/patches/__init__.py +++ b/kungfus/fen_shan_jin/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.fen_shan_jin.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.fen_shan_jin.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/fen_ying_sheng_jue/__init__.py b/kungfus/fen_ying_sheng_jue/__init__.py index 14fb0f1..344f502 100644 --- a/kungfus/fen_ying_sheng_jue/__init__.py +++ b/kungfus/fen_ying_sheng_jue/__init__.py @@ -1,7 +1,7 @@ -from kungfus.fen_ying_sheng_jue.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.fen_ying_sheng_jue.buffs import BUFFS -from kungfus.fen_ying_sheng_jue.dots import DOTS -from kungfus.fen_ying_sheng_jue.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.fen_ying_sheng_jue.recipes import RECIPES -from kungfus.fen_ying_sheng_jue.skills import SKILLS -from kungfus.fen_ying_sheng_jue.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/fen_ying_sheng_jue/patches/__init__.py b/kungfus/fen_ying_sheng_jue/patches/__init__.py index addf41d..54f24c9 100644 --- a/kungfus/fen_ying_sheng_jue/patches/__init__.py +++ b/kungfus/fen_ying_sheng_jue/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.fen_ying_sheng_jue.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.fen_ying_sheng_jue.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/fen_ying_sheng_jue/patches/buffs.py b/kungfus/fen_ying_sheng_jue/patches/buffs.py index 8a416aa..20308ba 100644 --- a/kungfus/fen_ying_sheng_jue/patches/buffs.py +++ b/kungfus/fen_ying_sheng_jue/patches/buffs.py @@ -1,4 +1,4 @@ -from base.expression import Ceil, Variable +from ....base.expression import Ceil, Variable BUFFS: dict[int, dict] = { 28355: dict(name="烈日", comment="自身"), diff --git a/kungfus/gu_feng_jue/__init__.py b/kungfus/gu_feng_jue/__init__.py index 764bf69..344f502 100644 --- a/kungfus/gu_feng_jue/__init__.py +++ b/kungfus/gu_feng_jue/__init__.py @@ -1,7 +1,7 @@ -from kungfus.gu_feng_jue.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.gu_feng_jue.buffs import BUFFS -from kungfus.gu_feng_jue.dots import DOTS -from kungfus.gu_feng_jue.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.gu_feng_jue.recipes import RECIPES -from kungfus.gu_feng_jue.skills import SKILLS -from kungfus.gu_feng_jue.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/gu_feng_jue/patches/__init__.py b/kungfus/gu_feng_jue/patches/__init__.py index d3fdabf..54f24c9 100644 --- a/kungfus/gu_feng_jue/patches/__init__.py +++ b/kungfus/gu_feng_jue/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.gu_feng_jue.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.gu_feng_jue.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/hua_jian_you/__init__.py b/kungfus/hua_jian_you/__init__.py index bc7141d..344f502 100644 --- a/kungfus/hua_jian_you/__init__.py +++ b/kungfus/hua_jian_you/__init__.py @@ -1,7 +1,7 @@ -from kungfus.hua_jian_you.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.hua_jian_you.buffs import BUFFS -from kungfus.hua_jian_you.dots import DOTS -from kungfus.hua_jian_you.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.hua_jian_you.recipes import RECIPES -from kungfus.hua_jian_you.skills import SKILLS -from kungfus.hua_jian_you.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/hua_jian_you/patches/__init__.py b/kungfus/hua_jian_you/patches/__init__.py index 84c472b..54f24c9 100644 --- a/kungfus/hua_jian_you/patches/__init__.py +++ b/kungfus/hua_jian_you/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.hua_jian_you.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.hua_jian_you.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/jing_yu_jue/__init__.py b/kungfus/jing_yu_jue/__init__.py index 9474256..344f502 100644 --- a/kungfus/jing_yu_jue/__init__.py +++ b/kungfus/jing_yu_jue/__init__.py @@ -1,7 +1,7 @@ -from kungfus.jing_yu_jue.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.jing_yu_jue.buffs import BUFFS -from kungfus.jing_yu_jue.dots import DOTS -from kungfus.jing_yu_jue.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.jing_yu_jue.recipes import RECIPES -from kungfus.jing_yu_jue.skills import SKILLS -from kungfus.jing_yu_jue.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/jing_yu_jue/patches/__init__.py b/kungfus/jing_yu_jue/patches/__init__.py index 1db0cdb..54f24c9 100644 --- a/kungfus/jing_yu_jue/patches/__init__.py +++ b/kungfus/jing_yu_jue/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.jing_yu_jue.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.jing_yu_jue.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/li_jing_yi_dao/__init__.py b/kungfus/li_jing_yi_dao/__init__.py index a871afa..344f502 100644 --- a/kungfus/li_jing_yi_dao/__init__.py +++ b/kungfus/li_jing_yi_dao/__init__.py @@ -1,7 +1,7 @@ -from kungfus.li_jing_yi_dao.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.li_jing_yi_dao.buffs import BUFFS -from kungfus.li_jing_yi_dao.dots import DOTS -from kungfus.li_jing_yi_dao.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.li_jing_yi_dao.recipes import RECIPES -from kungfus.li_jing_yi_dao.skills import SKILLS -from kungfus.li_jing_yi_dao.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/li_jing_yi_dao/patches/__init__.py b/kungfus/li_jing_yi_dao/patches/__init__.py index 8c274ad..54f24c9 100644 --- a/kungfus/li_jing_yi_dao/patches/__init__.py +++ b/kungfus/li_jing_yi_dao/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.li_jing_yi_dao.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.li_jing_yi_dao.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/ling_hai_jue/__init__.py b/kungfus/ling_hai_jue/__init__.py index 57bf7e2..344f502 100644 --- a/kungfus/ling_hai_jue/__init__.py +++ b/kungfus/ling_hai_jue/__init__.py @@ -1,7 +1,7 @@ -from kungfus.ling_hai_jue.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.ling_hai_jue.buffs import BUFFS -from kungfus.ling_hai_jue.dots import DOTS -from kungfus.ling_hai_jue.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.ling_hai_jue.recipes import RECIPES -from kungfus.ling_hai_jue.skills import SKILLS -from kungfus.ling_hai_jue.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/ling_hai_jue/patches/__init__.py b/kungfus/ling_hai_jue/patches/__init__.py index a683717..54f24c9 100644 --- a/kungfus/ling_hai_jue/patches/__init__.py +++ b/kungfus/ling_hai_jue/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.ling_hai_jue.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.ling_hai_jue.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/ling_su/__init__.py b/kungfus/ling_su/__init__.py index b591bf8..344f502 100644 --- a/kungfus/ling_su/__init__.py +++ b/kungfus/ling_su/__init__.py @@ -1,7 +1,7 @@ -from kungfus.ling_su.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.ling_su.buffs import BUFFS -from kungfus.ling_su.dots import DOTS -from kungfus.ling_su.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.ling_su.recipes import RECIPES -from kungfus.ling_su.skills import SKILLS -from kungfus.ling_su.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/ling_su/patches/__init__.py b/kungfus/ling_su/patches/__init__.py index 7400e2c..54f24c9 100644 --- a/kungfus/ling_su/patches/__init__.py +++ b/kungfus/ling_su/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.ling_su.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.ling_su.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/ming_zun_liu_li_ti/__init__.py b/kungfus/ming_zun_liu_li_ti/__init__.py index ba2a9cc..344f502 100644 --- a/kungfus/ming_zun_liu_li_ti/__init__.py +++ b/kungfus/ming_zun_liu_li_ti/__init__.py @@ -1,7 +1,7 @@ -from kungfus.ming_zun_liu_li_ti.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.ming_zun_liu_li_ti.buffs import BUFFS -from kungfus.ming_zun_liu_li_ti.dots import DOTS -from kungfus.ming_zun_liu_li_ti.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.ming_zun_liu_li_ti.recipes import RECIPES -from kungfus.ming_zun_liu_li_ti.skills import SKILLS -from kungfus.ming_zun_liu_li_ti.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/ming_zun_liu_li_ti/patches/__init__.py b/kungfus/ming_zun_liu_li_ti/patches/__init__.py index 7c32c91..54f24c9 100644 --- a/kungfus/ming_zun_liu_li_ti/patches/__init__.py +++ b/kungfus/ming_zun_liu_li_ti/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.ming_zun_liu_li_ti.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.ming_zun_liu_li_ti.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/mo_wen/__init__.py b/kungfus/mo_wen/__init__.py index b66d915..344f502 100644 --- a/kungfus/mo_wen/__init__.py +++ b/kungfus/mo_wen/__init__.py @@ -1,7 +1,7 @@ -from kungfus.mo_wen.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.mo_wen.buffs import BUFFS -from kungfus.mo_wen.dots import DOTS -from kungfus.mo_wen.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.mo_wen.recipes import RECIPES -from kungfus.mo_wen.skills import SKILLS -from kungfus.mo_wen.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/mo_wen/patches/__init__.py b/kungfus/mo_wen/patches/__init__.py index 7d062cf..54f24c9 100644 --- a/kungfus/mo_wen/patches/__init__.py +++ b/kungfus/mo_wen/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.mo_wen.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.mo_wen.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/shan_hai_xin_jue/__init__.py b/kungfus/shan_hai_xin_jue/__init__.py index 4c43add..344f502 100644 --- a/kungfus/shan_hai_xin_jue/__init__.py +++ b/kungfus/shan_hai_xin_jue/__init__.py @@ -1,7 +1,7 @@ -from kungfus.shan_hai_xin_jue.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.shan_hai_xin_jue.buffs import BUFFS -from kungfus.shan_hai_xin_jue.dots import DOTS -from kungfus.shan_hai_xin_jue.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.shan_hai_xin_jue.recipes import RECIPES -from kungfus.shan_hai_xin_jue.skills import SKILLS -from kungfus.shan_hai_xin_jue.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/shan_hai_xin_jue/patches/__init__.py b/kungfus/shan_hai_xin_jue/patches/__init__.py index b5f69d1..54f24c9 100644 --- a/kungfus/shan_hai_xin_jue/patches/__init__.py +++ b/kungfus/shan_hai_xin_jue/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.shan_hai_xin_jue.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.shan_hai_xin_jue.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/tai_xu_jian_yi/__init__.py b/kungfus/tai_xu_jian_yi/__init__.py index 01fea8d..344f502 100644 --- a/kungfus/tai_xu_jian_yi/__init__.py +++ b/kungfus/tai_xu_jian_yi/__init__.py @@ -1,7 +1,7 @@ -from kungfus.tai_xu_jian_yi.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.tai_xu_jian_yi.buffs import BUFFS -from kungfus.tai_xu_jian_yi.dots import DOTS -from kungfus.tai_xu_jian_yi.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.tai_xu_jian_yi.recipes import RECIPES -from kungfus.tai_xu_jian_yi.skills import SKILLS -from kungfus.tai_xu_jian_yi.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/tai_xu_jian_yi/patches/__init__.py b/kungfus/tai_xu_jian_yi/patches/__init__.py index 5ffc465..54f24c9 100644 --- a/kungfus/tai_xu_jian_yi/patches/__init__.py +++ b/kungfus/tai_xu_jian_yi/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.tai_xu_jian_yi.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.tai_xu_jian_yi.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/tai_xuan_jing/__init__.py b/kungfus/tai_xuan_jing/__init__.py index 716e882..344f502 100644 --- a/kungfus/tai_xuan_jing/__init__.py +++ b/kungfus/tai_xuan_jing/__init__.py @@ -1,7 +1,7 @@ -from kungfus.tai_xuan_jing.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.tai_xuan_jing.buffs import BUFFS -from kungfus.tai_xuan_jing.dots import DOTS -from kungfus.tai_xuan_jing.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.tai_xuan_jing.recipes import RECIPES -from kungfus.tai_xuan_jing.skills import SKILLS -from kungfus.tai_xuan_jing.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/tai_xuan_jing/patches/__init__.py b/kungfus/tai_xuan_jing/patches/__init__.py index 0b2663b..54f24c9 100644 --- a/kungfus/tai_xuan_jing/patches/__init__.py +++ b/kungfus/tai_xuan_jing/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.tai_xuan_jing.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.tai_xuan_jing.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/tai_xuan_jing_mobile/__init__.py b/kungfus/tai_xuan_jing_mobile/__init__.py index fe25534..344f502 100644 --- a/kungfus/tai_xuan_jing_mobile/__init__.py +++ b/kungfus/tai_xuan_jing_mobile/__init__.py @@ -1,7 +1,7 @@ -from kungfus.tai_xuan_jing_mobile.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.tai_xuan_jing_mobile.buffs import BUFFS -from kungfus.tai_xuan_jing_mobile.dots import DOTS -from kungfus.tai_xuan_jing_mobile.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.tai_xuan_jing_mobile.recipes import RECIPES -from kungfus.tai_xuan_jing_mobile.skills import SKILLS -from kungfus.tai_xuan_jing_mobile.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/tai_xuan_jing_mobile/patches/__init__.py b/kungfus/tai_xuan_jing_mobile/patches/__init__.py index 9b42e06..54f24c9 100644 --- a/kungfus/tai_xuan_jing_mobile/patches/__init__.py +++ b/kungfus/tai_xuan_jing_mobile/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.tai_xuan_jing_mobile.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.tai_xuan_jing_mobile.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/tian_luo_gui_dao/__init__.py b/kungfus/tian_luo_gui_dao/__init__.py index bf4f25a..344f502 100644 --- a/kungfus/tian_luo_gui_dao/__init__.py +++ b/kungfus/tian_luo_gui_dao/__init__.py @@ -1,7 +1,7 @@ -from kungfus.tian_luo_gui_dao.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.tian_luo_gui_dao.buffs import BUFFS -from kungfus.tian_luo_gui_dao.dots import DOTS -from kungfus.tian_luo_gui_dao.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.tian_luo_gui_dao.recipes import RECIPES -from kungfus.tian_luo_gui_dao.skills import SKILLS -from kungfus.tian_luo_gui_dao.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/tian_luo_gui_dao/patches/__init__.py b/kungfus/tian_luo_gui_dao/patches/__init__.py index 87ec0cc..54f24c9 100644 --- a/kungfus/tian_luo_gui_dao/patches/__init__.py +++ b/kungfus/tian_luo_gui_dao/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.tian_luo_gui_dao.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.tian_luo_gui_dao.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/tian_luo_gui_dao/patches/skills.py b/kungfus/tian_luo_gui_dao/patches/skills.py index 3c61bc8..bc02a88 100644 --- a/kungfus/tian_luo_gui_dao/patches/skills.py +++ b/kungfus/tian_luo_gui_dao/patches/skills.py @@ -1,4 +1,4 @@ -from base.expression import Variable +from ....base.expression import Variable SKILLS = { 3126: { diff --git a/kungfus/tie_gu_yi/__init__.py b/kungfus/tie_gu_yi/__init__.py index d74d050..344f502 100644 --- a/kungfus/tie_gu_yi/__init__.py +++ b/kungfus/tie_gu_yi/__init__.py @@ -1,7 +1,7 @@ -from kungfus.tie_gu_yi.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.tie_gu_yi.buffs import BUFFS -from kungfus.tie_gu_yi.dots import DOTS -from kungfus.tie_gu_yi.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.tie_gu_yi.recipes import RECIPES -from kungfus.tie_gu_yi.skills import SKILLS -from kungfus.tie_gu_yi.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/tie_gu_yi/patches/__init__.py b/kungfus/tie_gu_yi/patches/__init__.py index 684be40..54f24c9 100644 --- a/kungfus/tie_gu_yi/patches/__init__.py +++ b/kungfus/tie_gu_yi/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.tie_gu_yi.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.tie_gu_yi.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/tie_lao_lv/__init__.py b/kungfus/tie_lao_lv/__init__.py index 11bf64f..344f502 100644 --- a/kungfus/tie_lao_lv/__init__.py +++ b/kungfus/tie_lao_lv/__init__.py @@ -1,7 +1,7 @@ -from kungfus.tie_lao_lv.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.tie_lao_lv.buffs import BUFFS -from kungfus.tie_lao_lv.dots import DOTS -from kungfus.tie_lao_lv.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.tie_lao_lv.recipes import RECIPES -from kungfus.tie_lao_lv.skills import SKILLS -from kungfus.tie_lao_lv.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/tie_lao_lv/patches/__init__.py b/kungfus/tie_lao_lv/patches/__init__.py index 60ba0fd..54f24c9 100644 --- a/kungfus/tie_lao_lv/patches/__init__.py +++ b/kungfus/tie_lao_lv/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.tie_lao_lv.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.tie_lao_lv.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/wen_shui_jue/__init__.py b/kungfus/wen_shui_jue/__init__.py index da80b22..344f502 100644 --- a/kungfus/wen_shui_jue/__init__.py +++ b/kungfus/wen_shui_jue/__init__.py @@ -1,7 +1,7 @@ -from kungfus.wen_shui_jue.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.wen_shui_jue.buffs import BUFFS -from kungfus.wen_shui_jue.dots import DOTS -from kungfus.wen_shui_jue.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.wen_shui_jue.recipes import RECIPES -from kungfus.wen_shui_jue.skills import SKILLS -from kungfus.wen_shui_jue.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/wen_shui_jue/patches/__init__.py b/kungfus/wen_shui_jue/patches/__init__.py index 4747790..54f24c9 100644 --- a/kungfus/wen_shui_jue/patches/__init__.py +++ b/kungfus/wen_shui_jue/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.wen_shui_jue.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.wen_shui_jue.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/wu_fang/__init__.py b/kungfus/wu_fang/__init__.py index 8cff5b1..344f502 100644 --- a/kungfus/wu_fang/__init__.py +++ b/kungfus/wu_fang/__init__.py @@ -1,7 +1,7 @@ -from kungfus.wu_fang.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.wu_fang.buffs import BUFFS -from kungfus.wu_fang.dots import DOTS -from kungfus.wu_fang.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.wu_fang.recipes import RECIPES -from kungfus.wu_fang.skills import SKILLS -from kungfus.wu_fang.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/wu_fang/patches/__init__.py b/kungfus/wu_fang/patches/__init__.py index 54503c9..54f24c9 100644 --- a/kungfus/wu_fang/patches/__init__.py +++ b/kungfus/wu_fang/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.wu_fang.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.wu_fang.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/wu_fang_mobile/__init__.py b/kungfus/wu_fang_mobile/__init__.py index be3e2e6..344f502 100644 --- a/kungfus/wu_fang_mobile/__init__.py +++ b/kungfus/wu_fang_mobile/__init__.py @@ -1,7 +1,7 @@ -from kungfus.wu_fang_mobile.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.wu_fang_mobile.buffs import BUFFS -from kungfus.wu_fang_mobile.dots import DOTS -from kungfus.wu_fang_mobile.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.wu_fang_mobile.recipes import RECIPES -from kungfus.wu_fang_mobile.skills import SKILLS -from kungfus.wu_fang_mobile.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/wu_fang_mobile/patches/__init__.py b/kungfus/wu_fang_mobile/patches/__init__.py index e74bd5b..54f24c9 100644 --- a/kungfus/wu_fang_mobile/patches/__init__.py +++ b/kungfus/wu_fang_mobile/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.wu_fang_mobile.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.wu_fang_mobile.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/wu_fang_mobile/patches/skills.py b/kungfus/wu_fang_mobile/patches/skills.py index 31d862c..1ecff0f 100644 --- a/kungfus/wu_fang_mobile/patches/skills.py +++ b/kungfus/wu_fang_mobile/patches/skills.py @@ -1,4 +1,4 @@ -from base.expression import Variable +from ....base.expression import Variable SKILLS = { 102157: dict(dest_rollback_attributes=[("coming_damage_cof", 307.2 * Variable("recipe_17040_1"))]), diff --git a/kungfus/xi_sui_jing/__init__.py b/kungfus/xi_sui_jing/__init__.py index cbb155c..344f502 100644 --- a/kungfus/xi_sui_jing/__init__.py +++ b/kungfus/xi_sui_jing/__init__.py @@ -1,7 +1,7 @@ -from kungfus.xi_sui_jing.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.xi_sui_jing.buffs import BUFFS -from kungfus.xi_sui_jing.dots import DOTS -from kungfus.xi_sui_jing.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.xi_sui_jing.recipes import RECIPES -from kungfus.xi_sui_jing.skills import SKILLS -from kungfus.xi_sui_jing.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/xi_sui_jing/patches/__init__.py b/kungfus/xi_sui_jing/patches/__init__.py index c9cf581..54f24c9 100644 --- a/kungfus/xi_sui_jing/patches/__init__.py +++ b/kungfus/xi_sui_jing/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.xi_sui_jing.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.xi_sui_jing.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/xiang_zhi/__init__.py b/kungfus/xiang_zhi/__init__.py index d410ef8..344f502 100644 --- a/kungfus/xiang_zhi/__init__.py +++ b/kungfus/xiang_zhi/__init__.py @@ -1,7 +1,7 @@ -from kungfus.xiang_zhi.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.xiang_zhi.buffs import BUFFS -from kungfus.xiang_zhi.dots import DOTS -from kungfus.xiang_zhi.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.xiang_zhi.recipes import RECIPES -from kungfus.xiang_zhi.skills import SKILLS -from kungfus.xiang_zhi.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/xiang_zhi/patches/__init__.py b/kungfus/xiang_zhi/patches/__init__.py index 7569085..54f24c9 100644 --- a/kungfus/xiang_zhi/patches/__init__.py +++ b/kungfus/xiang_zhi/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.xiang_zhi.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.xiang_zhi.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/xiao_chen_jue/__init__.py b/kungfus/xiao_chen_jue/__init__.py index 122b066..344f502 100644 --- a/kungfus/xiao_chen_jue/__init__.py +++ b/kungfus/xiao_chen_jue/__init__.py @@ -1,7 +1,7 @@ -from kungfus.xiao_chen_jue.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.xiao_chen_jue.buffs import BUFFS -from kungfus.xiao_chen_jue.dots import DOTS -from kungfus.xiao_chen_jue.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.xiao_chen_jue.recipes import RECIPES -from kungfus.xiao_chen_jue.skills import SKILLS -from kungfus.xiao_chen_jue.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/xiao_chen_jue/patches/__init__.py b/kungfus/xiao_chen_jue/patches/__init__.py index f24be4d..54f24c9 100644 --- a/kungfus/xiao_chen_jue/patches/__init__.py +++ b/kungfus/xiao_chen_jue/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.xiao_chen_jue.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.xiao_chen_jue.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/yi_jin_jing/__init__.py b/kungfus/yi_jin_jing/__init__.py index cbb621e..344f502 100644 --- a/kungfus/yi_jin_jing/__init__.py +++ b/kungfus/yi_jin_jing/__init__.py @@ -1,7 +1,7 @@ -from kungfus.yi_jin_jing.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.yi_jin_jing.buffs import BUFFS -from kungfus.yi_jin_jing.dots import DOTS -from kungfus.yi_jin_jing.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.yi_jin_jing.recipes import RECIPES -from kungfus.yi_jin_jing.skills import SKILLS -from kungfus.yi_jin_jing.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/yi_jin_jing/patches/__init__.py b/kungfus/yi_jin_jing/patches/__init__.py index 296cba5..54f24c9 100644 --- a/kungfus/yi_jin_jing/patches/__init__.py +++ b/kungfus/yi_jin_jing/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.yi_jin_jing.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.yi_jin_jing.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/yin_long_jue/__init__.py b/kungfus/yin_long_jue/__init__.py index c9188a4..344f502 100644 --- a/kungfus/yin_long_jue/__init__.py +++ b/kungfus/yin_long_jue/__init__.py @@ -1,7 +1,7 @@ -from kungfus.yin_long_jue.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.yin_long_jue.buffs import BUFFS -from kungfus.yin_long_jue.dots import DOTS -from kungfus.yin_long_jue.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.yin_long_jue.recipes import RECIPES -from kungfus.yin_long_jue.skills import SKILLS -from kungfus.yin_long_jue.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/yin_long_jue/patches/__init__.py b/kungfus/yin_long_jue/patches/__init__.py index 92cb230..54f24c9 100644 --- a/kungfus/yin_long_jue/patches/__init__.py +++ b/kungfus/yin_long_jue/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.yin_long_jue.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.yin_long_jue.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/you_luo_yin/__init__.py b/kungfus/you_luo_yin/__init__.py index ad399f5..344f502 100644 --- a/kungfus/you_luo_yin/__init__.py +++ b/kungfus/you_luo_yin/__init__.py @@ -1,7 +1,7 @@ -from kungfus.you_luo_yin.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.you_luo_yin.buffs import BUFFS -from kungfus.you_luo_yin.dots import DOTS -from kungfus.you_luo_yin.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.you_luo_yin.recipes import RECIPES -from kungfus.you_luo_yin.skills import SKILLS -from kungfus.you_luo_yin.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/you_luo_yin/patches/__init__.py b/kungfus/you_luo_yin/patches/__init__.py index bda12cf..54f24c9 100644 --- a/kungfus/you_luo_yin/patches/__init__.py +++ b/kungfus/you_luo_yin/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.you_luo_yin.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.you_luo_yin.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/you_luo_yin_mobile/__init__.py b/kungfus/you_luo_yin_mobile/__init__.py index 749b203..344f502 100644 --- a/kungfus/you_luo_yin_mobile/__init__.py +++ b/kungfus/you_luo_yin_mobile/__init__.py @@ -1,7 +1,7 @@ -from kungfus.you_luo_yin_mobile.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.you_luo_yin_mobile.buffs import BUFFS -from kungfus.you_luo_yin_mobile.dots import DOTS -from kungfus.you_luo_yin_mobile.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.you_luo_yin_mobile.recipes import RECIPES -from kungfus.you_luo_yin_mobile.skills import SKILLS -from kungfus.you_luo_yin_mobile.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/you_luo_yin_mobile/patches/__init__.py b/kungfus/you_luo_yin_mobile/patches/__init__.py index 0b02240..54f24c9 100644 --- a/kungfus/you_luo_yin_mobile/patches/__init__.py +++ b/kungfus/you_luo_yin_mobile/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.you_luo_yin_mobile.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.you_luo_yin_mobile.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/you_luo_yin_mobile/patches/skills.py b/kungfus/you_luo_yin_mobile/patches/skills.py index 135eefc..b2ce257 100644 --- a/kungfus/you_luo_yin_mobile/patches/skills.py +++ b/kungfus/you_luo_yin_mobile/patches/skills.py @@ -1,4 +1,4 @@ -from base.expression import Int, Variable +from ....base.expression import Int, Variable SKILLS = { 102401: dict(dest_rollback_attributes=[( diff --git a/kungfus/yun_chang_xin_jing/__init__.py b/kungfus/yun_chang_xin_jing/__init__.py index a73df3a..344f502 100644 --- a/kungfus/yun_chang_xin_jing/__init__.py +++ b/kungfus/yun_chang_xin_jing/__init__.py @@ -1,7 +1,7 @@ -from kungfus.yun_chang_xin_jing.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.yun_chang_xin_jing.buffs import BUFFS -from kungfus.yun_chang_xin_jing.dots import DOTS -from kungfus.yun_chang_xin_jing.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.yun_chang_xin_jing.recipes import RECIPES -from kungfus.yun_chang_xin_jing.skills import SKILLS -from kungfus.yun_chang_xin_jing.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/yun_chang_xin_jing/patches/__init__.py b/kungfus/yun_chang_xin_jing/patches/__init__.py index a7b48f3..54f24c9 100644 --- a/kungfus/yun_chang_xin_jing/patches/__init__.py +++ b/kungfus/yun_chang_xin_jing/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.yun_chang_xin_jing.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.yun_chang_xin_jing.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/zhou_tian_gong/__init__.py b/kungfus/zhou_tian_gong/__init__.py index ce5a795..344f502 100644 --- a/kungfus/zhou_tian_gong/__init__.py +++ b/kungfus/zhou_tian_gong/__init__.py @@ -1,7 +1,7 @@ -from kungfus.zhou_tian_gong.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.zhou_tian_gong.buffs import BUFFS -from kungfus.zhou_tian_gong.dots import DOTS -from kungfus.zhou_tian_gong.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.zhou_tian_gong.recipes import RECIPES -from kungfus.zhou_tian_gong.skills import SKILLS -from kungfus.zhou_tian_gong.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/zhou_tian_gong/patches/__init__.py b/kungfus/zhou_tian_gong/patches/__init__.py index cacd291..54f24c9 100644 --- a/kungfus/zhou_tian_gong/patches/__init__.py +++ b/kungfus/zhou_tian_gong/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.zhou_tian_gong.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.zhou_tian_gong.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/zhou_tian_gong_mobile/__init__.py b/kungfus/zhou_tian_gong_mobile/__init__.py index 0eebc15..344f502 100644 --- a/kungfus/zhou_tian_gong_mobile/__init__.py +++ b/kungfus/zhou_tian_gong_mobile/__init__.py @@ -1,7 +1,7 @@ -from kungfus.zhou_tian_gong_mobile.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.zhou_tian_gong_mobile.buffs import BUFFS -from kungfus.zhou_tian_gong_mobile.dots import DOTS -from kungfus.zhou_tian_gong_mobile.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.zhou_tian_gong_mobile.recipes import RECIPES -from kungfus.zhou_tian_gong_mobile.skills import SKILLS -from kungfus.zhou_tian_gong_mobile.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/zhou_tian_gong_mobile/patches/__init__.py b/kungfus/zhou_tian_gong_mobile/patches/__init__.py index ef23030..54f24c9 100644 --- a/kungfus/zhou_tian_gong_mobile/patches/__init__.py +++ b/kungfus/zhou_tian_gong_mobile/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.zhou_tian_gong_mobile.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.zhou_tian_gong_mobile.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/zi_xia_gong/__init__.py b/kungfus/zi_xia_gong/__init__.py index 8cb8296..344f502 100644 --- a/kungfus/zi_xia_gong/__init__.py +++ b/kungfus/zi_xia_gong/__init__.py @@ -1,7 +1,7 @@ -from kungfus.zi_xia_gong.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.zi_xia_gong.buffs import BUFFS -from kungfus.zi_xia_gong.dots import DOTS -from kungfus.zi_xia_gong.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.zi_xia_gong.recipes import RECIPES -from kungfus.zi_xia_gong.skills import SKILLS -from kungfus.zi_xia_gong.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/zi_xia_gong/patches/__init__.py b/kungfus/zi_xia_gong/patches/__init__.py index b1453ef..54f24c9 100644 --- a/kungfus/zi_xia_gong/patches/__init__.py +++ b/kungfus/zi_xia_gong/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.zi_xia_gong.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.zi_xia_gong.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/zi_xia_gong_mobile/__init__.py b/kungfus/zi_xia_gong_mobile/__init__.py index ccf4d0d..344f502 100644 --- a/kungfus/zi_xia_gong_mobile/__init__.py +++ b/kungfus/zi_xia_gong_mobile/__init__.py @@ -1,7 +1,7 @@ -from kungfus.zi_xia_gong_mobile.attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL -from kungfus.zi_xia_gong_mobile.buffs import BUFFS -from kungfus.zi_xia_gong_mobile.dots import DOTS -from kungfus.zi_xia_gong_mobile.patches import BUFF_PATCHES, SKILL_PATCHES -from kungfus.zi_xia_gong_mobile.recipes import RECIPES -from kungfus.zi_xia_gong_mobile.skills import SKILLS -from kungfus.zi_xia_gong_mobile.talents import TALENTS +from .attribute import ATTRIBUTE, KIND, MAJOR, SCHOOL +from .buffs import BUFFS +from .dots import DOTS +from .patches import BUFF_PATCHES, SKILL_PATCHES +from .recipes import RECIPES +from .skills import SKILLS +from .talents import TALENTS diff --git a/kungfus/zi_xia_gong_mobile/patches/__init__.py b/kungfus/zi_xia_gong_mobile/patches/__init__.py index 7e8cf76..54f24c9 100644 --- a/kungfus/zi_xia_gong_mobile/patches/__init__.py +++ b/kungfus/zi_xia_gong_mobile/patches/__init__.py @@ -1,2 +1,2 @@ -from kungfus.zi_xia_gong_mobile.patches.buffs import BUFFS as BUFF_PATCHES -from kungfus.zi_xia_gong_mobile.patches.skills import SKILLS as SKILL_PATCHES +from .buffs import BUFFS as BUFF_PATCHES +from .skills import SKILLS as SKILL_PATCHES diff --git a/kungfus/zi_xia_gong_mobile/patches/skills.py b/kungfus/zi_xia_gong_mobile/patches/skills.py index 0b266e4..9ed5d52 100644 --- a/kungfus/zi_xia_gong_mobile/patches/skills.py +++ b/kungfus/zi_xia_gong_mobile/patches/skills.py @@ -1,4 +1,4 @@ -from base.expression import Variable +from ....base.expression import Variable SKILLS = { 18121: dict(channel_interval=21), diff --git a/qt/classes/attribute.py b/qt/classes/attribute.py index 20e132e..5166ec2 100644 --- a/qt/classes/attribute.py +++ b/qt/classes/attribute.py @@ -2,7 +2,7 @@ from base.attribute import BaseAttribute from base.constant import * -from base.expression import Expression, Variable +from ....base.expression import Expression, Variable from qt.classes.buff import Buff from tools.lua.enums import SKILL_KIND_TYPE diff --git a/qt/classes/damage.py b/qt/classes/damage.py index 769b5b0..bae2e5c 100644 --- a/qt/classes/damage.py +++ b/qt/classes/damage.py @@ -1,4 +1,4 @@ -from base.expression import Expression +from ....base.expression import Expression class Damage: diff --git a/qt/classes/skill.py b/qt/classes/skill.py index a0e5363..7ca8959 100644 --- a/qt/classes/skill.py +++ b/qt/classes/skill.py @@ -1,5 +1,5 @@ from assets.raw.skills import SKILLS -from base.expression import Expression +from ....base.expression import Expression from base.utils import parse_expr diff --git a/qt/utils.py b/qt/utils.py index 28b239a..af04765 100644 --- a/qt/utils.py +++ b/qt/utils.py @@ -1,4 +1,4 @@ -from base.expression import Constant, Min +from ....base.expression import Constant, Min from qt.classes.dot import Dot from qt.classes.skill import Skill diff --git a/tools/classes/belong.py b/tools/classes/belong.py index d25be1b..2f0ba0d 100644 --- a/tools/classes/belong.py +++ b/tools/classes/belong.py @@ -1,4 +1,4 @@ -from base.expression import Variable +from ....base.expression import Variable from tools.classes.skill import Skill from tools.lua.enums import ATTRIBUTE_EFFECT_MODE, ATTRIBUTE_TYPE from tools.settings import recipe_txts diff --git a/tools/classes/buff.py b/tools/classes/buff.py index 5e3aa66..0241672 100644 --- a/tools/classes/buff.py +++ b/tools/classes/buff.py @@ -1,4 +1,4 @@ -from base.expression import Variable +from ....base.expression import Variable from tools.classes import AliasBase from tools.classes.skill import Skill from tools.lua.enums import ATTRIBUTE_TYPE diff --git a/tools/classes/damage.py b/tools/classes/damage.py index dd5c636..243f6ca 100644 --- a/tools/classes/damage.py +++ b/tools/classes/damage.py @@ -1,7 +1,7 @@ from typing import TYPE_CHECKING from base.constant import * -from base.expression import Ceil, Expression, Int, Max, Min +from ....base.expression import Ceil, Expression, Int, Max, Min from tools.lua.enums import SKILL_KIND_TYPE if TYPE_CHECKING: diff --git a/tools/classes/recipe.py b/tools/classes/recipe.py index 9c4221b..f0311b4 100644 --- a/tools/classes/recipe.py +++ b/tools/classes/recipe.py @@ -1,6 +1,6 @@ from pathlib import Path -from base.expression import Variable +from ....base.expression import Variable from tools.classes import AliasBase from tools.classes.skill import Skill from tools.settings import buff_recipe_settings, recipe_settings, recipe_txts diff --git a/tools/classes/skill.py b/tools/classes/skill.py index 0c668f2..b3d6ba4 100644 --- a/tools/classes/skill.py +++ b/tools/classes/skill.py @@ -2,7 +2,7 @@ from base.constant import BINARY_SCALE, DEFAULT_SURPLUS_COF, DOT_DAMAGE_SCALE, FRAME_PER_SECOND, MAGICAL_DAMAGE_SCALE, \ PHYSICAL_DAMAGE_SCALE -from base.expression import Expression, Int +from ....base.expression import Expression, Int from tools.classes import AliasBase from tools.classes.attribute import Attribute from tools.classes.damage import DamageChain diff --git a/tools/parser/buff.py b/tools/parser/buff.py index dad5743..3f28300 100644 --- a/tools/parser/buff.py +++ b/tools/parser/buff.py @@ -1,4 +1,4 @@ -from base.expression import Expression +from ....base.expression import Expression from tools.classes.buff import Buff from tools.classes.skill import Skill diff --git a/tools/parser/dot.py b/tools/parser/dot.py index 1666a6a..a5bce95 100644 --- a/tools/parser/dot.py +++ b/tools/parser/dot.py @@ -1,4 +1,4 @@ -from base.expression import Variable +from ....base.expression import Variable from qt.classes.skill import Skill from tools.classes.dot import Dot from tools.parser.skill import parse_skill diff --git a/tools/utils.py b/tools/utils.py index 00d28c9..222e3f7 100644 --- a/tools/utils.py +++ b/tools/utils.py @@ -6,7 +6,7 @@ import pandas as pd -from tools.lua.enums import ATTRIBUTE_TYPE +from .lua.enums import ATTRIBUTE_TYPE formatter = string.Formatter()