Compare commits
No commits in common. "293b6d1c3ee467378db6e929a4158425b2cbb112" and "2e45acc51336cb448b7acce4fbfa96552f46d989" have entirely different histories.
293b6d1c3e
...
2e45acc513
@ -107,10 +107,7 @@ class Commander(CommandLine):
|
|||||||
if w.type == 'ASTEROID_FIELD':
|
if w.type == 'ASTEROID_FIELD':
|
||||||
traits.append('ASTROIDS')
|
traits.append('ASTROIDS')
|
||||||
print(w.symbol.split('-')[2], ', '.join(traits))
|
print(w.symbol.split('-')[2], ', '.join(traits))
|
||||||
|
|
||||||
def do_wp(self, s=''):
|
|
||||||
self.do_waypoints(s)
|
|
||||||
|
|
||||||
def do_marketplace(self, waypoint_str):
|
def do_marketplace(self, waypoint_str):
|
||||||
waypoint = self.store.get(Waypoint, waypoint_str.upper())
|
waypoint = self.store.get(Waypoint, waypoint_str.upper())
|
||||||
r = self.api.marketplace(waypoint)
|
r = self.api.marketplace(waypoint)
|
||||||
@ -242,9 +239,6 @@ class Commander(CommandLine):
|
|||||||
|
|
||||||
def do_jump(self, system_str):
|
def do_jump(self, system_str):
|
||||||
if not self.has_ship(): return
|
if not self.has_ship(): return
|
||||||
if '-' not in system_str:
|
|
||||||
sector = self.ship.location_str.split('-')[0]
|
|
||||||
system_str = f'{sector}-{system_str}'
|
|
||||||
system = self.resolve('System', system_str)
|
system = self.resolve('System', system_str)
|
||||||
self.api.jump(self.ship, system)
|
self.api.jump(self.ship, system)
|
||||||
pprint(self.ship)
|
pprint(self.ship)
|
||||||
|
@ -22,6 +22,5 @@ class Jumpgate(SystemMember):
|
|||||||
def f(self, detail=1):
|
def f(self, detail=1):
|
||||||
r = self.symbol
|
r = self.symbol
|
||||||
if detail > 1:
|
if detail > 1:
|
||||||
r += '\n'
|
|
||||||
r += '\n'.join(self.systems)
|
r += '\n'.join(self.systems)
|
||||||
return r
|
return r
|
||||||
|
@ -31,15 +31,6 @@ class Marketplace(SystemMember):
|
|||||||
def ext(self):
|
def ext(self):
|
||||||
return 'mkt'
|
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):
|
def path(self):
|
||||||
sector, system, _ = self.symbol.split('-')
|
sector, system, _ = self.symbol.split('-')
|
||||||
return f'atlas/{sector}/{system[0:1]}/{system}/{self.symbol}.{self.ext()}'
|
return f'atlas/{sector}/{system[0:1]}/{system}/{self.symbol}.{self.ext()}'
|
||||||
@ -49,6 +40,5 @@ class Marketplace(SystemMember):
|
|||||||
if detail > 1:
|
if detail > 1:
|
||||||
r += '\n'
|
r += '\n'
|
||||||
for p in self.prices.values():
|
for p in self.prices.values():
|
||||||
t = self.rtype(p['symbol'])
|
r += f'{p["symbol"]:25s} {p["sell"]:5d} {p["buy"]:5d}\n'
|
||||||
r += f'{t} {p["symbol"]:25s} {p["sell"]:5d} {p["buy"]:5d}\n'
|
|
||||||
return r
|
return r
|
||||||
|
@ -22,6 +22,3 @@ class System(Base):
|
|||||||
|
|
||||||
def distance(self, other):
|
def distance(self, other):
|
||||||
return int(sqrt((self.x - other.x) ** 2 + (self.y - other.y) ** 2))
|
return int(sqrt((self.x - other.x) ** 2 + (self.y - other.y) ** 2))
|
||||||
|
|
||||||
def sector(self):
|
|
||||||
return self.symbol.split('-')[0]
|
|
||||||
|
Loading…
Reference in New Issue
Block a user