Update commander.py, jumpgate.py and two other files
This commit is contained in:
@@ -22,5 +22,6 @@ class Jumpgate(SystemMember):
|
||||
def f(self, detail=1):
|
||||
r = self.symbol
|
||||
if detail > 1:
|
||||
r += '\n'
|
||||
r += '\n'.join(self.systems)
|
||||
return r
|
||||
|
||||
@@ -31,6 +31,15 @@ class Marketplace(SystemMember):
|
||||
def ext(self):
|
||||
return 'mkt'
|
||||
|
||||
def rtype(self, r):
|
||||
if r in self.imports:
|
||||
return 'I'
|
||||
if r in self.exports:
|
||||
return 'E'
|
||||
if r in self.exchange:
|
||||
return 'X'
|
||||
return '?'
|
||||
|
||||
def path(self):
|
||||
sector, system, _ = self.symbol.split('-')
|
||||
return f'atlas/{sector}/{system[0:1]}/{system}/{self.symbol}.{self.ext()}'
|
||||
@@ -40,5 +49,6 @@ class Marketplace(SystemMember):
|
||||
if detail > 1:
|
||||
r += '\n'
|
||||
for p in self.prices.values():
|
||||
r += f'{p["symbol"]:25s} {p["sell"]:5d} {p["buy"]:5d}\n'
|
||||
t = self.rtype(p['symbol'])
|
||||
r += f'{t} {p["symbol"]:25s} {p["sell"]:5d} {p["buy"]:5d}\n'
|
||||
return r
|
||||
|
||||
@@ -22,3 +22,6 @@ class System(Base):
|
||||
|
||||
def distance(self, other):
|
||||
return int(sqrt((self.x - other.x) ** 2 + (self.y - other.y) ** 2))
|
||||
|
||||
def sector(self):
|
||||
return self.symbol.split('-')[0]
|
||||
|
||||
Reference in New Issue
Block a user