summaryrefslogtreecommitdiffhomepage
path: root/config/menus
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-07-14 21:54:46 +0200
committerAki <nthirtyone@gmail.com>2017-07-14 21:54:46 +0200
commit96fef88f56fdcdf95bc5783eb2b3b881ff435ba0 (patch)
treea07a06c784b1768b323e4bfd551676c1052e617f /config/menus
parent9af261cd204b999e6b2b5a44d5c5eb768f84c49d (diff)
downloadroflnauts-96fef88f56fdcdf95bc5783eb2b3b881ff435ba0.zip
roflnauts-96fef88f56fdcdf95bc5783eb2b3b881ff435ba0.tar.gz
roflnauts-96fef88f56fdcdf95bc5783eb2b3b881ff435ba0.tar.bz2
Background in menu moved to separate class
Weird noise added to menu configs to use single MenuBackground instance Initial pause menu added
Diffstat (limited to 'config/menus')
-rw-r--r--config/menus/credits.lua9
-rw-r--r--config/menus/host.lua9
-rw-r--r--config/menus/main.lua9
-rw-r--r--config/menus/pause.lua19
-rw-r--r--config/menus/select.lua7
-rw-r--r--config/menus/settings.lua9
6 files changed, 53 insertions, 9 deletions
diff --git a/config/menus/credits.lua b/config/menus/credits.lua
index 6a2ab50..d59b560 100644
--- a/config/menus/credits.lua
+++ b/config/menus/credits.lua
@@ -1,4 +1,4 @@
-local menu = ...
+local menu, background = ...
local Button = require "not.Button"
local Element = require "not.Element"
@@ -6,7 +6,12 @@ local Element = require "not.Element"
local width, height = love.graphics.getWidth()/getRealScale(), love.graphics.getHeight()/getRealScale()
local bx = width/2-29
+if background == nil or not background:is(require "not.MenuBackground") then
+ background = require "not.MenuBackground"(menu)
+end
+
return {
+ background,
Button(menu)
:setText("Go back")
:setPosition(bx,144)
@@ -21,4 +26,4 @@ return {
love.graphics.printf("A game by the Awesomenauts community including:\nSeltzy, PlasmaWisp, ParaDoX, MilkingChicken, Burningdillo, Bronkey and Aki.\n\n04font was used.\n\nBased on a game by Jan Willem Nijman, Paul Veer and Bits_Beats XOXO.\n\nAwesomenauts is property of Ronimo Games.", (x-110)*scale, (y+10)*scale, 220, "left", 0, scale, scale)
end)
,
-} \ No newline at end of file
+}
diff --git a/config/menus/host.lua b/config/menus/host.lua
index fff683c..a180736 100644
--- a/config/menus/host.lua
+++ b/config/menus/host.lua
@@ -1,4 +1,4 @@
-local menu = ...
+local menu, background = ...
local Button = require "not.Button"
local Selector = require "not.Selector"
@@ -11,7 +11,12 @@ local map_Selector = Selector(menu)
require "iconsList"
local icons, maps = getMapsIconsList()
+if background == nil or not background:is(require "not.MenuBackground") then
+ background = require "not.MenuBackground"(menu)
+end
+
return {
+ background,
map_Selector
:setPosition(width/2, 40)
:setSize(80, 42)
@@ -42,4 +47,4 @@ return {
self.parent:open("main")
end)
,
-} \ No newline at end of file
+}
diff --git a/config/menus/main.lua b/config/menus/main.lua
index d65c57d..85e926f 100644
--- a/config/menus/main.lua
+++ b/config/menus/main.lua
@@ -1,4 +1,4 @@
-local menu = ...
+local menu, background = ...
local Button = require "not.Button"
local Header = require "not.Header"
@@ -9,7 +9,12 @@ local bx = width/2-29
local awesometwo = love.graphics.newImage("assets/two.png")
+if background == nil or not background:is(require "not.MenuBackground") then
+ background = require "not.MenuBackground"(menu)
+end
+
return {
+ background,
Button(menu)
:setText("Start")
:setPosition(bx, 80)
@@ -56,4 +61,4 @@ return {
:setText("Roflnauts")
:setPosition(width/2,40)
,
-} \ No newline at end of file
+}
diff --git a/config/menus/pause.lua b/config/menus/pause.lua
new file mode 100644
index 0000000..74dd043
--- /dev/null
+++ b/config/menus/pause.lua
@@ -0,0 +1,19 @@
+local menu = ...
+
+local Button = require "not.Button"
+
+local width, height = love.graphics.getWidth()/getScale(), love.graphics.getHeight()/getScale()
+local bx = width/2-29
+
+return {
+ Button(menu)
+ :setText("Unpause")
+ :setPosition(bx, height - 36)
+ :set("active", function () end)
+ ,
+ Button(menu)
+ :setText("Exit")
+ :setPosition(bx, height - 20)
+ :set("active", function () end)
+ ,
+}
diff --git a/config/menus/select.lua b/config/menus/select.lua
index 037b798..23f9374 100644
--- a/config/menus/select.lua
+++ b/config/menus/select.lua
@@ -1,4 +1,4 @@
-local menu = ...
+local menu, background = ...
local Button = require "not.Button"
local Selector = require "not.Selector"
@@ -13,7 +13,12 @@ local start_Button = Button(menu)
require "iconsList"
local nautsIcons, nautsList = getNautsIconsList()
+if background == nil or not background:is(require "not.MenuBackground") then
+ background = require "not.MenuBackground"(menu)
+end
+
return {
+ background,
naut_Selector
:setPosition(width/2,60)
:setMargin(8)
diff --git a/config/menus/settings.lua b/config/menus/settings.lua
index 96c12cd..59f9234 100644
--- a/config/menus/settings.lua
+++ b/config/menus/settings.lua
@@ -1,4 +1,4 @@
-local menu = ...
+local menu, background = ...
local Button = require "not.Button"
local Selector = require "not.Selector"
@@ -64,7 +64,12 @@ local controlreleased = function(self, set, action, key)
end
end
+if background == nil or not background:is(require "not.MenuBackground") then
+ background = require "not.MenuBackground"(menu)
+end
+
local a = {
+ background,
Button(menu)
:setText("Keyboard 1")
:setPosition(bx,80)
@@ -111,4 +116,4 @@ local a = {
dimmer
}
-return a \ No newline at end of file
+return a