summaryrefslogtreecommitdiffhomepage
path: root/config/menus
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2018-04-09 21:30:11 +0200
committerAki <nthirtyone@gmail.com>2018-04-09 21:30:11 +0200
commitfa4409cedb322bbd41722f22308f399979fc6676 (patch)
treea7cc4725b003c1932ad88f4fce8548d43605bf9b /config/menus
parent96f6ebdaf06650a35dcdb6a1fc3f472b3aab6d8a (diff)
parent290d75dceb905217cb67fcb32e95dbeb45e27e3c (diff)
downloadroflnauts-fa4409cedb322bbd41722f22308f399979fc6676.zip
roflnauts-fa4409cedb322bbd41722f22308f399979fc6676.tar.gz
roflnauts-fa4409cedb322bbd41722f22308f399979fc6676.tar.bz2
Love2D version 0.10.2 -> 11.0
Diffstat (limited to 'config/menus')
-rw-r--r--config/menus/host.lua2
-rw-r--r--config/menus/main.lua2
-rw-r--r--config/menus/pause.lua2
-rw-r--r--config/menus/select.lua4
-rw-r--r--config/menus/settings.lua8
-rw-r--r--config/menus/win.lua2
6 files changed, 10 insertions, 10 deletions
diff --git a/config/menus/host.lua b/config/menus/host.lua
index 2b5fac5..102c4c3 100644
--- a/config/menus/host.lua
+++ b/config/menus/host.lua
@@ -32,7 +32,7 @@ function loadConfigs (dir, process)
local items, icons = {}, {}
for _,file in pairs(love.filesystem.getDirectoryItems(dir)) do
local path = string.format("%s/%s", dir, file)
- if love.filesystem.isFile(path) and file ~= "readme.md" then
+ if love.filesystem.getInfo(path).type == "file" and file ~= "readme.md" then
local item = love.filesystem.load(path)()
if isAvailable(item) then
if process then
diff --git a/config/menus/main.lua b/config/menus/main.lua
index ae2cef2..87dca94 100644
--- a/config/menus/main.lua
+++ b/config/menus/main.lua
@@ -58,7 +58,7 @@ return {
:setPosition(width/2, 15)
:set("draw", function (self, scale)
local x,y = self:getPosition()
- love.graphics.setColor(255, 255, 255, 255)
+ love.graphics.setColor(1, 1, 1, 1)
love.graphics.setFont(Bold)
love.graphics.draw(awesometwo, x*scale, y*scale, 0, scale, scale, 35)
end)
diff --git a/config/menus/pause.lua b/config/menus/pause.lua
index 60aa2fc..d0b5777 100644
--- a/config/menus/pause.lua
+++ b/config/menus/pause.lua
@@ -9,7 +9,7 @@ local bx = width/2-29
return {
Element(menu)
:set("draw", function (self, scale)
- love.graphics.setColor(0, 0, 0, 110)
+ love.graphics.setColor(0, 0, 0, .45)
local width, height = love.graphics.getWidth(), love.graphics.getHeight()
love.graphics.rectangle("fill", 0, 0, width, height)
end)
diff --git a/config/menus/select.lua b/config/menus/select.lua
index 9f0ed9b..df14ad7 100644
--- a/config/menus/select.lua
+++ b/config/menus/select.lua
@@ -36,7 +36,7 @@ function loadConfigs (dir, process)
local items, icons = {}, {}
for _,file in pairs(love.filesystem.getDirectoryItems(dir)) do
local path = string.format("%s/%s", dir, file)
- if love.filesystem.isFile(path) and file ~= "readme.md" then
+ if love.filesystem.getInfo(path).type == "file" and file ~= "readme.md" then
local item = love.filesystem.load(path)()
if isAvailable(item) then
if process then
@@ -128,7 +128,7 @@ return {
if self.the_final_countdown ~= 9 then
local x,y = self:getPosition()
local countdown = math.max(1, math.ceil(self.the_final_countdown))
- love.graphics.setColor(255, 255, 255, 255)
+ love.graphics.setColor(1, 1, 1, 1)
love.graphics.setFont(Font)
love.graphics.print("Autostart in:", (x-16)*scale, (y+10)*scale, 0, scale, scale)
love.graphics.setFont(Bold)
diff --git a/config/menus/settings.lua b/config/menus/settings.lua
index 7102bea..94b8e7a 100644
--- a/config/menus/settings.lua
+++ b/config/menus/settings.lua
@@ -16,13 +16,13 @@ local dimmer = Element(menu)
:set("previousControl", "") -- it actually means key that was set as this control PREVIOUSLY
:set("draw", function (self, scale)
if self.visible then
- love.graphics.setColor(0, 0, 0, 210)
+ love.graphics.setColor(0, 0, 0, .8)
love.graphics.rectangle("fill",0,0,width*getRealScale(),height*getRealScale())
- love.graphics.setColor(120, 255, 120, 255)
+ love.graphics.setColor(.5, 1, .5, 1)
love.graphics.printf("Press new key for: \n> " .. self.currentControl .. " <", (width/2-110)*scale, (height/2-4)*scale, 220, "center", 0, scale, scale)
- love.graphics.setColor(120, 120, 120, 255)
+ love.graphics.setColor(.5, .5, .5, 1)
love.graphics.printf("Old: " .. self.previousControl .. "", (width/2-110)*scale, (height/2+16)*scale, 220, "center", 0, scale, scale)
- love.graphics.setColor(255, 255, 255, 255)
+ love.graphics.setColor(1, 1, 1, 1)
end
end)
diff --git a/config/menus/win.lua b/config/menus/win.lua
index f7163dd..ee56aeb 100644
--- a/config/menus/win.lua
+++ b/config/menus/win.lua
@@ -10,7 +10,7 @@ return {
:setPosition(width/2, 18)
:set("draw", function (self, scale)
local x,y = self:getPosition()
- love.graphics.setColor(255, 255, 255, 255)
+ love.graphics.setColor(1, 1, 1, 1)
love.graphics.printf("ROFL, NOW KILL YOURSELF", x*scale, y*scale, 160, "center", 0, scale, scale, 80, 3)
end)
:set("focus", function () return true end)