refactoring (#1)

* refactoring

* player name

* server

* disable fullscreen

* server window size

Author: prashantgupta24

.gitignore

@@ -2,4 +2,6 @@ test/*
 
 *.txt
 
-.DS_Store
+.DS_Store
+
+*.love

Makefile

@@ -0,0 +1,9 @@
+server:
+	/Applications/love.app/Contents/MacOS/love game/server
+client:
+	/Applications/love.app/Contents/MacOS/love game/client
+build-all: build-server build-client
+build-server:
+	(cd game/server && zip -r server.love .)
+build-client:
+	(cd game/client && zip -r client.love .)

game/client/main.lua

@@ -6,7 +6,7 @@ local zombie = require "zombie"
 local player = require "player"
 
 function love.load()
-    love.window.setFullscreen(true)
+    love.window.setMode(1000, 600)
     GameClient = game.newClient(22122)
     love.window.setTitle( "Client")
 
@@ -113,8 +113,14 @@ function love.draw()
         table.sort(sortedByScore, function(a, b) return a[2].score > b[2].score end)
         for _, v in pairs(sortedByScore) do
             local playerObj = v[2]
-            if playerObj.id == GameClient.player.id then love.graphics.setColor(1, 0, 0, 1) end
-            love.graphics.printf(playerObj.name .. " :: Zombies killed: " .. playerObj.score .. ", Accuracy: " .. string.format("%.2f %%",  playerObj.accuracy), Fonts.s ,20, love.graphics.getHeight()-height, love.graphics.getWidth(), "left")
+            local playerName = playerObj.name
+            if playerObj.id == GameClient.player.id then
+                love.graphics.setColor(0.2, 0.2, 0.8, 1)
+                playerName = playerName .. "*"
+            else
+                playerName = playerName .. " "
+            end
+            love.graphics.printf(playerName .. " :: Zombies killed: " .. playerObj.score .. ", Accuracy: " .. string.format("%.2f %%",  playerObj.accuracy), Fonts.s ,20, love.graphics.getHeight()-height, love.graphics.getWidth(), "left")
             love.graphics.setColor(0, 0, 0, 1)
             height = height - 30
         end
@@ -123,6 +129,7 @@ function love.draw()
     if GameClient.currentGameState == GameClient.states.SERVER_DISCONNECT then
         love.graphics.printf("Disconnected from server.. Game will close soon!", Fonts.l, 0, 50, love.graphics.getWidth(), "center")
     end
+    love.graphics.printf("Press escape to quit", Fonts.xs, 0, 5, love.graphics.getWidth(), "center")
 end
 
 function love.keypressed(key)
@@ -132,9 +139,13 @@ function love.keypressed(key)
                 timestamp = love.timer.getTime(),
             })
         else
-            GameClient:resetGame()
-            GameClient.currentGameState = GameClient.states.CLIENT_PLAY
+            if GameClient.currentGameState == GameClient.states.GAME_END then
+                GameClient:resetGame()
+                GameClient.currentGameState = GameClient.states.CLIENT_PLAY
+            end
         end
+    elseif key == "escape" then
+        love.event.quit()
     end
 end
 
@@ -145,8 +156,8 @@ function love.keyreleased(key)
 end
 
 function love.quit()
-  print("Thanks for playing!")
-  if GameClient.client then
-    GameClient.client:disconnectNow()
-  end
+    print("Thanks for playing!")
+    if GameClient.client then
+        GameClient.client:disconnectNow()
+    end
 end

game/server/main.lua

@@ -5,7 +5,7 @@ local game = require "game"
 local zombie = require "zombie"
 
 function love.load()
-    love.window.setFullscreen(true)
+    love.window.setMode(1000, 600)
     love.window.setTitle("Server")
     GameServer = game.newServer(GetIP(), 22122)
 end
@@ -41,5 +41,7 @@ end
 function love.keypressed( key )
     if key == "space" then
        zombie.spawn(GameServer)
+    elseif key == "escape" then
+        love.event.quit()
     end
 end

game/zombie.lua

@@ -20,18 +20,18 @@ local function spawn(server)
     zombie.playerToTarget = playerToTarget
 
     local side = math.random(1, 4)
-    if side == 1 then
+    if side == 1 then --left
         zombie.x = -30
+        zombie.y = math.random(0, love.graphics.getHeight()) - 30
+    elseif side == 2 then --right
+        zombie.x = love.graphics.getWidth() + 30
         zombie.y = math.random(0, love.graphics.getHeight())
-    elseif side == 2 then
-        zombie.x = love.graphics.getWidth()
-        zombie.y = math.random(0, love.graphics.getHeight())
-    elseif side == 3 then
+    elseif side == 3 then --top
         zombie.x = math.random(0, love.graphics.getWidth())
         zombie.y = -30
-    elseif side == 4 then
+    elseif side == 4 then --down
         zombie.x = math.random(0, love.graphics.getWidth())
-        zombie.y = love.graphics.getHeight()
+        zombie.y = love.graphics.getHeight() + 30
     end
 
     table.insert(server.zombies, zombie)