richard/0ptr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fly me to the moon!

Browse Source
This commit is contained in:
Richard Bronkhorst
2023-07-12 22:26:25 +02:00
parent 00db50687a
commit 3d3ceeab91
7 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nullptr/missions/base.py
View File

@@ -188,7 +188,7 @@ class BaseMission(Mission):
self.sts('traject', None)
return 'done'
hop = traject.pop(0)
if len(hop.split('-')) == 3:
if type(hop) == Waypoint:
self.api.navigate(self.ship, hop)
self.next_step = self.ship.arrival
else:
@@ -205,17 +205,18 @@ class BaseMission(Mission):
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
dest_jg = self.analyzer.get_jumpgate(dest_sys)
if dest_sys == loc_sys:
result = [dest.symbol]
result = [dest]
self.sts('traject', result)
return
path = self.analyzer.find_path(loc_sys, dest_sys)
result = []
if loc.symbol != loc_jg.symbol:
result.append(loc_jg)
result += [s.symbol for s in path[1:]]
result.append(loc_jg_wp)
result += [s for s in path[1:]]
if dest_jg.symbol != dest.symbol:
result.append(dest)
self.sts('traject', result)