summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-01-14 11:21:44 +0100
committerAki <nthirtyone@gmail.com>2017-01-14 11:21:44 +0100
commitb3f37fbf88e691425ff04cdeb942dda693f6e14e (patch)
tree199adda93b397bf6ff25b6595902b767d25ddbe5
parent586b8b7352f404246455a88ca42336183c12d542 (diff)
downloadroflnauts-b3f37fbf88e691425ff04cdeb942dda693f6e14e.zip
roflnauts-b3f37fbf88e691425ff04cdeb942dda693f6e14e.tar.gz
roflnauts-b3f37fbf88e691425ff04cdeb942dda693f6e14e.tar.bz2
Rill map sprites and layout update
-rw-r--r--assets/decorations/rill-lollipop-big-orange.pngbin0 -> 671 bytes
-rw-r--r--assets/decorations/rill-lollipop-big-purple.pngbin0 -> 663 bytes
-rw-r--r--assets/decorations/rill-lollipop-small-blue.pngbin0 -> 358 bytes
-rw-r--r--assets/decorations/rill-lollipop-small-green.pngbin0 -> 321 bytes
-rw-r--r--assets/platforms/rill-block-left.pngbin863 -> 0 bytes
-rw-r--r--assets/platforms/rill-block-right.pngbin920 -> 0 bytes
-rw-r--r--assets/platforms/rill-center.pngbin830 -> 760 bytes
-rw-r--r--assets/platforms/rill-flat-left.pngbin0 -> 615 bytes
-rw-r--r--assets/platforms/rill-flat-right.pngbin0 -> 641 bytes
-rw-r--r--assets/platforms/rill-slide-left.pngbin1296 -> 0 bytes
-rw-r--r--assets/platforms/rill-slide-right.pngbin1822 -> 0 bytes
-rw-r--r--assets/platforms/rill-slope-left.pngbin0 -> 1483 bytes
-rw-r--r--assets/platforms/rill-slope-right.pngbin0 -> 1319 bytes
-rw-r--r--maps/rill.lua59
14 files changed, 40 insertions, 19 deletions
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
--- /dev/null
+++ b/assets/decorations/rill-lollipop-big-orange.png
Binary files 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
--- /dev/null
+++ b/assets/decorations/rill-lollipop-big-purple.png
Binary files 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
--- /dev/null
+++ b/assets/decorations/rill-lollipop-small-blue.png
Binary files 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
--- /dev/null
+++ b/assets/decorations/rill-lollipop-small-green.png
Binary files differ
diff --git a/assets/platforms/rill-block-left.png b/assets/platforms/rill-block-left.png
deleted file mode 100644
index ecfeccc..0000000
--- a/assets/platforms/rill-block-left.png
+++ /dev/null
Binary files differ
diff --git a/assets/platforms/rill-block-right.png b/assets/platforms/rill-block-right.png
deleted file mode 100644
index 5c2c582..0000000
--- a/assets/platforms/rill-block-right.png
+++ /dev/null
Binary files differ
diff --git a/assets/platforms/rill-center.png b/assets/platforms/rill-center.png
index 0614c91..4ce0631 100644
--- a/assets/platforms/rill-center.png
+++ b/assets/platforms/rill-center.png
Binary files differ
diff --git a/assets/platforms/rill-flat-left.png b/assets/platforms/rill-flat-left.png
new file mode 100644
index 0000000..ad0d16c
--- /dev/null
+++ b/assets/platforms/rill-flat-left.png
Binary files differ
diff --git a/assets/platforms/rill-flat-right.png b/assets/platforms/rill-flat-right.png
new file mode 100644
index 0000000..dd0e14a
--- /dev/null
+++ b/assets/platforms/rill-flat-right.png
Binary files differ
diff --git a/assets/platforms/rill-slide-left.png b/assets/platforms/rill-slide-left.png
deleted file mode 100644
index bc20c71..0000000
--- a/assets/platforms/rill-slide-left.png
+++ /dev/null
Binary files differ
diff --git a/assets/platforms/rill-slide-right.png b/assets/platforms/rill-slide-right.png
deleted file mode 100644
index 14b1df1..0000000
--- a/assets/platforms/rill-slide-right.png
+++ /dev/null
Binary files differ
diff --git a/assets/platforms/rill-slope-left.png b/assets/platforms/rill-slope-left.png
new file mode 100644
index 0000000..a2ac2c6
--- /dev/null
+++ b/assets/platforms/rill-slope-left.png
Binary files differ
diff --git a/assets/platforms/rill-slope-right.png b/assets/platforms/rill-slope-right.png
new file mode 100644
index 0000000..4353cc8
--- /dev/null
+++ b/assets/platforms/rill-slope-right.png
Binary files 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"
+ },
+ }
}