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

Merge branch 'master' into efs_port

Browse Source
This commit is contained in:
MaruMaruOO
2018-07-17 03:06:34 -04:00
parent b1f1db1bee df75646766
commit fe43c2ee2e
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.py
View File

@@ -24,7 +24,7 @@ saveInRoot = False
# Version data # Version data
version = "2.3.0" version = "2.3.1"
tag = "Stable" tag = "Stable"
expansionName = "YC120.7" expansionName = "YC120.7"
expansionVersion = "1.2" expansionVersion = "1.2"

2
gui/bitmap_loader.py
View File

@@ -49,7 +49,7 @@ class BitmapLoader(object):
@classmethod @classmethod
def getStaticBitmap(cls, name, parent, location): def getStaticBitmap(cls, name, parent, location):
static = wx.StaticBitmap(parent) static = wx.StaticBitmap(parent)
static.SetBitmap(cls.getBitmap(name, location)) static.SetBitmap(cls.getBitmap(name or 0, location))
return static return static
@classmethod @classmethod

6
service/port.py
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