lots of netplay stuffs

classes/raccoon.lua

@@ -181,13 +181,5 @@ function raccoon:die()
 		objects["player"][1]:addMaxHealth()
 	end
 
-	bossSong = nil
-
-	collectgarbage()
-	collectgarbage()
-
-	finalBossSong = love.audio.newSource("audio/finalboss.ogg", "static")
-	finalBossSong:setLooping(true)
-
 	self.remove = true
 end

libraries/3ds.lua

@@ -40,6 +40,10 @@ function love.graphics.set3D(enable3D)
 	assert(enable3D and type(enable3D) == "boolean", "Boolean expected: got " .. type(depthValue))
 end
 
+function love.system.getWifiStrength()
+	return 3
+end
+
 local olddraw = love.graphics.draw
 function love.graphics.draw(...)
 	local args = {...}

libraries/character.lua

@@ -2,6 +2,7 @@ function loadCharacters()
 	local characters =
 	{
 		"astro",
+		"becky",
 		"furious",
 		"gabe",
 		"hugo",

libraries/keyboard.lua

@@ -3,8 +3,8 @@ keyboard = class("keyboard")
 local keys = 
 {
 	"1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-", "BS",
-	"q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "RT", "",
-	"a", "s", "d", "f", "g", "h", "j", "k", "l", "'", "=", "/",
+	"q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "RT","",
+	"a", "s", "d", "f", "g", "h", "j", "k", "l", "'", "=", "SP",
 	"z", "x", "c", "v", "b", "n", "m", ",", ".", "?", "!", "ST",
 }
 
@@ -87,7 +87,7 @@ function keyboard:draw()
 	love.graphics.translate(40, 240)
 
 	for x = 1, 26 do
-		love.graphics.line(self.x + 5 + (x - 1) * 12, self.y + mainFont:getHeight(), self.x + 10 + (x - 1) * 12, self.y + mainFont:getHeight())
+		love.graphics.line(self.x + 5 + (x - 1) * 12, self.y + mainFont:getHeight() + 2, self.x + 10 + (x - 1) * 12, self.y + mainFont:getHeight() + 2)
 	end
 
 	love.graphics.pop()
@@ -127,6 +127,9 @@ function keyboard:mousepressed(x, y, button)
 				end
 				self:clear()
 				return
+			elseif v.text == "SP" then
+				self.text = self.text .. " "
+				return
 			end
 
 			if #self.text < self.maxChars then
@@ -152,7 +155,7 @@ function keyboardkey:init(x, y, t)
 	self.shifted = false
 	self.specialKey = false
 
-	if t == "BS" or t == "ST" or t == "RT" then
+	if t == "BS" or t == "ST" or t == "RT" or t == "SP" then
 		self.specialKey = true
 	end
 
@@ -177,13 +180,13 @@ function keyboardkey:draw(fade)
 	end
 
 	if self.pressed then
-		love.graphics.setColor(unpack(util.colorFade(self.fadeTimer, 1, {255, 0, 0}, {255, 255, 255})))
+		love.graphics.setColor(unpack(util.colorFade(self.fadeTimer, 1, {255, 0, 0, 255 * fade}, {255, 255, 255, 255 * fade})))
 	end
 
 	love.graphics.print(self.text, (self.x + self.width / 2) - mainFont:getWidth(self.text) / 2, (self.y + self.height / 2) - mainFont:getHeight() / 2)
 
 	if self.pressed then
-		love.graphics.setColor(255, 255, 255, 255)
+		love.graphics.setColor(255, 255, 255, 255 * fade)
 	end
 end
 

main.lua

@@ -39,12 +39,6 @@ require 'states.netplay'
 require 'netplay.lobby'
 require 'netplay.client'
 
-clientSocket = require 'socket'.udp()
-
-if _EMULATEHOMEBREW then
-	clientSocket:settimeout(0)
-end
-
 io.stdout:setvbuf("no")
 
 --[[
@@ -201,6 +195,9 @@ function love.load()
 	keyboardCloseSound = love.audio.newSource("audio/close.ogg", "static")
 	
 	shieldSound = love.audio.newSource("audio/shield.ogg")
+
+	toggleSound = love.audio.newSource("audio/tick.ogg")
+	blipSound = love.audio.newSource("audio/blip.ogg")
 	
 	hurtSound = {}
 	for k = 1, 3 do

states/game.lua

@@ -364,6 +364,10 @@ function gameKeyPressed(key)
 		end
 	end
 
+	if key == "y" then
+		objects["player"][1]:setPowerup("shield")
+	end
+
 	if paused then
 		gamePauseMenu:keyPressed(key)
 		return

states/title.lua

@@ -83,7 +83,7 @@ function titleToggleOnline()
 	onlineMenu = not onlineMenu
 
 	if onlineMenu then
-		titleOptions[1] = {"Online Game", function() util.changeState("netplay") end}
+		titleOptions[1] = {"Online Game", function() if love.system.getWifiStrength() > 0 then util.changeState("netplay") end end}
 	else
 		titleOptions[1] = {"New Game", function() util.changeState("charSelect") end}
 	end