summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/maps/ribbit.lua12
-rw-r--r--config/maps/starstorm.lua27
-rw-r--r--config/platforms/ribbit-bottom.lua5
-rw-r--r--config/platforms/ribbit-left.lua5
-rw-r--r--config/platforms/ribbit-right.lua5
-rw-r--r--config/platforms/ribbit-top.lua5
-rw-r--r--config/platforms/starstorm-center.lua5
-rw-r--r--config/platforms/starstorm-left-bottom.lua5
-rw-r--r--config/platforms/starstorm-left-middle.lua5
-rw-r--r--config/platforms/starstorm-left-top.lua8
-rw-r--r--config/platforms/starstorm-right-bottom.lua5
-rw-r--r--config/platforms/starstorm-right-middle.lua5
-rw-r--r--config/platforms/starstorm-right-top.lua8
-rw-r--r--not/World.lua3
14 files changed, 74 insertions, 29 deletions
diff --git a/config/maps/ribbit.lua b/config/maps/ribbit.lua
index a8a4366..48e84c8 100644
--- a/config/maps/ribbit.lua
+++ b/config/maps/ribbit.lua
@@ -18,26 +18,22 @@ return
{
x = -154,
y = 10,
- shape = {1,12, 48,12, 48,32, 1,32},
- sprite = "assets/platforms/ribbit-left.png"
+ config = "ribbit-left"
},
{
x = 67,
y = 7,
- shape = {36,14, 83,14, 83,29, 36,29},
- sprite = "assets/platforms/ribbit-right.png"
+ config = "ribbit-right"
},
{
x = -70,
y = -5,
- shape = {0,3, 139,3, 134,24, 5,24},
- sprite = "assets/platforms/ribbit-top.png"
+ config = "ribbit-top"
},
{
x = -54,
y = 63,
- shape = {0,3, 107,3, 75,44, 32,44},
- sprite = "assets/platforms/ribbit-bottom.png"
+ config = "ribbit-bottom"
}
},
decorations = {}
diff --git a/config/maps/starstorm.lua b/config/maps/starstorm.lua
index c74372f..fe45e04 100644
--- a/config/maps/starstorm.lua
+++ b/config/maps/starstorm.lua
@@ -20,50 +20,37 @@ return
{
x = -170,
y = -55,
- shape = {
- {0,1, 33,1, 39,6, 39,21, 31,21, 0,21},
- {40,6, 115,6, 115,14, 40,14}
- },
- sprite = "assets/platforms/starstorm-left-top.png"
+ config = "starstorm-left-top"
},
{
x = -156,
y = -2,
- shape = {0,0, 109,0, 109,20, 0,20},
- sprite = "assets/platforms/starstorm-left-middle.png"
+ config = "starstorm-left-middle"
},
{
x = -160,
y = 69,
- shape = {0,4, 8,4, 13,1, 102,1, 102,16, 19,16, 0,11},
- sprite = "assets/platforms/starstorm-left-bottom.png"
+ config = "starstorm-left-bottom"
},
{
x = 52,
y = -55,
- shape = {
- {115,1, 82,1, 76,6, 76,21, 84,21, 115,21},
- {75,6, 0,6, 0,14, 75,14}
- },
- sprite = "assets/platforms/starstorm-right-top.png"
+ config = "starstorm-right-top"
},
{
x = 44,
y = -2,
- shape = {109,0, 0,0, 0,20, 109,20},
- sprite = "assets/platforms/starstorm-right-middle.png"
+ config = "starstorm-right-middle"
},
{
x = 55,
y = 69,
- shape = {102,4, 94,4, 89,1, 0,1, 0,16, 83,16, 102,11},
- sprite = "assets/platforms/starstorm-right-bottom.png"
+ config = "starstorm-right-bottom"
},
{
x = -27,
y = 40,
- shape = {0,6, 53,6, 53,14, 0,14},
- sprite = "assets/platforms/starstorm-center.png"
+ config = "starstorm-center"
}
},
decorations = {
diff --git a/config/platforms/ribbit-bottom.lua b/config/platforms/ribbit-bottom.lua
new file mode 100644
index 0000000..38e4d95
--- /dev/null
+++ b/config/platforms/ribbit-bottom.lua
@@ -0,0 +1,5 @@
+return
+{
+ sprite = "assets/platforms/ribbit-bottom.png",
+ shape = {0,3, 107,3, 75,44, 32,44},
+}
diff --git a/config/platforms/ribbit-left.lua b/config/platforms/ribbit-left.lua
new file mode 100644
index 0000000..69039dd
--- /dev/null
+++ b/config/platforms/ribbit-left.lua
@@ -0,0 +1,5 @@
+return
+{
+ sprite = "assets/platforms/ribbit-left.png",
+ shape = {1,12, 48,12, 48,32, 1,32},
+}
diff --git a/config/platforms/ribbit-right.lua b/config/platforms/ribbit-right.lua
new file mode 100644
index 0000000..1aa6e9e
--- /dev/null
+++ b/config/platforms/ribbit-right.lua
@@ -0,0 +1,5 @@
+return
+{
+ sprite = "assets/platforms/ribbit-right.png",
+ shape = {36,14, 83,14, 83,29, 36,29},
+}
diff --git a/config/platforms/ribbit-top.lua b/config/platforms/ribbit-top.lua
new file mode 100644
index 0000000..1493114
--- /dev/null
+++ b/config/platforms/ribbit-top.lua
@@ -0,0 +1,5 @@
+return
+{
+ sprite = "assets/platforms/ribbit-top.png",
+ shape = {0,3, 139,3, 134,24, 5,24},
+}
diff --git a/config/platforms/starstorm-center.lua b/config/platforms/starstorm-center.lua
new file mode 100644
index 0000000..77af4f8
--- /dev/null
+++ b/config/platforms/starstorm-center.lua
@@ -0,0 +1,5 @@
+return
+{
+ sprite = "assets/platforms/starstorm-center.png",
+ shape = {0,6, 53,6, 53,14, 0,14}
+}
diff --git a/config/platforms/starstorm-left-bottom.lua b/config/platforms/starstorm-left-bottom.lua
new file mode 100644
index 0000000..f40185b
--- /dev/null
+++ b/config/platforms/starstorm-left-bottom.lua
@@ -0,0 +1,5 @@
+return
+{
+ sprite = "assets/platforms/starstorm-left-bottom.png",
+ shape = {0,4, 8,4, 13,1, 102,1, 102,16, 19,16, 0,11},
+}
diff --git a/config/platforms/starstorm-left-middle.lua b/config/platforms/starstorm-left-middle.lua
new file mode 100644
index 0000000..0804309
--- /dev/null
+++ b/config/platforms/starstorm-left-middle.lua
@@ -0,0 +1,5 @@
+return
+{
+ sprite = "assets/platforms/starstorm-left-middle.png",
+ shape = {0,0, 109,0, 109,20, 0,20}
+}
diff --git a/config/platforms/starstorm-left-top.lua b/config/platforms/starstorm-left-top.lua
new file mode 100644
index 0000000..9cc1944
--- /dev/null
+++ b/config/platforms/starstorm-left-top.lua
@@ -0,0 +1,8 @@
+return
+{
+ sprite = "assets/platforms/starstorm-left-top.png",
+ shape = {
+ {0,1, 33,1, 39,6, 39,21, 31,21, 0,21},
+ {40,6, 115,6, 115,14, 40,14}
+ }
+}
diff --git a/config/platforms/starstorm-right-bottom.lua b/config/platforms/starstorm-right-bottom.lua
new file mode 100644
index 0000000..16462cb
--- /dev/null
+++ b/config/platforms/starstorm-right-bottom.lua
@@ -0,0 +1,5 @@
+return
+{
+ sprite = "assets/platforms/starstorm-right-bottom.png",
+ shape = {102,4, 94,4, 89,1, 0,1, 0,16, 83,16, 102,11}
+}
diff --git a/config/platforms/starstorm-right-middle.lua b/config/platforms/starstorm-right-middle.lua
new file mode 100644
index 0000000..af9b712
--- /dev/null
+++ b/config/platforms/starstorm-right-middle.lua
@@ -0,0 +1,5 @@
+return
+{
+ sprite = "assets/platforms/starstorm-right-middle.png",
+ shape = {109,0, 0,0, 0,20, 109,20}
+}
diff --git a/config/platforms/starstorm-right-top.lua b/config/platforms/starstorm-right-top.lua
new file mode 100644
index 0000000..4470754
--- /dev/null
+++ b/config/platforms/starstorm-right-top.lua
@@ -0,0 +1,8 @@
+return
+{
+ sprite = "assets/platforms/starstorm-right-top.png",
+ shape = {
+ {115,1, 82,1, 76,6, 76,21, 84,21, 115,21},
+ {75,6, 0,6, 0,14, 75,14}
+ }
+}
diff --git a/not/World.lua b/not/World.lua
index 7d40476..d4d933f 100644
--- a/not/World.lua
+++ b/not/World.lua
@@ -52,7 +52,8 @@ function World:loadMap (name)
self.map = map()
-- Platforms
for _,platform in pairs(self.map.platforms) do
- self:createPlatform(platform.x, platform.y, platform.shape, platform.sprite, platform.animations)
+ local config = love.filesystem.load(string.format("config/platforms/%s.lua", platform.config))()
+ self:createPlatform(platform.x, platform.y, config.shape, config.sprite, platform.animations)
end
-- Decorations
for _,decoration in pairs(self.map.decorations) do
generated by cgit v1.1 at 2024-11-21 18:33:06 +0000