A more classic - yet improved - LRS

Author: soft9000

ErrorCollision.py

@@ -1,6 +1,6 @@
 class ErrorEnterpriseCollision(Exception):
     '''
-    ... because some problems simpy have to wait ... =)
+    ... because some problems simply have to wait ... =)
     '''
     def __init__(self, glyph):
         super().__init__()

ShipEnterprise.py

@@ -2,6 +2,7 @@
 from AbsShip import AbsShip
 from ShipStarbase import ShipStarbase
 from Quadrant import Quadrant
+import Glyphs
 
 class ShipEnterprise(AbsShip):
 
@@ -120,26 +121,27 @@ def long_range_scan(self, game):
             game.display(Quips.jibe_damage('Long Ranged Scanners'))
             game.display()
             return
-        sb = ""
+
         pw_sector = game.game_map.sector
-        if pw_sector < 5:
-            pw_sector = 6
-        elif pw_sector > 59:
-            pw_sector = 59
-        dots = None
-        for peek in range(pw_sector-5, pw_sector + 6):
+        if pw_sector < 4:
+            pw_sector = 5
+        elif pw_sector > 60:
+            pw_sector = 60
+        lines = []
+        for peek in range(pw_sector-4, pw_sector + 5):
             quad = game.game_map.scan_quad(peek)
-            lines = \
-                (f"| Sector: {quad.number:>02}",
-                f"Enemies: {quad.klingons:>02}",
-                f"Bases: {quad.starbases:>02}",
-                f"Stars: {quad.stars:>03} |")
-            str_ = ' | '.join(lines)
-            dots = '-' * len(str_) + "\n"
-            sb += dots
-            sb += str_
-            game.display(sb)
-            sb = ""
+            lines.append(f"SEC: {quad.number:>03}")
+            lines.append(f"{Glyphs.KLINGON}: {quad.klingons:>03}")
+            lines.append(f"{Glyphs.STARBASE}: {quad.starbases:>03}")
+            lines.append(f"{Glyphs.STAR}: {quad.stars:>03}")
+        dots = '     +' + ('-' * 35) + '+'
+        game.display(dots)
+        game.display('     |          LONG RANGE SCAN          |')
         game.display(dots)
+        for ss in range(0,(len(lines)-1),12):
+            for offs in range(4):
+                line = f'     | {lines[ss+offs]:<9} | {lines[ss+4+offs]:<9} | {lines[ss+8+offs]:<9} |'
+                game.display(line)
+            game.display(dots)
         game.display()
 

StarTrek2020.py

@@ -76,11 +76,9 @@ def run(self):
     def command_prompt(self):
         command = self.read("Enter command: ").strip().lower()
         self.display()
-        if command == "nav": # force of habit?
+        if command == "nav":
             Calc.warp_navigation(game)
-        if command == "wsn":
-            Calc.warp_navigation(game)
-        if command == "ssn":
+        if command == "sub":
             Calc.sublight_navigation(game)
         elif command == "srs":
             game.enterprise.short_range_scan(game)

TrekStrings.py

@@ -98,11 +98,9 @@
 
 HELM_CMDS = [
     "--- Commands -----------------",
-    "nav = Warp Speed      srs = Short Range Scan",
-    "sub = Sublight Speed  lrs = Long Range Scan",
-    "pha = Phasers         tor = Photon Torpedos",
-    "she = Shields         com = Access Computer",
-    "qui = Quit",
+    "nav = Warp Speed      srs = Short Range Scan  tor = Photon Torpedos",
+    "sub = Sublight Speed  lrs = Long Range Scan   pha = Phasers",
+    "qui = Quit            com = Access Computer   she = Shields",
     ]
 
 CPU_CMDS = [