Docking assured. Safe warp-ins enabled.

Author: soft9000

Calculators.py

@@ -3,7 +3,7 @@
 
 from MapGame import *
 from AbsShip import *
-from Points import Destination
+from Points import *
 
 class Calc():
 

Console.py

@@ -1,5 +1,5 @@
 from AbsDisplay import abs_display
-from Points import Destination
+from Points import *
 
 class Con(abs_display):
     '''
@@ -33,19 +33,15 @@ def read_xypos(self, prompt = "Location (alpha,num)"):
         Example: b,4 
         '''
         text = input(prompt + ': ')
-        return Destination.parse_xypos(text)
+        return SubDest.parse(text)
 
     def read_sector(self, prompt= "Helm: sector 1-64, speed 1.0-9.0?"):
         text = input(prompt + ': ')
-        return Destination.parse_warp(text)
-
-    def read_nav(self, prompt= "Helm: sector 1-64, a-h, 1-8?"):
-        text = input(prompt + ': ')
-        return Destination.parse_sector(text)
+        return WarpDest.parse(text)
 
     def read_xypos(self, prompt= "Helm: a-h, 1-8?"):
         text = input(prompt + ': ')
-        return Destination.parse_xypos(text)
+        return SubDest.parse(text)
 
 
 if __name__ == '__main__':

ErrorCollision.py

@@ -7,5 +7,3 @@ def __init__(self, glyph):
         self.glyph = glyph
 
 
-
-

MapGame.py

@@ -3,7 +3,7 @@
 
 import Glyphs
 from ShipKlingon import ShipKlingon
-from Points import Destination
+from Points import *
 from Quadrant import Quadrant
 from ErrorCollision import ErrorEnterpriseCollision
 
@@ -58,12 +58,14 @@ def place(self, takers):
 
     def enterprise_in(self, dest=None):
         ''' Place the ENTERPRISE at the destination, else a 
-        random one. 
+        random one.
         
         Will raise an ErrorEnterpriseCollision, upon same.
 
         Returns the final x, y location upon success '''
         area = self.pw_area()
+        if not dest:
+            return area.place_glyph(Glyphs.ENTERPRISE)
         berror = False
         if area:
             for p in area._pieces:
@@ -211,29 +213,35 @@ def get_map(self):
         return area.get_map()
 
     def random_jump(self):
-        dest = Destination(
+        dest = SubDest(
             random.randint(1, 64),
             random.randint(0, 7),
             random.randint(0, 7)
             )
         self._go_to(dest)
 
     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.
         '''
+        if not dest:
+            return
         if self.last_nav:
             self.enterprise_out()
-        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
-        pos = self.enterprise_in(dest)
+        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!
+        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?
         dest.xpos = pos[0]
         dest.ypos = pos[1]
         self.last_nav = dest

Points.py

@@ -1,41 +1,52 @@
-
-
-class Destination():
-    ''' Zero based, Map navigation '''
-    def __init__(self, sector=-1, xpos=-1, ypos=-1, warp=0):
+class WarpDest():
+    ''' Warp Speed: 
+    One's based GALAXY navigation.
+    Guaranteed SAFE placement.
+    '''
+    def __init__(self, sector=-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
-        self.ypos = ypos
 
     @staticmethod
-    def parse_sector(dest, sep=','):
+    def parse(dest, sep=','):
         '''
-        Parse: sector#, alpha-col, row-num
-        Example: 5,b,1 
+        Parse: sector-num, speed-float - None on error
+        Example: 5,1.1 
         '''
         dest = str(dest)
         cols = dest.split(sep)
-        if len(cols) == 3:
+        if len(cols) == 2:
             try:
-                sector = int(cols[0]) % 8
-                if str(cols[1]).isalpha():
-                    xpos = ((ord(cols[1]) - ord('a')) % 8)
-                    ypos = int(cols[2]) % 8
-                    return Destination(sector, xpos, ypos)
+                sector = int(cols[0].strip())
+                if sector < 1:
+                    sector = 1
+                speed = float(cols[1].strip())
+                if speed < 0: speed = 0.1
+                if speed > 9: speed = 9.0
+                return WarpDest(sector, speed)
             except:
                 pass
         return None
 
+
+class SubDest():
+    ''' Sublight Navigation:
+    Zero based, AREA placement.
+    Caveat, User! ;-)
+    '''
+    def __init__(self, xpos=-1, ypos=-1):
+        if xpos > 7:  xpos = 7
+        if ypos > 7:  ypos = 7
+        if xpos < 0:  xpos = 0
+        if ypos < 0:  ypos = 0
+        self.xpos = xpos
+        self.ypos = ypos
+
     @staticmethod
-    def parse_xypos(dest, sep=','):
+    def parse(dest, sep=','):
         '''
         WARNING: USER 1's -> 0-BASED TRANSLATION HERE
 
@@ -57,34 +68,8 @@ def parse_xypos(dest, sep=','):
                     num = int(alph)
                 xpos = num
                 ypos = int(cols[1].strip()[0])
-                return Destination(-1, xpos-1, ypos-1, -1)
+                return SubDest(xpos-1, ypos-1)
             except:
                 pass
         return None
 
-    @staticmethod
-    def parse_warp(dest, sep=','):
-        '''
-        Parse: sector-num, speed-float - None on error
-        Example: 5,1.1 
-        '''
-        dest = str(dest)
-        cols = dest.split(sep)
-        if len(cols) == 2:
-            try:
-                sector = int(cols[0].strip())
-                if sector < 1:
-                    sector = 1
-                speed = float(cols[1].strip())
-                if speed < 0: speed = 0.1
-                if speed > 9: speed = 9.0
-                return Destination(sector, -1, -1, speed)
-            except:
-                pass
-        return None
-
-
-
-
-
-

StarTrek2020.py

@@ -8,7 +8,7 @@
 from Calculators import Calc
 from Controls import Control
 from Reports import Stats
-from Points import Destination
+from Points import *
 from Quips import Quips
 from MapGame import *
 
@@ -32,6 +32,7 @@ def move_to(self, dest):
                 if p.xpos + 1 == pos.xpos or p.ypos + 1 == pos.ypos or \
                     p.xpos - 1 == pos.xpos or p.ypos - 1 == pos.ypos:
                         self.enterprise.docked = True
+                        ShipStarbase.dock_enterprise(self.enterprise)
         return pos
 
     def run(self):
@@ -43,7 +44,7 @@ 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)
+        dest = WarpDest(64, 0)
         game.move_to(dest)
         game.game_map.get_area(64).name = 'Outer Limits'
         self.print_mission()
@@ -70,6 +71,7 @@ def run(self):
             self.destroyed = True
         game.display()
         self.display(Quips.jibe_fatal_mistake())
+        game.display()
         game.display(';-)')
         return False