Fixed generous starbase docking logic.

Author: soft9000

Calculators.py

@@ -8,6 +8,29 @@
 
 class Calc():
 
+    @staticmethod
+    def surrounding(pos):
+        '''
+        Return the complete set of
+        points surrounding a piece.
+        Sanity checking is not performed.
+        '''
+        results = []
+        if pos:
+            above = pos.ypos - 1
+            below = pos.ypos + 1
+            left  = pos.xpos - 1
+            right = pos.xpos + 1
+            results.append([left, above])
+            results.append([right, below])
+            results.append([left, below])
+            results.append([right, above])
+            results.append([pos.xpos, above])
+            results.append([pos.xpos, below])
+            results.append([left, pos.ypos])
+            results.append([right, pos.ypos])
+        return results
+
     @staticmethod
     def distance(x1, y1, x2, y2):
         x = x2 - x1

StarTrek2020.py

@@ -39,10 +39,11 @@ def move_to(self, dest):
         self.enterprise.docked = False
         for p in area._pieces:
             if p.glyph == Glyphs.STARBASE:
-                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)
+                for point in Calc.surrounding(pos):
+                    if  p.xpos == point[0] and \
+                        p.ypos == point[1]:
+                            self.enterprise.docked = True
+                            ShipStarbase.dock_enterprise(self.enterprise)
         if was_docked and self.enterprise.docked == False:
             ShipStarbase.launch_enterprise(self.enterprise)
         return pos
@@ -80,7 +81,6 @@ def run(self):
                 if not self.command_prompt():
                     break
         except ErrorEnterpriseCollision as ex:
-            game.display()
             if ex.glyph == Glyphs.KLINGON:
                 self.display("You flew into a KLINGON!")
             if ex.glyph == Glyphs.STARBASE: