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

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

View File

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

View File

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