From c2efe7832eceba1de575a8d5ffa4ff84779024a9 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 19 Nov 2011 19:19:37 +0400 Subject: [PATCH] Add proper incursion effects and do not show market group context menu on them --- gui/builtinContextMenus/marketJump.py | 10 +++++++--- gui/builtinContextMenus/whProjector.py | 2 +- service/market.py | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gui/builtinContextMenus/marketJump.py b/gui/builtinContextMenus/marketJump.py index c86e42c13..2a2e8c29c 100644 --- a/gui/builtinContextMenus/marketJump.py +++ b/gui/builtinContextMenus/marketJump.py @@ -8,9 +8,13 @@ class MarketJump(ContextMenu): self.mainFrame = gui.mainFrame.MainFrame.getInstance() def display(self, srcContext, selection): - return srcContext in ("marketItemMisc", "fittingModule", "fittingCharge", "droneItem", - "implantItem", "boosterItem", "projectedModule", "projectedDrone", "projectedCharge") \ - and (not selection[0].isEmpty if srcContext == "fittingModule" else True) + validContexts = ("marketItemMisc", "fittingModule", "fittingCharge", "droneItem", "implantItem", + "boosterItem", "projectedModule", "projectedDrone", "projectedCharge") + sMkt = service.Market.getInstance() + item = getattr(selection[0], "item", selection[0]) + doit = srcContext in validContexts and (not selection[0].isEmpty if srcContext == "fittingModule" else True) \ + and sMkt.getMarketGroupByItem(item) is not None + return doit def getText(self, itmContext, selection): return "{0} Market Group".format(itmContext if itmContext is not None else "Item") diff --git a/gui/builtinContextMenus/whProjector.py b/gui/builtinContextMenus/whProjector.py index 1ecf17de4..bf5696252 100644 --- a/gui/builtinContextMenus/whProjector.py +++ b/gui/builtinContextMenus/whProjector.py @@ -12,7 +12,7 @@ class WhProjector(ContextMenu): return srcContext in ("projectedDrone", "projectedModule", "projectedCharge", "projectedFit", "projectedNone") def getText(self, itmContext, selection): - return "System effects" + return "Add System Effects" def activate(self, fullContext, selection, i): pass diff --git a/service/market.py b/service/market.py index 011c35550..2e33a8dce 100644 --- a/service/market.py +++ b/service/market.py @@ -682,9 +682,9 @@ class Market(): "Pulsar Effect Beacon", "Red Giant Beacon", "Wolf Rayet Effect Beacon", - "Incursion Effect") + "Incursion ship attributes effects") # Stuff we don't want to see in names - garbages = ("Effect", "Beacon") + garbages = ("Effect", "Beacon", "ship attributes effects") # Get group with all the system-wide beacons grp = self.getGroup("Effect Beacon") beacons = self.getItemsByGroup(grp)