summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-10-03 18:28:07 +0200
committerAki <nthirtyone@gmail.com>2017-10-03 18:28:07 +0200
commitb0d27965ed58f0bbc6d00f5cf60edeb78be31f35 (patch)
treeecea2f5ab8ca32bef6ef1cf04d242ad556e7f9c5
parent854b045d153ef8b560093afc1530763e07ff99c3 (diff)
parentf67e67c50c85f943c032277e245e94b55be9ec1e (diff)
downloadroflnauts-b0d27965ed58f0bbc6d00f5cf60edeb78be31f35.zip
roflnauts-b0d27965ed58f0bbc6d00f5cf60edeb78be31f35.tar.gz
roflnauts-b0d27965ed58f0bbc6d00f5cf60edeb78be31f35.tar.bz2
Merge branch 'alpha'v1.0
-rw-r--r--assets/backgrounds/alpha.pngbin3708 -> 18668 bytes
-rw-r--r--assets/dust.pngbin0 -> 570 bytes
-rw-r--r--config/animations/background-alpha.lua17
-rw-r--r--config/maps/alpha.lua94
4 files changed, 67 insertions, 44 deletions
diff --git a/assets/backgrounds/alpha.png b/assets/backgrounds/alpha.png
index d897910..39bc44d 100644
--- a/assets/backgrounds/alpha.png
+++ b/assets/backgrounds/alpha.png
Binary files differ
diff --git a/assets/dust.png b/assets/dust.png
new file mode 100644
index 0000000..4023f1f
--- /dev/null
+++ b/assets/dust.png
Binary files differ
diff --git a/config/animations/background-alpha.lua b/config/animations/background-alpha.lua
new file mode 100644
index 0000000..019f661
--- /dev/null
+++ b/config/animations/background-alpha.lua
@@ -0,0 +1,17 @@
+return
+{
+ default = {
+ [1] = love.graphics.newQuad(0, 0, 320, 200, 3200, 200),
+ [2] = love.graphics.newQuad(320, 0, 320, 200, 3200, 200),
+ [3] = love.graphics.newQuad(640, 0, 320, 200, 3200, 200),
+ [4] = love.graphics.newQuad(960, 0, 320, 200, 3200, 200),
+ [5] = love.graphics.newQuad(1280, 0, 320, 200, 3200, 200),
+ [6] = love.graphics.newQuad(1600, 0, 320, 200, 3200, 200),
+ [7] = love.graphics.newQuad(1920, 0, 320, 200, 3200, 200),
+ [8] = love.graphics.newQuad(2240, 0, 320, 200, 3200, 200),
+ [9] = love.graphics.newQuad(2560, 0, 320, 200, 3200, 200),
+ [10] = love.graphics.newQuad(2880, 0, 320, 200, 3200, 200),
+ frames = 10,
+ repeated = true
+ }
+} \ No newline at end of file
diff --git a/config/maps/alpha.lua b/config/maps/alpha.lua
index 43c12ee..b99adf3 100644
--- a/config/maps/alpha.lua
+++ b/config/maps/alpha.lua
@@ -1,44 +1,50 @@
-return
-{
- name = "Alpha Abyss",
- theme = "alpha.ogg",
- portrait = "assets/maps/alpha.png",
- available = true,
- center = {x = 0, y = -80},
- width = 360,
- height = 240,
- 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}
- },
- create = {
- {
- ratio = 0,
- background = "assets/backgrounds/alpha.png",
- },
- {
- x = -60,
- y = 0,
- platform = "alpha-big",
- },
- {
- x = -145,
- y = -50,
- platform = "alpha-small",
- },
- {
- x = 85,
- y = -50,
- platform = "alpha-small",
- },
- {
- x = -30,
- y = -80,
- platform = "alpha-small",
- }
- },
-}
+return
+{
+ name = "Alpha Abyss",
+ theme = "alpha.ogg",
+ portrait = "assets/maps/alpha.png",
+ available = true,
+ center = {x = 0, y = -80},
+ width = 360,
+ height = 240,
+ 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}
+ },
+ create = {
+ {
+ clouds = "assets/dust.png",
+ animations = "clouds-default",
+ count = 8,
+ },
+ {
+ ratio = 0,
+ background = "assets/backgrounds/alpha.png",
+ animations = "background-alpha"
+ },
+ {
+ x = -60,
+ y = 0,
+ platform = "alpha-big",
+ },
+ {
+ x = -145,
+ y = -50,
+ platform = "alpha-small",
+ },
+ {
+ x = 85,
+ y = -50,
+ platform = "alpha-small",
+ },
+ {
+ x = -30,
+ y = -80,
+ platform = "alpha-small",
+ }
+ },
+}