Added a distance-based cost for sublight navigation.

Author: soft9000

Calculators.py

@@ -45,8 +45,18 @@ def sublight_navigation(game):
             game.display()
             return
 
+
+        dist = Calc.distance(game.game_map.xpos, game.game_map.ypos,
+                             dest_sys.xpos, dest_sys.ypos)
+        energy_required = int(dist)
+        if energy_required >= game.enterprise.energy:
+            game.display("Insufficient energy move to that location.")
+            game.display()
+            return
+
         game.display()
         game.display("Sub-light engines engaged.")
+        game.enterprise.energy -= energy_required
         game.display()
         game.move_to(dest_sys)
 
@@ -81,6 +91,9 @@ def warp_navigation(game):
 
         game.display()
 
+        if dest_sys.warp < 1:
+            dest_sys.warp = 1
+
         dist = dest_sys.warp * 8
         energy_required = int(dist)
         if energy_required >= game.enterprise.energy:

Controls.py

@@ -39,7 +39,7 @@ def computer(game):
     @staticmethod
     def phasers(game):
         if game.enterprise.phaser_damage > 0:
-            game.display(Quips.jibe_damage("phasers"))
+            game.display(Quips.jibe_damage("phaser"))
             game.display()
             return
         kships = game.game_map.get_area_klingons()

MapGame.py

@@ -22,7 +22,7 @@ def __init__(self):
         self.game_stars      = -1
         self.game_klingons   = -1
         self.game_starbases  = -1
-        self.last_nav = None
+        self.last_nav = Dest()
 
     def place(self, takers):
         ''' 
@@ -251,29 +251,34 @@ def _go_to(self, dest):
         ''' 
         Either a WARP ~or~ a SUBSPACE destination is ok.
         Place the main player (Enterprise, for now) into the Area.
-        Returns the final, effective, player location.
+        Returns the final, effective, arrival Dest().
         '''
         if not dest:
             return
-        if self.last_nav:
+        if not self.last_nav.is_null():
             self.enterprise_out()
         pos = None
         if isinstance(dest, WarpDest):
             if dest.sector > 0:
                 self.sector = dest.sector
             dest.sector = self.sector
             pos = self.enterprise_in() # SAFE WARP-IN!
+            self.last_nav.sector = dest.sector
+            self.last_nav.warp = dest.warp
         else:
             if dest.xpos != -1:
                 self.xpos = dest.xpos
                 self.ypos = dest.ypos
             dest.xpos = self.xpos
             dest.ypos = self.ypos
             pos = self.enterprise_in(dest) # CAPIN' KNOWS BEST?
-        self.xpos = dest.xpos = pos[0]
-        self.ypos = dest.ypos = pos[1]
-        self.last_nav = dest
-        return dest
+            dest.xpos = pos[0]
+            dest.ypos = pos[1]
+        self.xpos = pos[0]
+        self.ypos = pos[1]
+        self.last_nav.xpos = pos[0]
+        self.last_nav.ypos = pos[1]
+        return self.last_nav.clone()
 
     def randomize(self, bases=None, stars=None, aliens=None)->None:
         '''

Points.py

@@ -73,3 +73,36 @@ def parse(dest, sep=','):
                 pass
         return None
 
+
+class Dest(WarpDest, SubDest):
+
+    def __init__(self):
+        WarpDest.__init__(self)
+        SubDest.__init__(self)
+
+    def is_null(self):
+        return self.xpos == 0 and \
+            self.sector == -1
+
+    def clone(self):
+        result = Dest()
+        result.xpos = self.xpos
+        result.ypos = self.ypos
+        result.sector = self.sector
+        result.warp = self.warp
+        return result
+
+
+if __name__ == '__main__':
+    test = Dest()
+    assert(test.is_null() == True)
+    test.xpos = test.ypos = 123
+    test.sector = 22
+    test.warp = 22
+    assert(test.is_null() == False)
+    clone = test.clone()
+    assert(clone.sector == test.sector)
+    assert(clone.warp == test.warp)
+    assert(clone.xpos == test.xpos)
+    assert(clone.ypos == test.ypos)
+

ShipEnterprise.py

@@ -38,25 +38,25 @@ def damage(self, game, item):
             item = random.randint(0, 6)
         if item == 0:
             self.navigation_damage = damage
-            game.display(Quips.jibe_damage('Warp Engines'))
+            game.display(Quips.jibe_damage('warp engine'))
         elif item == 1:
             self.short_range_scan_damage = damage
-            game.display(Quips.jibe_damage('Short Range Scanner'))
+            game.display(Quips.jibe_damage('short range scanner'))
         elif item == 2:
             self.long_range_scan_damage = damage
-            game.display(Quips.jibe_damage('Long Range Scanner'))
+            game.display(Quips.jibe_damage('long range scanner'))
         elif item == 3:
             self.shield_control_damage = damage
-            game.display(Quips.jibe_damage('Shield Controls'))
+            game.display(Quips.jibe_damage('shield control'))
         elif item == 4:
             self.computer_damage = damage
-            game.display(Quips.jibe_damage('Main Computer'))
+            game.display(Quips.jibe_damage('main computer'))
         elif item == 5:
             self.photon_damage = damage
-            game.display(Quips.jibe_damage('Photon Torpedo Controls'))
+            game.display(Quips.jibe_damage('torpedo controller'))
         elif item == 6:
             self.phaser_damage = damage
-            game.display(Quips.jibe_damage('Phasers'))
+            game.display(Quips.jibe_damage('phaser'))
         game.display()
 
     def repair(self, game):
@@ -109,7 +109,7 @@ def repair(self, game):
 
     def short_range_scan(self, game):
         if self.short_range_scan_damage > 0:
-            game.display(Quips.jibe_damage('Short Ranged Scanner'))
+            game.display(Quips.jibe_damage('short ranged scanner'))
             game.display()
         else:
             quad = game.game_map.get_pw_sector()
@@ -120,7 +120,7 @@ def short_range_scan(self, game):
 
     def long_range_scan(self, game):
         if self.long_range_scan_damage > 0:
-            game.display(Quips.jibe_damage('Long Ranged Scanner'))
+            game.display(Quips.jibe_damage('long ranged scanner'))
             game.display()
             return