Better in-play inventory.

Author: soft9000

Calculators.py

@@ -32,7 +32,7 @@ def navigation(game):
         dist = dest_sys.warp * 8
         energy_required = int(dist)
         if energy_required >= game.enterprise.energy:
-            game.display("Unable to comply. Insufficient energy to travel that speed.")
+            game.display("Insufficient energy to travel at that speed.")
             game.display()
             return
         else:
@@ -79,7 +79,7 @@ def show_torp_targets(game):
         game.display()
         kships = game.game_map.get_area_klingons()
         if len(kships) == 0:
-            game.display("There are no enemy ships in this quadrant.")
+            game.display("There are no enemies in this quadrant.")
             return
 
         game.display("Enemies:")

Controls.py

@@ -69,7 +69,6 @@ def phasers(game):
             else:
                 game.display(f"Hit ship at [{ship.xpos + 1},{ship.ypos + 1}].")
                 game.display(f"Enemy shield down to {ship.shield_level}.")
-        game.game_map.klingons -= len(destroyed_ships)
         game.game_map.remove_items(destroyed_ships)
         if game.game_map.klingons > 0:
             game.display()
@@ -141,7 +140,6 @@ def torpedos(game):
                     num = game.game_map.game_id(ship)
                     game.display(f"Klingon ship #{num} destroyed.")
                     game.display(Quips.jibe_defeat('enemy'))
-                    game.game_map.klingons -= 1
                     game.game_map.remove_items([ship])
                     hit = True
                     break
@@ -156,7 +154,7 @@ def torpedos(game):
                 elif ship.glyph == Glyphs.STAR:
                     num = game.game_map.game_id(ship)
                     game.display(f"Torpedo vaporizes star #{num}!")
-                    game.display(Quips.jibe_defeat('scientist'))
+                    game.display(Quips.jibe_defeat('academic'))
                     game.game_map.remove_items([ship])
                     hit = True
                     break

MapGame.py

@@ -13,8 +13,7 @@ class GameMap(MapSparse.SparseMap):
     def __init__(self):
         super().__init__()
         self.sector = -1
-        self.major_x = self.major_y = -1
-        self.xpos    = self.ypos    = -1
+        self.xpos = self.ypos = -1
         self.stars      = -1
         self.klingons   = -1
         self.starbases  = -1
@@ -124,10 +123,16 @@ def _count(self, glyph):
                     count += 1
         return count
 
-    def remove_items(self, destroyed_ships):
+    def update_counts(self):
+        self.klingons = self._count(Glyphs.KLINGON)
+        self.starbases = self._count(Glyphs.STARBASE)
+        self.stars = self._count(Glyphs.STAR)
+
+    def remove_items(self, removed):
         area = self.area()
-        for obj in destroyed_ships:
+        for obj in removed:
             area.remove(obj.xpos, obj.ypos)
+        self.update_counts()
 
     def get_area_klingons(self):
         '''
@@ -201,16 +206,6 @@ def go_to(self, dest):
             self.enterprise_out()
         assert(isinstance(self.sector, int))
         self.sector = dest.sector
-        if self.sector > 0:
-            fop = (self.sector + 8) / 8
-            self.major_x = int(fop) - 1 # ZERO BASED REGIONS
-            if not fop.is_integer():
-                self.major_y = \
-                ((fop - float(self.major_x)) * 10) - 1 # ZBR
-        else:
-            self.major_x = -1
-            self.major_y = -1
-
         self.xpos = dest.xpos
         self.ypos = dest.ypos
         self.enterprise_in(dest)

MapSparse.py

@@ -4,7 +4,8 @@
 
 class SparseMap:
     ''' 
-    Minimalist mapping. On-demand Area epansion to full-Area views.
+    Minimalist mapping. 
+    On-demand 'sparse-array' expansion to full-Area views.
     '''
 
     class Region():

Quips.py

@@ -4,21 +4,22 @@
     "The main ",
     "That @#$#@& ",
     "Our cheap ",
-    "Darnit captian, that ",
+    "Darn-it captain, that ",
     "Yikes, the ",
     ]
 DAMAGE_SUFFIX = [
     " has died. We're on it!",
     " is out. We're working on it!",
     " is almost repaired!",
     " is dead.",
-    " is fried. I'm working as fast as I can!",
+    " is fried. Working as fast as we can!",
+    " is toast. Working as fast as I can!",
     " is being replaced.",
     " is dead. Please leave a message.",
     ]
 DEFEAT_PREFIX = [
     "A defeated ",
-    "The vengefull ",
+    "The vengeful ",
     "An angry ",
     "The ejecting ",
     "A confused ",
@@ -35,6 +36,7 @@
     " is no more.",
     " is recycled.",
     " is eliminated.",
+    " was aborted. Few lives, matter?",
     " ejects.",
     " crew is rescued.",
     " crew is spaced.",
@@ -47,8 +49,8 @@
     " screams: 'Thy father is a Targ!'",
     " yells: 'Your parents eat bats!'",
     " snarls: 'Thy people eat vermin!'",
-    " yells: 'May you create social diseases!'",
-    " curses: 'Thy fathers spread pox!'",
+    " yells: 'May you create social disease!'",
+    " curses: 'Thy fathers spreadeth pox!'",
     " yells: 'Your mother is progressive!'",
     ]
 

README.rst

@@ -11,7 +11,6 @@ So far:
 
 Original authors did an excellent job here - made the modernization a WHOLE LOT easier!
 
-:monocle_face:
 
 -- Nagy
 

Reports.py

@@ -31,7 +31,7 @@ def show_galactic_status(game):
 
 
     @staticmethod
-    def show_game_status(game):
+    def show_exit_status(game):
         if game.destroyed:
             msg = "MISSION FAILED: ENTERPRISE DESTROYED!!!"
             game.display('!' * len(msg))

StarTrek2020.py

@@ -38,7 +38,7 @@ def run(self):
             self.destroyed and self.game_map.klingons > 0 and \
             self.time_remaining > 0:
             self.command_prompt()
-            Stats.show_game_status(game)
+            Stats.show_exit_status(game)
 
     def command_prompt(self):
         command = self.read("Enter command: ").strip().lower()