Merge pull request #38 from Stephenson-Software/energy-bar

Energy Bar

Author: dmccoystephenson

src/energyBar.py

@@ -0,0 +1,18 @@
+from graphik import Graphik
+from player import Player
+
+# @author Daniel McCoy Stephenson
+# @since August 16th, 2022
+class EnergyBar:
+    def __init__(self, graphik: Graphik, player: Player):
+        self.graphik = graphik
+        self.player = player
+    
+    def draw(self):
+        x, y = self.graphik.getGameDisplay().get_size()
+        xpos = 0
+        ypos = y - y/64
+        width = x * (self.player.getEnergy()/self.player.getMaxEnergy())
+        height = y/64
+        color = (255, 215, 73)
+        self.graphik.drawRectangle(xpos, ypos, width, height, color)

src/player.py

@@ -23,6 +23,9 @@ def getColor(self):
 
     def getEnergy(self):
         return self.energy
+
+    def getMaxEnergy(self):
+        return self.maxEnergy
 
     def addEnergy(self, energy):
         self.energy += energy

src/worldScreen.py

@@ -4,6 +4,7 @@
 import pygame
 from apple import Apple
 from config import Config
+from energyBar import EnergyBar
 from food import Food
 from graphik import Graphik
 from grass import Grass
@@ -31,6 +32,7 @@ def __init__(self, graphik: Graphik, config: Config, status: Status, tick: int):
         self.numApplesEaten = 0
         self.numDeaths = 0
         self.running = True
+        self.energyBar = EnergyBar(self.graphik, self.player)
 
     def initializeLocationWidthAndHeight(self):
         x, y = self.graphik.getGameDisplay().get_size()
@@ -269,17 +271,6 @@ def respawnPlayer(self):
         self.status.set("respawned", self.tick)
         pygame.display.set_caption(("Roam - " + str(self.currentRoom.getName())))
 
-    def displayInfo(self):
-        x, y = self.graphik.getGameDisplay().get_size()
-        startingX = x/8
-        startingY = y/8
-        size = 30
-        self.displayEnergy(startingX, startingY, size)
-        
-    def displayEnergy(self, startingX, startingY, size):
-        self.graphik.drawText("Energy:", startingX, startingY - size/2, size, self.config.black)
-        self.graphik.drawText(str(floor((self.player.getEnergy()))), startingX, startingY + size/2, size, self.config.black)
-    
     def displayInventoryTopItem(self):
         x, y = self.graphik.getGameDisplay().get_size()
         xpos = x - x/8
@@ -331,9 +322,9 @@ def run(self):
             self.graphik.getGameDisplay().fill(self.currentRoom.getBackgroundColor())
             self.currentRoom.draw(self.locationWidth, self.locationHeight)
             self.status.draw()
+            self.energyBar.draw()
 
             # display
-            self.displayInfo()
             self.displayInventoryTopItem()
 
             # update