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

Merge pull request #99 from blitzmann/issue-63

Browse Source 
Fixes #63
This commit is contained in:
Anton Vorobyov
2014-06-03 00:34:58 +04:00
parent 5a1e39180a b783f0641c
commit 2ea0c57be5
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
eos/saveddata/fit.py
View File

@@ -319,17 +319,8 @@ class Fit(object):
else: else:
c = chain((self.character, self.ship), self.drones, self.boosters, self.appliedImplants, self.modules, c = chain((self.character, self.ship), self.drones, self.boosters, self.appliedImplants, self.modules,
self.projectedDrones, self.projectedModules) self.projectedDrones, self.projectedModules)
for item in c:
# Registering the item about to affect the fit allows us to track "Affected By" relations correctly
if item is not None:
self.register(item)
item.calculateModifiedAttributes(self, runTime, False)
if forceProjected is True:
targetFit.register(item)
item.calculateModifiedAttributes(targetFit, runTime, True)
if self.gangBoosts is not None: if self.gangBoosts is not None:
#print self.gangBoosts
contextMap = {Skill: "skill", contextMap = {Skill: "skill",
Ship: "ship", Ship: "ship",
Module: "module", Module: "module",
@@ -344,17 +335,27 @@ class Fit(object):
(effect.isType("active") and thing.state >= State.ACTIVE): (effect.isType("active") and thing.state >= State.ACTIVE):
# Run effect, and get proper bonuses applied # Run effect, and get proper bonuses applied
try: try:
effect.handler(targetFit, thing, context) effect.handler(self, thing, context)
except: except:
pass pass
else: else:
# Run effect, and get proper bonuses applied # Run effect, and get proper bonuses applied
try: try:
effect.handler(targetFit, thing, context) effect.handler(self, thing, context)
except: except:
pass pass
for item in c:
# Registering the item about to affect the fit allows us to track "Affected By" relations correctly
if item is not None:
self.register(item)
item.calculateModifiedAttributes(self, runTime, False)
if forceProjected is True:
targetFit.register(item)
item.calculateModifiedAttributes(targetFit, runTime, True)
for fit in self.projectedFits: for fit in self.projectedFits:
fit.calculateModifiedAttributes(self, dirtyStorage=dirtyStorage) fit.calculateModifiedAttributes(self, withBoosters=withBoosters, dirtyStorage=dirtyStorage)
def fill(self): def fill(self):
""" """

15
service/fit.py
View File

@@ -220,7 +220,11 @@ class Fit(object):
eos.db.commit() eos.db.commit()
self.recalc(fit, withBoosters=True) self.recalc(fit, withBoosters=True)
def getFit(self, fitID): def getFit(self, fitID, projected = False):
''' Gets fit from database, and populates fleet data.
Projected is a recursion flag that is set to reduce recursions into projected fits
'''
if fitID is None: if fitID is None:
return None return None
fit = eos.db.getFit(fitID) fit = eos.db.getFit(fitID)
@@ -233,8 +237,13 @@ class Fit(object):
fit.fleet = None fit.fleet = None
else: else:
fit.fleet = f fit.fleet = f
self.recalc(fit, withBoosters=True)
fit.fill() if not projected:
for fitP in fit.projectedFits:
self.getFit(fitP.ID, projected = True)
self.recalc(fit, withBoosters=True)
fit.fill()
eos.db.commit() eos.db.commit()
fit.inited = True fit.inited = True
return fit return fit