store fixes and probe role

nullptr/missions/__init__.py

@@ -1,6 +1,6 @@
 from nullptr.missions.survey import SurveyMission
 from nullptr.missions.mine import MiningMission
-from nullptr.missions.haul import HaulMission
+from nullptr.missions.trade import TradeMission
 from nullptr.missions.travel import TravelMission
 from nullptr.missions.probe import ProbeMission
 from nullptr.missions.idle import IdleMission
@@ -10,7 +10,7 @@ def get_mission_class( mtype):
   types = {
     'survey': SurveyMission,
     'mine': MiningMission,
-    'haul': HaulMission,
+    'trade': TradeMission,
     'travel': TravelMission,
     'probe': ProbeMission,
     'idle': IdleMission

nullptr/missions/mine.py

@@ -49,7 +49,7 @@ class MiningMission(BaseMission):
     site = self.rst(Waypoint,'site')
     # todo optimize
     for s in self.store.all(Survey):
-      if resource in s.deposits and site.symbol == s.waypoint():
+      if resource in s.deposits and site.symbol == s.waypoint:
         return s
     return None
     

nullptr/missions/trade.py

@@ -2,7 +2,7 @@ from nullptr.missions.base import BaseMission, MissionParam
 from nullptr.models.waypoint import Waypoint
 from nullptr.models.survey import Survey
 from nullptr.models.contract import Contract
-class HaulMission(BaseMission):
+class TradeMission(BaseMission):
   def start_state(self):
     return 'travel-to'