|
@@ -608,10 +608,8 @@ class ScriptPort(object):
|
|
|
)
|
|
|
|
|
|
self.queue_game.put(self.r + self.nl + "Trading {0}".format(
|
|
|
- GameData.port_show(self.this_sector,
|
|
|
- self.game.gamedata.ports[self.this_sector],
|
|
|
- self.sector2,
|
|
|
- self.game.gamedata.ports[self.sector2])
|
|
|
+ self.game.gamedata.port_trade_show(self.this_sector,
|
|
|
+ self.sector2)
|
|
|
))
|
|
|
|
|
|
# The code is smart enough now, that this can't happen. :( Drat!
|
|
@@ -854,7 +852,7 @@ class ScriptPort(object):
|
|
|
self.deactivate()
|
|
|
return
|
|
|
|
|
|
- possible = [ x for x in possible if port_trading(self.game.gamedata.ports[self.this_sector]['port'], self.game.gamedata.ports[x]['port'])]
|
|
|
+ possible = [ x for x in possible if GameData.port_trading(self.game.gamedata.ports[self.this_sector]['port'], self.game.gamedata.ports[x]['port'])]
|
|
|
self.possible = possible
|
|
|
|
|
|
if len(possible) == 0:
|