Added a banner -w- closing Quips.

Author: soft9000

AbsDisplay.py

@@ -3,12 +3,15 @@
 class abs_display(abc.ABC):
     '''
     The plan is to have several places to 
-    display information. The goal is to 
-    use only one display, to display a 
-    certain type of message. Networked
-    screens would also be a great idea.
-    Logging would be in there somewhere,
-    as well.
+    display information. The idea is to 
+    use only one display to show a certain 
+    type of message. 
+    
+    Networked screens would (let alone game 
+    play)would also be a great idea.
+
+    Event logging would be in there somewhere
+    as well?
     '''
 
     ST_DEFAULT = 'd'
@@ -26,9 +29,28 @@ def __init__(self, type_ = ST_DEFAULT, width = 80, height = 24):
     def display(self, message):
         pass
 
-
     def show_strings(self, string_list):
+        '''
+        Enumerate an array of strings into 
+        self.display.
+        '''
         for string in string_list:
             self.display(string)
         self.display()
 
+    def show_banner(self, string_list, star = '*'):
+        '''
+        Enumerate an array of strings into a 
+        single-character self.display box.
+        '''
+        if not star:
+            star = '*'
+        star = star[0]
+        sz = len(max(string_list, key=len))
+        max_ = sz + 4
+        self.display(star * max_)
+        for str_ in string_list:
+            self.display(star + ' ' + str_.center(sz) + ' ' + star)
+        self.display(star * max_)
+        return sz
+

Console.py

@@ -47,3 +47,5 @@ def read_xypos(self, prompt= "Helm: a-h, 1-8?"):
 if __name__ == '__main__':
     con = Con()
     con.display("Testing!")
+    con.show_banner(["Testing, too!"])
+    con.show_banner(["Testing", " .......... too!"])

MapGame.py

@@ -180,6 +180,7 @@ def update_counts(self)->None:
             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:

MapSparse.py

@@ -136,7 +136,6 @@ def place_glyph(self, glyph, dest=None):
 
         @staticmethod
         def clone(piece):
-            ''' Copy a piece. '''
             ''' Copy a piece. '''
             return SparseMap.Area.Piece(piece.xpos, piece.ypos, piece.glyph)
 

Quips.py

@@ -42,49 +42,64 @@
     " crew is spaced.",
     " crew is recycled.",
     " crew is recovered.",
-    " yells: 'Thy mother mates poorly!'",
-    " snarls: 'Lucky shot.'",
-    " laughs: 'You'll not do THAT again!'",
+    " yells: 'thy mother mates poorly!'",
+    " snarls: 'lucky shot.'",
+    " laughs: 'you'll not do THAT again!'",
     " says nothing.",
-    " screams: 'Thy father is a Targ!'",
-    " yells: 'Your parents eat bats!'",
-    " snarls: 'Thy people eat vermin!'",
-    " yells: 'May you create social disease!'",
-    " curses: 'Thy fathers spreadeth pox!'",
-    " yells: 'Your mother is progressive!'",
+    " screams: 'thy father is a Targ!'",
+    " yells: 'thine family eats bats!'",
+    " snarls: 'thine people eat vermin!'",
+    " curses: 'thy fathers spreadeth pox!'",
+    " yells: 'thy mother is progressive!'",
     ]
 MISTAKES = [
     "... the crew was not impressed ...",
     "... that's going to leave a mark ...",
-    "... next time, remember to 'carry the 1'? ...",
+    "... next time carry the 1?",
     "... math lives matter ...",
-    "... that's coming out of your paycheck ...",
+    "... its coming out of your pay ...",
     "... this is not a bumper car ...",
-    "... life can be tough, that way ...",
-    "... who ordered THAT take-out ...",
+    "... 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 ...",
+    "... 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?",
+    "... starfleet will talk about this for years.",
+    "... who is going to pay for that?",
     "... 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 ...",
     ]
 
+QUITS = [
+    "-Let's call it a draw?",
+    "-You call yourself a 'Trekkie?",
+    "Kobayashi Maru. Python for you?",
+    "(Spock shakes his head)",
+    "(Duras, stop laughing!)",
+    "(... and the Klingons rejoice)",
+    "(... and our enemies, rejoice)",
+    "Kobayashi Maru... Got Python?",
+    "(Kirk shakes his head)",
+    ]
+
 class Quips():
 
     @staticmethod
     def jibe(noun, prefix, suffix):
         prand = random.randrange(0, len(prefix))
         srand = random.randrange(0, len(suffix))
         return prefix[prand] + noun + suffix[srand]
+
+    @staticmethod
+    def jibe_quit():
+        return QUITS[random.randrange(0, len(QUITS))]
 
     @staticmethod
     def jibe_damage(noun):

Reports.py

@@ -1,4 +1,5 @@
 import Glyphs
+from Quips import Quips
 
 class Stats():
     '''
@@ -33,23 +34,18 @@ def show_galactic_status(game):
     @staticmethod
     def show_exit_status(game):
         if game.destroyed:
-            msg = "MISSION FAILED: ENTERPRISE DESTROYED!!!"
-            game.display('!' * len(msg))
-            game.display(msg)
-            game.display('!' * len(msg))
+            msg = "MISSION FAILED: SHIP DESTROYED"
+            game.show_banner([msg], '!')
         elif game.enterprise.energy == 0:
-            msg = "MISSION FAILED: ENTERPRISE RAN OUT OF ENERGY."
-            game.display('!' * len(msg))
-            game.display(msg)
-            game.display('!' * len(msg))
+            msg = "MISSION FAILED: OUT OF ENERGY."
+            game.show_banner([msg], '!')
         elif game.game_map.game_klingons == 0:
-            msg = "MISSION ACCOMPLISHED: ALL ENEMY SHIPS DESTROYED. WELL DONE!!!"
-            game.display('!' * len(msg))
-            game.display(msg)
-            game.display('!' * len(msg))
+            msg = "MISSION ACCOMPLISHED: ENEMIES DESTROYED. WELL DONE!"
+            game.show_banner([msg])
         elif game.time_remaining == 0:
-            msg = "MISSION FAILED: ENTERPRISE RAN OUT OF TIME."
-            game.display('!' * len(msg))
-            game.display(msg)
-            game.display('!' * len(msg))
+            msg = "MISSION FAILED: OUT OF TIME."
+            game.show_banner([msg], '!')
+        else:
+            ary = ["::::::::: MISSION ABORTED :::::::::", Quips.jibe_quit()]
+            game.show_banner(ary, ':')
 

StarTrek2020.py

@@ -24,6 +24,15 @@ def __init__(self):
         self.destroyed = False
 
     def move_to(self, dest):
+        '''
+        Move the player to a nav, or a sub,
+        destination. Handles docking, random 
+        warp-in placement, as well as deliberate
+        collisions / rammming.
+        
+        Returns final resting coordinate on success.
+        Raises ErrorEnterpriseCollision on yikes.
+        '''
         pos = self.game_map._go_to(dest)
         area = self.game_map.pw_area()
         was_docked = self.enterprise.docked
@@ -38,16 +47,19 @@ def move_to(self, dest):
             ShipStarbase.launch_enterprise(self.enterprise)
         return pos
 
-    def game_over(self):
+    def game_on(self):
         '''
-        Check to see if the game is over.
+        See if the game is still running.
         '''
         running = self.enterprise.energy > 0 and not \
         self.destroyed and self.game_map.game_klingons > 0 and \
         self.time_remaining > 0
         return running
 
     def run(self):
+        '''
+        The game loop - runs until the game is over.
+        '''
         self.show_strings(TrekStrings.LOGO_TREKER)
         game.star_date = random.randint(2250, 2300)
         game.time_remaining = random.randint(40, 45)
@@ -64,12 +76,10 @@ def run(self):
         self.show_strings(TrekStrings.HELM_CMDS)
         running = True
         try:
-            while running:
-                self.command_prompt()
-                if not self.game_over():
-                    Stats.show_exit_status(game)
+            while self.game_on():
+                if not self.command_prompt():
+                    break
         except ErrorEnterpriseCollision as ex:
-            Stats.show_exit_status(game)
             game.display()
             if ex.glyph == Glyphs.KLINGON:
                 self.display("You flew into a KLINGON!")
@@ -79,7 +89,10 @@ def run(self):
                 self.display("You flew into a STAR?")
             self.destroyed = True
         game.display()
-        self.display(Quips.jibe_fatal_mistake())
+        Stats.show_exit_status(game)
+        game.display()
+        if self.destroyed == True:
+            self.display(Quips.jibe_fatal_mistake())
         game.display()
         game.display(';-)')
         return False
@@ -104,9 +117,10 @@ def command_prompt(self):
         elif command == "com":
             Control.computer(game)
         elif command.startswith('qui') or command.startswith('exi'):
-            exit()
+            return False
         else:
             self.show_strings(TrekStrings.HELM_CMDS)
+        return True
 
     def print_mission(self):
         self.display("Mission: Destroy {0} Klingon ships in {1} stardates with {2} starbases.".format(