mission and cli improvements

nullptr/missions/base.py

@@ -148,10 +148,10 @@ class BaseMission(Mission):
     self.next_step = self.ship.arrival
     
   def step_unload(self):
-    contract = self.rst(Contract, 'contract')
     delivery = self.st('delivery')
     if delivery == 'sell':
       return self.step_sell(False)
+    contract = self.rst(Contract, 'contract') 
     typs = self.ship.deliverable_cargo(contract)
     if len(typs) == 0:
       return 'done'
@@ -206,6 +206,7 @@ class BaseMission(Mission):
       dest = self.store.get(Waypoint, dest)
     loc = self.ship.location
     loc_sys = loc.system
+    
     loc_jg = self.analyzer.get_jumpgate(loc_sys)
     loc_jg_wp = self.store.get(Waypoint, loc_jg.symbol)
     dest_sys = dest.system