improving haulers

nullptr/models/base.py

@@ -57,6 +57,9 @@ class Base:
         val = interp(val)
       setattr(self, attr, val)
   
+  def __lt__(self, o):
+    return self.symbol < o.symbol
+    
   def setlst(self, attr, d, name, member=None, interp=None):
     val = sg(d, name)
     if val is not None:

nullptr/models/marketplace.py

@@ -19,6 +19,9 @@ class Marketplace(Base):
     waypoint = self.store.get(Waypoint, self.symbol, create=True)
     self.waypoint = waypoint
   
+  def is_fuel(self):
+    return self.imports + self.exports + self.exchange == ['FUEL']
+    
   def update(self, d):
     self.setlst('imports', d, 'imports', 'symbol')
     self.setlst('exports', d, 'exports', 'symbol')
@@ -40,6 +43,11 @@ class Marketplace(Base):
     if resource not in self.prices:
       return None
     return self.prices[resource]['buy']
+  
+  def volume(self, resource):
+    if resource not in self.prices:
+      return None
+    return self.prices[resource]['volume']
     
   def sellable_items(self, resources):
     return [r for r in resources if r in self.prices]

nullptr/models/ship.py

@@ -23,6 +23,11 @@ class Ship(Base):
   def ext(self):
     return 'shp'
   
+  def range(self):
+    if self.fuel_capacity == 0:
+      return 100000
+    return self.fuel_capacity
+    
   def update(self, d):
     self.seta('status', d, 'nav.status')
     getter = self.store.getter(Waypoint, create=True)