Collision & Docking Detection.

Author: soft9000

.gitignore

@@ -34,3 +34,4 @@
 /__pycache__/ShipStarbase.cpython-37.pyc
 /__pycache__/ShipKlingon.cpython-37.pyc
 /__pycache__/ShipEnterprise.cpython-37.pyc
+/__pycache__/ErrorCollision.cpython-37.pyc

Calculators.py

@@ -24,7 +24,7 @@ def sublight_navigation(game):
         game.display()
         game.display("Sub-light engines engaged.")
         game.display()
-        game.game_map.go_to(dest_sys)
+        game.move_to(dest_sys)
 
         game.time_remaining -= 1
         game.star_date += 1
@@ -68,7 +68,7 @@ def warp_navigation(game):
             game.display()
             game.enterprise.energy -= energy_required
 
-        game.game_map.go_to(dest_sys)
+        game.move_to(dest_sys)
 
         game.time_remaining -= 1
         game.star_date += 1

ErrorCollision.py

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

MapGame.py

@@ -5,6 +5,7 @@
 from ShipKlingon import ShipKlingon
 from Points import Destination
 from Quadrant import Quadrant
+from ErrorCollision import ErrorEnterpriseCollision
 
 import MapSparse
 
@@ -57,19 +58,30 @@ def place(self, takers):
 
     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()
+        random one. 
+        
+        Will raise an ErrorEnterpriseCollision, upon same.
+
+        Returns the final x, y location upon success '''
+        area = self.pw_area()
+        berror = False
         if area:
+            for p in area._pieces:
+                if p.xpos == dest.xpos and p.ypos == dest.ypos:
+                    pos = area.place_glyph(Glyphs.ENTERPRISE)
+                    berror = p.glyph
             pos = area.place_glyph(Glyphs.ENTERPRISE, dest)
+            if berror:
+                raise ErrorEnterpriseCollision(berror)
             if pos:
                 return pos
         return False
 
     def enterprise_location(self):
         ''' Get Enterprise location. False if not found. '''
-        area = self.area()
+        area = self.pw_area()
         if area:
-            for obj in area.objs:
+            for obj in area._pieces:
                 if obj.glyph == Glyphs.ENTERPRISE:
                     return obj.xpos, obj.ypos
         return False
@@ -82,7 +94,7 @@ def enterprise_out(self):
 
     def place_glyph(self, glyph, dest=None):
         ''' Place the glyph as the destination, else a random one '''
-        area = self.area()
+        area = self.pw_area()
         if area:
             pos = area.place_glyph(self, glyph, dest)
             if pos:
@@ -91,11 +103,11 @@ def place_glyph(self, glyph, dest=None):
 
     def remove(self, xpos, ypos):
         ''' Remove ANYTHING from the present AREA '''
-        area = self.area()
+        area = self.pw_area()
         if area:
             area.remove(xpos, ypos)
 
-    def area(self):
+    def pw_area(self):
         ''' 
         Return the internal / sparsely populated AREA object.
         Return an empty / default AREA upon coordinate error.
@@ -119,9 +131,9 @@ def scan_quad(self, sector):
     def _count_area(self, glyph):
         ''' Tally the number of glyphs in the AREA '''
         count = 0
-        area = self.area()
+        area = self.pw_area()
         if area:
-            for obj in area.objs:
+            for obj in area._pieces:
                 if obj.glyph == glyph:
                     count += 1
         return count
@@ -134,7 +146,7 @@ def update_counts(self):
             self.stars     += area.count_glyphs(Glyphs.STAR)
 
     def remove_items(self, removed):
-        area = self.area()
+        area = self.pw_area()
         for obj in removed:
             area.remove(obj.xpos, obj.ypos)
         self.update_counts()
@@ -144,7 +156,7 @@ def get_area_klingons(self):
         Return this Area's data for Kingons, in an array.
         '''
         results = []
-        area = self.area()
+        area = self.pw_area()
         for data in area.get_data(Glyphs.KLINGON):
             ship = ShipKlingon()
             ship.from_map(data.xpos, data.ypos)
@@ -166,14 +178,14 @@ def get_area_objects(self):
         NOTE: Changes to this collection will update Area
         content.
         '''
-        area = self.area()
-        return area.objs
+        area = self.pw_area()
+        return area._pieces
 
     def game_id(self, piece):
         '''
         Uniquely identify a game piece / object.
         '''
-        area = self.area()
+        area = self.pw_area()
         num = (area.number * 100) + (piece.ypos * 8) + piece.xpos
         return f"{piece.glyph[1]}x{num}"
 
@@ -188,25 +200,29 @@ def get_all(self, glyph):
         return results
 
     def quad(self):
-        area = self.area()
+        area = self.pw_area()
         return Quadrant.from_area(area)
 
     def get_map(self):
         ''' 
         Generate AREA map of the present sector.
         '''
-        area = self.area()
+        area = self.pw_area()
         return area.get_map()
 
     def random_jump(self):
         dest = Destination(
-            random.randint(1, 65),
+            random.randint(1, 64),
             random.randint(0, 7),
             random.randint(0, 7)
             )
-        self.go_to(dest)
+        self._go_to(dest)
 
-    def go_to(self, dest):
+    def _go_to(self, dest):
+        '''
+        Place the main player (Enterprise, for now) into the Area.
+        Returns the final, effective, player location.
+        '''
         if self.last_nav:
             self.enterprise_out()
         if dest.sector > 0:
@@ -217,8 +233,11 @@ def go_to(self, dest):
         dest.sector = self.sector
         dest.xpos = self.xpos
         dest.ypos = self.ypos
-        self.enterprise_in(dest)
+        pos = self.enterprise_in(dest)
+        dest.xpos = pos[0]
+        dest.ypos = pos[1]
         self.last_nav = dest
+        return dest
 
     def randomize(self, bases=None, stars=None, aliens=None):
         if not aliens:

MapSparse.py

@@ -38,7 +38,7 @@ def __init__(self):
             self.name = ""
             self.number = -1
             self.scanned = False
-            self.objs = []
+            self._pieces = []
 
         def is_null(self):
             '''
@@ -48,21 +48,21 @@ def is_null(self):
             return dum.name == self.name and \
                 dum.number == self.number and \
                 dum.scanned == self.scanned and \
-                len(dum.objs) == len(self.objs)
+                len(dum.objs) == len(self._pieces)
 
         def is_empty(self):
             ''' Checks to see if the Area has anything ...'''
-            return len(self.objs) == True
+            return len(self._pieces) == True
 
         def items(self):
             ''' Items in the Area ...'''
-            return len(self.objs)
+            return len(self._pieces)
 
         def remove(self, xpos, ypos):
             ''' Remove an item from the Area. '''
-            for ss, obj in enumerate(self.objs):
+            for ss, obj in enumerate(self._pieces):
                 if obj.xpos == xpos and obj.ypos == ypos:
-                    self.objs.remove(obj)
+                    self._pieces.remove(obj)
                     return
 
         def get_map(self):
@@ -71,7 +71,7 @@ def get_map(self):
             of Glyphs.SPACE on error.
             '''
             results = [[Glyphs.SPACE for _ in range(8)] for _ in range(8)]
-            for obj in self.objs:
+            for obj in self._pieces:
                 results[obj.ypos][obj.xpos] = obj.glyph # ASSURED
             return results
 
@@ -91,7 +91,7 @@ def range_ok(self, xpos, ypos):
 
         def get_data(self, glyph):
             results = []
-            for p in self.objs:
+            for p in self._pieces:
                 if p.glyph == glyph:
                     results.append(SparseMap.Area.clone(p))
             return results
@@ -101,7 +101,7 @@ def count_glyphs(self, glyph):
             Tally the number of glyphs that we have in the Area.
             '''
             count = 0
-            for p in self.objs:
+            for p in self._pieces:
                 if p.glyph == glyph:
                     count += 1
             return count
@@ -113,11 +113,11 @@ def plot_glyph(self, xpos, ypos, glyph):
             '''
             if self.range_ok(xpos, ypos) is False:
                 return None
-            for p in self.objs:
+            for p in self._pieces:
                 if p.xpos is xpos and p.ypos is ypos:
                     p.glyph = glyph
                     return xpos, ypos
-            self.objs.append(SparseMap.Area.Piece(xpos, ypos, glyph))
+            self._pieces.append(SparseMap.Area.Piece(xpos, ypos, glyph))
             return xpos, ypos
 
         def place_glyph(self, glyph, dest=None):

Quips.py

@@ -53,6 +53,30 @@
     " curses: 'Thy fathers spreadeth pox!'",
     " yells: 'Your mother is progressive!'",
     ]
+MISTAKES = [
+    "... the crew was not impressed ...",
+    "... that's going to leave a mark ...",
+    "... next time, remember to 'carry the 1'? ...",
+    "... math lives matter ...",
+    "... that's coming out of your paycheck ...",
+    "... this is not a bumper car ...",
+    "... life can be tough, that way ...",
+    "... who ordered THAT take-out ...",
+    "... random is, what random does ...",
+    "... you've got their attention ...",
+    "... next time, just text them ...",
+    "... how rude!",
+    "... yes, karma CAN hurt ...",
+    "... life is but a dream!",
+    "... game over.",
+    "... they will talk about this one for years.",
+    "... who is going to pay for this?",
+    "... galactic insurance premiums skyrocket ...",
+    "... captain goes down with the starship ...",
+    "... we'll notify your next-of-kin.",
+    "... that was not in the script ...",
+    "... you never did THAT in the simulator ...",
+    ]
 
 class Quips():
 
@@ -73,6 +97,10 @@ def jibe_defeat(noun):
         if random.randrange(0, 100) > 25:
             return f"Another {noun.lower()} defeated."
         return Quips.jibe(noun, DEFEAT_PREFIX, DEFEAT_SUFFIX)
+    
+    @staticmethod
+    def jibe_fatal_mistake():
+        return MISTAKES[random.randrange(0, len(MISTAKES) - 1)]
 
 
 

README.rst

@@ -6,6 +6,8 @@ So far:
 
 * Added random event Quips – should make the game a tad more ‘NPC’?
 
+* Added that classic sublight / in system propulsion system. Warp speeds engines are now a seperate navigational system.
+
 * Heavily re-factored for growth, testing, re-use, and maintenance using modern Python.