Update api.py, commander.py and six other files

This commit is contained in:
Richard Bronkhorst
2023-06-17 14:59:52 +02:00
parent bb93950fa3
commit b5850bcb5f
8 changed files with 92 additions and 13 deletions

View File

@@ -25,7 +25,7 @@ class Contract(Base):
def api_dict(self):
return {
'id': self.symbol,
'id': self.symbol.lower(),
'expiration': self.expires_str,
}

View File

@@ -4,7 +4,7 @@ from dataclasses import field
class Jumpgate(SystemMember):
range: int
faction: str
systems: list = field(default_factory=list)
systems: list = []
def update(self, d):
self.setlst('systems', d, 'connectedSystems', 'symbol')
@@ -18,3 +18,9 @@ class Jumpgate(SystemMember):
def path(self):
sector, system, _ = self.symbol.split('-')
return f'atlas/{sector}/{system[0:1]}/{system}/{self.symbol}.{self.ext()}'
def f(self, detail=1):
r = self.symbol
if detail > 1:
r += '\n'.join(self.systems)
return r

View File

@@ -5,10 +5,10 @@ from nullptr.util import *
from dataclasses import field
class Marketplace(SystemMember):
imports:list = field(default_factory=list)
exports:list = field(default_factory=list)
exchange:list = field(default_factory=list)
prices:dict = field(default_factory=dict)
imports:list = []
exports:list = []
exchange:list = []
prices:dict = {}
last_prices:int = 0
def update(self, d):

View File

@@ -5,7 +5,7 @@ from dataclasses import dataclass, field
class Ship(Base):
cargo:dict = {}
mission_state:dict = field(default_factory=dict)
mission_state:dict = {}
status:str = ''
cargo_capacity:int = 0
cargo_units:int = 0

View File

@@ -6,7 +6,7 @@ class Waypoint(SystemMember):
x:int = 0
y:int = 0
type:str = 'unknown'
traits:list = field(default_factory=list)
traits:list = []
faction:str = ''
def update(self, d):