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/maps')

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 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 +++++++--------------------
 2 files changed, 11 insertions(+), 28 deletions(-)

(limited to 'config/maps')

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 = {
-- 
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/maps')

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/maps')

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 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 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

(limited to 'config/maps')

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 = {}
+	}
 }
-- 
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 ++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 75 deletions(-)
 delete mode 100644 config/maps/alpha abyss.lua
 create mode 100644 config/maps/alpha.lua

(limited to 'config/maps')

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",
+		}
+	},
+}
-- 
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 ++++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

(limited to 'config/maps')

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 = {}
 }
-- 
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/maps')

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 +++++++++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

(limited to 'config/maps')

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"
+		}
 	}
 }
-- 
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 ++++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 36 deletions(-)

(limited to 'config/maps')

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 = {}
+	}
 }
-- 
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 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 config/maps/205.lua

(limited to 'config/maps')

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"
+		}
+	}
+}
-- 
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/maps')

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/maps/default.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config/maps')

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/maps/default.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config/maps')

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/maps')

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/maps')

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/maps')

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/maps')

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/maps')

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 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 config/maps/404.lua

(limited to 'config/maps')

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
-- 
cgit v1.1