From d480978edd91e0b096c57fb151780a957587e06d Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Sat, 2 Sep 2017 21:08:08 +0200
Subject: First changes to map format, two samples

---
 config/maps/ribbit.lua    | 12 +++++-------
 config/maps/starstorm.lua | 10 ++++------
 2 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'config')

diff --git a/config/maps/ribbit.lua b/config/maps/ribbit.lua
index c3f5c78..a8a4366 100644
--- a/config/maps/ribbit.lua
+++ b/config/maps/ribbit.lua
@@ -1,19 +1,17 @@
-return {
-	-- GENERAL
+return
+{
 	name = "ribbit",
 	theme = "ribbit.ogg",
-	center_x = 0,
-	center_y = 50,
+	portrait = 3, -- TODO: either separate portraits now or change `iconsList` and `menu/host`.
+	center = {x = 0, y = 50},
 	width  = 360,
 	height = 240,
-	-- RESPAWN POINTS
 	respawns = {
 		{x = -15, y = -80},
 		{x =  -5, y = -80},
 		{x =   5, y = -80},
 		{x =  15, y = -80}
 	},
-	-- GRAPHICS
 	clouds = false,
 	background = "assets/backgrounds/ribbit.png",
 	platforms = {
@@ -43,4 +41,4 @@ return {
 		}
 	},
 	decorations = {}
-}
\ No newline at end of file
+}
diff --git a/config/maps/starstorm.lua b/config/maps/starstorm.lua
index 7f00633..c74372f 100644
--- a/config/maps/starstorm.lua
+++ b/config/maps/starstorm.lua
@@ -1,12 +1,11 @@
-return {
-	-- CENTER AND SIZE
+return
+{
 	name = "starstorm",
 	theme = "starstorm.ogg",
-	center_x = 0,
-	center_y = -20,
+	portrait = 4, -- TODO: See `maps/ribbit`.
+	center = {x = 0, y = -20},
 	width  = 400,
 	height = 260,
-	-- RESPAWN POINTS
 	respawns = {
 		{x = 100, y = 45},
 		{x = -100, y = 45},
@@ -15,7 +14,6 @@ return {
 		{x = -110, y = -70},
 		{x = 110, y = -70}
 	},
-	-- GRAPHICS
 	clouds = false,
 	background = "assets/backgrounds/starstorm.png",
 	platforms = {
-- 
cgit v1.1


From 2b33497121abec53d1fcbce68c9c0d8224079032 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Sat, 2 Sep 2017 21:08:42 +0200
Subject: Map selector no longer use pre-written maps list or iconsList
 functions

---
 config/menus/host.lua | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/menus/host.lua b/config/menus/host.lua
index a180736..2166360 100644
--- a/config/menus/host.lua
+++ b/config/menus/host.lua
@@ -8,13 +8,27 @@ local bx = width/2-29
 
 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
 
+-- TODO: Temporary fun stuff for maps, will be changed along `iconsList`.
+local icons, maps = {}, {}
+do
+	local files = love.filesystem.getDirectoryItems("config/maps")
+	for _,filename in pairs(files) do
+		local path = string.format("config/maps/%s", filename)
+		if love.filesystem.isFile(path) and filename ~= "readme.md" then
+			local map = love.filesystem.load(path)()
+			local i, name = map.portrait, map.name
+			if i then
+				icons[name] = love.graphics.newQuad((i-1)*76, 0, 76, 37, 532, 37)
+				table.insert(maps, name)
+			end
+		end
+	end
+end
+
 return {
 	background,
 	map_Selector
-- 
cgit v1.1


From 2757fa1de92f2eff8be080721a7f777086afa072 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Sat, 2 Sep 2017 22:30:32 +0200
Subject: Separated platforms' configs from maps' configs

---
 config/maps/ribbit.lua                      | 12 ++++--------
 config/maps/starstorm.lua                   | 27 +++++++--------------------
 config/platforms/ribbit-bottom.lua          |  5 +++++
 config/platforms/ribbit-left.lua            |  5 +++++
 config/platforms/ribbit-right.lua           |  5 +++++
 config/platforms/ribbit-top.lua             |  5 +++++
 config/platforms/starstorm-center.lua       |  5 +++++
 config/platforms/starstorm-left-bottom.lua  |  5 +++++
 config/platforms/starstorm-left-middle.lua  |  5 +++++
 config/platforms/starstorm-left-top.lua     |  8 ++++++++
 config/platforms/starstorm-right-bottom.lua |  5 +++++
 config/platforms/starstorm-right-middle.lua |  5 +++++
 config/platforms/starstorm-right-top.lua    |  8 ++++++++
 13 files changed, 72 insertions(+), 28 deletions(-)
 create mode 100644 config/platforms/ribbit-bottom.lua
 create mode 100644 config/platforms/ribbit-left.lua
 create mode 100644 config/platforms/ribbit-right.lua
 create mode 100644 config/platforms/ribbit-top.lua
 create mode 100644 config/platforms/starstorm-center.lua
 create mode 100644 config/platforms/starstorm-left-bottom.lua
 create mode 100644 config/platforms/starstorm-left-middle.lua
 create mode 100644 config/platforms/starstorm-left-top.lua
 create mode 100644 config/platforms/starstorm-right-bottom.lua
 create mode 100644 config/platforms/starstorm-right-middle.lua
 create mode 100644 config/platforms/starstorm-right-top.lua

(limited to 'config')

diff --git a/config/maps/ribbit.lua b/config/maps/ribbit.lua
index a8a4366..48e84c8 100644
--- a/config/maps/ribbit.lua
+++ b/config/maps/ribbit.lua
@@ -18,26 +18,22 @@ return
 		{
 			x = -154,
 			y = 10,
-			shape = {1,12, 48,12, 48,32, 1,32},
-			sprite = "assets/platforms/ribbit-left.png"
+			config = "ribbit-left"
 		},
 		{
 			x = 67,
 			y = 7,
-			shape = {36,14, 83,14, 83,29, 36,29},
-			sprite = "assets/platforms/ribbit-right.png"
+			config = "ribbit-right"
 		},
 		{
 			x = -70,
 			y = -5,
-			shape = {0,3, 139,3, 134,24, 5,24},
-			sprite = "assets/platforms/ribbit-top.png"
+			config = "ribbit-top"
 		},
 		{
 			x = -54,
 			y = 63,
-			shape = {0,3, 107,3, 75,44, 32,44},
-			sprite = "assets/platforms/ribbit-bottom.png"
+			config = "ribbit-bottom"
 		}
 	},
 	decorations = {}
diff --git a/config/maps/starstorm.lua b/config/maps/starstorm.lua
index c74372f..fe45e04 100644
--- a/config/maps/starstorm.lua
+++ b/config/maps/starstorm.lua
@@ -20,50 +20,37 @@ return
 		{
 			x = -170,
 			y = -55,
-			shape = {
-				{0,1, 33,1, 39,6, 39,21, 31,21, 0,21},
-				{40,6, 115,6, 115,14, 40,14}
-			},
-			sprite = "assets/platforms/starstorm-left-top.png"
+			config = "starstorm-left-top"
 		},
 		{
 			x = -156,
 			y = -2,
-			shape = {0,0, 109,0, 109,20, 0,20},
-			sprite = "assets/platforms/starstorm-left-middle.png"
+			config = "starstorm-left-middle"
 		},
 		{
 			x = -160,
 			y = 69,
-			shape = {0,4, 8,4, 13,1, 102,1, 102,16, 19,16, 0,11},
-			sprite = "assets/platforms/starstorm-left-bottom.png"
+			config = "starstorm-left-bottom"
 		},
 		{
 			x = 52,
 			y = -55,
-			shape = {
-				{115,1, 82,1, 76,6, 76,21, 84,21, 115,21},
-				{75,6, 0,6, 0,14, 75,14}
-			},
-			sprite = "assets/platforms/starstorm-right-top.png"
+			config = "starstorm-right-top"
 		},
 		{
 			x = 44,
 			y = -2,
-			shape = {109,0, 0,0, 0,20, 109,20},
-			sprite = "assets/platforms/starstorm-right-middle.png"
+			config = "starstorm-right-middle"
 		},
 		{
 			x = 55,
 			y = 69,
-			shape = {102,4, 94,4, 89,1, 0,1, 0,16, 83,16, 102,11},
-			sprite = "assets/platforms/starstorm-right-bottom.png"
+			config = "starstorm-right-bottom"
 		},
 		{
 			x = -27,
 			y = 40,
-			shape = {0,6, 53,6, 53,14, 0,14},
-			sprite = "assets/platforms/starstorm-center.png"
+			config = "starstorm-center"
 		}
 	},
 	decorations = {
diff --git a/config/platforms/ribbit-bottom.lua b/config/platforms/ribbit-bottom.lua
new file mode 100644
index 0000000..38e4d95
--- /dev/null
+++ b/config/platforms/ribbit-bottom.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/ribbit-bottom.png",
+	shape = {0,3, 107,3, 75,44, 32,44},
+}
diff --git a/config/platforms/ribbit-left.lua b/config/platforms/ribbit-left.lua
new file mode 100644
index 0000000..69039dd
--- /dev/null
+++ b/config/platforms/ribbit-left.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/ribbit-left.png",
+	shape = {1,12, 48,12, 48,32, 1,32},
+}
diff --git a/config/platforms/ribbit-right.lua b/config/platforms/ribbit-right.lua
new file mode 100644
index 0000000..1aa6e9e
--- /dev/null
+++ b/config/platforms/ribbit-right.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/ribbit-right.png",
+	shape = {36,14, 83,14, 83,29, 36,29},
+}
diff --git a/config/platforms/ribbit-top.lua b/config/platforms/ribbit-top.lua
new file mode 100644
index 0000000..1493114
--- /dev/null
+++ b/config/platforms/ribbit-top.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/ribbit-top.png",
+	shape = {0,3, 139,3, 134,24, 5,24},
+}
diff --git a/config/platforms/starstorm-center.lua b/config/platforms/starstorm-center.lua
new file mode 100644
index 0000000..77af4f8
--- /dev/null
+++ b/config/platforms/starstorm-center.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/starstorm-center.png",
+	shape = {0,6, 53,6, 53,14, 0,14}
+}
diff --git a/config/platforms/starstorm-left-bottom.lua b/config/platforms/starstorm-left-bottom.lua
new file mode 100644
index 0000000..f40185b
--- /dev/null
+++ b/config/platforms/starstorm-left-bottom.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/starstorm-left-bottom.png",
+	shape = {0,4, 8,4, 13,1, 102,1, 102,16, 19,16, 0,11},
+}
diff --git a/config/platforms/starstorm-left-middle.lua b/config/platforms/starstorm-left-middle.lua
new file mode 100644
index 0000000..0804309
--- /dev/null
+++ b/config/platforms/starstorm-left-middle.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/starstorm-left-middle.png",
+	shape = {0,0, 109,0, 109,20, 0,20}
+}
diff --git a/config/platforms/starstorm-left-top.lua b/config/platforms/starstorm-left-top.lua
new file mode 100644
index 0000000..9cc1944
--- /dev/null
+++ b/config/platforms/starstorm-left-top.lua
@@ -0,0 +1,8 @@
+return
+{
+	sprite = "assets/platforms/starstorm-left-top.png",
+	shape = {
+		{0,1, 33,1, 39,6, 39,21, 31,21, 0,21},
+		{40,6, 115,6, 115,14, 40,14}
+	}
+}
diff --git a/config/platforms/starstorm-right-bottom.lua b/config/platforms/starstorm-right-bottom.lua
new file mode 100644
index 0000000..16462cb
--- /dev/null
+++ b/config/platforms/starstorm-right-bottom.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/starstorm-right-bottom.png",
+	shape = {102,4, 94,4, 89,1, 0,1, 0,16, 83,16, 102,11}
+}
diff --git a/config/platforms/starstorm-right-middle.lua b/config/platforms/starstorm-right-middle.lua
new file mode 100644
index 0000000..af9b712
--- /dev/null
+++ b/config/platforms/starstorm-right-middle.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/starstorm-right-middle.png",
+	shape = {109,0, 0,0, 0,20, 109,20}
+}
diff --git a/config/platforms/starstorm-right-top.lua b/config/platforms/starstorm-right-top.lua
new file mode 100644
index 0000000..4470754
--- /dev/null
+++ b/config/platforms/starstorm-right-top.lua
@@ -0,0 +1,8 @@
+return
+{
+	sprite = "assets/platforms/starstorm-right-top.png",
+	shape = {
+		{115,1, 82,1, 76,6, 76,21, 84,21, 115,21},
+		{75,6, 0,6, 0,14, 75,14}
+	}
+}
-- 
cgit v1.1


From d2ba9f3c87589f167e715b17f6740977e1c29dff Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Sun, 3 Sep 2017 01:55:35 +0200
Subject: More map config and loading changes Decorations, platforms and
 background are now created and stored in config together

---
 config/maps/ribbit.lua    | 18 ++++++++++--------
 config/maps/starstorm.lua | 35 ++++++++++++++++++-----------------
 2 files changed, 28 insertions(+), 25 deletions(-)

(limited to 'config')

diff --git a/config/maps/ribbit.lua b/config/maps/ribbit.lua
index 48e84c8..40ae355 100644
--- a/config/maps/ribbit.lua
+++ b/config/maps/ribbit.lua
@@ -13,28 +13,30 @@ return
 		{x =  15, y = -80}
 	},
 	clouds = false,
-	background = "assets/backgrounds/ribbit.png",
-	platforms = {
+	create = {
+		{
+			ratio = 0,
+			background = "assets/backgrounds/ribbit.png"
+		},
 		{
 			x = -154,
 			y = 10,
-			config = "ribbit-left"
+			platform = "ribbit-left"
 		},
 		{
 			x = 67,
 			y = 7,
-			config = "ribbit-right"
+			platform = "ribbit-right"
 		},
 		{
 			x = -70,
 			y = -5,
-			config = "ribbit-top"
+			platform = "ribbit-top"
 		},
 		{
 			x = -54,
 			y = 63,
-			config = "ribbit-bottom"
+			platform = "ribbit-bottom"
 		}
-	},
-	decorations = {}
+	}
 }
diff --git a/config/maps/starstorm.lua b/config/maps/starstorm.lua
index fe45e04..eaf488e 100644
--- a/config/maps/starstorm.lua
+++ b/config/maps/starstorm.lua
@@ -15,64 +15,65 @@ return
 		{x = 110, y = -70}
 	},
 	clouds = false,
-	background = "assets/backgrounds/starstorm.png",
-	platforms = {
+	create = {
+		{
+			ratio = 0,
+			background = "assets/backgrounds/starstorm.png"
+		},
 		{
 			x = -170,
 			y = -55,
-			config = "starstorm-left-top"
+			platform = "starstorm-left-top"
 		},
 		{
 			x = -156,
 			y = -2,
-			config = "starstorm-left-middle"
+			platform = "starstorm-left-middle"
 		},
 		{
 			x = -160,
 			y = 69,
-			config = "starstorm-left-bottom"
+			platform = "starstorm-left-bottom"
 		},
 		{
 			x = 52,
 			y = -55,
-			config = "starstorm-right-top"
+			platform = "starstorm-right-top"
 		},
 		{
 			x = 44,
 			y = -2,
-			config = "starstorm-right-middle"
+			platform = "starstorm-right-middle"
 		},
 		{
 			x = 55,
 			y = 69,
-			config = "starstorm-right-bottom"
+			platform = "starstorm-right-bottom"
 		},
 		{
 			x = -27,
 			y = 40,
-			config = "starstorm-center"
-		}
-	},
-	decorations = {
+			platform = "starstorm-center"
+		},
 		{
 			x = -166,
 			y = -37,
-			sprite = "assets/decorations/starstorm-left-top.png"
+			decoration = "assets/decorations/starstorm-left-top.png"
 		},
 		{
 			x = -163,
 			y = 19,
-			sprite = "assets/decorations/starstorm-left-bottom.png"
+			decoration = "assets/decorations/starstorm-left-bottom.png"
 		},
 		{
 			x = 119,
 			y = -37,
-			sprite = "assets/decorations/starstorm-right-top.png"
+			decoration = "assets/decorations/starstorm-right-top.png"
 		},
 		{
-			x = 52+77,
+			x = 129,
 			y = 19,
-			sprite = "assets/decorations/starstorm-right-bottom.png"
+			decoration = "assets/decorations/starstorm-right-bottom.png"
 		}
 	}
 }
-- 
cgit v1.1


From 10ad4ebb8db9bcc43c5517d95cfe668c6d6abc4c Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Sun, 3 Sep 2017 19:50:56 +0200
Subject: Mentions in TODO

---
 config/maps/ribbit.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/maps/ribbit.lua b/config/maps/ribbit.lua
index 40ae355..03076fa 100644
--- a/config/maps/ribbit.lua
+++ b/config/maps/ribbit.lua
@@ -2,7 +2,7 @@ return
 {
 	name = "ribbit",
 	theme = "ribbit.ogg",
-	portrait = 3, -- TODO: either separate portraits now or change `iconsList` and `menu/host`.
+	portrait = 3, -- TODO: Either separate portraits now or change `iconsList` and `menu/host`. See also both mentioned files.
 	center = {x = 0, y = 50},
 	width  = 360,
 	height = 240,
-- 
cgit v1.1


From ddd632254394a8ebfa3151e91978daa5455829a6 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Sun, 3 Sep 2017 20:04:44 +0200
Subject: Verbose explanation of TODO about map selector list

---
 config/menus/host.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/menus/host.lua b/config/menus/host.lua
index 2166360..38cc463 100644
--- a/config/menus/host.lua
+++ b/config/menus/host.lua
@@ -12,7 +12,7 @@ if background == nil or not background:is(require "not.MenuBackground") then
 	background = require "not.MenuBackground"(menu)
 end
 
--- TODO: Temporary fun stuff for maps, will be changed along `iconsList`.
+-- TODO: This is temporary solution for generating available maps list and portraits for them to pass to Selector. See also: `iconsList`.
 local icons, maps = {}, {}
 do
 	local files = love.filesystem.getDirectoryItems("config/maps")
-- 
cgit v1.1


From 48f8e2e9b19a074306a9db896b84b27b21a2cc99 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Mon, 4 Sep 2017 22:23:32 +0200
Subject: Testing new Selector and added update, locked drawing

---
 config/menus/host.lua | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'config')

diff --git a/config/menus/host.lua b/config/menus/host.lua
index 38cc463..e7b41c2 100644
--- a/config/menus/host.lua
+++ b/config/menus/host.lua
@@ -6,8 +6,6 @@ local Selector = require "not.Selector"
 local width, height = love.graphics.getWidth()/getScale(), love.graphics.getHeight()/getScale()
 local bx = width/2-29
 
-local map_Selector = Selector(menu)
-
 if background == nil or not background:is(require "not.MenuBackground") then
 	background = require "not.MenuBackground"(menu)
 end
@@ -23,34 +21,28 @@ do
 			local i, name = map.portrait, map.name
 			if i then
 				icons[name] = love.graphics.newQuad((i-1)*76, 0, 76, 37, 532, 37)
-				table.insert(maps, name)
+				table.insert(maps, map)
 			end
 		end
 	end
 end
 
+local mapSelector = Selector(maps, nil, menu)
+
 return {
 	background,
-	map_Selector
+	mapSelector
 		:setPosition(width/2, 40)
-		:setSize(80, 42)
-		:setMargin(0)
-		:set("global", true)
-		:set("first", true)
-		:set("list", maps)
-		:set("icons_i", love.graphics.newImage("assets/maps.png"))
-		:set("icons_q", icons)
-		:set("shape", "panorama")
-		:init()
+		:set("shape", Selector.SHAPE_PANORAMA)
 	,
 	Button(menu)
 		:setText("Next")
 		:setPosition(bx,101)
 		:set("isEnabled", function ()
-				return map_Selector:isLocked()
+				return mapSelector:getLocked()
 			end)
 		:set("active", function (self)
-				MAP = map_Selector:getFullSelection(true)[1][1] -- please, don't kill me for this, kek
+				MAP = mapSelector:getSelected().name -- TODO: It uses map name for compatibility with old code.
 				self.parent:open("select")
 			end)
 	,
-- 
cgit v1.1


From 5da2cf3f8dc86da6b35641b3bf462808bfab913b Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Mon, 4 Sep 2017 22:37:24 +0200
Subject: Centered map selector

---
 config/menus/host.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/menus/host.lua b/config/menus/host.lua
index e7b41c2..8fca328 100644
--- a/config/menus/host.lua
+++ b/config/menus/host.lua
@@ -32,7 +32,7 @@ local mapSelector = Selector(maps, nil, menu)
 return {
 	background,
 	mapSelector
-		:setPosition(width/2, 40)
+		:setPosition(width/2-40, 40)
 		:set("shape", Selector.SHAPE_PANORAMA)
 	,
 	Button(menu)
-- 
cgit v1.1


From 0e79f3ecbb0dca43aad166a718f58484afabe712 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Mon, 4 Sep 2017 23:50:25 +0200
Subject: Naut selection kinda works with new Group+Selector combo

---
 config/menus/select.lua | 49 ++++++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

(limited to 'config')

diff --git a/config/menus/select.lua b/config/menus/select.lua
index 23f9374..937bfd8 100644
--- a/config/menus/select.lua
+++ b/config/menus/select.lua
@@ -3,46 +3,49 @@ local menu, background = ...
 local Button = require "not.Button"
 local Selector = require "not.Selector"
 local Element = require "not.Element"
+local Group = require "not.Group"
 
 local width, height = love.graphics.getWidth()/getScale(), love.graphics.getHeight()/getScale()
 local bx = width/2-29
 
-local naut_Selector = Selector(menu)
 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
 
+-- TODO: Temporary group for naut selectors. This isn't production code at any means!
+local group = Group(menu)
+local
+function add (element)
+	table.insert(group.children, element)
+	return element
+end
+
+for i,_ in pairs(Controller.getSets()) do
+	add(Selector(require("config.nauts"), group, menu)):setPosition(10+48*(i-1), 10)
+end
+
+local
+function get ()
+	local selection = group:callEach("getSelected")
+	for i,naut in ipairs(selection) do
+		selection[i] = {naut, Controller.getSets()[i]}
+	end
+	return selection
+end
+
 return {
 	background,
-	naut_Selector
-		:setPosition(width/2,60)
-		:setMargin(8)
-		:setSize(32, 32)
-		:set("list", nautsList)
-		:set("global", false)
-		:set("icons_i", love.graphics.newImage("assets/portraits.png"))
-		:set("icons_q", nautsIcons)
-		:init()
-	,
+	group,
 	start_Button
 		:setText("Force start")
 		:setPosition(bx,134)
 		:set("isEnabled", function ()
-				if #naut_Selector:getFullSelection(false) > 1 then
-					return true
-				end
-				return false
+				return true
 			end)
 		:set("active", function (self)
-				local nauts = naut_Selector:getFullSelection(false)
-				if #nauts > 1 then
-					sceneManager:changeScene(World(MAP, nauts))
-				end
+				sceneManager:changeScene(World(MAP, get()))
 			end)
 	,
 	Button(menu)
@@ -67,7 +70,7 @@ return {
 				end
 			end)
 		:set("update", function (self, dt)
-				local total = #naut_Selector:getFullSelection(false)
+				local total = 0
 				if total > 1 then
 					self.the_final_countdown = self.the_final_countdown - dt
 				else
-- 
cgit v1.1


From 0f97a9712bbbb297c83758ecd48e5e51532a426f Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Tue, 5 Sep 2017 00:34:42 +0200
Subject: Provide icons for map selector to draw

---
 config/menus/host.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/menus/host.lua b/config/menus/host.lua
index 8fca328..8054942 100644
--- a/config/menus/host.lua
+++ b/config/menus/host.lua
@@ -20,7 +20,7 @@ do
 			local map = love.filesystem.load(path)()
 			local i, name = map.portrait, map.name
 			if i then
-				icons[name] = love.graphics.newQuad((i-1)*76, 0, 76, 37, 532, 37)
+				table.insert(icons, love.graphics.newQuad((i-1)*76, 0, 76, 37, 532, 37))
 				table.insert(maps, map)
 			end
 		end
@@ -34,6 +34,8 @@ return {
 	mapSelector
 		:setPosition(width/2-40, 40)
 		:set("shape", Selector.SHAPE_PANORAMA)
+		:set("icons_quads", icons)
+		:set("icons_atlas", love.graphics.newImage("assets/maps.png"))
 	,
 	Button(menu)
 		:setText("Next")
-- 
cgit v1.1


From dacc12eb824264e4f71e21ebecac4c76c9ad6382 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Tue, 5 Sep 2017 00:58:00 +0200
Subject: Provided icons for nauts selectors

---
 config/menus/select.lua | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/menus/select.lua b/config/menus/select.lua
index 937bfd8..9ce7201 100644
--- a/config/menus/select.lua
+++ b/config/menus/select.lua
@@ -15,6 +15,13 @@ if background == nil or not background:is(require "not.MenuBackground") then
 end
 
 -- TODO: Temporary group for naut selectors. This isn't production code at any means!
+local atlas = love.graphics.newImage("assets/portraits.png")
+local nauts = require("config.nauts")
+local icons = {}
+for i=0,#nauts-1 do
+	table.insert(icons, love.graphics.newQuad(i*28, 0, 28, 27, 1008, 27))
+end
+
 local group = Group(menu)
 local
 function add (element)
@@ -23,7 +30,10 @@ function add (element)
 end
 
 for i,_ in pairs(Controller.getSets()) do
-	add(Selector(require("config.nauts"), group, menu)):setPosition(10+48*(i-1), 10)
+	add(Selector(nauts, group, menu))
+		:setPosition(10+48*(i-1), 10)
+		:set("icons_atlas", atlas)
+		:set("icons_quads", icons)
 end
 
 local
-- 
cgit v1.1


From 9fcdea2e2eb36a2ee0a32cede760b8ec74b1feed Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Tue, 5 Sep 2017 00:59:50 +0200
Subject: Separated dev code part from rest

---
 config/menus/select.lua | 50 +++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

(limited to 'config')

diff --git a/config/menus/select.lua b/config/menus/select.lua
index 9ce7201..609c2f6 100644
--- a/config/menus/select.lua
+++ b/config/menus/select.lua
@@ -15,34 +15,36 @@ if background == nil or not background:is(require "not.MenuBackground") then
 end
 
 -- TODO: Temporary group for naut selectors. This isn't production code at any means!
-local atlas = love.graphics.newImage("assets/portraits.png")
-local nauts = require("config.nauts")
-local icons = {}
-for i=0,#nauts-1 do
-	table.insert(icons, love.graphics.newQuad(i*28, 0, 28, 27, 1008, 27))
-end
+local group, get
+do
+	local atlas = love.graphics.newImage("assets/portraits.png")
+	local nauts = require("config.nauts")
+	local icons = {}
+	for i=0,#nauts-1 do
+		table.insert(icons, love.graphics.newQuad(i*28, 0, 28, 27, 1008, 27))
+	end
 
-local group = Group(menu)
-local
-function add (element)
-	table.insert(group.children, element)
-	return element
-end
+	group = Group(menu)
+	local
+	function add (element)
+		table.insert(group.children, element)
+		return element
+	end
 
-for i,_ in pairs(Controller.getSets()) do
-	add(Selector(nauts, group, menu))
-		:setPosition(10+48*(i-1), 10)
-		:set("icons_atlas", atlas)
-		:set("icons_quads", icons)
-end
+	for i,_ in pairs(Controller.getSets()) do
+		add(Selector(nauts, group, menu))
+			:setPosition(10+48*(i-1), 10)
+			:set("icons_atlas", atlas)
+			:set("icons_quads", icons)
+	end
 
-local
-function get ()
-	local selection = group:callEach("getSelected")
-	for i,naut in ipairs(selection) do
-		selection[i] = {naut, Controller.getSets()[i]}
+	function get ()
+		local selection = group:callEach("getSelected")
+		for i,naut in ipairs(selection) do
+			selection[i] = {naut, Controller.getSets()[i]}
+		end
+		return selection
 	end
-	return selection
 end
 
 return {
-- 
cgit v1.1


From fc16ad592a45648c7df7cc18c2b6cd153af238e3 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Tue, 5 Sep 2017 01:02:52 +0200
Subject: Notes on new naut selector

---
 config/menus/select.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'config')

diff --git a/config/menus/select.lua b/config/menus/select.lua
index 609c2f6..a3c379b 100644
--- a/config/menus/select.lua
+++ b/config/menus/select.lua
@@ -15,6 +15,9 @@ if background == nil or not background:is(require "not.MenuBackground") then
 end
 
 -- TODO: Temporary group for naut selectors. This isn't production code at any means!
+-- TODO: New nauts selector is missing random rolling!
+-- TODO: New nauts selector allows empty naut as selection!
+-- TODO: New nauts selector allows non-unique selections within groups!
 local group, get
 do
 	local atlas = love.graphics.newImage("assets/portraits.png")
-- 
cgit v1.1


From b117c29325698e56a4fbd76426739dd48fa154cb Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Tue, 5 Sep 2017 01:24:02 +0200
Subject: Map config table is now passed to World rather than map name

---
 config/menus/host.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/menus/host.lua b/config/menus/host.lua
index 8054942..1ac4b0f 100644
--- a/config/menus/host.lua
+++ b/config/menus/host.lua
@@ -44,7 +44,7 @@ return {
 				return mapSelector:getLocked()
 			end)
 		:set("active", function (self)
-				MAP = mapSelector:getSelected().name -- TODO: It uses map name for compatibility with old code.
+				MAP = mapSelector:getSelected()
 				self.parent:open("select")
 			end)
 	,
-- 
cgit v1.1


From 78654392715768991cb10fc7c1aca60859e58516 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Tue, 5 Sep 2017 02:03:35 +0200
Subject: Centered nauts selectors group

---
 config/menus/select.lua | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'config')

diff --git a/config/menus/select.lua b/config/menus/select.lua
index a3c379b..c4a9595 100644
--- a/config/menus/select.lua
+++ b/config/menus/select.lua
@@ -28,19 +28,17 @@ do
 	end
 
 	group = Group(menu)
-	local
-	function add (element)
-		table.insert(group.children, element)
-		return element
-	end
 
 	for i,_ in pairs(Controller.getSets()) do
-		add(Selector(nauts, group, menu))
-			:setPosition(10+48*(i-1), 10)
+		group:addChild(Selector(nauts, group, menu))
 			:set("icons_atlas", atlas)
 			:set("icons_quads", icons)
 	end
 
+	group:set("margin", 16)
+	local gw, gh = group:getSize()
+	group:setPosition((width - gw)/2, 10)
+
 	function get ()
 		local selection = group:callEach("getSelected")
 		for i,naut in ipairs(selection) do
-- 
cgit v1.1


From e8c85303a138e44e1bbe7613c0e6db8d5b7c1fb6 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Tue, 5 Sep 2017 02:11:07 +0200
Subject: Force start and countdown; selectors properly placed

---
 config/menus/select.lua | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'config')

diff --git a/config/menus/select.lua b/config/menus/select.lua
index c4a9595..2341556 100644
--- a/config/menus/select.lua
+++ b/config/menus/select.lua
@@ -37,10 +37,10 @@ do
 
 	group:set("margin", 16)
 	local gw, gh = group:getSize()
-	group:setPosition((width - gw)/2, 10)
+	group:setPosition((width - gw)/2, 55)
 
 	function get ()
-		local selection = group:callEach("getSelected")
+		local selection = group:callEach("getLocked")
 		for i,naut in ipairs(selection) do
 			selection[i] = {naut, Controller.getSets()[i]}
 		end
@@ -55,7 +55,7 @@ return {
 		:setText("Force start")
 		:setPosition(bx,134)
 		:set("isEnabled", function ()
-				return true
+				return #get() > 1
 			end)
 		:set("active", function (self)
 				sceneManager:changeScene(World(MAP, get()))
@@ -83,8 +83,7 @@ return {
 				end
 			end)
 		:set("update", function (self, dt)
-				local total = 0
-				if total > 1 then
+				if #get() > 1 then
 					self.the_final_countdown = self.the_final_countdown - dt
 				else
 					self.the_final_countdown = 9
-- 
cgit v1.1


From 7f524270713a558c0538c7d728271121928a60ec Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Tue, 5 Sep 2017 02:17:01 +0200
Subject: Map config filepath is now added to map config table; used by debug
 mode

---
 config/menus/host.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config')

diff --git a/config/menus/host.lua b/config/menus/host.lua
index 1ac4b0f..5595f8b 100644
--- a/config/menus/host.lua
+++ b/config/menus/host.lua
@@ -19,6 +19,7 @@ do
 		if love.filesystem.isFile(path) and filename ~= "readme.md" then
 			local map = love.filesystem.load(path)()
 			local i, name = map.portrait, map.name
+			map.filepath = path
 			if i then
 				table.insert(icons, love.graphics.newQuad((i-1)*76, 0, 76, 37, 532, 37))
 				table.insert(maps, map)
-- 
cgit v1.1


From 9fb64e49be5d991a0bf4bc1f6f162f40276ba2f5 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Tue, 5 Sep 2017 02:41:02 +0200
Subject: Disallow nauts duplicates and empty as selection

---
 config/menus/select.lua | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/menus/select.lua b/config/menus/select.lua
index 2341556..0540bd5 100644
--- a/config/menus/select.lua
+++ b/config/menus/select.lua
@@ -16,8 +16,6 @@ end
 
 -- TODO: Temporary group for naut selectors. This isn't production code at any means!
 -- TODO: New nauts selector is missing random rolling!
--- TODO: New nauts selector allows empty naut as selection!
--- TODO: New nauts selector allows non-unique selections within groups!
 local group, get
 do
 	local atlas = love.graphics.newImage("assets/portraits.png")
@@ -29,10 +27,26 @@ do
 
 	group = Group(menu)
 
+	local
+	function attack (self)
+		if not self.lock then
+			if self.index == 1 then
+				return
+			end
+			if self.index == 2 then
+				return -- roll random, soon.
+			end
+			if self:isUnique() then
+				self.lock = true
+			end
+		end
+	end
+
 	for i,_ in pairs(Controller.getSets()) do
 		group:addChild(Selector(nauts, group, menu))
 			:set("icons_atlas", atlas)
 			:set("icons_quads", icons)
+			:set("attack", attack)
 	end
 
 	group:set("margin", 16)
-- 
cgit v1.1


From 84f6ec47be56d397fe140b5707b76078917fe8fb Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Tue, 5 Sep 2017 03:49:33 +0200
Subject: Random naut selection is back!

---
 config/menus/select.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/menus/select.lua b/config/menus/select.lua
index 0540bd5..d350c32 100644
--- a/config/menus/select.lua
+++ b/config/menus/select.lua
@@ -34,7 +34,7 @@ do
 				return
 			end
 			if self.index == 2 then
-				return -- roll random, soon.
+				self.index = self:rollRandom({1, 2})
 			end
 			if self:isUnique() then
 				self.lock = true
-- 
cgit v1.1


From 3cb43876bc41e3074b7235b484f6b2f7622b5eda Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Tue, 5 Sep 2017 04:01:56 +0200
Subject: Display map name instead of table ref

---
 config/menus/host.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'config')

diff --git a/config/menus/host.lua b/config/menus/host.lua
index 5595f8b..6861d91 100644
--- a/config/menus/host.lua
+++ b/config/menus/host.lua
@@ -37,6 +37,9 @@ return {
 		:set("shape", Selector.SHAPE_PANORAMA)
 		:set("icons_quads", icons)
 		:set("icons_atlas", love.graphics.newImage("assets/maps.png"))
+		:set("getText", function (self)
+				return self:getSelected().name
+			end)
 	,
 	Button(menu)
 		:setText("Next")
-- 
cgit v1.1


From 50eefa52a843f03fd5dda4c8628d558bc00ced87 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Tue, 5 Sep 2017 04:03:22 +0200
Subject: It isn't anymore

---
 config/menus/select.lua | 1 -
 1 file changed, 1 deletion(-)

(limited to 'config')

diff --git a/config/menus/select.lua b/config/menus/select.lua
index d350c32..1e57960 100644
--- a/config/menus/select.lua
+++ b/config/menus/select.lua
@@ -15,7 +15,6 @@ if background == nil or not background:is(require "not.MenuBackground") then
 end
 
 -- TODO: Temporary group for naut selectors. This isn't production code at any means!
--- TODO: New nauts selector is missing random rolling!
 local group, get
 do
 	local atlas = love.graphics.newImage("assets/portraits.png")
-- 
cgit v1.1


From 1ffc08dd2343b76b2f94d9c290ef346346585270 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Tue, 5 Sep 2017 19:05:21 +0200
Subject: Converted default map to new format for cloud testing

---
 config/maps/default.lua           | 33 ++++++++++++++-------------------
 config/platforms/default-big.lua  |  5 +++++
 config/platforms/default-side.lua |  5 +++++
 config/platforms/default-top.lua  |  5 +++++
 4 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 config/platforms/default-big.lua
 create mode 100644 config/platforms/default-side.lua
 create mode 100644 config/platforms/default-top.lua

(limited to 'config')

diff --git a/config/maps/default.lua b/config/maps/default.lua
index 05b8dc9..a11c503 100644
--- a/config/maps/default.lua
+++ b/config/maps/default.lua
@@ -1,47 +1,42 @@
--- Default map from original roflnauts
-return {
-	-- GENERAL
+return
+{
 	name = "default",
 	theme = "default.ogg",
-	center_x = 0,
-	center_y = 0,
+	portrait = 1, -- TODO: See `maps/ribbit`.
+	center = {x = 0, y = 0},
 	width  = 360,
 	height = 240,
-	-- RESPAWN POINTS
 	respawns = {
 		{x = -15, y = -80},
 		{x =  -5, y = -80},
 		{x =   5, y = -80},
 		{x =  15, y = -80}
 	},
-	-- GRAPHICS
 	clouds = true,
-	background = "assets/backgrounds/default.png",
-	platforms = {
+	create = {
+		{
+			ratio = 0,
+			background = "assets/backgrounds/default.png"
+		},
 		{
 			x = -91,
 			y = 0,
-			shape = {0,1, 180,1, 180,10, 95,76, 86,76, 0,10},
-			sprite = "assets/platforms/default-big.png"
+			platform = "default-big"
 		},
 		{
 			x = 114,
 			y = 50,
-			shape = {0,1, 51,1, 51,18, 0,18},
-			sprite = "assets/platforms/default-side.png"
+			platform = "default-side"
 		},
 		{
 			x = -166,
 			y = 50,
-			shape = {0,1, 51,1, 51,18, 0,18},
-			sprite = "assets/platforms/default-side.png"
+			platform = "default-side"
 		},
 		{
 			x = -17,
 			y = -50,
-			shape = {0,1, 33,1, 33,14, 0,14},
-			sprite = "assets/platforms/default-top.png"
+			platform = "default-top"
 		}
-	},
-	decorations = {}
+	}
 }
diff --git a/config/platforms/default-big.lua b/config/platforms/default-big.lua
new file mode 100644
index 0000000..85893b3
--- /dev/null
+++ b/config/platforms/default-big.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/default-big.png",
+	shape = {0,1, 180,1, 180,10, 95,76, 86,76, 0,10}
+}
diff --git a/config/platforms/default-side.lua b/config/platforms/default-side.lua
new file mode 100644
index 0000000..77b55bd
--- /dev/null
+++ b/config/platforms/default-side.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/default-side.png",
+	shape = {0,1, 51,1, 51,18, 0,18}
+}
diff --git a/config/platforms/default-top.lua b/config/platforms/default-top.lua
new file mode 100644
index 0000000..dbe4cbe
--- /dev/null
+++ b/config/platforms/default-top.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/default-top.png",
+	shape = {0,1, 33,1, 33,14, 0,14}
+}
-- 
cgit v1.1


From 438c230b21f93a98f78b03bfc3cf1cad6a6e2655 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Wed, 6 Sep 2017 03:45:35 +0200
Subject: Translated Alpha Abyss map to dev format

---
 config/maps/alpha abyss.lua      | 75 ----------------------------------------
 config/maps/alpha.lua            | 44 +++++++++++++++++++++++
 config/platforms/alpha-big.lua   | 31 +++++++++++++++++
 config/platforms/alpha-small.lua | 31 +++++++++++++++++
 4 files changed, 106 insertions(+), 75 deletions(-)
 delete mode 100644 config/maps/alpha abyss.lua
 create mode 100644 config/maps/alpha.lua
 create mode 100644 config/platforms/alpha-big.lua
 create mode 100644 config/platforms/alpha-small.lua

(limited to 'config')

diff --git a/config/maps/alpha abyss.lua b/config/maps/alpha abyss.lua
deleted file mode 100644
index 0dd2c61..0000000
--- a/config/maps/alpha abyss.lua	
+++ /dev/null
@@ -1,75 +0,0 @@
--- The abyss of the alpha.
--- Animations
-local animations_small = {
-	default = {
-		frames = 20,
-		repeated = true
-	}
-}
-local animations_big = {
-	default = {
-		frames = 20,
-		repeated = true
-	}
-}
-for i=1,10 do
-	local a = love.graphics.newQuad(i*118-118, 0, 118,51, 1180,51)
-	animations_big.default[i*2-1] = a
-	animations_big.default[i*2] = a
-	local a = love.graphics.newQuad(i*60-60, 0, 60,20, 600,20)
-	animations_small.default[i*2-1] = a
-	animations_small.default[i*2] = a
-end
--- Map data
-return {
-	-- GENERAL
-	name = "alpha abyss",
-	theme = "alpha.ogg",
-	center_x = 0,
-	center_y = -80,
-	width  = 360,
-	height = 240,
-	-- RESPAWN POINTS
-	respawns = {
-		{x = -30, y = 0},
-		{x =  30, y = 0},
-		{x =   0, y = 0},
-		{x = -120, y = -50},
-		{x = 120, y = -50},
-		{x =  0, y = -75}
-	},
-	-- GRAPHICS
-	clouds = false,
-	background = "assets/backgrounds/alpha-1.png",
-	platforms = {
-		{
-			x = -60,
-			y = 0,
-			shape = {0,0, 117,0, 101,50, 16,50},
-			sprite = "assets/platforms/alpha-big.png",
-			animations = animations_big
-		},
-		{
-			x = -145,
-			y = -50,
-			shape = {0,0, 59,0, 59,19, 0,19},
-			sprite = "assets/platforms/alpha-small.png",
-			animations = animations_small
-		},
-		{
-			x = 85,
-			y = -50,
-			shape = {0,0, 59,0, 59,19, 0,19},
-			sprite = "assets/platforms/alpha-small.png",
-			animations = animations_small
-		},
-		{
-			x = -30,
-			y = -80,
-			shape = {0,0, 59,0, 59,19, 0,19},
-			sprite = "assets/platforms/alpha-small.png",
-			animations = animations_small
-		}
-	},
-	decorations = {}
-}
diff --git a/config/maps/alpha.lua b/config/maps/alpha.lua
new file mode 100644
index 0000000..4f900c2
--- /dev/null
+++ b/config/maps/alpha.lua
@@ -0,0 +1,44 @@
+return
+{
+	name = "Alpha Abyss",
+	theme = "alpha.ogg",
+	portrait = 7, -- TODO: See `maps/ribbit`.
+	center = {x = 0, y = -80},
+	width  = 360,
+	height = 240,
+	respawns = {
+		{x = -30, y = 0},
+		{x =  30, y = 0},
+		{x =   0, y = 0},
+		{x = -120, y = -50},
+		{x = 120, y = -50},
+		{x =  0, y = -75}
+	},
+	clouds = false,
+	create = {
+		{
+			ratio = 0,
+			background = "assets/backgrounds/alpha.png",
+		},
+		{
+			x = -60,
+			y = 0,
+			platform = "alpha-big",
+		},
+		{
+			x = -145,
+			y = -50,
+			platform = "alpha-small",
+		},
+		{
+			x = 85,
+			y = -50,
+			platform = "alpha-small",
+		},
+		{
+			x = -30,
+			y = -80,
+			platform = "alpha-small",
+		}
+	},
+}
diff --git a/config/platforms/alpha-big.lua b/config/platforms/alpha-big.lua
new file mode 100644
index 0000000..a0cfb32
--- /dev/null
+++ b/config/platforms/alpha-big.lua
@@ -0,0 +1,31 @@
+return
+{
+	sprite = "assets/platforms/alpha-big.png",
+	shape = {0,0, 117,0, 101,50, 16,50},
+	animations = {
+		default = {
+			[1] = love.graphics.newQuad(0, 0, 118, 51, 1180, 51),
+			[2] = love.graphics.newQuad(0, 0, 118, 51, 1180, 51),
+			[3] = love.graphics.newQuad(118, 0, 118, 51, 1180, 51),
+			[4] = love.graphics.newQuad(118, 0, 118, 51, 1180, 51),
+			[5] = love.graphics.newQuad(236, 0, 118, 51, 1180, 51),
+			[6] = love.graphics.newQuad(236, 0, 118, 51, 1180, 51),
+			[7] = love.graphics.newQuad(354, 0, 118, 51, 1180, 51),
+			[8] = love.graphics.newQuad(354, 0, 118, 51, 1180, 51),
+			[9] = love.graphics.newQuad(472, 0, 118, 51, 1180, 51),
+			[10] = love.graphics.newQuad(472, 0, 118, 51, 1180, 51),
+			[11] = love.graphics.newQuad(590, 0, 118, 51, 1180, 51),
+			[12] = love.graphics.newQuad(590, 0, 118, 51, 1180, 51),
+			[13] = love.graphics.newQuad(708, 0, 118, 51, 1180, 51),
+			[14] = love.graphics.newQuad(708, 0, 118, 51, 1180, 51),
+			[15] = love.graphics.newQuad(826, 0, 118, 51, 1180, 51),
+			[16] = love.graphics.newQuad(826, 0, 118, 51, 1180, 51),
+			[17] = love.graphics.newQuad(944, 0, 118, 51, 1180, 51),
+			[18] = love.graphics.newQuad(944, 0, 118, 51, 1180, 51),
+			[19] = love.graphics.newQuad(1062, 0, 118, 51, 1180, 51),
+			[20] = love.graphics.newQuad(1062, 0, 118, 51, 1180, 51),
+			frames = 20,
+			repeated = true
+		}
+	}
+}
diff --git a/config/platforms/alpha-small.lua b/config/platforms/alpha-small.lua
new file mode 100644
index 0000000..3c72af9
--- /dev/null
+++ b/config/platforms/alpha-small.lua
@@ -0,0 +1,31 @@
+return
+{
+	sprite = "assets/platforms/alpha-small.png",
+	shape = {0,0, 59,0, 59,19, 0,19},
+	animations = {
+		default = {
+			[1] = love.graphics.newQuad(0, 0, 60, 20, 600, 20),
+			[2] = love.graphics.newQuad(0, 0, 60, 20, 600, 20),
+			[3] = love.graphics.newQuad(60, 0, 60, 20, 600, 20),
+			[4] = love.graphics.newQuad(60, 0, 60, 20, 600, 20),
+			[5] = love.graphics.newQuad(120, 0, 60, 20, 600, 20),
+			[6] = love.graphics.newQuad(120, 0, 60, 20, 600, 20),
+			[7] = love.graphics.newQuad(180, 0, 60, 20, 600, 20),
+			[8] = love.graphics.newQuad(180, 0, 60, 20, 600, 20),
+			[9] = love.graphics.newQuad(240, 0, 60, 20, 600, 20),
+			[10] = love.graphics.newQuad(240, 0, 60, 20, 600, 20),
+			[11] = love.graphics.newQuad(300, 0, 60, 20, 600, 20),
+			[12] = love.graphics.newQuad(300, 0, 60, 20, 600, 20),
+			[13] = love.graphics.newQuad(360, 0, 60, 20, 600, 20),
+			[14] = love.graphics.newQuad(360, 0, 60, 20, 600, 20),
+			[15] = love.graphics.newQuad(420, 0, 60, 20, 600, 20),
+			[16] = love.graphics.newQuad(420, 0, 60, 20, 600, 20),
+			[17] = love.graphics.newQuad(480, 0, 60, 20, 600, 20),
+			[18] = love.graphics.newQuad(480, 0, 60, 20, 600, 20),
+			[19] = love.graphics.newQuad(540, 0, 60, 20, 600, 20),
+			[20] = love.graphics.newQuad(540, 0, 60, 20, 600, 20),
+			frames = 20,
+			repeated = true
+		}
+	}
+}
-- 
cgit v1.1


From c21ba70172ca360d4305834ad7c21719af781225 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Thu, 7 Sep 2017 01:18:46 +0200
Subject: Aiguillon translated to dev format

---
 config/maps/aiguillon.lua                  | 46 +++++++++++++-----------------
 config/platforms/aiguillon-left-big.lua    |  5 ++++
 config/platforms/aiguillon-left-small.lua  |  5 ++++
 config/platforms/aiguillon-middle.lua      |  5 ++++
 config/platforms/aiguillon-right-big.lua   |  5 ++++
 config/platforms/aiguillon-right-small.lua |  5 ++++
 config/platforms/aiguillon-wide.lua        |  5 ++++
 7 files changed, 50 insertions(+), 26 deletions(-)
 create mode 100644 config/platforms/aiguillon-left-big.lua
 create mode 100644 config/platforms/aiguillon-left-small.lua
 create mode 100644 config/platforms/aiguillon-middle.lua
 create mode 100644 config/platforms/aiguillon-right-big.lua
 create mode 100644 config/platforms/aiguillon-right-small.lua
 create mode 100644 config/platforms/aiguillon-wide.lua

(limited to 'config')

diff --git a/config/maps/aiguillon.lua b/config/maps/aiguillon.lua
index 40d3928..3fc3d3a 100644
--- a/config/maps/aiguillon.lua
+++ b/config/maps/aiguillon.lua
@@ -1,58 +1,52 @@
-return {
-	-- CENTER AND SIZE
-	name = "aiguillon",
+return
+{
+	name = "Aiguillon",
 	theme = "aiguillon.ogg",
-	center_x = 0,
-	center_y = 10,
+	portrait = 5, -- TODO: See `maps/ribbit`.
+	center = {x = 0, y = 10},
 	width  = 370,
 	height = 290,
-	-- RESPAWN POINTS
 	respawns = {
-		{x = 0, y = -80},
-		{x = 0, y = -80},
-		{x = 0, y = -80},
-		{x = 0, y = -80},
+		{x = -15, y = -80},
+		{x = -5, y = -80},
+		{x = 5, y = -80},
+		{x = 15, y = -80},
 	},
-	-- GRAPHICS
 	clouds = false,
-	background = "assets/backgrounds/aiguillon.png",
-	platforms = {
+	create = {
+		{
+			ratio = 0,
+			background = "assets/backgrounds/aiguillon.png"
+		},
 		{
 			x = -108,
 			y = 22,
-			shape = {1,0, 212,0, 212,12, 206,18, 14,18, 1,12},
-			sprite = "assets/platforms/aiguillon-wide.png"
+			platform = "aiguillon-wide"
 		},
 		{
 			x = -46,
 			y = -19,
-			shape = {1,0, 87,0, 87,18, 14,18, 1,12},
-			sprite = "assets/platforms/aiguillon-middle.png"
+			platform = "aiguillon-middle"
 		},
 		{
 			x = -141,
 			y = -57,
-			shape = {1,0, 50,0, 50,18, 5,18, 1,13},
-			sprite = "assets/platforms/aiguillon-left-big.png"
+			platform = "aiguillon-left-big"
 		},
 		{
 			x = -132,
 			y = 84,
-			shape = {1,0, 25,0, 25,18, 1,18},
-			sprite = "assets/platforms/aiguillon-left-small.png"
+			platform = "aiguillon-left-small"
 		},
 		{
 			x = 77,
 			y = -57,
-			shape = {1,0, 50,0, 50,12, 37,18, 1,18},
-			sprite = "assets/platforms/aiguillon-right-big.png"
+			platform = "aiguillon-right-big"
 		},
 		{
 			x = 103,
 			y = 84,
-			shape = {1,0, 25,0, 25,18, 1,18},
-			sprite = "assets/platforms/aiguillon-right-small.png"
+			platform = "aiguillon-right-small"
 		}
 	},
-	decorations = {}
 }
diff --git a/config/platforms/aiguillon-left-big.lua b/config/platforms/aiguillon-left-big.lua
new file mode 100644
index 0000000..41ae46d
--- /dev/null
+++ b/config/platforms/aiguillon-left-big.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/aiguillon-left-big.png",
+	shape = {1,0, 50,0, 50,18, 5,18, 1,13}
+}
diff --git a/config/platforms/aiguillon-left-small.lua b/config/platforms/aiguillon-left-small.lua
new file mode 100644
index 0000000..7495374
--- /dev/null
+++ b/config/platforms/aiguillon-left-small.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/aiguillon-left-small.png",
+	shape = {1,0, 25,0, 25,18, 1,18}
+}
diff --git a/config/platforms/aiguillon-middle.lua b/config/platforms/aiguillon-middle.lua
new file mode 100644
index 0000000..9107dcd
--- /dev/null
+++ b/config/platforms/aiguillon-middle.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/aiguillon-middle.png",
+	shape = {1,0, 87,0, 87,18, 14,18, 1,12}
+}
diff --git a/config/platforms/aiguillon-right-big.lua b/config/platforms/aiguillon-right-big.lua
new file mode 100644
index 0000000..e5d525b
--- /dev/null
+++ b/config/platforms/aiguillon-right-big.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/aiguillon-right-big.png",
+	shape = {1,0, 50,0, 50,12, 37,18, 1,18}
+}
diff --git a/config/platforms/aiguillon-right-small.lua b/config/platforms/aiguillon-right-small.lua
new file mode 100644
index 0000000..b0baf3d
--- /dev/null
+++ b/config/platforms/aiguillon-right-small.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/aiguillon-right-small.png",
+	shape = {1,0, 25,0, 25,18, 1,18}
+}
diff --git a/config/platforms/aiguillon-wide.lua b/config/platforms/aiguillon-wide.lua
new file mode 100644
index 0000000..7b653a2
--- /dev/null
+++ b/config/platforms/aiguillon-wide.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/aiguillon-wide.png",
+	shape = {1,0, 212,0, 212,12, 206,18, 14,18, 1,12}
+}
-- 
cgit v1.1


From 7aa507c51e2893ff30965b9b2abd8072531441ac Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Thu, 7 Sep 2017 01:19:15 +0200
Subject: Map name changes

---
 config/maps/ribbit.lua    | 2 +-
 config/maps/starstorm.lua | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/maps/ribbit.lua b/config/maps/ribbit.lua
index 03076fa..0b01f09 100644
--- a/config/maps/ribbit.lua
+++ b/config/maps/ribbit.lua
@@ -1,6 +1,6 @@
 return
 {
-	name = "ribbit",
+	name = "Ribbit IV",
 	theme = "ribbit.ogg",
 	portrait = 3, -- TODO: Either separate portraits now or change `iconsList` and `menu/host`. See also both mentioned files.
 	center = {x = 0, y = 50},
diff --git a/config/maps/starstorm.lua b/config/maps/starstorm.lua
index eaf488e..31e2d01 100644
--- a/config/maps/starstorm.lua
+++ b/config/maps/starstorm.lua
@@ -1,6 +1,6 @@
 return
 {
-	name = "starstorm",
+	name = "Starstorm",
 	theme = "starstorm.ogg",
 	portrait = 4, -- TODO: See `maps/ribbit`.
 	center = {x = 0, y = -20},
-- 
cgit v1.1


From 52ffee5f446c9e237d3b7437dec34ce0dd9da9f1 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Thu, 7 Sep 2017 01:33:48 +0200
Subject: Rill translated to dev format

---
 config/maps/rill.lua                  | 48 +++++++++++++++--------------------
 config/platforms/rill-center.lua      |  5 ++++
 config/platforms/rill-flat-left.lua   |  5 ++++
 config/platforms/rill-flat-right.lua  |  5 ++++
 config/platforms/rill-slope-left.lua  |  5 ++++
 config/platforms/rill-slope-right.lua |  5 ++++
 6 files changed, 46 insertions(+), 27 deletions(-)
 create mode 100644 config/platforms/rill-center.lua
 create mode 100644 config/platforms/rill-flat-left.lua
 create mode 100644 config/platforms/rill-flat-right.lua
 create mode 100644 config/platforms/rill-slope-left.lua
 create mode 100644 config/platforms/rill-slope-right.lua

(limited to 'config')

diff --git a/config/maps/rill.lua b/config/maps/rill.lua
index 83c02f2..25af95d 100644
--- a/config/maps/rill.lua
+++ b/config/maps/rill.lua
@@ -1,73 +1,67 @@
-return {
-	-- CENTER AND SIZE
-	name = "rill",
+return
+{
+	name = "Rill",
 	theme = "rill.ogg",
-	center_x = 0,
-	center_y = 75,
+	portrait = 2, -- TODO: See `maps/ribbit`.
+	center = {x = 0, y = 75},
 	width  = 400,
 	height = 260,
-	-- RESPAWN POINTS
 	respawns = {
 		{x = -135, y = 10},
 		{x = -135, y = 10},
 		{x =  135, y = 10},
 		{x =  135, y = 10}
 	},
-	-- GRAPHICS
 	clouds = false,
-	background = "assets/backgrounds/rill.png",
-	platforms = {
+	create = {
+		{
+			ratio = 0,
+			background = "assets/backgrounds/rill.png"
+		},
 		{
 			x = -151,
 			y = 25,
-			shape = {0,0, 55,0, 55,11, 0,11},
-			sprite = "assets/platforms/rill-flat-left.png"
+			platform = "rill-flat-left"
 		},
 		{
 			x = 93,
 			y = 25,
-			shape = {0,0, 55,0, 55,11, 0,11},
-			sprite = "assets/platforms/rill-flat-right.png"
+			platform = "rill-flat-right"
 		},
 		{
 			x = -24,
 			y = 55,
-			shape = {0,0, 48,0, 47,15, 1,15},
-			sprite = "assets/platforms/rill-center.png"
+			platform = "rill-center"
 		},
 		{
 			x = -112,
 			y = 80,
-			shape = {77,30, 17,0, 0,0, 0,7, 77,44},
-			sprite = "assets/platforms/rill-slope-left.png"
+			platform = "rill-slope-left"
 		},
 		{
 			x = 35,
 			y = 80,
-			shape = {0,30, 60,0, 77,0, 77,7, 0,44},
-			sprite = "assets/platforms/rill-slope-right.png"
-		}
-	},
-	decorations = {
+			platform = "rill-slope-right"
+		},
 		{
 			x = 98,
 			y = -20,
-			sprite = "assets/decorations/rill-lollipop-big-purple.png"
+			decoration = "assets/decorations/rill-lollipop-big-purple.png"
 		},
 		{
 			x = 127,
 			y = 4,
-			sprite = "assets/decorations/rill-lollipop-small-green.png"
+			decoration = "assets/decorations/rill-lollipop-small-green.png"
 		},
 		{
 			x = -152,
 			y = -20,
-			sprite = "assets/decorations/rill-lollipop-big-orange.png"
+			decoration = "assets/decorations/rill-lollipop-big-orange.png"
 		},
 		{
 			x = -121,
 			y = 4,
-			sprite = "assets/decorations/rill-lollipop-small-blue.png"
-		},
+			decoration = "assets/decorations/rill-lollipop-small-blue.png"
+		}
 	}
 }
diff --git a/config/platforms/rill-center.lua b/config/platforms/rill-center.lua
new file mode 100644
index 0000000..72104b3
--- /dev/null
+++ b/config/platforms/rill-center.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/rill-center.png",
+	shape = {0,0, 48,0, 47,15, 1,15}
+}
diff --git a/config/platforms/rill-flat-left.lua b/config/platforms/rill-flat-left.lua
new file mode 100644
index 0000000..f1fdd5e
--- /dev/null
+++ b/config/platforms/rill-flat-left.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/rill-flat-left.png",
+	shape = {0,0, 55,0, 55,11, 0,11}
+}
diff --git a/config/platforms/rill-flat-right.lua b/config/platforms/rill-flat-right.lua
new file mode 100644
index 0000000..8bf70a9
--- /dev/null
+++ b/config/platforms/rill-flat-right.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/rill-flat-right.png",
+	shape = {0,0, 55,0, 55,11, 0,11}
+}
diff --git a/config/platforms/rill-slope-left.lua b/config/platforms/rill-slope-left.lua
new file mode 100644
index 0000000..49052b4
--- /dev/null
+++ b/config/platforms/rill-slope-left.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/rill-slope-left.png",
+	shape = {77,30, 17,0, 0,0, 0,7, 77,44}
+}
diff --git a/config/platforms/rill-slope-right.lua b/config/platforms/rill-slope-right.lua
new file mode 100644
index 0000000..3eca829
--- /dev/null
+++ b/config/platforms/rill-slope-right.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/rill-slope-right.png",
+	shape = {0,30, 60,0, 77,0, 77,7, 0,44}
+}
-- 
cgit v1.1


From 3b878cea9db4fb48f307ef06d4315fcf31a0ad08 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Thu, 7 Sep 2017 01:41:20 +0200
Subject: Removed obsolete config/maps.lua

---
 config/maps.lua | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 config/maps.lua

(limited to 'config')

diff --git a/config/maps.lua b/config/maps.lua
deleted file mode 100644
index 32e89a5..0000000
--- a/config/maps.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
-	"default",
-	"rill",
-	"ribbit",
-	"starstorm",
-	"aiguillon",
-	"sorona",
-	"alpha abyss"
-}
-- 
cgit v1.1


From 37da34f0dbc6f6fe58629e52a7126caed4f10434 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Thu, 7 Sep 2017 04:45:33 +0200
Subject: Renamed filepath to filename

---
 config/menus/host.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/menus/host.lua b/config/menus/host.lua
index 6861d91..07c5b80 100644
--- a/config/menus/host.lua
+++ b/config/menus/host.lua
@@ -19,7 +19,7 @@ do
 		if love.filesystem.isFile(path) and filename ~= "readme.md" then
 			local map = love.filesystem.load(path)()
 			local i, name = map.portrait, map.name
-			map.filepath = path
+			map.filename = path
 			if i then
 				table.insert(icons, love.graphics.newQuad((i-1)*76, 0, 76, 37, 532, 37))
 				table.insert(maps, map)
-- 
cgit v1.1


From 11dcd305ac4bf23f6fc2ddfe878376abaddefcac Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Fri, 8 Sep 2017 22:19:12 +0200
Subject: Sorona translated to dev format; Sorona's design changed

---
 config/maps/sorona.lua             | 70 ++++++++++++++++++--------------------
 config/platforms/sorona-button.lua |  5 +++
 config/platforms/sorona-medium.lua |  5 +++
 config/platforms/sorona-small.lua  |  5 +++
 config/platforms/sorona-spiked.lua |  5 +++
 config/platforms/sorona-wide.lua   |  5 +++
 6 files changed, 59 insertions(+), 36 deletions(-)
 create mode 100644 config/platforms/sorona-button.lua
 create mode 100644 config/platforms/sorona-medium.lua
 create mode 100644 config/platforms/sorona-small.lua
 create mode 100644 config/platforms/sorona-spiked.lua
 create mode 100644 config/platforms/sorona-wide.lua

(limited to 'config')

diff --git a/config/maps/sorona.lua b/config/maps/sorona.lua
index 8ec4727..986d0c8 100644
--- a/config/maps/sorona.lua
+++ b/config/maps/sorona.lua
@@ -1,53 +1,51 @@
--- Sorona, but with the worms and such.
-return {
-	-- GENERAL
-	name = "sorona",
+return
+{
+	name = "Sorona",
 	theme = "sorona.ogg",
-	center_x = 0,
-	center_y = 0,
+	portrait = 6, -- TODO: See `maps/ribbit`.
+	center = {x = 0, y = 0},
 	width  = 360,
 	height = 240,
-	-- RESPAWN POINTS
 	respawns = {
-		{x = -98, y = -70},
-		{x = 70, y = -70},
-		{x = -30, y = -20},
-		{x = -90, y = 40},
+		{x = -10, y = -20},
+		{x = 0, y = -20},
+		{x = 10, y = -20}
 	},
-	-- GRAPHICS
 	clouds = false,
-	background = "assets/backgrounds/sorona.png",
-	platforms = {
+	create = {
 		{
-			x = -60,
-			y = 0,
-			shape = {0,1, 59,1, 59,17, 0,17},
-			sprite = "assets/platforms/sorona-center.png"
+			ratio = 0,
+			background = "assets/backgrounds/sorona.png",
 		},
 		{
-			x = -40,
-			y = 55,
-			shape = {3,0, 180,0, 180,20, 3,20},
-			sprite = "assets/platforms/sorona-right-bottom.png"
+			x = -71,
+			y = 50,
+			platform = "sorona-wide"
 		},
 		{
-			x = -120,
-			y = 55,
-			shape = {3,0, 62,0, 62,23, 3,23},
-			sprite = "assets/platforms/sorona-left-bottom.png"
+			x = -84,
+			y = -5,
+			platform = "sorona-small"
 		},
 		{
-			x = 0,
-			y = -50,
-			shape = {1,1, 140,1, 1,17, 140,17},
-			sprite = "assets/platforms/sorona-right-top.png"
+			x = -50,
+			y = -4,
+			decoration = "assets/decorations/sorona-bridge-left.png"
 		},
 		{
-			x = -150,
-			y = -55,
-			shape = {1,9, 106,9, 40,27, 1,27},
-			sprite = "assets/platforms/sorona-left-top.png"
+			x = -14,
+			y = -4,
+			decoration = "assets/decorations/sorona-bridge-loop.png"
+		},
+		{
+			x = 14,
+			y = -4,
+			decoration = "assets/decorations/sorona-bridge-right.png"
+		},
+		{
+			x = 43,
+			y = -5,
+			platform = "sorona-small"
 		}
-	},
-	decorations = {}
+	}
 }
diff --git a/config/platforms/sorona-button.lua b/config/platforms/sorona-button.lua
new file mode 100644
index 0000000..2ca3bae
--- /dev/null
+++ b/config/platforms/sorona-button.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/sorona-button.png",	
+	shape = {0,1, 59,1, 59,17, 0,17}
+}
diff --git a/config/platforms/sorona-medium.lua b/config/platforms/sorona-medium.lua
new file mode 100644
index 0000000..50eaeeb
--- /dev/null
+++ b/config/platforms/sorona-medium.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/sorona-medium.png",
+	shape = {3,1, 61,1, 61,23, 3,23}
+}
diff --git a/config/platforms/sorona-small.lua b/config/platforms/sorona-small.lua
new file mode 100644
index 0000000..1a01c69
--- /dev/null
+++ b/config/platforms/sorona-small.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/sorona-small.png",
+	shape = {3,1, 39,1, 39,18, 3,18}
+}
diff --git a/config/platforms/sorona-spiked.lua b/config/platforms/sorona-spiked.lua
new file mode 100644
index 0000000..00d975b
--- /dev/null
+++ b/config/platforms/sorona-spiked.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/sorona-spiked.png",
+	shape = {1,9, 106,9, 40,27, 1,27}
+}
diff --git a/config/platforms/sorona-wide.lua b/config/platforms/sorona-wide.lua
new file mode 100644
index 0000000..d0916c9
--- /dev/null
+++ b/config/platforms/sorona-wide.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/sorona-wide.png",
+	shape = {1,1, 140,1, 1,17, 140,17}
+}
-- 
cgit v1.1


From ddf8c5f880e7175ce316e61471743654b2486d14 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Wed, 13 Sep 2017 00:08:06 +0200
Subject: Backgroundless, themeless and iconless AI Station 205 added

---
 config/maps/205.lua            | 47 ++++++++++++++++++++++++++++++++++++++++++
 config/platforms/205-left.lua  |  8 +++++++
 config/platforms/205-right.lua |  8 +++++++
 config/platforms/205-top.lua   |  5 +++++
 4 files changed, 68 insertions(+)
 create mode 100644 config/maps/205.lua
 create mode 100644 config/platforms/205-left.lua
 create mode 100644 config/platforms/205-right.lua
 create mode 100644 config/platforms/205-top.lua

(limited to 'config')

diff --git a/config/maps/205.lua b/config/maps/205.lua
new file mode 100644
index 0000000..3fb348f
--- /dev/null
+++ b/config/maps/205.lua
@@ -0,0 +1,47 @@
+return
+{
+	name = "AI Station 205",
+	theme = "sorona.ogg",
+	portrait = 1, -- TODO: See `maps/ribbit`.
+	center = {x = 0, y = 0},
+	width  = 360,
+	height = 240,
+	respawns = {
+		{x = -10, y = -55},
+		{x = 0, y = -55},
+		{x = 10, y = -55}
+	},
+	clouds = false,
+	create = {
+		{
+			x = -36,
+			y = -48,
+			platform = "205-top"
+		},
+		{
+			x = -36+9,
+			y = -48+11,
+			decoration = "assets/decorations/205-exhaust-top.png"
+		},
+		{
+			x = -122,
+			y = 10,
+			platform = "205-left"
+		},
+		{
+			x = -122+49,
+			y = 10+2,
+			decoration = "assets/decorations/205-exhaust-left.png"
+		},
+		{
+			x = 28,
+			y = 10,
+			platform = "205-right"
+		},
+		{
+			x = 28+29,
+			y = 10+2,
+			decoration = "assets/decorations/205-exhaust-right.png"
+		}
+	}
+}
diff --git a/config/platforms/205-left.lua b/config/platforms/205-left.lua
new file mode 100644
index 0000000..b04a17f
--- /dev/null
+++ b/config/platforms/205-left.lua
@@ -0,0 +1,8 @@
+return
+{
+	sprite = "assets/platforms/205-left.png",
+	shape = {
+		{8,0, 54,0, 54,31, 8,27},
+		{55,29, 94,29, 92,36, 55,36}
+	}
+}
diff --git a/config/platforms/205-right.lua b/config/platforms/205-right.lua
new file mode 100644
index 0000000..c5bcca6
--- /dev/null
+++ b/config/platforms/205-right.lua
@@ -0,0 +1,8 @@
+return
+{
+	sprite = "assets/platforms/205-right.png",
+	shape = {
+		{86,0, 40,0, 40,31, 86,27},
+		{39,29, 0,29, 2,36, 39,36}
+	}
+}
diff --git a/config/platforms/205-top.lua b/config/platforms/205-top.lua
new file mode 100644
index 0000000..8470ed6
--- /dev/null
+++ b/config/platforms/205-top.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/205-top.png",
+	shape = {0,1, 72,1, 70,8, 2,8}
+}
-- 
cgit v1.1


From f15ace4d5b9f62b6288a2b6750bc48159ebebe00 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Wed, 13 Sep 2017 03:55:59 +0200
Subject: CloudGenerator is now treated as Entity

---
 config/maps/default.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/maps/default.lua b/config/maps/default.lua
index a11c503..ebfcbb8 100644
--- a/config/maps/default.lua
+++ b/config/maps/default.lua
@@ -12,9 +12,11 @@ return
 		{x =   5, y = -80},
 		{x =  15, y = -80}
 	},
-	clouds = true,
 	create = {
 		{
+			clouds = true
+		},
+		{
 			ratio = 0,
 			background = "assets/backgrounds/default.png"
 		},
-- 
cgit v1.1


From 291e9ffce1151be503f1c4550e6f4ff3230960b9 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Wed, 13 Sep 2017 04:07:16 +0200
Subject: CloudGenerator's atlas and quads are loaded from map config

---
 config/animations/default-clouds.lua | 18 ++++++++++++++++++
 config/maps/default.lua              |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 config/animations/default-clouds.lua

(limited to 'config')

diff --git a/config/animations/default-clouds.lua b/config/animations/default-clouds.lua
new file mode 100644
index 0000000..bbf8a28
--- /dev/null
+++ b/config/animations/default-clouds.lua
@@ -0,0 +1,18 @@
+return
+{
+	default = {
+		[1] = love.graphics.newQuad(  1,  1, 158,47, 478,49),
+		frames = 1,
+		repeated = true
+	},
+	default2 = {
+		[1] = love.graphics.newQuad(160,  1, 158,47, 478,49),
+		frames = 1,
+		repeated = true
+	},
+	default3 = {
+		[1] = love.graphics.newQuad(319,  1, 158,47, 478,49),
+		frames = 1,
+		repeated = true
+	}
+}
diff --git a/config/maps/default.lua b/config/maps/default.lua
index ebfcbb8..216e703 100644
--- a/config/maps/default.lua
+++ b/config/maps/default.lua
@@ -14,7 +14,8 @@ return
 	},
 	create = {
 		{
-			clouds = true
+			clouds = "assets/clouds.png",
+			animations = "default-clouds"
 		},
 		{
 			ratio = 0,
-- 
cgit v1.1


From 8285dc2b0cb5eae93e9532d9a6c4c75f3dcaafab Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Wed, 13 Sep 2017 04:09:08 +0200
Subject: Renamed clouds animation file as animations aren't only for maps

---
 config/animations/clouds-default.lua | 18 ++++++++++++++++++
 config/animations/default-clouds.lua | 18 ------------------
 config/maps/default.lua              |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 config/animations/clouds-default.lua
 delete mode 100644 config/animations/default-clouds.lua

(limited to 'config')

diff --git a/config/animations/clouds-default.lua b/config/animations/clouds-default.lua
new file mode 100644
index 0000000..bbf8a28
--- /dev/null
+++ b/config/animations/clouds-default.lua
@@ -0,0 +1,18 @@
+return
+{
+	default = {
+		[1] = love.graphics.newQuad(  1,  1, 158,47, 478,49),
+		frames = 1,
+		repeated = true
+	},
+	default2 = {
+		[1] = love.graphics.newQuad(160,  1, 158,47, 478,49),
+		frames = 1,
+		repeated = true
+	},
+	default3 = {
+		[1] = love.graphics.newQuad(319,  1, 158,47, 478,49),
+		frames = 1,
+		repeated = true
+	}
+}
diff --git a/config/animations/default-clouds.lua b/config/animations/default-clouds.lua
deleted file mode 100644
index bbf8a28..0000000
--- a/config/animations/default-clouds.lua
+++ /dev/null
@@ -1,18 +0,0 @@
-return
-{
-	default = {
-		[1] = love.graphics.newQuad(  1,  1, 158,47, 478,49),
-		frames = 1,
-		repeated = true
-	},
-	default2 = {
-		[1] = love.graphics.newQuad(160,  1, 158,47, 478,49),
-		frames = 1,
-		repeated = true
-	},
-	default3 = {
-		[1] = love.graphics.newQuad(319,  1, 158,47, 478,49),
-		frames = 1,
-		repeated = true
-	}
-}
diff --git a/config/maps/default.lua b/config/maps/default.lua
index 216e703..8bb5ebc 100644
--- a/config/maps/default.lua
+++ b/config/maps/default.lua
@@ -15,7 +15,7 @@ return
 	create = {
 		{
 			clouds = "assets/clouds.png",
-			animations = "default-clouds"
+			animations = "clouds-default"
 		},
 		{
 			ratio = 0,
-- 
cgit v1.1


From d6ad468c42ba9dcd8697109ac8e30c4ccdaa7c32 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Wed, 13 Sep 2017 04:13:33 +0200
Subject: Removed obsolete clouds property from map configs

---
 config/maps/205.lua       | 1 -
 config/maps/aiguillon.lua | 1 -
 config/maps/alpha.lua     | 1 -
 config/maps/ribbit.lua    | 1 -
 config/maps/rill.lua      | 1 -
 config/maps/sorona.lua    | 1 -
 config/maps/starstorm.lua | 1 -
 7 files changed, 7 deletions(-)

(limited to 'config')

diff --git a/config/maps/205.lua b/config/maps/205.lua
index 3fb348f..1a9ae0e 100644
--- a/config/maps/205.lua
+++ b/config/maps/205.lua
@@ -11,7 +11,6 @@ return
 		{x = 0, y = -55},
 		{x = 10, y = -55}
 	},
-	clouds = false,
 	create = {
 		{
 			x = -36,
diff --git a/config/maps/aiguillon.lua b/config/maps/aiguillon.lua
index 3fc3d3a..c4f0ee3 100644
--- a/config/maps/aiguillon.lua
+++ b/config/maps/aiguillon.lua
@@ -12,7 +12,6 @@ return
 		{x = 5, y = -80},
 		{x = 15, y = -80},
 	},
-	clouds = false,
 	create = {
 		{
 			ratio = 0,
diff --git a/config/maps/alpha.lua b/config/maps/alpha.lua
index 4f900c2..795b6cf 100644
--- a/config/maps/alpha.lua
+++ b/config/maps/alpha.lua
@@ -14,7 +14,6 @@ return
 		{x = 120, y = -50},
 		{x =  0, y = -75}
 	},
-	clouds = false,
 	create = {
 		{
 			ratio = 0,
diff --git a/config/maps/ribbit.lua b/config/maps/ribbit.lua
index 0b01f09..08683ac 100644
--- a/config/maps/ribbit.lua
+++ b/config/maps/ribbit.lua
@@ -12,7 +12,6 @@ return
 		{x =   5, y = -80},
 		{x =  15, y = -80}
 	},
-	clouds = false,
 	create = {
 		{
 			ratio = 0,
diff --git a/config/maps/rill.lua b/config/maps/rill.lua
index 25af95d..b027923 100644
--- a/config/maps/rill.lua
+++ b/config/maps/rill.lua
@@ -12,7 +12,6 @@ return
 		{x =  135, y = 10},
 		{x =  135, y = 10}
 	},
-	clouds = false,
 	create = {
 		{
 			ratio = 0,
diff --git a/config/maps/sorona.lua b/config/maps/sorona.lua
index 986d0c8..4cc87cd 100644
--- a/config/maps/sorona.lua
+++ b/config/maps/sorona.lua
@@ -11,7 +11,6 @@ return
 		{x = 0, y = -20},
 		{x = 10, y = -20}
 	},
-	clouds = false,
 	create = {
 		{
 			ratio = 0,
diff --git a/config/maps/starstorm.lua b/config/maps/starstorm.lua
index 31e2d01..b4fabcd 100644
--- a/config/maps/starstorm.lua
+++ b/config/maps/starstorm.lua
@@ -14,7 +14,6 @@ return
 		{x = -110, y = -70},
 		{x = 110, y = -70}
 	},
-	clouds = false,
 	create = {
 		{
 			ratio = 0,
-- 
cgit v1.1


From ed16d208863944f64ce42298132597345cb749bb Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Wed, 13 Sep 2017 04:37:07 +0200
Subject: Clouds are now counted, their number is limited and can be configured

---
 config/maps/default.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/maps/default.lua b/config/maps/default.lua
index 8bb5ebc..6acc577 100644
--- a/config/maps/default.lua
+++ b/config/maps/default.lua
@@ -15,7 +15,8 @@ return
 	create = {
 		{
 			clouds = "assets/clouds.png",
-			animations = "clouds-default"
+			animations = "clouds-default",
+			count = 8
 		},
 		{
 			ratio = 0,
-- 
cgit v1.1


From 4e3b4358bb3f8280a4739bf6a110823b029acae2 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Wed, 13 Sep 2017 04:53:00 +0200
Subject: CloudGenerators now can be configured to use layer with ratio

---
 config/maps/default.lua | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/maps/default.lua b/config/maps/default.lua
index 6acc577..43fb696 100644
--- a/config/maps/default.lua
+++ b/config/maps/default.lua
@@ -16,7 +16,20 @@ return
 		{
 			clouds = "assets/clouds.png",
 			animations = "clouds-default",
-			count = 8
+			count = 4,
+			ratio = 0.9
+		},
+		{
+			clouds = "assets/clouds.png",
+			animations = "clouds-default",
+			count = 3,
+			ratio = 0.8
+		},
+		{
+			clouds = "assets/clouds.png",
+			animations = "clouds-default",
+			count = 3,
+			ratio = 0.7
 		},
 		{
 			ratio = 0,
-- 
cgit v1.1


From a1ce3b0b8aa311c464f180edbf8c269b8abbf9b0 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Wed, 13 Sep 2017 07:15:25 +0200
Subject: Default map clouds reverted to original state

---
 config/maps/default.lua | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'config')

diff --git a/config/maps/default.lua b/config/maps/default.lua
index 43fb696..22c03f6 100644
--- a/config/maps/default.lua
+++ b/config/maps/default.lua
@@ -16,20 +16,7 @@ return
 		{
 			clouds = "assets/clouds.png",
 			animations = "clouds-default",
-			count = 4,
-			ratio = 0.9
-		},
-		{
-			clouds = "assets/clouds.png",
-			animations = "clouds-default",
-			count = 3,
-			ratio = 0.8
-		},
-		{
-			clouds = "assets/clouds.png",
-			animations = "clouds-default",
-			count = 3,
-			ratio = 0.7
+			count = 8,
 		},
 		{
 			ratio = 0,
-- 
cgit v1.1


From a8a581f3003c49f89eae85b5e57c278e7e3f835a Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Thu, 14 Sep 2017 21:10:22 +0200
Subject: Prototyped trap map hazard (flames on 205)

---
 config/maps/205.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'config')

diff --git a/config/maps/205.lua b/config/maps/205.lua
index 1a9ae0e..d0aa1f8 100644
--- a/config/maps/205.lua
+++ b/config/maps/205.lua
@@ -13,6 +13,9 @@ return
 	},
 	create = {
 		{
+			flames = true
+		},
+		{
 			x = -36,
 			y = -48,
 			platform = "205-top"
-- 
cgit v1.1


From 1bef699a48e9a2c147d0358954d2c63ec359d1b5 Mon Sep 17 00:00:00 2001
From: MilkingChicken <THECHEESEMEISTERS@GMAIL.COM>
Date: Tue, 19 Sep 2017 18:53:45 +0200
Subject: AI Station 404 assets and configs added

---
 config/maps/404.lua             | 51 +++++++++++++++++++++++++++++++++++++++++
 config/platforms/404-bottom.lua | 10 ++++++++
 config/platforms/404-small.lua  |  5 ++++
 config/platforms/404-top.lua    |  9 ++++++++
 4 files changed, 75 insertions(+)
 create mode 100644 config/maps/404.lua
 create mode 100644 config/platforms/404-bottom.lua
 create mode 100644 config/platforms/404-small.lua
 create mode 100644 config/platforms/404-top.lua

(limited to 'config')

diff --git a/config/maps/404.lua b/config/maps/404.lua
new file mode 100644
index 0000000..44b6c93
--- /dev/null
+++ b/config/maps/404.lua
@@ -0,0 +1,51 @@
+return
+{
+	name = "AI Station 404",
+	theme = "404.ogg",
+	portrait = 8, -- TODO: See `maps/ribbit`.
+	center = {x = 0, y = 0},
+	width  = 360,
+	height = 240,
+	respawns = {
+		{x = -15, y = -80},
+		{x =  -5, y = -80},
+		{x =   5, y = -80},
+		{x =  15, y = -80}
+	},
+	create = {
+		{
+			ratio = 0,
+			background = "assets/backgrounds/404.png",
+		},
+		{
+			x = -105,
+			y = -75,
+			platform = "404-top"
+		},
+		{
+			x = -123,
+			y = 25,
+			platform = "404-bottom"
+		},
+		{
+			x = 138,
+			y = -25,
+			platform = "404-small"
+		},
+		{
+			x = -180,
+			y = -25,
+			platform = "404-small"
+		},
+		{
+			x = 138,
+			y = 65,
+			platform = "404-small"
+		},
+		{
+			x = -180,
+			y = 65,
+			platform = "404-small"
+		}
+	}
+}
\ No newline at end of file
diff --git a/config/platforms/404-bottom.lua b/config/platforms/404-bottom.lua
new file mode 100644
index 0000000..4e59a98
--- /dev/null
+++ b/config/platforms/404-bottom.lua
@@ -0,0 +1,10 @@
+return
+{
+	sprite = "assets/platforms/404-bottom.png",
+	shape = {
+		{0,0, 69,0, 87,17, 87,28, 0,28},
+		{161,17, 178,0, 247,0, 247,28, 161,28},
+		{33,28, 214,28, 214,57, 33,57},
+		{87,17, 161,17, 168,28, 87,28}
+	}
+}
diff --git a/config/platforms/404-small.lua b/config/platforms/404-small.lua
new file mode 100644
index 0000000..36b8a1d
--- /dev/null
+++ b/config/platforms/404-small.lua
@@ -0,0 +1,5 @@
+return
+{
+	sprite = "assets/platforms/404-small.png",
+	shape = {0,0, 43,0, 43,8, 0,8}
+}
diff --git a/config/platforms/404-top.lua b/config/platforms/404-top.lua
new file mode 100644
index 0000000..3d3ba2b
--- /dev/null
+++ b/config/platforms/404-top.lua
@@ -0,0 +1,9 @@
+return
+{
+	sprite = "assets/platforms/404-top.png",
+	shape = {
+		{45,0, 166,0, 166,13, 45,13},
+		{23,14, 188,14, 188,26, 23,26},
+		{0,27, 211,27, 211,45, 0,45}
+	}
+}
-- 
cgit v1.1


From 1546be903cbf7a09eb5ff3fbd7c040f842d366a5 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Tue, 19 Sep 2017 18:54:51 +0200
Subject: Changed host map icons sheet width

---
 config/menus/host.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/menus/host.lua b/config/menus/host.lua
index 07c5b80..c8ef4d8 100644
--- a/config/menus/host.lua
+++ b/config/menus/host.lua
@@ -21,7 +21,7 @@ do
 			local i, name = map.portrait, map.name
 			map.filename = path
 			if i then
-				table.insert(icons, love.graphics.newQuad((i-1)*76, 0, 76, 37, 532, 37))
+				table.insert(icons, love.graphics.newQuad((i-1)*76, 0, 76, 37, 608, 37))
 				table.insert(maps, map)
 			end
 		end
-- 
cgit v1.1


From 453095b2e0b34cc4bd24671bc8abe6ff9279a318 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Thu, 21 Sep 2017 16:06:53 +0200
Subject: Flames animations moved to separate config file

---
 config/animations/flames.lua | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 config/animations/flames.lua

(limited to 'config')

diff --git a/config/animations/flames.lua b/config/animations/flames.lua
new file mode 100644
index 0000000..62ecbb1
--- /dev/null
+++ b/config/animations/flames.lua
@@ -0,0 +1,21 @@
+return
+{
+	default = {
+		[1] = love.graphics.newQuad(0, 0, 42, 19, 168, 19),
+		[2] = love.graphics.newQuad(42, 0, 42, 19, 168, 19),
+		frames = 2,
+		repeated = true
+	},
+	fadein = {
+		[1] = love.graphics.newQuad(84, 0, 42, 19, 168, 19),
+		[2] = love.graphics.newQuad(126, 0, 42, 19, 168, 19),
+		frames = 2,
+		repeated = false
+	},
+	fadeout = {
+		[1] = love.graphics.newQuad(126, 0, 42, 19, 168, 19),
+		[2] = love.graphics.newQuad(84, 0, 42, 19, 168, 19),
+		frames = 2,
+		repeated = false
+	}
+}
-- 
cgit v1.1