Skip to content

add prices to market items #2277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add prices to market items #2277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion gui/builtinMarketBrowser/itemView.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ class ItemView(Display):
DEFAULT_COLS = ["Base Icon",
"Base Name",
"attr:power,,,True",
"attr:cpu,,,True"]
"attr:cpu,,,True",
"Price"]

def __init__(self, parent, marketBrowser):
Display.__init__(self, parent, style=wx.LC_SINGLE_SEL)
Expand Down
9 changes: 6 additions & 3 deletions gui/builtinViewColumns/price.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from eos.saveddata.drone import Drone
from eos.saveddata.fighter import Fighter
from eos.saveddata.module import Module
from eos.gamedata import Item
from eos.saveddata.price import PriceStatus
from gui.bitmap_loader import BitmapLoader
from gui.utils.numberFormatter import formatAmount
Expand Down Expand Up @@ -53,7 +54,7 @@ def __init__(self, fittingView, params):
self.imageId = fittingView.imageList.GetImageIndex("totalPrice_small", "gui")

def getText(self, stuff):
if stuff.item is None or stuff.item.group.name == "Ship Modifiers":
if not isinstance(stuff, Item) and (stuff.item is None or stuff.item.group.name == "Ship Modifiers"):
return ""

if hasattr(stuff, "isEmpty"):
Expand All @@ -63,7 +64,7 @@ def getText(self, stuff):
if isinstance(stuff, Module) and stuff.isMutated:
return ""

priceObj = stuff.item.price
priceObj = stuff.price if isinstance(stuff, Item) else stuff.item.price

if not priceObj.isValid():
return False
Expand All @@ -79,7 +80,9 @@ def callback(item):

display.SetItem(colItem)

sPrice.getPrices([mod.item], callback, waitforthread=True)
item = mod if isinstance(mod, Item) else mod.item
wait = not isinstance(mod, Item)
sPrice.getPrices([item], callback, waitforthread=wait)

def getImageId(self, mod):
return -1
Expand Down