From 7e94afeff5f8c11f9dece2c14e4b988a407d7059 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Fri, 13 Jan 2017 16:54:23 +0100
Subject: Updated themes and Aiguillon design

---
 assets/platforms/aiguillon-bottom.png | Bin 1866 -> 0 bytes
 assets/platforms/aiguillon-middle.png | Bin 0 -> 1866 bytes
 assets/platforms/aiguillon-top.png    | Bin 3098 -> 0 bytes
 assets/platforms/aiguillon-wide.png   | Bin 0 -> 3098 bytes
 maps/aiguillon.lua                    |  36 +++++++++++++++++-----------------
 maps/default.lua                      |   2 +-
 maps/ribbit.lua                       |   2 +-
 maps/rill.lua                         |   2 +-
 maps/starstorm.lua                    |   2 +-
 music.lua                             |   2 +-
 10 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 assets/platforms/aiguillon-bottom.png
 create mode 100644 assets/platforms/aiguillon-middle.png
 delete mode 100644 assets/platforms/aiguillon-top.png
 create mode 100644 assets/platforms/aiguillon-wide.png

diff --git a/assets/platforms/aiguillon-bottom.png b/assets/platforms/aiguillon-bottom.png
deleted file mode 100644
index c5dfc3c..0000000
Binary files a/assets/platforms/aiguillon-bottom.png and /dev/null differ
diff --git a/assets/platforms/aiguillon-middle.png b/assets/platforms/aiguillon-middle.png
new file mode 100644
index 0000000..c5dfc3c
Binary files /dev/null and b/assets/platforms/aiguillon-middle.png differ
diff --git a/assets/platforms/aiguillon-top.png b/assets/platforms/aiguillon-top.png
deleted file mode 100644
index 88c20e7..0000000
Binary files a/assets/platforms/aiguillon-top.png and /dev/null differ
diff --git a/assets/platforms/aiguillon-wide.png b/assets/platforms/aiguillon-wide.png
new file mode 100644
index 0000000..88c20e7
Binary files /dev/null and b/assets/platforms/aiguillon-wide.png differ
diff --git a/maps/aiguillon.lua b/maps/aiguillon.lua
index 7581a75..117d4fc 100644
--- a/maps/aiguillon.lua
+++ b/maps/aiguillon.lua
@@ -1,17 +1,17 @@
 return {
 	-- CENTER AND SIZE
 	name = "aiguillon",
-	theme = "sorona.ogg",
+	theme = "aiguillon.mp3",
 	center_x = 0,
-	center_y = -45,
+	center_y = 10,
 	width  = 370,
 	height = 290,
 	-- RESPAWN POINTS
 	respawns = {
-		{x = -119, y = -28},
-		{x = 115, y = -28},
-		{x = 0, y = -90},
-		{x = 0, y = 45},
+		{x = 0, y = -80},
+		{x = 0, y = -80},
+		{x = 0, y = -80},
+		{x = 0, y = -80},
 	},
 	-- GRAPHICS
 	clouds = false,
@@ -19,37 +19,37 @@ return {
 	platforms = {
 		{
 			x = -108,
-			y = -72,
+			y = 22,
 			shape = {1,0, 212,0, 212,12, 206,18, 14,18, 1,12},
-			sprite = "assets/platforms/aiguillon-top.png"
+			sprite = "assets/platforms/aiguillon-wide.png"
 		},
 		{
 			x = -46,
-			y = 62,
+			y = -19,
 			shape = {1,0, 87,0, 87,18, 14,18, 1,12},
-			sprite = "assets/platforms/aiguillon-bottom.png"
+			sprite = "assets/platforms/aiguillon-middle.png"
 		},
 		{
-			x = -144,
-			y = -14,
+			x = -141,
+			y = -57,
 			shape = {1,0, 50,0, 50,18, 5,18, 1,13},
 			sprite = "assets/platforms/aiguillon-left-big.png"
 		},
 		{
-			x = -82,
-			y = 16,
+			x = -132,
+			y = 84,
 			shape = {1,0, 25,0, 25,18, 1,18},
 			sprite = "assets/platforms/aiguillon-left-small.png"
 		},
 		{
-			x = 90,
-			y = -14,
+			x = 77,
+			y = -57,
 			shape = {1,0, 50,0, 50,12, 37,18, 1,18},
 			sprite = "assets/platforms/aiguillon-right-big.png"
 		},
 		{
-			x = 53,
-			y = 16,
+			x = 103,
+			y = 84,
 			shape = {1,0, 25,0, 25,18, 1,18},
 			sprite = "assets/platforms/aiguillon-right-small.png"
 		}
diff --git a/maps/default.lua b/maps/default.lua
index 7f4df7a..12f1ef2 100644
--- a/maps/default.lua
+++ b/maps/default.lua
@@ -2,7 +2,7 @@
 return {
 	-- GENERAL
 	name = "default",
-	theme = "sorona.ogg",
+	theme = "sorona.mp3",
 	center_x = 0,
 	center_y = 0,
 	width  = 360,
diff --git a/maps/ribbit.lua b/maps/ribbit.lua
index 92950e8..a3d9b66 100644
--- a/maps/ribbit.lua
+++ b/maps/ribbit.lua
@@ -1,7 +1,7 @@
 return {
 	-- GENERAL
 	name = "ribbit",
-	theme = "sorona.ogg",
+	theme = "ribbit.mp3",
 	center_x = 0,
 	center_y = 50,
 	width  = 360,
diff --git a/maps/rill.lua b/maps/rill.lua
index 59c34ca..29faf13 100644
--- a/maps/rill.lua
+++ b/maps/rill.lua
@@ -1,7 +1,7 @@
 return {
 	-- CENTER AND SIZE
 	name = "rill",
-	theme = "rill.ogg",
+	theme = "rill.mp3",
 	center_x = 0,
 	center_y = 65,
 	width  = 400,
diff --git a/maps/starstorm.lua b/maps/starstorm.lua
index 0540009..ac241a9 100644
--- a/maps/starstorm.lua
+++ b/maps/starstorm.lua
@@ -1,7 +1,7 @@
 return {
 	-- CENTER AND SIZE
 	name = "starstorm",
-	theme = "starstorm.ogg",
+	theme = "starstorm.mp3",
 	center_x = 0,
 	center_y = -20,
 	width  = 400,
diff --git a/music.lua b/music.lua
index 1ac26bb..31f2889 100644
--- a/music.lua
+++ b/music.lua
@@ -19,7 +19,7 @@ function Music:new(track)
 	o.source = love.audio.newSource("assets/music/" .. o.track)
 	o.source:setLooping(true)
 	o.source:setVolume(.7)
-	o.source:play()
+	--o.source:play()
 	return o
 end
 function Music:delete()
-- 
cgit v1.1