Merge pull request #1675 from MaruMaruOO/port_bug_fix

Bug fix to set implantLocation when importing fits
This commit is contained in:
Ryan Holmes
2018-07-16 12:09:58 -04:00
committed by GitHub

View File

@@ -46,7 +46,7 @@ from eos.saveddata.fighter import Fighter
from eos.saveddata.module import Module, State, Slot from eos.saveddata.module import Module, State, Slot
from eos.saveddata.ship import Ship from eos.saveddata.ship import Ship
from eos.saveddata.citadel import Citadel from eos.saveddata.citadel import Citadel
from eos.saveddata.fit import Fit from eos.saveddata.fit import Fit, ImplantLocation
from service.market import Market from service.market import Market
from utils.strfunctions import sequential_rep, replace_ltgt from utils.strfunctions import sequential_rep, replace_ltgt
from abc import ABCMeta, abstractmethod from abc import ABCMeta, abstractmethod
@@ -306,6 +306,8 @@ class Port(object):
fit.character = sFit.character fit.character = sFit.character
fit.damagePattern = sFit.pattern fit.damagePattern = sFit.pattern
fit.targetResists = sFit.targetResists fit.targetResists = sFit.targetResists
useCharImplants = sFit.serviceFittingOptions["useCharacterImplantsByDefault"]
fit.implantLocation = ImplantLocation.CHARACTER if useCharImplants else ImplantLocation.FIT
db.save(fit) db.save(fit)
# IDs.append(fit.ID) # IDs.append(fit.ID)
if iportuser: # Pulse if iportuser: # Pulse
@@ -337,6 +339,8 @@ class Port(object):
fit.character = sFit.character fit.character = sFit.character
fit.damagePattern = sFit.pattern fit.damagePattern = sFit.pattern
fit.targetResists = sFit.targetResists fit.targetResists = sFit.targetResists
useCharImplants = sFit.serviceFittingOptions["useCharacterImplantsByDefault"]
fit.implantLocation = ImplantLocation.CHARACTER if useCharImplants else ImplantLocation.FIT
db.save(fit) db.save(fit)
return fits return fits