From 6915ac4ca248b47ed0078bb8e3f59bfd4e85a27b Mon Sep 17 00:00:00 2001
From: Simon Kellet <sik00038@students.stir.ac.uk>
Date: Sun, 21 Apr 2024 13:51:07 +0100
Subject: [PATCH] added delay for each player

---
 keyPressed.lua | 40 +++++++++++++++++++++++-----------------
 main.lua       | 19 ++++++++++++-------
 updateGame.lua | 11 ++++++++---
 3 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/keyPressed.lua b/keyPressed.lua
index af024a9..a5b6c79 100644
--- a/keyPressed.lua
+++ b/keyPressed.lua
@@ -1,24 +1,30 @@
 function keyPressed(key)
-	if EnableKeyPress == false then
-		return --return early
+	if EnableKeyPress1 == true then
+		if key == "space" then
+			local bullet = Bullet(UserPlayer1.x + UserPlayer1.width / 2, UserPlayer1.y, 1, BulletImg, 500)
+			GameSounds.shoot1:play()
+			table.insert(Bullets1, bullet)
+
+			KeyPressTime1 = KeyDelay1
+			EnableKeyPress1 = false
+		end
 	end
 
-	local bulletImg = "/assets/bullet.png"
-	if key == "space" then
-		local bullet = Bullet(UserPlayer1.x + UserPlayer1.width / 2, UserPlayer1.y, 1, bulletImg, 500)
-		GameSounds.shoot1:play()
-		table.insert(Bullets1, bullet)
-	elseif key == "return" then
-		local bullet = Bullet(UserPlayer2.x + UserPlayer2.width / 2, UserPlayer2.y, 2, bulletImg, 500)
-		GameSounds.shoot2:play()
-		table.insert(Bullets2, bullet)
-	elseif key == "escape" then
+	if EnableKeyPress2 == true then
+		if key == "return" then
+			local bullet = Bullet(UserPlayer2.x + UserPlayer2.width / 2, UserPlayer2.y, 2, BulletImg, 500)
+			GameSounds.shoot2:play()
+			table.insert(Bullets2, bullet)
+
+			KeyPressTime2 = KeyDelay2
+			EnableKeyPress2 = false
+		end
+	end
+
+	if key == "escape" then
 		love.event.quit()
-	elseif key == "r" then
+	end
+	if key == "r" then
 		love.load()
 	end
-
-	-- KeyPressTime now equals a delay
-	KeyPressTime = KeyDelay
-	EnableKeyPress = false
 end
diff --git a/main.lua b/main.lua
index ec93e1b..cfa6126 100644
--- a/main.lua
+++ b/main.lua
@@ -19,9 +19,13 @@ function love.load()
 	ScrnHeight = love.graphics.getHeight()
 	ScrnWidth = love.graphics.getWidth()
 
-	EnableKeyPress = true
-	KeyPressTime = 0
-	KeyDelay = 0.5
+	EnableKeyPress1 = true
+	KeyPressTime1 = 0
+	KeyDelay1 = 0.5
+
+	EnableKeyPress2 = true
+	KeyPressTime2 = 0
+	KeyDelay2 = 0.5
 
 	GameSounds = {}
 	--static, loaded into memory all time
@@ -35,10 +39,11 @@ function love.load()
 	GameSounds.bg:setVolume(0.5)
 	GameSounds.bg:play()
 
-	local player1Img = "/assets/player1.png"
-	local player2Img = "/assets/player2.png"
-	UserPlayer1 = Player(400, ScrnHeight - 30, 1, 3, player1Img, 300)
-	UserPlayer2 = Player(200, 0, 2, 3, player2Img, 300)
+	Player1Img = "/assets/player1.png"
+	Player2Img = "/assets/player2.png"
+	BulletImg = "/assets/bullet.png"
+	UserPlayer1 = Player(400, ScrnHeight - 30, 1, 3, Player1Img, 300)
+	UserPlayer2 = Player(200, 0, 2, 3, Player2Img, 300)
 
 	Bullets1 = {}
 	Bullets2 = {}
diff --git a/updateGame.lua b/updateGame.lua
index d5f3e2d..943fb52 100644
--- a/updateGame.lua
+++ b/updateGame.lua
@@ -8,9 +8,14 @@ end
 
 function updateGame(dt)
 	--add delay between key presses
-	KeyPressTime = math.max(0, KeyPressTime - dt)
-	if KeyPressTime <= 0 then
-		EnableKeyPress = true
+	KeyPressTime1 = math.max(0, KeyPressTime1 - dt)
+	if KeyPressTime1 <= 0 then
+		EnableKeyPress1 = true
+	end
+
+	KeyPressTime2 = math.max(0, KeyPressTime2 - dt)
+	if KeyPressTime2 <= 0 then
+		EnableKeyPress2 = true
 	end
 
 	TimeToPlaceWall = TimeToPlaceWall - dt