Merge pull request #37 from Stephenson-Software/running

Run Button

Author: dmccoystephenson

README.md

@@ -15,9 +15,9 @@ w | move up
 a | move left
 s | move down
 d | move right
+shift | run
 e | interact
 q | place item from inventory
-f11 | fullscreen
 print screen | take screenshot
 l | toggle tick speed limit
 esc | quit

src/config.py

@@ -12,8 +12,10 @@ def __init__(self):
         self.fullscreen = False
         self.black = (0,0,0)
         self.white = (255,255,255)
-        self.tickSpeed = 1/30 # 30 frames per second
+        self.ticksPerSecond = 30
+        self.tickSpeed = 1/self.ticksPerSecond
         self.limitTickSpeed = True
         self.gridSize = 16
         self.playerMovementEnergyCost = 0.2
-        self.worldBorder = 16
+        self.worldBorder = 16
+        self.runSpeedFactor = 2.5

src/player.py

@@ -15,6 +15,8 @@ def __init__(self):
         self.inventory = Inventory()
         self.interacting = False
         self.placing = False
+        self.tickLastMoved = -1
+        self.speed = 15
 
     def getColor(self):
         return self.color
@@ -56,4 +58,16 @@ def setPlacing(self, bool):
         self.placing = bool
 
     def isDead(self):
-        return self.energy < 1
+        return self.energy < 1
+    
+    def setTickLastMoved(self, tick):
+        self.tickLastMoved = tick
+    
+    def getTickLastMoved(self):
+        return self.tickLastMoved
+    
+    def getSpeed(self):
+        return self.speed
+    
+    def setSpeed(self, newSpeed):
+        self.speed = newSpeed

src/roam.py

@@ -21,6 +21,7 @@ def __init__(self):
         self.status = Status(self.graphik)
         self.status.set("entered the world", self.tick)
         self.worldScreen = WorldScreen(self.graphik, self.config, self.status, self.tick)
+        self.currentScreen = WorldScreen
 
     def initializeGameDisplay(self):
         if self.config.fullscreen:
@@ -33,7 +34,9 @@ def quitApplication(self):
         quit()
 
     def run(self):
-        self.worldScreen.run()
+        if self.currentScreen == WorldScreen:
+            self.worldScreen.run()
+        self.quitApplication()
 
 roam = Roam()
 roam.run()

src/worldScreen.py

@@ -150,6 +150,7 @@ def movePlayer(self, direction: int):
 
         # decrease energy
         self.player.removeEnergy(self.config.playerMovementEnergyCost)
+        self.player.setTickLastMoved(self.tick)
 
     def canBePickedUp(self, entity):
         itemTypes = [Wood, Leaves, Grass, Apple]
@@ -234,6 +235,8 @@ def handleKeyDownEvent(self, key):
             x, y = self.graphik.getGameDisplay().get_size()
             self.captureScreen("screenshot-" + str(datetime.datetime.now()).replace(" ", "-").replace(":", ".") +".png", (0,0), (x,y))
             self.status.set("screenshot saved", self.tick)
+        elif key == pygame.K_LSHIFT:
+            self.player.setSpeed(self.player.getSpeed()*self.config.runSpeedFactor)
 
     def handleKeyUpEvent(self, key):
         if (key == pygame.K_w or key == pygame.K_UP) and self.player.getDirection() == 0:
@@ -248,6 +251,8 @@ def handleKeyUpEvent(self, key):
             self.player.setInteracting(False)
         elif key == pygame.K_q:
             self.player.setPlacing(False)
+        elif key == pygame.K_LSHIFT:
+            self.player.setSpeed(self.player.getSpeed()/self.config.runSpeedFactor)
 
     # @source https://stackoverflow.com/questions/63342477/how-to-take-screenshot-of-entire-display-pygame
     def captureScreen(self, name, pos, size): # (pygame Surface, String, tuple, tuple)
@@ -305,7 +310,8 @@ def run(self):
                 elif event.type == pygame.VIDEORESIZE:
                     self.initializeLocationWidthAndHeight()
 
-            self.movePlayer(self.player.direction)
+            if self.player.getTickLastMoved() + 30/self.player.getSpeed() < self.tick:
+                self.movePlayer(self.player.direction)
 
             if self.player.isInteracting():
                 self.executeInteractAction()