Better randomization.

Author: soft9000

AbsShip.py

@@ -3,6 +3,7 @@
 
 import Glyphs
 from Quips import Quips
+from Quadrant import Quadrant
 
 class AbsShip(abc.ABC):
     ''' The first step, into a much larger universe ... '''
@@ -14,7 +15,7 @@ def __init__(self):
     def get_glyph(self):
         pass
 
-class StarBase(AbsShip):
+class ShipStarbase(AbsShip):
 
     def __init__(self):
         super().__init__()
@@ -41,7 +42,7 @@ def launch_enterprise(ship):
         ship.docked = False
 
 
-class Enterprise(AbsShip):
+class ShipEnterprise(AbsShip):
 
     def __init__(self):
         super().__init__()
@@ -56,14 +57,16 @@ def __init__(self):
         self.photon_damage = 0
         self.phaser_damage = 0
         self.photon_torpedoes = 0
-        StarBase.dock_enterprise(self)
-        StarBase.launch_enterprise(self)
+        ShipStarbase.dock_enterprise(self)
+        ShipStarbase.launch_enterprise(self)
 
     def get_glyph(self):
         return Glyphs.ENTERPRISE
 
-
     def damage(self, game, item):
+        '''
+        Damage the Enterprise.
+        '''
         if game.is_testing:
             return
         if random.randint(0, 6) > 0:
@@ -94,8 +97,10 @@ def damage(self, game, item):
             game.display(Quips.jibe_damage('Phasers'))
         game.display()
 
-
     def repair(self, game):
+        '''
+        Rapair damage to the Enterprise.
+        '''
         if self.navigation_damage > 0:
             self.navigation_damage -= 1
             if self.navigation_damage == 0:
@@ -140,9 +145,7 @@ def repair(self, game):
             return True
         return False
 
-
     def short_range_scan(self, game):
-
         if self.short_range_scan_damage > 0:
             game.display(Quips.jibe_damage('Short Ranged Scanners'))
             game.display()
@@ -151,38 +154,43 @@ def short_range_scan(self, game):
             Quadrant.display_area(game, quad)
         game.display()
 
-
     def long_range_scan(self, game):
         if self.long_range_scan_damage > 0:
             game.display(Quips.jibe_damage('Long Ranged Scanners'))
             game.display()
             return
         sb = ""
-        game.display("-------------------")
         pw_sector = game.game_map.sector
         if pw_sector < 5:
             pw_sector = 5
         elif pw_sector > 59:
             pw_sector = 59
+        dots = None
         for peek in range(pw_sector-5, pw_sector + 6):
             quad = game.game_map.scan_quad(peek)
-            f"{quad.klingons}{quad.starbases}{quad.stars} "
-            sb += "|"
+            lines = \
+                (f"Sector: {quad.number:>02}",
+                f"Enemies:{quad.klingons:>02}",
+                f"Bases:{quad.starbases:>02}",
+                f"Stars: {quad.stars:>03}")
+            str_ = ' | '.join(lines)
+            dots = '-' * len(str_) + "\n"
+            sb += dots
+            sb += str_
             game.display(sb)
             sb = ""
-            game.display("-------------------")
+        game.display(dots)
         game.display()
 
 
-class KlingonShip(AbsShip):
+class ShipKlingon(AbsShip):
 
     def __init__(self):
         super().__init__()
         self.xpos = 0
         self.ypos = 0
         self.shield_level = 0
 
-
     def get_glyph(self):
         return Glyphs.KLINGON
 

Calculators.py

@@ -1,4 +1,4 @@
-from math import atan2, pi, sqrt, cos, sin
+from math import sqrt
 import random
 
 from MapGame import *
@@ -53,7 +53,7 @@ def navigation(game):
             game.display()
         else:
             if game.game_map.klingons > 0:
-                KlingonShip.attack(game)
+                ShipKlingon.attack(game)
                 game.display()
             elif not game.enterprise.repair(game):
                 game.enterprise.damage(game, -1)

Controls.py

@@ -1,4 +1,3 @@
-from math import pi, sqrt, cos, sin
 import random
 
 import TrekStrings
@@ -72,7 +71,7 @@ def phasers(game):
         game.game_map.remove_items(destroyed_ships)
         if game.game_map.klingons > 0:
             game.display()
-            KlingonShip.attack(game)
+            ShipKlingon.attack(game)
         game.display()
 
 
@@ -162,7 +161,7 @@ def torpedos(game):
             game.display("Torpedo missed.")
         if len(game.game_map.get_area_klingons()) > 0:
             game.display()
-            KlingonShip.attack(game)
+            ShipKlingon.attack(game)
         game.display()
 
 

MapGame.py

@@ -2,7 +2,7 @@
 import TrekStrings
 
 import Glyphs
-from AbsShip import KlingonShip
+from AbsShip import ShipKlingon
 from Points import Destination
 from Quadrant import Quadrant
 
@@ -36,18 +36,22 @@ def place(self, takers):
                 continue
             taken = 0
             while taken != to_take:
-                for ss, area in enumerate(self.areas()):
-                    should_take = random.randrange(1, 8)
-                    if should_take % (ss + 2) == 0:
-                        if which is 0:
-                            area.place_glyph(Glyphs.STARBASE)
-                        elif which is 1:
-                            area.place_glyph(Glyphs.STAR)
-                        elif which is 2:
-                            area.place_glyph(Glyphs.KLINGON)
-                        taken += 1
-                        if taken == to_take:
-                            break;
+                ss = random.randrange(1, 64)
+                area = self.get_area(ss)
+                should_take = random.randrange(1, 8)
+                if which is 0:
+                    if area.count_glyphs(Glyphs.STARBASE) != 0:
+                        continue
+                    area.place_glyph(Glyphs.STARBASE)
+                elif which is 1:
+                    area.place_glyph(Glyphs.STAR)
+                elif which is 2:
+                    if area.count_glyphs(Glyphs.KLINGON) > 3:
+                        continue
+                    area.place_glyph(Glyphs.KLINGON)
+                taken += 1
+                if taken == to_take:
+                    break;
             takers[which] -= taken
         return tuple(takers)
 
@@ -107,10 +111,9 @@ def scan_quad(self, sector):
         Return a scan (LRS?) for a specific quadrant.
         Return empty quadrant, on error.
         '''
-        if sector > 0 and sector < 65:
-            for area in self.areas():
-                if area.number == self.sector:
-                    return Quadrant.from_area(area)
+        area = self.get_area(sector)
+        if area:
+            return Quadrant.from_area(area)
         return Quadrant()
 
     def _count(self, glyph):
@@ -141,7 +144,7 @@ def get_area_klingons(self):
         results = []
         area = self.area()
         for data in area.get_data(Glyphs.KLINGON):
-            ship = KlingonShip()
+            ship = ShipKlingon()
             ship.from_map(data.xpos, data.ypos)
             results.append(ship)
         return results
@@ -222,7 +225,7 @@ def randomize(self, bases=None, stars=None, aliens=None):
         self.init()
         takers = bases, stars, aliens
         while takers:
-            for lrs in self.map:
+            for lrs in self._map:
                 takers = self.place(takers)
                 if not takers:
                     break

MapSparse.py

@@ -67,7 +67,7 @@ def remove(self, xpos, ypos):
 
         def get_map(self):
             ''' 
-            Generate a map of this sector. Map is full 
+            Generate a map of this AREA. Map is full 
             of Glyphs.SPACE on error.
             '''
             results = [[Glyphs.SPACE for _ in range(8)] for _ in range(8)]
@@ -142,31 +142,52 @@ def clone(piece):
 
     def __init__(self):
         self.initalized = False
-        self.map = [[[y,x] for y in range(8)] for x in range(8)]
+        self._map = [[[y,x] for y in range(8)] for x in range(8)]
 
     def init(self, reset=False):
         if not reset and self.initalized:
             return
-        for xx, row in enumerate(self.map):
+        for xx, row in enumerate(self._map):
             lrs = SparseMap.Region()
             for yy, col in enumerate(row):
-                self.map[xx][yy] = [lrs, SparseMap.Area()]
+                self._map[xx][yy] = [lrs, SparseMap.Area()]
         self.name_areas()
         self.initalized = True
 
+    def get_area(self, which):
+        '''
+        Get an AREA from the map. 
+        Area identifiers are 1's based.
+        Returns False on under / over flows.
+        '''
+        if which < 1:
+            return False
+        if which >= 65:
+            return False
+        which -= 1 # ASSURED
+        fid = which / 8
+        ypos = 0
+        xpos = int(fid)
+        if not fid.is_integer():
+            ypos = which %8
+        return self._map[xpos][ypos][1]
+
     def data(self):
         ''' Enumerate thru every [Region, Area] in the Map '''
-        for row in self.map:
+        for row in self._map:
             for col in row:
                 yield col
 
     def areas(self):
         ''' Enumerare thru every Area on the Map '''
-        for row in self.map:
+        for row in self._map:
             for col in row:
                 yield col[1]
 
     def name_areas(self):
+        '''
+        Assign / re-assign 'Trekian names.
+        '''
         names = list(TrekStrings.AREA_NAMES)
         for num, area in enumerate(self.areas(),1):
             index = random.randint(0, len(names) - 1)
@@ -175,6 +196,9 @@ def name_areas(self):
             del names[index]
 
     def get_sector_names(self):
+        '''
+        Return a list of [secor numbers, sector_name] pairs.
+        '''
         results = []
         temp = []
         for ss, col in enumerate(self.areas(),1):

Quadrant.py

@@ -1,8 +1,9 @@
 import Glyphs
 
 class Quadrant():
-    def __init__(self, num=-1, name='', lines=[], 
-                 aliens=-1, stars=-1, starbases=-1):
+    def __init__(self, num=-1, name='', 
+                 aliens=-1, stars=-1, 
+                 starbases=-1, lines=[]):
         self.name = name
         self.number = num
         self.lines = lines
@@ -21,10 +22,11 @@ def from_area(area):
         name = area.name
         num = area.number
         map = area.get_map()
-        return Quadrant(num, name, map, 
-                        area.get_data(Glyphs.KLINGON),
+        return Quadrant(num, name, 
+                        area.count_glyphs(Glyphs.KLINGON),
                         area.count_glyphs(Glyphs.STAR),
-                        area.count_glyphs(Glyphs.STARBASE))
+                        area.count_glyphs(Glyphs.STARBASE),
+                        map)
 
 
     @staticmethod                
@@ -39,7 +41,7 @@ def display_area(game, quad):
         sb += f"    -=--=--=--=--=--=--=--=-           Quadrant: {quad.name}\n"
         info = list()
         info.append(f"               Area: [{quad.number}]\n")
-        info.append(f"           Hazzards: [{quad.stars + len(quad.klingons)}]\n")
+        info.append(f"           Hazzards: [{quad.stars + quad.klingons}]\n")
         info.append(f"           Stardate: {game.star_date}\n")
         info.append(f"          Condition: {game.enterprise.condition}\n")
         info.append(f"             Energy: {game.enterprise.energy}\n")
@@ -54,7 +56,7 @@ def display_area(game, quad):
         sb += f"    -=--=--=--=--=--=--=--=-             Docked: {game.enterprise.docked}\n"
         print(sb, end='')
 
-        if len(quad.klingons) > 0:
+        if quad.klingons > 0:
             game.display()
             game.display("Condition RED: Klingon ship{0} detected.".format("" if quad.klingons == 1 else "s"))
             if game.enterprise.shield_level == 0 and not game.enterprise.docked:

StarTrek2020.py

@@ -1,5 +1,4 @@
-from math import pi, sqrt, cos, sin
-import random
+import random
 
 import TrekStrings
 
@@ -17,7 +16,7 @@ class Game(Con):
     def __init__(self):
         self.is_testing = False
         self.game_map = GameMap()
-        self.enterprise = Enterprise()
+        self.enterprise = ShipEnterprise()
         self.star_date = 0
         self.time_remaining = 0
         self.destroyed = False
@@ -27,7 +26,7 @@ def run(self):
         game.star_date = random.randint(0, 50) + 2250
         game.time_remaining = 40 + random.randint(0, 9)
         game.destroyed = False
-        stars     = random.randrange(32, 64)
+        stars     = random.randrange(400, 600) # 4096 = ALL
         aliens    = random.randrange(12, 16)
         starbases = random.randrange(6, 8)
         game.game_map.randomize(starbases, stars, aliens)