From b3f37fbf88e691425ff04cdeb942dda693f6e14e Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 14 Jan 2017 11:21:44 +0100 Subject: Rill map sprites and layout update --- assets/decorations/rill-lollipop-big-orange.png | Bin 0 -> 671 bytes assets/decorations/rill-lollipop-big-purple.png | Bin 0 -> 663 bytes assets/decorations/rill-lollipop-small-blue.png | Bin 0 -> 358 bytes assets/decorations/rill-lollipop-small-green.png | Bin 0 -> 321 bytes assets/platforms/rill-block-left.png | Bin 863 -> 0 bytes assets/platforms/rill-block-right.png | Bin 920 -> 0 bytes assets/platforms/rill-center.png | Bin 830 -> 760 bytes assets/platforms/rill-flat-left.png | Bin 0 -> 615 bytes assets/platforms/rill-flat-right.png | Bin 0 -> 641 bytes assets/platforms/rill-slide-left.png | Bin 1296 -> 0 bytes assets/platforms/rill-slide-right.png | Bin 1822 -> 0 bytes assets/platforms/rill-slope-left.png | Bin 0 -> 1483 bytes assets/platforms/rill-slope-right.png | Bin 0 -> 1319 bytes maps/rill.lua | 59 +++++++++++++++-------- 14 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 assets/decorations/rill-lollipop-big-orange.png create mode 100644 assets/decorations/rill-lollipop-big-purple.png create mode 100644 assets/decorations/rill-lollipop-small-blue.png create mode 100644 assets/decorations/rill-lollipop-small-green.png delete mode 100644 assets/platforms/rill-block-left.png delete mode 100644 assets/platforms/rill-block-right.png create mode 100644 assets/platforms/rill-flat-left.png create mode 100644 assets/platforms/rill-flat-right.png delete mode 100644 assets/platforms/rill-slide-left.png delete mode 100644 assets/platforms/rill-slide-right.png create mode 100644 assets/platforms/rill-slope-left.png create mode 100644 assets/platforms/rill-slope-right.png diff --git a/assets/decorations/rill-lollipop-big-orange.png b/assets/decorations/rill-lollipop-big-orange.png new file mode 100644 index 0000000..dce8410 Binary files /dev/null and b/assets/decorations/rill-lollipop-big-orange.png differ diff --git a/assets/decorations/rill-lollipop-big-purple.png b/assets/decorations/rill-lollipop-big-purple.png new file mode 100644 index 0000000..015ac4b Binary files /dev/null and b/assets/decorations/rill-lollipop-big-purple.png differ diff --git a/assets/decorations/rill-lollipop-small-blue.png b/assets/decorations/rill-lollipop-small-blue.png new file mode 100644 index 0000000..95163e2 Binary files /dev/null and b/assets/decorations/rill-lollipop-small-blue.png differ diff --git a/assets/decorations/rill-lollipop-small-green.png b/assets/decorations/rill-lollipop-small-green.png new file mode 100644 index 0000000..2734c49 Binary files /dev/null and b/assets/decorations/rill-lollipop-small-green.png differ diff --git a/assets/platforms/rill-block-left.png b/assets/platforms/rill-block-left.png deleted file mode 100644 index ecfeccc..0000000 Binary files a/assets/platforms/rill-block-left.png and /dev/null differ diff --git a/assets/platforms/rill-block-right.png b/assets/platforms/rill-block-right.png deleted file mode 100644 index 5c2c582..0000000 Binary files a/assets/platforms/rill-block-right.png and /dev/null differ diff --git a/assets/platforms/rill-center.png b/assets/platforms/rill-center.png index 0614c91..4ce0631 100644 Binary files a/assets/platforms/rill-center.png and b/assets/platforms/rill-center.png differ diff --git a/assets/platforms/rill-flat-left.png b/assets/platforms/rill-flat-left.png new file mode 100644 index 0000000..ad0d16c Binary files /dev/null and b/assets/platforms/rill-flat-left.png differ diff --git a/assets/platforms/rill-flat-right.png b/assets/platforms/rill-flat-right.png new file mode 100644 index 0000000..dd0e14a Binary files /dev/null and b/assets/platforms/rill-flat-right.png differ diff --git a/assets/platforms/rill-slide-left.png b/assets/platforms/rill-slide-left.png deleted file mode 100644 index bc20c71..0000000 Binary files a/assets/platforms/rill-slide-left.png and /dev/null differ diff --git a/assets/platforms/rill-slide-right.png b/assets/platforms/rill-slide-right.png deleted file mode 100644 index 14b1df1..0000000 Binary files a/assets/platforms/rill-slide-right.png and /dev/null differ diff --git a/assets/platforms/rill-slope-left.png b/assets/platforms/rill-slope-left.png new file mode 100644 index 0000000..a2ac2c6 Binary files /dev/null and b/assets/platforms/rill-slope-left.png differ diff --git a/assets/platforms/rill-slope-right.png b/assets/platforms/rill-slope-right.png new file mode 100644 index 0000000..4353cc8 Binary files /dev/null and b/assets/platforms/rill-slope-right.png differ diff --git a/maps/rill.lua b/maps/rill.lua index 59c34ca..e150335 100644 --- a/maps/rill.lua +++ b/maps/rill.lua @@ -3,7 +3,7 @@ return { name = "rill", theme = "rill.ogg", center_x = 0, - center_y = 65, + center_y = 75, width = 400, height = 260, -- RESPAWN POINTS @@ -18,35 +18,56 @@ return { background = "assets/backgrounds/rill.png", platforms = { { - x = -160, + x = -151, y = 25, - shape = {2,2, 47,2, 47,18, 2,18}, - sprite = "assets/platforms/rill-block-left.png" + shape = {0,0, 56,0, 56,12, 0,12}, + sprite = "assets/platforms/rill-flat-left.png" }, { - x = 110, + x = 93, y = 25, - shape = {0,2, 46,2, 42,18, 0,18}, - sprite = "assets/platforms/rill-block-right.png" + shape = {0,0, 56,0, 56,12, 0,12}, + sprite = "assets/platforms/rill-flat-right.png" }, { - x = -32, - y = 70, - shape = {2,2, 62,2, 42,18, 22,18}, + x = -24, + y = 55, + shape = {0,0, 49,0, 47,18, 3,18, 0,4}, sprite = "assets/platforms/rill-center.png" }, { - x = -110, - y = 90, - shape = {2,2, 18,2, 76,41, 75,61, 2,9}, - sprite = "assets/platforms/rill-slide-left.png" + x = -112, + y = 80, + shape = {78,30, 17,0, 0,0, 0,7, 78,45}, + sprite = "assets/platforms/rill-slope-left.png" }, { - x = 34, - y = 90, - shape = {2,44, 64,2, 75,2, 7,57}, - sprite = "assets/platforms/rill-slide-right.png" + x = 35, + y = 80, + shape = {0,30, 61,0, 78,0, 78,7, 0,45}, + sprite = "assets/platforms/rill-slope-right.png" } }, - decorations = {} + 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" + }, + } } -- cgit v1.1