From 266b3ce98502fb5a4e1282a56b6883d9dc4ad366 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sat, 28 Oct 2017 19:17:41 -0400 Subject: [PATCH] Set Victor and Virtuso to not published, and fix bug which allowed user fits to return in search even if ship isn't published (#1310) --- gui/shipBrowser.py | 4 ++++ service/market.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 5eea8029b..935797718 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -378,6 +378,10 @@ class ShipBrowser(wx.Panel): for ID, name, shipID, shipName, booster, timestamp, notes in fitList: ship = sMkt.getItem(shipID) + + if not sMkt.getPublicityByItem(ship): + continue + shipTrait = ship.traits.traitText if (ship.traits is not None) else "" # empty string if no traits self.lpane.AddWidget(FitItem(self.lpane, ID, (shipName, shipTrait, name, booster, timestamp, notes), shipID)) diff --git a/service/market.py b/service/market.py index 0e8205b98..962094b4a 100644 --- a/service/market.py +++ b/service/market.py @@ -203,6 +203,8 @@ class Market(object): "Fiend" : self.les_grp, # AT13 prize "Caedes" : self.les_grp, # AT14 prize "Rabisu" : self.les_grp, # AT14 prize + "Victor" : self.les_grp, # AT prize + "Virtuoso" : self.les_grp, # AT prize } self.ITEMS_FORCEGROUP_R = self.__makeRevDict(self.ITEMS_FORCEGROUP) @@ -226,6 +228,8 @@ class Market(object): "Guristas Shuttle" : False, "Mobile Decoy Unit" : False, # Seems to be left over test mod for deployables "Tournament Micro Jump Unit" : False, # Normally seen only on tournament arenas + "Victor": False, # See GH Issue 1323 + "Virtuoso": False, # See GH Issue 1323 } # do not publish ships that we convert