Merge branch 'com'

8 files changed, 0 insertions, 527 deletions

diff --git a/maps/aiguillon.lua b/maps/aiguillon.lua
deleted file mode 100644
index 40d3928..0000000
--- a/maps/aiguillon.lua
+++ /dev/null
@@ -1,58 +0,0 @@
-return {
-	-- CENTER AND SIZE
-	name = "aiguillon",
-	theme = "aiguillon.ogg",
-	center_x = 0,
-	center_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},
-	},
-	-- GRAPHICS
-	clouds = false,
-	background = "assets/backgrounds/aiguillon.png",
-	platforms = {
-		{
-			x = -108,
-			y = 22,
-			shape = {1,0, 212,0, 212,12, 206,18, 14,18, 1,12},
-			sprite = "assets/platforms/aiguillon-wide.png"
-		},
-		{
-			x = -46,
-			y = -19,
-			shape = {1,0, 87,0, 87,18, 14,18, 1,12},
-			sprite = "assets/platforms/aiguillon-middle.png"
-		},
-		{
-			x = -141,
-			y = -57,
-			shape = {1,0, 50,0, 50,18, 5,18, 1,13},
-			sprite = "assets/platforms/aiguillon-left-big.png"
-		},
-		{
-			x = -132,
-			y = 84,
-			shape = {1,0, 25,0, 25,18, 1,18},
-			sprite = "assets/platforms/aiguillon-left-small.png"
-		},
-		{
-			x = 77,
-			y = -57,
-			shape = {1,0, 50,0, 50,12, 37,18, 1,18},
-			sprite = "assets/platforms/aiguillon-right-big.png"
-		},
-		{
-			x = 103,
-			y = 84,
-			shape = {1,0, 25,0, 25,18, 1,18},
-			sprite = "assets/platforms/aiguillon-right-small.png"
-		}
-	},
-	decorations = {}
-}
diff --git a/maps/alpha abyss.lua b/maps/alpha abyss.lua
deleted file mode 100644
index 0dd2c61..0000000
--- a/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/maps/default.lua b/maps/default.lua
deleted file mode 100644
index 05b8dc9..0000000
--- a/maps/default.lua
+++ /dev/null
@@ -1,47 +0,0 @@
--- Default map from original roflnauts
-return {
-	-- GENERAL
-	name = "default",
-	theme = "default.ogg",
-	center_x = 0,
-	center_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 = {
-		{
-			x = -91,
-			y = 0,
-			shape = {0,1, 180,1, 180,10, 95,76, 86,76, 0,10},
-			sprite = "assets/platforms/default-big.png"
-		},
-		{
-			x = 114,
-			y = 50,
-			shape = {0,1, 51,1, 51,18, 0,18},
-			sprite = "assets/platforms/default-side.png"
-		},
-		{
-			x = -166,
-			y = 50,
-			shape = {0,1, 51,1, 51,18, 0,18},
-			sprite = "assets/platforms/default-side.png"
-		},
-		{
-			x = -17,
-			y = -50,
-			shape = {0,1, 33,1, 33,14, 0,14},
-			sprite = "assets/platforms/default-top.png"
-		}
-	},
-	decorations = {}
-}
diff --git a/maps/readme.md b/maps/readme.md
deleted file mode 100644
index dc139ad..0000000
--- a/maps/readme.md
+++ /dev/null
@@ -1,82 +0,0 @@
-# Mapmaking
-*Hugs Emo*
-
-### Name (string)
-Name of the map. Should be same as the filename. *I think*.
-```lua
-name = "default"
-```
-
-### Center (int)
-Coordinates of center of the map. Camera zone and death zone are placed relative to it.
-```lua
-center_x = 0,
-center_y = 0
-```
-
-### Size (int)
-Width and height of playground. Camera zone and death zone sizes are calculated based on map size.
-```lua
-width  = 360,
-height = 240
-```
-
-### Respawns (table, int)
-Table of possible respawn points. Players will randomly spawn on one of these points.
-```lua
-respawns = {
-	{x = -15, y = -80},
-	{x =  -5, y = -80},
-	{x =   5, y = -80},
-	{x =  15, y = -80}
-}
-```
-
-### Clouds (bool)
-Presence of clouds. Clouds will spawn if set to **true**.
-```lua
-clouds = true
-```
-
-### Background (string)
-Path to background image in the game structure. It will be used as fixed background.
-```lua
-background = "assets/background-default.png"
-```
-
-### Platforms (table, int, string)
-Platforms on which player can stand. They will be placed on given coordinates with given sprite and shape.
-Shape are points placed relatively to platform's coordinates. Shape points are connected in given order. On top of that last point is connected with first one.
-```lua
-platforms = {
-	{
-		x = -91,
-		y = 0,
-		shape = {0,1, 181,1, 181,10, 96,76, 86,76, 0,10},
-		sprite = "assets/platform_big.png"
-	},
-	{
-		x = 114,
-		y = 50,
-		shape = {0,1, 52,1, 52,30, 0,30},
-		sprite = "assets/platform_small.png"
-	}
-}
-```
-
-### Decoration (table, int, string)
-Decorations are objects in the background which are not fixed but move alongside with foreground objects (platforms, players, clouds). They do not have physical body.
-```lua
-decorations = {
-	{
-		x = -80,
-		y = 10,
-		sprite = "assets/decoration_big.png"
-	},
-	{
-		x = 50,
-		y = 50,
-		sprite = "assets/decoration_small.png"
-	}
-}
-```
\ No newline at end of file
diff --git a/maps/ribbit.lua b/maps/ribbit.lua
deleted file mode 100644
index c3f5c78..0000000
--- a/maps/ribbit.lua
+++ /dev/null
@@ -1,46 +0,0 @@
-return {
-	-- GENERAL
-	name = "ribbit",
-	theme = "ribbit.ogg",
-	center_x = 0,
-	center_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 = {
-		{
-			x = -154,
-			y = 10,
-			shape = {1,12, 48,12, 48,32, 1,32},
-			sprite = "assets/platforms/ribbit-left.png"
-		},
-		{
-			x = 67,
-			y = 7,
-			shape = {36,14, 83,14, 83,29, 36,29},
-			sprite = "assets/platforms/ribbit-right.png"
-		},
-		{
-			x = -70,
-			y = -5,
-			shape = {0,3, 139,3, 134,24, 5,24},
-			sprite = "assets/platforms/ribbit-top.png"
-		},
-		{
-			x = -54,
-			y = 63,
-			shape = {0,3, 107,3, 75,44, 32,44},
-			sprite = "assets/platforms/ribbit-bottom.png"
-		}
-	},
-	decorations = {}
-}
\ No newline at end of file
diff --git a/maps/rill.lua b/maps/rill.lua
deleted file mode 100644
index 83c02f2..0000000
--- a/maps/rill.lua
+++ /dev/null
@@ -1,73 +0,0 @@
-return {
-	-- CENTER AND SIZE
-	name = "rill",
-	theme = "rill.ogg",
-	center_x = 0,
-	center_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 = {
-		{
-			x = -151,
-			y = 25,
-			shape = {0,0, 55,0, 55,11, 0,11},
-			sprite = "assets/platforms/rill-flat-left.png"
-		},
-		{
-			x = 93,
-			y = 25,
-			shape = {0,0, 55,0, 55,11, 0,11},
-			sprite = "assets/platforms/rill-flat-right.png"
-		},
-		{
-			x = -24,
-			y = 55,
-			shape = {0,0, 48,0, 47,15, 1,15},
-			sprite = "assets/platforms/rill-center.png"
-		},
-		{
-			x = -112,
-			y = 80,
-			shape = {77,30, 17,0, 0,0, 0,7, 77,44},
-			sprite = "assets/platforms/rill-slope-left.png"
-		},
-		{
-			x = 35,
-			y = 80,
-			shape = {0,30, 60,0, 77,0, 77,7, 0,44},
-			sprite = "assets/platforms/rill-slope-right.png"
-		}
-	},
-	decorations = {
-		{
-			x = 98,
-			y = -20,
-			sprite = "assets/decorations/rill-lollipop-big-purple.png"
-		},
-		{
-			x = 127,
-			y = 4,
-			sprite = "assets/decorations/rill-lollipop-small-green.png"
-		},
-		{
-			x = -152,
-			y = -20,
-			sprite = "assets/decorations/rill-lollipop-big-orange.png"
-		},
-		{
-			x = -121,
-			y = 4,
-			sprite = "assets/decorations/rill-lollipop-small-blue.png"
-		},
-	}
-}
diff --git a/maps/sorona.lua b/maps/sorona.lua
deleted file mode 100644
index 8ec4727..0000000
--- a/maps/sorona.lua
+++ /dev/null
@@ -1,53 +0,0 @@
--- Sorona, but with the worms and such.
-return {
-	-- GENERAL
-	name = "sorona",
-	theme = "sorona.ogg",
-	center_x = 0,
-	center_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},
-	},
-	-- GRAPHICS
-	clouds = false,
-	background = "assets/backgrounds/sorona.png",
-	platforms = {
-		{
-			x = -60,
-			y = 0,
-			shape = {0,1, 59,1, 59,17, 0,17},
-			sprite = "assets/platforms/sorona-center.png"
-		},
-		{
-			x = -40,
-			y = 55,
-			shape = {3,0, 180,0, 180,20, 3,20},
-			sprite = "assets/platforms/sorona-right-bottom.png"
-		},
-		{
-			x = -120,
-			y = 55,
-			shape = {3,0, 62,0, 62,23, 3,23},
-			sprite = "assets/platforms/sorona-left-bottom.png"
-		},
-		{
-			x = 0,
-			y = -50,
-			shape = {1,1, 140,1, 1,17, 140,17},
-			sprite = "assets/platforms/sorona-right-top.png"
-		},
-		{
-			x = -150,
-			y = -55,
-			shape = {1,9, 106,9, 40,27, 1,27},
-			sprite = "assets/platforms/sorona-left-top.png"
-		}
-	},
-	decorations = {}
-}
diff --git a/maps/starstorm.lua b/maps/starstorm.lua
deleted file mode 100644
index 7f00633..0000000
--- a/maps/starstorm.lua
+++ /dev/null
@@ -1,93 +0,0 @@
-return {
-	-- CENTER AND SIZE
-	name = "starstorm",
-	theme = "starstorm.ogg",
-	center_x = 0,
-	center_y = -20,
-	width  = 400,
-	height = 260,
-	-- RESPAWN POINTS
-	respawns = {
-		{x = 100, y = 45},
-		{x = -100, y = 45},
-		{x = -90, y = -25},
-		{x = 90, y = -25},
-		{x = -110, y = -70},
-		{x = 110, y = -70}
-	},
-	-- GRAPHICS
-	clouds = false,
-	background = "assets/backgrounds/starstorm.png",
-	platforms = {
-		{
-			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"
-		},
-		{
-			x = -156,
-			y = -2,
-			shape = {0,0, 109,0, 109,20, 0,20},
-			sprite = "assets/platforms/starstorm-left-middle.png"
-		},
-		{
-			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"
-		},
-		{
-			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"
-		},
-		{
-			x = 44,
-			y = -2,
-			shape = {109,0, 0,0, 0,20, 109,20},
-			sprite = "assets/platforms/starstorm-right-middle.png"
-		},
-		{
-			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"
-		},
-		{
-			x = -27,
-			y = 40,
-			shape = {0,6, 53,6, 53,14, 0,14},
-			sprite = "assets/platforms/starstorm-center.png"
-		}
-	},
-	decorations = {
-		{
-			x = -166,
-			y = -37,
-			sprite = "assets/decorations/starstorm-left-top.png"
-		},
-		{
-			x = -163,
-			y = 19,
-			sprite = "assets/decorations/starstorm-left-bottom.png"
-		},
-		{
-			x = 119,
-			y = -37,
-			sprite = "assets/decorations/starstorm-right-top.png"
-		},
-		{
-			x = 52+77,
-			y = 19,
-			sprite = "assets/decorations/starstorm-right-bottom.png"
-		}
-	}
-}