Random damage & probability updates.

Author: soft9000

.gitignore

@@ -35,3 +35,5 @@
 /__pycache__/ShipKlingon.cpython-37.pyc
 /__pycache__/ShipEnterprise.cpython-37.pyc
 /__pycache__/ErrorCollision.cpython-37.pyc
+/__pycache__/Sector.cpython-37.pyc
+/__pycache__/Difficulity.cpython-37.pyc

AbsShip.py

@@ -3,7 +3,7 @@
 
 import Glyphs
 from Quips import Quips
-from Quadrant import Quadrant
+from Sector import Sector
 
 class AbsShip(abc.ABC):
     ''' The first step, into a much larger universe ... '''

Calculators.py

@@ -4,6 +4,7 @@
 from MapGame import *
 from AbsShip import *
 from Points import *
+from Difficulity import Probabilities
 
 class Calc():
 
@@ -36,11 +37,11 @@ def sublight_navigation(game):
             game.display("Enterprise successfully docked with starbase.")
             game.display()
         else:
-            if game.game_map.klingons > 0:
+            if game.game_map.count_area_klingons() > 0:
                 ShipKlingon.attack_if_you_can(game)
                 game.display()
             elif not game.enterprise.repair(game):
-                game.enterprise.damage(game, -1)
+                game.enterprise.damage(game, Probabilities.LRS)
 
     @staticmethod
     def warp_navigation(game):
@@ -80,11 +81,11 @@ def warp_navigation(game):
             game.display("Enterprise successfully docked with starbase.")
             game.display()
         else:
-            if game.game_map.klingons > 0:
+            if game.game_map.count_area_klingons() > 0:
                 ShipKlingon.attack_if_you_can(game)
                 game.display()
             elif not game.enterprise.repair(game):
-                game.enterprise.damage(game, -1)
+                game.enterprise.damage(game, Probabilities.RANDOM)
 
 
     @staticmethod
@@ -107,15 +108,11 @@ def show_torp_targets(game):
         game.display()
         kships = game.game_map.get_area_klingons()
         if len(kships) == 0:
-            game.display("There are no enemies in this quadrant.")
+            game.display("There are no enemies in this sector.")
             return
 
         game.display("Enemies:")
         for ship in kships:
             game.display(f"\tKlingon [{ship.xpos},{ship.ypos}].")
         game.display()
 
-
-
-
-

Controls.py

@@ -9,6 +9,7 @@
 from Calculators import Calc
 from Reports import Stats
 from Quips import Quips
+from Difficulity import Probabilities
 
 class Control():
 
@@ -32,7 +33,7 @@ def computer(game):
             game.display()
             game.display("Invalid computer command.")
             game.display()
-        game.enterprise.damage(game, 4)
+        game.enterprise.damage(game, Probabilities.COMPUTER)
 
 
     @staticmethod
@@ -43,7 +44,7 @@ def phasers(game):
             return
         kships = game.game_map.get_area_klingons()
         if len(kships) == 0:
-            game.display("There are no Klingon ships in this quadrant.")
+            game.display("There are no Klingon ships in this sector.")
             game.display()
             return
         game.display("Phasers locked on target.")
@@ -72,11 +73,12 @@ 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.remove_items(destroyed_ships)
-        if game.game_map.klingons > 0:
+        game.game_map.remove_area_items(destroyed_ships)
+        if game.game_map.count_area_klingons() > 0:
             game.display()
             ShipKlingon.attack_if_you_can(game)
         game.display()
+        game.enterprise.damage(game, Probabilities.PHASERS)
 
 
     def shields(game):
@@ -111,6 +113,7 @@ def shields(game):
             game.enterprise.shield_level -= int(transfer)
         game.display("Shield strength is now {0}. Energy level is now {1}.".format(game.enterprise.shield_level, game.enterprise.energy))
         game.display()
+        game.enterprise.damage(game, Probabilities.SHIELDS)
 
 
     def torpedos(game):
@@ -122,8 +125,8 @@ def torpedos(game):
             game.display("Photon torpedoes exhausted.")
             game.display()
             return
-        if len(game.game_map.get_area_klingons()) == 0:
-            game.display("There are no Klingon ships in this quadrant.")
+        if game.game_map.count_area_klingons() == 0:
+            game.display("There are no Klingon ships in this sector.")
             game.display()
             return
         shot = game.read_xypos()
@@ -140,33 +143,34 @@ def torpedos(game):
                 print(f'{ship.glyph}({ship.xpos},{ship.ypos}), shot({shot.xpos},{shot.ypos})')
             if ship.xpos == shot.xpos and ship.ypos == shot.ypos:
                 if ship.glyph == Glyphs.KLINGON:
-                    num = game.game_map.game_id(ship)
+                    num = game.game_map.get_game_id(ship)
                     game.display(f"Klingon ship #{num} destroyed.")
                     game.display(Quips.jibe_defeat('enemy'))
-                    game.game_map.remove_items([ship])
+                    game.game_map.remove_area_items([ship])
                     hit = True
                     break
                 elif ship.glyph == Glyphs.STARBASE:
-                    game.game_map.starbases -= 1
-                    num = game.game_map.game_id(ship)
+                    game.game_map.game_starbases -= 1
+                    num = game.game_map.get_game_id(ship)
                     game.display("Federation Starbase #{num} destroyed!")
                     game.display(Quips.jibe_defeat('commander'))
-                    game.game_map.remove_items([ship])
+                    game.game_map.remove_area_items([ship])
                     hit = True
                     break
                 elif ship.glyph == Glyphs.STAR:
-                    num = game.game_map.game_id(ship)
+                    num = game.game_map.get_game_id(ship)
                     game.display(f"Torpedo vaporizes star #{num}!")
                     game.display(Quips.jibe_defeat('academic'))
-                    game.game_map.remove_items([ship])
+                    game.game_map.remove_area_items([ship])
                     hit = True
                     break
         if not hit:
             game.display("Torpedo missed.")
-        if len(game.game_map.get_area_klingons()) > 0:
+        if game.game_map.count_area_klingons() > 0:
             game.display()
             ShipKlingon.attack_if_you_can(game)
         game.display()
+        game.enterprise.damage(game, Probabilities.PHOTON)
 
 
 

Difficulity.py

@@ -0,0 +1,49 @@
+import random
+
+class Probabilities:
+    '''
+    Extracting allows for easier customization.
+    '''
+    _LEVEL  = 4    
+    RANDOM  = -1
+    NAV     = 0
+    SRS     = 1
+    LRS     = 2
+    SHIELDS = 3
+    COMPUTER = 4
+    PHOTON   = 5
+    PHASERS  = 6
+
+    @staticmethod
+    def set_difficulity(game, level):
+        '''
+        The HIGHER the level, the MORE difficult 
+        the game will be. 0 = EASY, 6 = HIGHEST
+        '''
+        if level < 0: level = 0
+        if level > 6: level = 6
+        Probabilities._LEVEL = level
+
+    @staticmethod
+    def calc_damage(game, item):
+        '''
+        How mch damage?
+        '''
+        return random.randint(1, 3)
+
+    @staticmethod
+    def should_damage_enterprise(game, item):
+        '''
+        Should we damage?
+        Lowest level (above) eliminates damage to ITEM
+        '''
+        if game.is_testing:
+            return False
+        if item == Probabilities.SHIELDS:
+            return False
+        if random.randint(0, 6) < Probabilities._LEVEL:
+            return True
+        return False
+
+
+