Add proper incursion effects and do not show market group context menu on them

This commit is contained in:
DarkPhoenix
2011-11-19 19:19:37 +04:00
parent 8747be71ac
commit c2efe7832e
3 changed files with 10 additions and 6 deletions

View File

@@ -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")

View File

@@ -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

View File

@@ -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)