Sub-Space Navigation. Hazzard / Docking checking to follow. \o/

Author: soft9000

Calculators.py

@@ -13,12 +13,40 @@ def distance(x1, y1, x2, y2):
         y = y2 - y1
         return sqrt(x * x + y * y)
 
+    @staticmethod
+    def sublight_navigation(game):
+        dest_sys = game.read_xypos()
+        if not dest_sys:
+            game.display("Invalid course.")
+            game.display()
+            return
+
+        game.display()
+        game.display("Sub-light engines engaged.")
+        game.display()
+        game.game_map.go_to(dest_sys)
+
+        game.time_remaining -= 1
+        game.star_date += 1
+
+        game.enterprise.short_range_scan(game)
+
+        if game.enterprise.docked:
+            game.display("Lowering shields as part of docking sequence...")
+            game.display("Enterprise successfully docked with starbase.")
+            game.display()
+        else:
+            if game.game_map.klingons > 0:
+                ShipKlingon.attack_if_you_can(game)
+                game.display()
+            elif not game.enterprise.repair(game):
+                game.enterprise.damage(game, -1)
 
     @staticmethod
-    def navigation(game):
+    def warp_navigation(game):
         if game.enterprise.navigation_damage > 0:
             max_warp_factor = 0.2 + random.randint(0, 8) / 10.0
-            game.display("Warp engines damaged. Maximum warp factor: {0}".format(max_warp_factor))
+            game.display(f"Warp engines damaged. Maximum warp factor: {max_warp_factor}")
             game.display()
 
         dest_sys = game.read_sector()
@@ -53,7 +81,7 @@ def navigation(game):
             game.display()
         else:
             if game.game_map.klingons > 0:
-                ShipKlingon.attack(game)
+                ShipKlingon.attack_if_you_can(game)
                 game.display()
             elif not game.enterprise.repair(game):
                 game.enterprise.damage(game, -1)

Console.py

@@ -43,6 +43,10 @@ def read_nav(self, prompt= "Helm: sector 1-64, a-h, 1-8?"):
         text = input(prompt + ': ')
         return Destination.parse_sector(text)
 
+    def read_xypos(self, prompt= "Helm: a-h, 1-8?"):
+        text = input(prompt + ': ')
+        return Destination.parse_xypos(text)
+
 
 if __name__ == '__main__':
     con = Con()

Controls.py

@@ -75,7 +75,7 @@ def phasers(game):
         game.game_map.remove_items(destroyed_ships)
         if game.game_map.klingons > 0:
             game.display()
-            ShipKlingon.attack(game)
+            ShipKlingon.attack_if_you_can(game)
         game.display()
 
 
@@ -165,7 +165,7 @@ def torpedos(game):
             game.display("Torpedo missed.")
         if len(game.game_map.get_area_klingons()) > 0:
             game.display()
-            ShipKlingon.attack(game)
+            ShipKlingon.attack_if_you_can(game)
         game.display()
 
 

MapGame.py

@@ -55,7 +55,7 @@ def place(self, takers):
             takers[which] -= taken
         return tuple(takers)
 
-    def enterprise_in(self, glyph, dest=None):
+    def enterprise_in(self, dest=None):
         ''' Place the ENTERPRISE at the destination, else a 
         random one. Return the x, y location - else False '''
         area = self.area()
@@ -209,10 +209,14 @@ def random_jump(self):
     def go_to(self, dest):
         if self.last_nav:
             self.enterprise_out()
-        assert(isinstance(self.sector, int))
-        self.sector = dest.sector
-        self.xpos = dest.xpos
-        self.ypos = dest.ypos
+        if dest.sector > 0:
+            self.sector = dest.sector
+        if dest.xpos != -1:
+            self.xpos = dest.xpos
+            self.ypos = dest.ypos
+        dest.sector = self.sector
+        dest.xpos = self.xpos
+        dest.ypos = self.ypos
         self.enterprise_in(dest)
         self.last_nav = dest
 

MapSparse.py

@@ -131,7 +131,7 @@ def place_glyph(self, glyph, dest=None):
                         self.plot_glyph(xpos, ypos, glyph)
                         return xpos, ypos                    
             else:
-                self.plot_glyph(xpos, ypos, glyph)
+                self.plot_glyph(dest.xpos, dest.ypos, glyph)
             return dest.xpos, dest.ypos
 
         @staticmethod

Points.py

@@ -3,6 +3,13 @@
 class Destination():
     ''' Zero based, Map navigation '''
     def __init__(self, sector=-1, xpos=-1, ypos=-1, warp=0):
+        if sector > 64: sector = 64 # zOuter Limits =)
+        if xpos > 7:  xpos = 7
+        if ypos > 7:  ypos = 7
+        if xpos < 0:  xpos = 0
+        if ypos < 0:  ypos = 0
+        if warp > 10: warp = 10
+        if warp < 0:  warp = 0
         self.warp = warp
         self.sector = sector
         self.xpos = xpos

Quadrant.py

@@ -54,6 +54,7 @@ def display_area(game, quad):
                 sb += col
             sb += info[row]
         sb += f"    -=--=--=--=--=--=--=--=-             Docked: {game.enterprise.docked}\n"
+        sb +=  "     a  b  c  d  e  f  g  h \n"
         print(sb, end='')
 
         if quad.klingons > 0:

ShipKlingon.py

@@ -18,7 +18,10 @@ def from_map(self, xpos, ypos):
         self.shield_level = 300 + random.randint(0, 199)
 
     @staticmethod
-    def attack(game):
+    def attack_if_you_can(game):
+        '''
+        IF you ever find yourself in the AREA, then have at USS?
+        '''
         if game.is_testing:
             return False
         from Calculators import Calc

StarTrek2020.py

@@ -32,6 +32,9 @@ def run(self):
         aliens    = random.randrange(12, 16)
         starbases = random.randrange(6, 8)
         game.game_map.randomize(starbases, stars, aliens)
+        dest = Destination(64, 5, 5)
+        game.game_map.go_to(dest)
+        game.game_map.get_area(64).name = 'Outer Limits'
         self.print_mission()
 
         self.show_strings(TrekStrings.HELM_CMDS)
@@ -47,8 +50,12 @@ def run(self):
     def command_prompt(self):
         command = self.read("Enter command: ").strip().lower()
         self.display()
-        if command == "nav":
-            Calc.navigation(game)
+        if command == "nav": # force of habbit?
+            Calc.warp_navigation(game)
+        if command == "wsn":
+            Calc.warp_navigation(game)
+        if command == "ssn":
+            Calc.sublight_navigation(game)
         elif command == "srs":
             game.enterprise.short_range_scan(game)
         elif command == "lrs":

TrekStrings.py

@@ -98,7 +98,8 @@
 
 HELM_CMDS = [
     "--- Commands -----------------",
-    "nav = Navigation",
+    "wsn = Warp Speed Navigator",
+    "ssn = Sublight Speed Navigator",
     "srs = Short Range Scan",
     "lrs = Long Range Scan",
     "pha = Phaser Control",