From 42e370fde564523fa13c65e7bd1e6f337d12c3a5 Mon Sep 17 00:00:00 2001 From: Richard Bronkhorst Date: Tue, 20 Jun 2023 23:12:57 +0200 Subject: [PATCH] Update commander.py and mission.py --- nullptr/commander.py | 4 ++++ nullptr/mission.py | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nullptr/commander.py b/nullptr/commander.py index 58a18dd..2d229d0 100644 --- a/nullptr/commander.py +++ b/nullptr/commander.py @@ -99,6 +99,10 @@ class Commander(CommandLine): self.set_mission(arg) self.print_mission() + def mreset(self): + if not self.has_ship(): return + self.ship.mission_state = {} + def do_mset(self, nm, val): if not self.has_ship(): return self.centcom.set_mission_param(self.ship, nm, val) diff --git a/nullptr/mission.py b/nullptr/mission.py index f14a219..a0fbb32 100644 --- a/nullptr/mission.py +++ b/nullptr/mission.py @@ -189,7 +189,8 @@ class BaseMission(Mission): else: self.api.jump(self.ship, hop) self.next_step = self.ship.cooldown - + if traject == []: + traject= None self.sts('traject', traject) return 'more' @@ -351,7 +352,7 @@ class HaulMission(BaseMission): class TravelMission(BaseMission): def start_state(self): - return 'travel' + return 'orbit' @classmethod def params(cls): @@ -361,6 +362,7 @@ class TravelMission(BaseMission): def steps(self): return { + 'orbit': (self.step_orbit, 'travel'), 'travel': (self.step_travel_dest, { 'more': 'travel', 'done': 'done'