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

Merge tag 'v2.0.1' into singularity (bring sisi code up to date with pyfa 2 / py3 / wx4)

Browse Source 
# Conflicts:
#	eos/effects/techtwocommandburstbonus.py
This commit is contained in:
blitzmann
2018-05-15 01:17:51 -04:00
parent df24313bcf 9bb83d4574
commit deecfb31dc
258 changed files with 6365 additions and 9307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/builtinViewColumns/ammo.py
View File

@@ -21,7 +21,7 @@
import wx
from eos.saveddata.fighter import Fighter
from gui.viewColumn import ViewColumn
from gui.bitmapLoader import BitmapLoader
from gui.bitmap_loader import BitmapLoader
class Ammo(ViewColumn):

11
gui/builtinViewColumns/attributeDisplay.py
View File

@@ -21,7 +21,7 @@
import wx
from gui.viewColumn import ViewColumn
from gui.bitmapLoader import BitmapLoader
from gui.bitmap_loader import BitmapLoader
from gui.utils.numberFormatter import formatAmount
from service.attribute import Attribute
@@ -72,7 +72,7 @@ class AttributeDisplay(ViewColumn):
def getText(self, mod):
if hasattr(mod, "item"):
attr = mod.getModifiedItemAttr(self.info.name)
attr = mod.getModifiedItemAttr(self.info.name, None)
else:
if self.direct:
info = self.directInfo
@@ -80,16 +80,19 @@ class AttributeDisplay(ViewColumn):
else:
attr = mod.getAttribute(self.info.name)
if attr is None:
return ""
if self.info.name == "volume":
str_ = (formatAmount(attr, 3, 0, 3))
if hasattr(mod, "amount"):
str_ += u"m\u00B3 (%s m\u00B3)" % (formatAmount(attr * mod.amount, 3, 0, 3))
str_ += "m\u00B3 (%s m\u00B3)" % (formatAmount(attr * mod.amount, 3, 0, 3))
attr = str_
if isinstance(attr, (float, int)):
attr = (formatAmount(attr, 3, 0, 3))
return attr if attr is not None else ""
return attr
def getImageId(self, mod):
return -1

6
gui/builtinViewColumns/baseName.py
View File

@@ -71,9 +71,9 @@ class BaseName(ViewColumn):
elif isinstance(stuff, Rack):
if FitSvc.getInstance().serviceFittingOptions["rackLabels"]:
if stuff.slot == Slot.MODE:
return u'─ Tactical Mode ─'
return '─ Tactical Mode ─'
else:
return u'─ {} Slots ─'.format(Slot.getName(stuff.slot).capitalize())
return '─ {} Slots ─'.format(Slot.getName(stuff.slot).capitalize())
else:
return ""
elif isinstance(stuff, Module):
@@ -91,7 +91,7 @@ class BaseName(ViewColumn):
if marketShortcut:
# use unicode subscript to display shortcut value
shortcut = unichr(marketShortcut + 8320) + u" "
shortcut = chr(marketShortcut + 8320) + " "
del item.marketShortcut
return shortcut + item.name

2
gui/builtinViewColumns/capacitorUse.py
View File

@@ -24,7 +24,7 @@ from eos.saveddata.mode import Mode
from service.attribute import Attribute
from gui.utils.numberFormatter import formatAmount
from gui.viewColumn import ViewColumn
from gui.bitmapLoader import BitmapLoader
from gui.bitmap_loader import BitmapLoader
class CapacitorUse(ViewColumn):

4
gui/builtinViewColumns/maxRange.py
View File

@@ -23,7 +23,7 @@ import wx
from eos.saveddata.mode import Mode
from service.attribute import Attribute
from gui.viewColumn import ViewColumn
from gui.bitmapLoader import BitmapLoader
from gui.bitmap_loader import BitmapLoader
from gui.utils.numberFormatter import formatAmount
@@ -58,7 +58,7 @@ class MaxRange(ViewColumn):
if isinstance(stuff, Mode):
return ""
maxRange = stuff.maxRange if hasattr(stuff, "maxRange") else stuff.getModifiedItemAttr("maxRange")
maxRange = stuff.maxRange if hasattr(stuff, "maxRange") else stuff.getModifiedItemAttr("maxRange", None)
falloff = stuff.falloff
if falloff:
falloff = "+%sm" % formatAmount(falloff, 3, 0, 3)

10
gui/builtinViewColumns/misc.py
View File

@@ -24,7 +24,7 @@ from service.fit import Fit
from service.market import Market
import gui.mainFrame
from gui.viewColumn import ViewColumn
from gui.bitmapLoader import BitmapLoader
from gui.bitmap_loader import BitmapLoader
from gui.utils.numberFormatter import formatAmount
from gui.utils.listFormatter import formatList
from eos.saveddata.drone import Drone
@@ -223,7 +223,7 @@ class Miscellanea(ViewColumn):
"falloff range": falloffRangeBonus,
"tracking speed": trackingSpeedBonus}
isTrackingDisruptor = any(map(lambda x: x is not None and x != 0, trackingDisruptorAttributes.values()))
isTrackingDisruptor = any([x is not None and x != 0 for x in list(trackingDisruptorAttributes.values())])
# Then get the attributes for guidance disruptors
explosionVelocityBonus = stuff.getModifiedItemAttr("aoeVelocityBonus")
@@ -238,7 +238,7 @@ class Miscellanea(ViewColumn):
"flight time": flightTimeBonus,
"missile velocity": missileVelocityBonus}
isGuidanceDisruptor = any(map(lambda x: x is not None and x != 0, guidanceDisruptorAttributes.values()))
isGuidanceDisruptor = any([x is not None and x != 0 for x in list(guidanceDisruptorAttributes.values())])
if isTrackingDisruptor:
attributes = trackingDisruptorAttributes
@@ -247,12 +247,12 @@ class Miscellanea(ViewColumn):
else:
return "", None
display = max(attributes.values(), key=lambda x: abs(x))
display = max(list(attributes.values()), key=lambda x: abs(x))
text = "{0}%".format(formatAmount(display, 3, 0, 3, forceSign=True))
ttEntries = []
for attributeName, attributeValue in attributes.items():
for attributeName, attributeValue in list(attributes.items()):
if attributeValue == display:
ttEntries.append(attributeName)

2
gui/builtinViewColumns/price.py
View File

@@ -24,7 +24,7 @@ from eos.saveddata.cargo import Cargo
from eos.saveddata.drone import Drone
from service.price import Price as ServicePrice
from gui.viewColumn import ViewColumn
from gui.bitmapLoader import BitmapLoader
from gui.bitmap_loader import BitmapLoader
from gui.utils.numberFormatter import formatAmount