Replace Barleft with Bar

vivienyuwenchen · Oct 18, 2017 · Oct 19, 2017 · Oct 19, 2017 · Oct 19, 2017 · Oct 21, 2017
commit dd5ea39e99761e7fe413e81f71e2cb0b812426d1
diff --git a/Game4.py b/Game4.py
@@ -78,7 +78,7 @@ def mainLoop(self):
             # up to jump
             if pressed[pygame.K_UP] and P1_stamina_bar.bars >= player.jumpcost:
                 if  player.play_y == (360 - player.play_len):
-                    P1_stamina_bar.decreaseBarleft(player.jumpcost)
+                    P1_stamina_bar.decreaseBar(player.jumpcost)
                     player.jump()
                     P1_stamina_bar.draw()
             # left to move left
@@ -108,7 +108,7 @@ def mainLoop(self):
             # generate obstacle player's obstacle at appropriate height
             if (new_obstical == True and P2_stamina_bar.bars >= 33):
                 new_obstical = False
-                P2_stamina_bar.decreaseBarleft(33)
+                P2_stamina_bar.decreaseBar(33)
                 obstacles.append(Obstacle(obs_x, obstical_height, obs_len, self.screen,'RED'))
 
             # move each obstacle forward
@@ -121,8 +121,8 @@ def mainLoop(self):
             obstacles = [obstacle for obstacle in obstacles if not obstacle.isGone()]
 
             # update stamina bars
-            P1_stamina_bar.increaseBarleft()
-            P2_stamina_bar.increaseBarleft(1.5)
+            P1_stamina_bar.increaseBar()
+            P2_stamina_bar.increaseBar(1.5)
             P1_stamina_bar.draw()
             P2_stamina_bar.draw()
 

diff --git a/misc.py b/misc.py
@@ -49,6 +49,7 @@ def __init__(self, play_x, play_y, play_len, screen):
         self.m = 2.5                    # "mass" for jump
         self.floor = play_y             # location of player before jump, used for comparison
         self.jumpcost = 30
+
     def draw(self):
         """Draw player based on top left hand coordinate and length."""
         pygame.draw.rect(self.screen, colors['WHITE'], [self.play_x, self.play_y, self.play_len, self.play_len])
@@ -117,11 +118,11 @@ def draw(self):
         """Draw stamina bar based on color, starting location, and number of health bars."""
         pygame.draw.rect(self.screen, colors[self.color], [self.start, 20, self.bars, 10])
 
-    def decreaseBarleft(self, num_bars):
+    def decreaseBar(self, num_bars):
         """Decrease health bar by num_bars."""
         self.bars -= num_bars
 
-    def increaseBarleft(self, speed = 1):
+    def increaseBar(self, speed = 1):
         """Increase health bar continuously if number of bars is lower than 100."""
         if self.bars < 100:
             self.bars += 1 * speed