Merge pull request #1463 from Alasdairbugs/master

Level Improvements

Author: serano01

data/levels/bonus2/level1.stl

@@ -2,6 +2,7 @@
   (version 3)
   (name (_ "Mario's Supposed to Deal With This..."))
   (author "Kevin")
+  (target-time 300)
   (sector
     (name "main")
     (ambient-light
@@ -94,82 +95,6 @@
       (x 13564)
       (y 546)
     )
-    (flame
-      (x -6175)
-      (y -12736)
-    )
-    (flame
-      (x -5791)
-      (y -12737)
-    )
-    (flame
-      (x -10528)
-      (y -12769)
-    )
-    (flame
-      (x -10655)
-      (y -12672)
-    )
-    (flame
-      (x -5057)
-      (y -12658)
-    )
-    (flame
-      (x 3521)
-      (y -12640)
-    )
-    (flame
-      (x 3553)
-      (y -12640)
-    )
-    (flame
-      (x 3584)
-      (y -12641)
-    )
-    (flame
-      (x 3616)
-      (y -12641)
-    )
-    (flame
-      (x 3647)
-      (y -12641)
-    )
-    (flame
-      (x 5217)
-      (y -12800)
-    )
-    (flame
-      (x 5216)
-      (y -12673)
-    )
-    (flyingsnowball
-      (x 6150)
-      (y -11027)
-    )
-    (flyingsnowball
-      (x 5958)
-      (y -11027)
-    )
-    (flyingsnowball
-      (x 6341)
-      (y -11027)
-    )
-    (flyingsnowball
-      (x 6531)
-      (y -11027)
-    )
-    (flyingsnowball
-      (x 6722)
-      (y -11027)
-    )
-    (flyingsnowball
-      (x 4631)
-      (y -10861)
-    )
-    (flyingsnowball
-      (x 15700)
-      (y -11042)
-    )
     (gradient
       (top_color 0 0 0)
       (bottom_color 0 0.03750668 0.1420157)

data/levels/bonus2/level10.stl

@@ -3,6 +3,7 @@
   (name (_ "fjerd"))
   (author "Thomas")
   (license "GPL 2+ / CC-by-sa 3.0")
+  (target-time 30)
   (sector
     (name "main")
     (ambient-light
@@ -257,9 +258,9 @@
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48 0 0 48 0 0 0 0 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 84 7 8 8 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
       0 0 0 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 48 0 0 48 48 48 48 48 0 0 0 84 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 84 13 14 14 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 22 11 11 11 11 11 11 11 11 115 116 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 122 123 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 129 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 84 83 83 83 83 83 83 83 83 83 83 83 83 83 83 0 0 0 83 83 83 83 83 83 83 83 83 84 10 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 14 14 14 14 14 23 11 11 2947 11 11 11 11 11 117 118 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 8 8 8 8 8 8 8 0 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8
-      2019 2140 2141 2142 2019 2140 2141 2142 2019 2140 2141 2142 2019 2140 2141 2142 2019 2140 2141 2142 2019 2140 2141 2142 2019 2140 2141 2142 2019 2019 2140 2141 2142 2019 2140 2141 2142 2019 2140 2141 2142 2019 2140 2141 2142 2019 104 2140 2141 2142 104 2141 2142 2019 2140 2141 2142 2019 2140 2141 10 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 0 0 0 0 0 0 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 122 123 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 122 123 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14
-      2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 104 2020 2020 2020 104 2020 2020 2020 2020 2020 2020 2020 2020 2020 10 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 122 123 0 0 0 124 125 0 0 0 124 125 0 0 0 0 0 122 123 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11
-      2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 104 104 104 104 104 2020 2020 2020 2020 2020 2020 2020 2020 2020 10 11 11 21 8 8 8 8 8 8 8 102 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 124 125 0 0 0 124 125 0 0 0 124 125 0 0 0 0 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11
+      2019 2140 2141 2142 2019 2140 2141 2142 2019 2140 2141 2142 2019 2140 2141 2142 2019 2140 2141 2142 2019 2140 2141 2142 2019 2140 2141 2142 2019 2019 2140 2141 2142 2019 2140 2141 2142 2019 2140 2141 2142 2019 2140 2141 2142 2019 48 2140 2141 2142 48 2141 2142 2019 2140 2141 2142 2019 2140 2141 10 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 17 18 0 0 0 0 0 0 0 0 44 44 44 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 122 123 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 122 123 0 0 0 0 13 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14
+      2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 48 2020 2020 2020 48 2020 2020 2020 2020 2020 2020 2020 2020 2020 10 11 11 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 122 123 0 0 0 124 125 0 0 0 124 125 0 0 0 0 0 122 123 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11
+      2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 48 48 48 48 48 2020 2020 2020 2020 2020 2020 2020 2020 2020 10 11 11 21 8 8 8 8 8 8 8 102 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 9 0 124 125 0 0 0 124 125 0 0 0 124 125 0 0 0 0 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11
       2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 10 11 11 20 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 15 0 124 125 0 0 0 124 125 0 0 0 124 125 0 0 0 0 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11
       2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 124 125 0 0 0 124 125 0 0 0 124 125 0 0 0 0 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11
       2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 2020 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 0 124 125 0 0 0 124 125 0 0 0 124 125 0 0 0 0 0 124 125 0 0 0 0 0 0 0 0 0 0 0 0 0 0 124 125 0 0 0 0 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11

data/levels/bonus2/level11.stl

@@ -3,6 +3,7 @@
   (name (_ "The long cave"))
   (author "Torfi Gunnarsson")
   (license "GPL 2+ / CC-by-sa 3.0")
+  (target-time 105)
   (sector
     (name "main")
     (ambient-light
@@ -129,6 +130,16 @@
       (x 15488)
       (y 448)
     )
+    (smartball
+      (direction "left")
+      (x 4640)
+      (y 704)
+    )
+    (smartball
+      (direction "left")
+      (x 3904)
+      (y 512)
+    )
     (snowball
       (x 1678)
       (y 521)
@@ -137,23 +148,11 @@
       (x 1611)
       (y 519)
     )
-    (snowball
-      (x 3916)
-      (y 489)
-    )
-    (snowball
-      (x 4621)
-      (y 711)
-    )
     (spawnpoint
       (name "main")
       (x 96)
       (y 544)
     )
-    (spiky
-      (x 2894)
-      (y 488)
-    )
     (spiky
       (x 5423)
       (y 745)
@@ -162,10 +161,6 @@
       (x 5903)
       (y 551)
     )
-    (spiky
-      (x 6352)
-      (y 487)
-    )
     (spiky
       (x 8202)
       (y 746)
@@ -178,10 +173,6 @@
       (x 9039)
       (y 553)
     )
-    (spiky
-      (x 6250)
-      (y 711)
-    )
     (spiky
       (x 12271)
       (y 749)

data/levels/bonus2/level12.stl

@@ -3,6 +3,7 @@
   (name (_ "Blind To The World"))
   (author "Daniel Alston")
   (license "GPL 2+ / CC-by-sa 3.0")
+  (target-time 100)
   (sector
     (name "main")
     (ambient-light

data/levels/bonus2/level13.stl

@@ -3,6 +3,7 @@
   (name (_ "snarf"))
   (author "Thomas Nilsen")
   (license "GPL 2+ / CC-by-sa 3.0")
+  (target-time 50)
   (sector
     (name "main")
     (ambient-light

data/levels/bonus2/level14.stl

@@ -3,6 +3,7 @@
   (name (_ "On The Road Again"))
   (author "Nilrok")
   (license "GPL 2+ / CC-by-sa 3.0")
+  (target-time 50)
   (sector
     (name "main")
     (ambient-light
@@ -107,29 +108,13 @@
       (x 6233)
       (y 747)
     )
-    (mriceblock
-      (x 5592)
-      (y 681)
-    )
     (mriceblock
       (x 5171)
       (y 714)
     )
     (mriceblock
-      (x 4116)
-      (y 668)
-    )
-    (mriceblock
-      (x 2472)
-      (y 739)
-    )
-    (mriceblock
-      (x 1042)
-      (y 645)
-    )
-    (mriceblock
-      (x 2234)
-      (y 607)
+      (x 1024)
+      (y 672)
     )
     (music
       (file "music/antarctic/chipdisko.ogg")
@@ -148,17 +133,49 @@
       (x 9248)
       (y 384)
     )
-    (snowball
-      (x 582)
-      (y 625)
+    (smartball
+      (direction "left")
+      (x 800)
+      (y 672)
     )
-    (snowball
-      (x 529)
-      (y 657)
+    (smartball
+      (direction "left")
+      (x 576)
+      (y 704)
+    )
+    (smartball
+      (direction "left")
+      (x 1824)
+      (y 640)
+    )
+    (smartball
+      (direction "left")
+      (x 8448)
+      (y 608)
+    )
+    (smartblock
+      (direction "left")
+      (x 2208)
+      (y 640)
+    )
+    (smartblock
+      (direction "left")
+      (x 2464)
+      (y 768)
+    )
+    (smartblock
+      (direction "left")
+      (x 4096)
+      (y 672)
+    )
+    (smartblock
+      (direction "left")
+      (x 5600)
+      (y 672)
     )
     (snowball
-      (x 8437)
-      (y 648)
+      (x 480)
+      (y 704)
     )
     (snowball
       (x 6336)
@@ -168,21 +185,13 @@
       (x 6287)
       (y 739)
     )
-    (snowball
-      (x 787)
-      (y 672)
-    )
     (snowball
       (x 4967)
       (y 570)
     )
     (snowball
-      (x 1842)
-      (y 644)
-    )
-    (snowball
-      (x 1129)
-      (y 579)
+      (x 1120)
+      (y 608)
     )
     (snowball
       (x 6366)

data/levels/bonus2/level15.stl

@@ -3,6 +3,7 @@
   (name (_ "Frozen Tunnel"))
   (author "Nilrok")
   (license "GPL 2+ / CC-by-sa 3.0")
+  (target-time 65)
   (sector
     (name "main")
     (ambient-light
@@ -28,10 +29,6 @@
       (x 1456)
       (y 611)
     )
-    (bouncingsnowball
-      (x 1594)
-      (y 732)
-    )
     (bouncingsnowball
       (x 1414)
       (y 575)
@@ -81,7 +78,7 @@
       (y 406)
     )
     (leveltime
-      (time 100)
+      (time 300)
     )
     (mrbomb
       (x 8448)
@@ -91,22 +88,6 @@
       (x 8543)
       (y 650)
     )
-    (mrbomb
-      (x 9597)
-      (y 694)
-    )
-    (mrbomb
-      (x 9530)
-      (y 694)
-    )
-    (mrbomb
-      (x 9689)
-      (y 693)
-    )
-    (mrbomb
-      (x 9759)
-      (y 692)
-    )
     (mrbomb
       (x 6894)
       (y 383)