summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-09-20 15:51:05 +0200
committerAki <nthirtyone@gmail.com>2017-09-20 15:51:05 +0200
commit6810cd64354ff2c6914598f7318ca71e7bbd65a7 (patch)
tree8d38c1b03a4bdf19c1d26d0efe8ae43386e82a4d
parentcdec3cf410bba80d037fda760da06e9e3ed75945 (diff)
parent1546be903cbf7a09eb5ff3fbd7c040f842d366a5 (diff)
downloadroflnauts-6810cd64354ff2c6914598f7318ca71e7bbd65a7.zip
roflnauts-6810cd64354ff2c6914598f7318ca71e7bbd65a7.tar.gz
roflnauts-6810cd64354ff2c6914598f7318ca71e7bbd65a7.tar.bz2
Merge branch '404' into maps
-rw-r--r--assets/backgrounds/404.pngbin0 -> 15541 bytes
-rw-r--r--assets/maps.pngbin10070 -> 10688 bytes
-rw-r--r--assets/music/404.oggbin0 -> 3338347 bytes
-rw-r--r--assets/platforms/404-bottom.pngbin0 -> 2054 bytes
-rw-r--r--assets/platforms/404-small.pngbin0 -> 389 bytes
-rw-r--r--assets/platforms/404-top.pngbin0 -> 1911 bytes
-rw-r--r--config/maps/404.lua51
-rw-r--r--config/menus/host.lua2
-rw-r--r--config/platforms/404-bottom.lua10
-rw-r--r--config/platforms/404-small.lua5
-rw-r--r--config/platforms/404-top.lua9
11 files changed, 76 insertions, 1 deletions
diff --git a/assets/backgrounds/404.png b/assets/backgrounds/404.png
new file mode 100644
index 0000000..d1d7231
--- /dev/null
+++ b/assets/backgrounds/404.png
Binary files differ
diff --git a/assets/maps.png b/assets/maps.png
index 261622c..f0e530d 100644
--- a/assets/maps.png
+++ b/assets/maps.png
Binary files differ
diff --git a/assets/music/404.ogg b/assets/music/404.ogg
new file mode 100644
index 0000000..e952135
--- /dev/null
+++ b/assets/music/404.ogg
Binary files differ
diff --git a/assets/platforms/404-bottom.png b/assets/platforms/404-bottom.png
new file mode 100644
index 0000000..b3e9831
--- /dev/null
+++ b/assets/platforms/404-bottom.png
Binary files differ
diff --git a/assets/platforms/404-small.png b/assets/platforms/404-small.png
new file mode 100644
index 0000000..787cd67
--- /dev/null
+++ b/assets/platforms/404-small.png
Binary files differ
diff --git a/assets/platforms/404-top.png b/assets/platforms/404-top.png
new file mode 100644
index 0000000..7452857
--- /dev/null
+++ b/assets/platforms/404-top.png
Binary files differ
diff --git a/config/maps/404.lua b/config/maps/404.lua
new file mode 100644
index 0000000..44b6c93
--- /dev/null
+++ b/config/maps/404.lua
@@ -0,0 +1,51 @@
+return
+{
+ name = "AI Station 404",
+ theme = "404.ogg",
+ portrait = 8, -- TODO: See `maps/ribbit`.
+ center = {x = 0, y = 0},
+ width = 360,
+ height = 240,
+ respawns = {
+ {x = -15, y = -80},
+ {x = -5, y = -80},
+ {x = 5, y = -80},
+ {x = 15, y = -80}
+ },
+ create = {
+ {
+ ratio = 0,
+ background = "assets/backgrounds/404.png",
+ },
+ {
+ x = -105,
+ y = -75,
+ platform = "404-top"
+ },
+ {
+ x = -123,
+ y = 25,
+ platform = "404-bottom"
+ },
+ {
+ x = 138,
+ y = -25,
+ platform = "404-small"
+ },
+ {
+ x = -180,
+ y = -25,
+ platform = "404-small"
+ },
+ {
+ x = 138,
+ y = 65,
+ platform = "404-small"
+ },
+ {
+ x = -180,
+ y = 65,
+ platform = "404-small"
+ }
+ }
+} \ No newline at end of file
diff --git a/config/menus/host.lua b/config/menus/host.lua
index 07c5b80..c8ef4d8 100644
--- a/config/menus/host.lua
+++ b/config/menus/host.lua
@@ -21,7 +21,7 @@ do
local i, name = map.portrait, map.name
map.filename = path
if i then
- table.insert(icons, love.graphics.newQuad((i-1)*76, 0, 76, 37, 532, 37))
+ table.insert(icons, love.graphics.newQuad((i-1)*76, 0, 76, 37, 608, 37))
table.insert(maps, map)
end
end
diff --git a/config/platforms/404-bottom.lua b/config/platforms/404-bottom.lua
new file mode 100644
index 0000000..4e59a98
--- /dev/null
+++ b/config/platforms/404-bottom.lua
@@ -0,0 +1,10 @@
+return
+{
+ sprite = "assets/platforms/404-bottom.png",
+ shape = {
+ {0,0, 69,0, 87,17, 87,28, 0,28},
+ {161,17, 178,0, 247,0, 247,28, 161,28},
+ {33,28, 214,28, 214,57, 33,57},
+ {87,17, 161,17, 168,28, 87,28}
+ }
+}
diff --git a/config/platforms/404-small.lua b/config/platforms/404-small.lua
new file mode 100644
index 0000000..36b8a1d
--- /dev/null
+++ b/config/platforms/404-small.lua
@@ -0,0 +1,5 @@
+return
+{
+ sprite = "assets/platforms/404-small.png",
+ shape = {0,0, 43,0, 43,8, 0,8}
+}
diff --git a/config/platforms/404-top.lua b/config/platforms/404-top.lua
new file mode 100644
index 0000000..3d3ba2b
--- /dev/null
+++ b/config/platforms/404-top.lua
@@ -0,0 +1,9 @@
+return
+{
+ sprite = "assets/platforms/404-top.png",
+ shape = {
+ {45,0, 166,0, 166,13, 45,13},
+ {23,14, 188,14, 188,26, 23,26},
+ {0,27, 211,27, 211,45, 0,45}
+ }
+}