From 1ffc08dd2343b76b2f94d9c290ef346346585270 Mon Sep 17 00:00:00 2001 From: Aki 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/default.lua') 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 f15ace4d5b9f62b6288a2b6750bc48159ebebe00 Mon Sep 17 00:00:00 2001 From: Aki 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/default.lua') 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 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/default.lua') 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 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/default.lua') 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 ed16d208863944f64ce42298132597345cb749bb Mon Sep 17 00:00:00 2001 From: Aki 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/default.lua') 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 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/default.lua') 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 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/default.lua') 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