Merge branch 'maps'

1 files changed, 34 insertions, 37 deletions

diff --git a/config/maps/sorona.lua b/config/maps/sorona.lua
index 8ec4727..4cc87cd 100644
--- a/config/maps/sorona.lua
+++ b/config/maps/sorona.lua
@@ -1,53 +1,50 @@
--- 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 = {}
+	}
 }