Alpha testing underway ...

Author: soft9000

Controls.py

@@ -172,5 +172,3 @@ def torpedos(game):
         game.display()
         game.enterprise.damage(game, Probabilities.PHOTON)
 
-
-

MapGame.py

@@ -12,6 +12,10 @@
 class GameMap(MapSparse.SparseMap):
 
     def __init__(self):
+        '''
+        Prepare a 'Trekian GameMap for future 
+        initialization.
+        '''
         super().__init__()
         self.sector = -1
         self.xpos = self.ypos = -1
@@ -179,9 +183,6 @@ def update_counts(self)->None:
             self.game_klingons  += area.count_glyphs(Glyphs.KLINGON)
             self.game_starbases += area.count_glyphs(Glyphs.STARBASE)
             self.game_stars     += area.count_glyphs(Glyphs.STAR)
-        area = self.get_pw_sector()
-        area = self.get_pw_sector()
-
 
     def remove_area_items(self, piece_array)->None:
         '''
@@ -199,16 +200,16 @@ def get_area_klingons(self)->list:
         '''
         results = []
         area = self.pw_area()
-        for data in area.get_data(Glyphs.KLINGON):
+        for data in area.query(Glyphs.KLINGON):
             ship = ShipKlingon()
             ship.from_map(data.xpos, data.ypos)
             results.append(ship)
         return results
 
     def get_area_objects(self)->list:
         '''
-        Return the actual objects, as located in the Area. 
-        NOTE: Changes to this collection will update Area
+        Return the actual pieces, as maintained in the Area. 
+        WARNING: Changes to this collection WILL update Area
         content.
         '''
         area = self.pw_area()
@@ -228,7 +229,7 @@ def get_all(self, glyph)->list:
         '''
         results = []
         for area in self.areas():
-            for piece in area.get_data(glyph):
+            for piece in area.query(glyph):
                 results.append([area, piece])
         return results
 
@@ -247,7 +248,8 @@ def get_map(self)->list:
         return area.get_map()
 
     def _go_to(self, dest):
-        ''' Either a WARP ~or~ a SUBSPACE destination is ok.
+        ''' 
+        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.
         '''
@@ -274,6 +276,12 @@ def _go_to(self, dest):
         return dest
 
     def randomize(self, bases=None, stars=None, aliens=None)->None:
+        '''
+        Randomly place the inventoried items into the map.
+        If no bases ot aliens are specified, a random number
+        will be selected. Stars are not required. Not having 
+        any stars is ok.
+        '''
         if not aliens:
             aliens = random.randint(5, 10)
         if not bases:

MapSparse.py

@@ -20,7 +20,7 @@ class Area():
         A minimalist collection of Area-plotted Glyphs. 
         Area numbers are 1's based.
         Area plotting is 0's based.
-        Names are Trekian.
+        Area names are Trekian.
         '''
         class Piece:
             '''
@@ -37,7 +37,6 @@ def __init__(self):
             '''
             self.name = ""
             self.number = -1
-            self.scanned = False
             self._pieces = []
 
         def is_null(self):
@@ -47,15 +46,14 @@ def is_null(self):
             dum = Area()
             return dum.name == self.name and \
                 dum.number == self.number and \
-                dum.scanned == self.scanned and \
                 len(dum.objs) == len(self._pieces)
 
         def is_empty(self):
             ''' Checks to see if the Area has anything ...'''
             return len(self._pieces) == True
 
-        def items(self):
-            ''' Items in the Area ...'''
+        def item_count(self)->int:
+            ''' The number of pieces / items in the randint ...'''
             return len(self._pieces)
 
         def remove(self, xpos, ypos):
@@ -67,7 +65,7 @@ def remove(self, xpos, ypos):
 
         def get_map(self)->list:
             ''' 
-            Generate a map of this AREA. Map is full 
+            Generate a map of this randint. Map is full 
             of Glyphs.SPACE on error.
             '''
             results = [[Glyphs.SPACE for _ in range(8)] for _ in range(8)]
@@ -89,7 +87,12 @@ def range_ok(self, xpos, ypos):
                 return False
             return True
 
-        def get_data(self, glyph):
+        def query(self, glyph):
+            '''
+            Clone each Piece for a glyph into a new 
+            collection. Changes to the results WILL NOT 
+            affect the glyph in the AREA.
+            '''
             results = []
             for p in self._pieces:
                 if p.glyph == glyph:
@@ -140,10 +143,17 @@ def clone(piece):
             return SparseMap.Area.Piece(piece.xpos, piece.ypos, piece.glyph)
 
     def __init__(self):
+        '''
+        Create the uninitialized REGION. Use .init() to
+        populate same with AREAs.
+        '''
         self.initalized = False
         self._map = [[[y,x] for y in range(8)] for x in range(8)]
 
     def init(self, reset=False):
+        '''
+        Fill a newly-created map with a set of randomly-named AREAs.
+        '''
         if not reset and self.initalized:
             return
         for xx, row in enumerate(self._map):

Reports.py

@@ -40,8 +40,8 @@ def show_exit_status(game):
             msg = "MISSION FAILED: OUT OF ENERGY."
             game.show_banner([msg], '!')
         elif game.game_map.game_klingons == 0:
-            msg = "MISSION ACCOMPLISHED: ENEMIES DESTROYED. WELL DONE!"
-            game.show_banner([msg])
+            msg = "MISSION ACCOMPLISHED","ENEMIES DESTROYED","WELL DONE!"
+            game.show_banner(msg)
         elif game.time_remaining == 0:
             msg = "MISSION FAILED: OUT OF TIME."
             game.show_banner([msg], '!')

Sector.py

@@ -10,7 +10,6 @@ def __init__(self, num=-1, name='',
         self.area_klingons = aliens
         self.area_stars = stars
         self.area_starbases = starbases
-        self.scanned = True # meh
 
     def is_null(self):
         return self.num == -1

ShipKlingon.py

@@ -22,7 +22,7 @@ def attack_if_you_can(game):
         '''
         IF you ever find yourself in the AREA, then have at USS?
         '''
-        if game.is_testing:
+        if game.is_cloked:
             return False
         from Calculators import Calc
         kships = game.game_map.get_area_klingons()

StarTrek2020.py

@@ -3,8 +3,8 @@
 import TrekStrings
 from Console import Con
 from ShipKlingon import ShipKlingon
-from ShipStarbase import ShipStarbase
 from ShipEnterprise import ShipEnterprise
+from ShipStarbase import ShipStarbase
 from Calculators import Calc
 from Controls import Control
 from Reports import Stats
@@ -17,6 +17,7 @@ class Game(Con):
 
     def __init__(self):
         self.is_testing = False
+        self.is_cloked  = False # unable to be fired-upon
         self.game_map = GameMap()
         self.enterprise = ShipEnterprise()
         self.star_date = 0
@@ -80,6 +81,12 @@ def run(self):
             while self.game_on():
                 if not self.command_prompt():
                     break
+                if self.is_testing:
+                    self.destoryed = False
+                    ShipStarbase.dock_enterprise(self.enterprise)
+                    ShipStarbase.launch_enterprise(self.enterprise)
+                    self.enterprise.shield_level = 1000
+                    
         except ErrorEnterpriseCollision as ex:
             if ex.glyph == Glyphs.KLINGON:
                 self.display("You flew into a KLINGON!")
@@ -94,7 +101,6 @@ def run(self):
         if self.destroyed == True:
             self.display(Quips.jibe_fatal_mistake())
         game.display()
-        game.display(';-)')
         return False
 
     def command_prompt(self):