Rename multiple entities to reflect that it's target profile rather than target resists
This commit is contained in:
@@ -69,7 +69,7 @@ class Fit:
|
||||
def __init__(self):
|
||||
pyfalog.debug("Initialize Fit class")
|
||||
self.pattern = DamagePattern.getInstance().getDamagePattern("Uniform")
|
||||
self.targetResists = None
|
||||
self.targetProfile = None
|
||||
self.character = saveddata_Character.getAll5()
|
||||
self.booster = False
|
||||
self._loadedFits = WeakSet()
|
||||
@@ -170,7 +170,7 @@ class Fit:
|
||||
fit = FitType(ship)
|
||||
fit.name = name if name is not None else "New %s" % fit.ship.item.name
|
||||
fit.damagePattern = self.pattern
|
||||
fit.targetResists = self.targetResists
|
||||
fit.targetProfile = self.targetProfile
|
||||
fit.character = self.character
|
||||
fit.booster = self.booster
|
||||
useCharImplants = self.serviceFittingOptions["useCharacterImplantsByDefault"]
|
||||
@@ -358,21 +358,21 @@ class Fit:
|
||||
self.fill(fit)
|
||||
|
||||
@staticmethod
|
||||
def getTargetResists(fitID):
|
||||
pyfalog.debug("Get target resists for fit ID: {0}", fitID)
|
||||
def getTargetProfile(fitID):
|
||||
pyfalog.debug("Get target profile for fit ID: {0}", fitID)
|
||||
if fitID is None:
|
||||
return
|
||||
|
||||
fit = eos.db.getFit(fitID)
|
||||
return fit.targetResists
|
||||
return fit.targetProfile
|
||||
|
||||
def setTargetResists(self, fitID, pattern):
|
||||
def setTargetProfile(self, fitID, pattern):
|
||||
pyfalog.debug("Set target resist for fit ID: {0}", fitID)
|
||||
if fitID is None:
|
||||
return
|
||||
|
||||
fit = eos.db.getFit(fitID)
|
||||
fit.targetResists = pattern
|
||||
fit.targetProfile = pattern
|
||||
eos.db.commit()
|
||||
|
||||
self.recalc(fit)
|
||||
|
||||
@@ -156,7 +156,7 @@ class Port:
|
||||
# Set some more fit attributes and save
|
||||
fit.character = sFit.character
|
||||
fit.damagePattern = sFit.pattern
|
||||
fit.targetResists = sFit.targetResists
|
||||
fit.targetProfile = sFit.targetProfile
|
||||
if len(fit.implants) > 0:
|
||||
fit.implantLocation = ImplantLocation.FIT
|
||||
else:
|
||||
@@ -194,7 +194,7 @@ class Port:
|
||||
for fit in importData:
|
||||
fit.character = sFit.character
|
||||
fit.damagePattern = sFit.pattern
|
||||
fit.targetResists = sFit.targetResists
|
||||
fit.targetProfile = sFit.targetProfile
|
||||
if len(fit.implants) > 0:
|
||||
fit.implantLocation = ImplantLocation.FIT
|
||||
else:
|
||||
|
||||
@@ -20,34 +20,34 @@
|
||||
import copy
|
||||
|
||||
from eos import db
|
||||
from eos.saveddata.targetResists import TargetResists as es_TargetResists
|
||||
from eos.saveddata.targetProfile import TargetProfile as es_TargetProfile
|
||||
|
||||
|
||||
class ImportError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class TargetResists:
|
||||
class TargetProfile:
|
||||
instance = None
|
||||
|
||||
@classmethod
|
||||
def getInstance(cls):
|
||||
if cls.instance is None:
|
||||
cls.instance = TargetResists()
|
||||
cls.instance = TargetProfile()
|
||||
|
||||
return cls.instance
|
||||
|
||||
@staticmethod
|
||||
def getTargetResistsList():
|
||||
return db.getTargetResistsList()
|
||||
def getTargetProfileList():
|
||||
return db.getTargetProfileList()
|
||||
|
||||
@staticmethod
|
||||
def getTargetResists(name):
|
||||
return db.getTargetResists(name)
|
||||
def getTargetProfile(name):
|
||||
return db.getTargetProfile(name)
|
||||
|
||||
@staticmethod
|
||||
def newPattern(name):
|
||||
p = es_TargetResists(0.0, 0.0, 0.0, 0.0)
|
||||
p = es_TargetProfile(0.0, 0.0, 0.0, 0.0)
|
||||
p.name = name
|
||||
db.save(p)
|
||||
return p
|
||||
@@ -72,7 +72,7 @@ class TargetResists:
|
||||
db.save(p)
|
||||
|
||||
def importPatterns(self, text):
|
||||
imports, num = es_TargetResists.importPatterns(text)
|
||||
imports, num = es_TargetProfile.importPatterns(text)
|
||||
lenImports = len(imports)
|
||||
|
||||
if lenImports == 0:
|
||||
@@ -81,6 +81,6 @@ class TargetResists:
|
||||
raise ImportError("%d patterns imported from clipboard; %d had errors" % (num, num - lenImports))
|
||||
|
||||
def exportPatterns(self):
|
||||
patterns = self.getTargetResistsList()
|
||||
patterns = self.getTargetProfileList()
|
||||
patterns.sort(key=lambda p: p.name)
|
||||
return es_TargetResists.exportPatterns(*patterns)
|
||||
return es_TargetProfile.exportPatterns(*patterns)
|
||||
Reference in New Issue
Block a user