reslove : inureyes#425

bean3 · Apr 15, 2018 · 06c0a8b · 06c0a8b
1 parent 4b6f8a0
commit 06c0a8b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/gameFunctions.py b/gameFunctions.py
@@ -470,15 +470,18 @@ def checkBulletAlienCol(setting, screen, stats, sb, ship, aliens, bullets, eBull
                 sounds.enemy_explosion_sound.play()
                 #if an enemy dies, it falls down an item randomly.
                 #use cumulative probability
-                i = random.randrange(100)
-                if i<=setting.probabilityHeal:
-                    createItem(setting, screen, stats, alien.rect.x, alien.rect.y, 1, items)
-                if setting.probabilityHeal<i<=setting.probabilityHeal+setting.probabilityTime:
-                    createItem(setting, screen, stats, alien.rect.x, alien.rect.y, 2, items)
-                if setting.probabilityHeal+setting.probabilityTime<i<=setting.probabilityHeal+setting.probabilityTime+setting.probabilityShield:
-                    createItem(setting, screen, stats, alien.rect.x, alien.rect.y, 3, items)
-                if setting.probabilityHeal+setting.probabilityTime+setting.probabilityShield<i<=setting.probabilityHeal+setting.probabilityTime+setting.probabilityShield+setting.probabilitySpeed:
-                    createItem(setting, screen, stats, alien.rect.x, alien.rect.y, 4, items)
+                i = random.randrange(1,101)
+                if(i <= setting.probability):
+                	createItem(setting, screen, stats, alien.rect.x, alien.rect.y, random.
+                		randrange(1,5), items)
+                #if i<=setting.probabilityHeal:
+                #    createItem(setting, screen, stats, alien.rect.x, alien.rect.y, 1, items)
+                #if setting.probabilityHeal<i<=setting.probabilityHeal+setting.probabilityTime:
+                #    createItem(setting, screen, stats, alien.rect.x, alien.rect.y, 2, items)
+                #if setting.probabilityHeal+setting.probabilityTime<i<=setting.probabilityHeal+setting.probabilityTime+setting.probabilityShield:
+                #    createItem(setting, screen, stats, alien.rect.x, alien.rect.y, 3, items)
+                #if setting.probabilityHeal+setting.probabilityTime+setting.probabilityShield<i<=setting.probabilityHeal+setting.probabilityTime+setting.probabilityShield+setting.probabilitySpeed:
+                #    createItem(setting, screen, stats, alien.rect.x, alien.rect.y, 4, items)
                 aliens.remove(alien)
 
 

diff --git a/main.py b/main.py
@@ -136,6 +136,8 @@ def runGame():
 
                 # Create a new fleet and center the ship
                 gf.createFleet(setting, stats, screen, ship, aliens)
+                if(setting.gameLevel == "hard"):
+                    setting.probability = 10
                 ship.centerShip()
 
             mm.checkEvents(setting, screen, stats, sb, bMenu, ship, aliens, bullets, eBullets)

diff --git a/settings.py b/settings.py
@@ -58,10 +58,11 @@ def __init__(self):
         self.shootTimer = 50
 
         #item probability %
-        self.probabilityHeal = 10
-        self.probabilityTime = 20
-        self.probabilityShield = 25
-        self.probabilitySpeed = 20
+        self.probability = 20
+        #self.probabilityHeal = 10
+        #self.probabilityTime = 20
+        #self.probabilityShield = 25
+        #self.probabilitySpeed = 20
 
         #invincibile time
         self.invincibileTime = 2000