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

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)

Browse Source
This commit is contained in:
blitzmann
2017-10-28 19:17:41 -04:00
parent 3b61a07c55
commit 266b3ce985
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/shipBrowser.py
View File

@@ -378,6 +378,10 @@ class ShipBrowser(wx.Panel):
for ID, name, shipID, shipName, booster, timestamp, notes in fitList: for ID, name, shipID, shipName, booster, timestamp, notes in fitList:
ship = sMkt.getItem(shipID) 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 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)) self.lpane.AddWidget(FitItem(self.lpane, ID, (shipName, shipTrait, name, booster, timestamp, notes), shipID))

4
service/market.py
View File

@@ -203,6 +203,8 @@ class Market(object):
"Fiend" : self.les_grp, # AT13 prize "Fiend" : self.les_grp, # AT13 prize
"Caedes" : self.les_grp, # AT14 prize "Caedes" : self.les_grp, # AT14 prize
"Rabisu" : 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) self.ITEMS_FORCEGROUP_R = self.__makeRevDict(self.ITEMS_FORCEGROUP)
@@ -226,6 +228,8 @@ class Market(object):
"Guristas Shuttle" : False, "Guristas Shuttle" : False,
"Mobile Decoy Unit" : False, # Seems to be left over test mod for deployables "Mobile Decoy Unit" : False, # Seems to be left over test mod for deployables
"Tournament Micro Jump Unit" : False, # Normally seen only on tournament arenas "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 # do not publish ships that we convert