dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Use uniform as default resists profile, if no resist profile can be fetched

Browse Source
This commit is contained in:
DarkPhoenix
2019-12-07 01:29:15 +03:00
parent a400821268
commit c3108f773a
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eos/saveddata/damagePattern.py
View File

@@ -144,6 +144,12 @@ class DamagePattern:
cls.__generateBuiltins() cls.__generateBuiltins()
return cls._builtins.get(id) return cls._builtins.get(id)
@classmethod
def getDefaultBuiltin(cls):
if cls._builtins is None:
cls.__generateBuiltins()
return cls._builtins.get(-1)
@classmethod @classmethod
def __generateBuiltins(cls): def __generateBuiltins(cls):
cls._builtins = OrderedDict() cls._builtins = OrderedDict()

10
eos/saveddata/fit.py
View File

@@ -179,7 +179,7 @@ class Fit:
if targetProfile is None: if targetProfile is None:
self.__userTargetProfile = None self.__userTargetProfile = None
self.__builtinTargetProfileID = None self.__builtinTargetProfileID = None
if targetProfile.builtin: elif targetProfile.builtin:
self.__userTargetProfile = None self.__userTargetProfile = None
self.__builtinTargetProfileID = targetProfile.ID self.__builtinTargetProfileID = targetProfile.ID
else: else:
@@ -195,15 +195,17 @@ class Fit:
if self.__userDamagePattern is not None: if self.__userDamagePattern is not None:
return self.__userDamagePattern return self.__userDamagePattern
if self.__builtinDamagePatternID is not None: if self.__builtinDamagePatternID is not None:
return DamagePattern.getBuiltinById(self.__builtinDamagePatternID) pattern = DamagePattern.getBuiltinById(self.__builtinDamagePatternID)
return None if pattern is not None:
return pattern
return DamagePattern.getDefaultBuiltin()
@damagePattern.setter @damagePattern.setter
def damagePattern(self, damagePattern): def damagePattern(self, damagePattern):
if damagePattern is None: if damagePattern is None:
self.__userDamagePattern = None self.__userDamagePattern = None
self.__builtinDamagePatternID = None self.__builtinDamagePatternID = None
if damagePattern.builtin: elif damagePattern.builtin:
self.__userDamagePattern = None self.__userDamagePattern = None
self.__builtinDamagePatternID = damagePattern.ID self.__builtinDamagePatternID = damagePattern.ID
else: else: