added new waterfall and transparent water tiles by unDEFER, used it in levels 5,24,25

[supertux.git] / data / images / tilesets / supertux.stgt

diff --git a/data/images/tilesets/supertux.stgt b/data/images/tilesets/supertux.stgt
index baa7ad4..d0db396 100644 (file)
--- a/data/images/tilesets/supertux.stgt
+++ b/data/images/tilesets/supertux.stgt
@@ -12,14 +12,16 @@
  (tilegroup (name "Classic-Bg") (tiles 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101))
  (tilegroup (name "Points") (tiles 132 133))
  (tilegroup (name "Bonus") (tiles 44 83 84 102 140 103 104 105 112 128))
- (tilegroup (name "Misc") (tiles 75 76 79 80 126 127 129 130 134 135 81 200 173 174))
+ (tilegroup (name "Misc") (tiles 75 76 200 201 79 80 126 127 129 130 134 135 81 300 173 174))
  (tilegroup (name "Pipe") (tiles 53 54 55 56 57 58 59 60))
  (tilegroup (name "Grey") (tiles 64 65 66 67 68 69))
  (tilegroup (name "Signs") (tiles 136 137 138 139 141 142 143 144))
  (tilegroup (name "Grasslands") (tiles 145 146 147 148))
  (tilegroup (name "Jungle") (tiles 301 302 303 304 305 306 307 308 309 310 311 312))
  (tilegroup (name "Slopes") (tiles 400 401))
- (tilegroup (name "Waterfall") (tiles 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199))
+ (tilegroup (name "Waterfall-trans") (tiles 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194))
+ (tilegroup (name "Waterfall") (tiles 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294))
+ (tilegroup (name "Waterfall-edgecloud") (tile 195 196 197 198 199))
  (tile (id 0)
        (images "notile.png"))
 
@@ -601,114 +603,214 @@
        (water #t)
        (anim-speed 120))
        
-  ;; WaterFall
+ ;; WaterFall
  (tile (id 175)
-       (images "waterfall1-1-1.png" "waterfall1-1-2.png" "waterfall1-1-3.png" "waterfall1-1-4.png")
+       (images "waterfall-trans1-1-1.png" "waterfall-trans1-1-2.png" "waterfall-trans1-1-3.png" "waterfall-trans1-1-4.png")
        (water #t)
        (anim-speed 45))
  (tile (id 176)
-       (images "waterfall1-2-1.png" "waterfall1-2-2.png" "waterfall1-2-3.png" "waterfall1-2-4.png")
+       (images "waterfall-trans1-2-1.png" "waterfall-trans1-2-2.png" "waterfall-trans1-2-3.png" "waterfall-trans1-2-4.png")
        (water #t)
        (anim-speed 45))
  (tile (id 177)
-       (images "waterfall1-3-1.png" "waterfall1-3-2.png" "waterfall1-3-3.png" "waterfall1-3-4.png")
+       (images "waterfall-trans1-3-1.png" "waterfall-trans1-3-2.png" "waterfall-trans1-3-3.png" "waterfall-trans1-3-4.png")
        (water #t) 
        (anim-speed 45))
  (tile (id 178)
-       (images "waterfall1-4-1.png" "waterfall1-4-2.png" "waterfall1-4-3.png" "waterfall1-4-4.png")
+       (images "waterfall-trans1-4-1.png" "waterfall-trans1-4-2.png" "waterfall-trans1-4-3.png" "waterfall-trans1-4-4.png")
        (water #t) 
        (anim-speed 45))
 
  (tile (id 179)
-       (images "waterfall2-1-1.png" "waterfall2-1-2.png" "waterfall2-1-3.png" "waterfall2-1-4.png")
+       (images "waterfall-trans2-1-1.png" "waterfall-trans2-1-2.png" "waterfall-trans2-1-3.png" "waterfall-trans2-1-4.png")
        (water #t) 
        (anim-speed 45))
  (tile (id 180)
-       (images "waterfall2-2-1.png" "waterfall2-2-2.png" "waterfall2-2-3.png" "waterfall2-2-4.png")
+       (images "waterfall-trans2-2-1.png" "waterfall-trans2-2-2.png" "waterfall-trans2-2-3.png" "waterfall-trans2-2-4.png")
        (water #t) 
        (anim-speed 45))
  (tile (id 181)
-       (images "waterfall2-3-1.png" "waterfall2-3-2.png" "waterfall2-3-3.png" "waterfall2-3-4.png")
+       (images "waterfall-trans2-3-1.png" "waterfall-trans2-3-2.png" "waterfall-trans2-3-3.png" "waterfall-trans2-3-4.png")
        (water #t) 
        (anim-speed 45))
  (tile (id 182)
-       (images "waterfall2-4-1.png" "waterfall2-4-2.png" "waterfall2-4-3.png" "waterfall2-4-4.png")
+       (images "waterfall-trans2-4-1.png" "waterfall-trans2-4-2.png" "waterfall-trans2-4-3.png" "waterfall-trans2-4-4.png")
        (water #t) 
        (anim-speed 45))
 
  (tile (id 183)
-       (images "waterfall3-1-1.png" "waterfall3-1-2.png" "waterfall3-1-3.png" "waterfall3-1-4.png")
+       (images "waterfall-trans3-1-1.png" "waterfall-trans3-1-2.png" "waterfall-trans3-1-3.png" "waterfall-trans3-1-4.png")
        (water #t) 
        (anim-speed 45))
  (tile (id 184)
-       (images "waterfall3-2-1.png" "waterfall3-2-2.png" "waterfall3-2-3.png" "waterfall3-2-4.png")
+       (images "waterfall-trans3-2-1.png" "waterfall-trans3-2-2.png" "waterfall-trans3-2-3.png" "waterfall-trans3-2-4.png")
        (water #t) 
        (anim-speed 45))
  (tile (id 185)
-       (images "waterfall3-3-1.png" "waterfall3-3-2.png" "waterfall3-3-3.png" "waterfall3-3-4.png")
+       (images "waterfall-trans3-3-1.png" "waterfall-trans3-3-2.png" "waterfall-trans3-3-3.png" "waterfall-trans3-3-4.png")
        (water #t) 
        (anim-speed 45))
  (tile (id 186)
-       (images "waterfall3-4-1.png" "waterfall3-4-2.png" "waterfall3-4-3.png" "waterfall3-4-4.png")
+       (images "waterfall-trans3-4-1.png" "waterfall-trans3-4-2.png" "waterfall-trans3-4-3.png" "waterfall-trans3-4-4.png")
        (water #t) 
        (anim-speed 45))
 
  (tile (id 187)
-       (images "waterfall4-1-1.png" "waterfall4-1-2.png" "waterfall4-1-3.png" "waterfall4-1-4.png")
+       (images "waterfall-trans4-1-1.png" "waterfall-trans4-1-2.png" "waterfall-trans4-1-3.png" "waterfall-trans4-1-4.png")
        (water #t) 
        (anim-speed 45))
  (tile (id 188)
-       (images "waterfall4-2-1.png" "waterfall4-2-2.png" "waterfall4-2-3.png" "waterfall4-2-4.png")
+       (images "waterfall-trans4-2-1.png" "waterfall-trans4-2-2.png" "waterfall-trans4-2-3.png" "waterfall-trans4-2-4.png")
        (water #t) 
        (anim-speed 45))
  (tile (id 189)
-       (images "waterfall4-3-1.png" "waterfall4-3-2.png" "waterfall4-3-3.png" "waterfall4-3-4.png")
+       (images "waterfall-trans4-3-1.png" "waterfall-trans4-3-2.png" "waterfall-trans4-3-3.png" "waterfall-trans4-3-4.png")
        (water #t) 
        (anim-speed 45))
  (tile (id 190)
-       (images "waterfall4-4-1.png" "waterfall4-4-2.png" "waterfall4-4-3.png" "waterfall4-4-4.png")
+       (images "waterfall-trans4-4-1.png" "waterfall-trans4-4-2.png" "waterfall-trans4-4-3.png" "waterfall-trans4-4-4.png")
        (water #t) 
        (anim-speed 45))
 
  (tile (id 191)
-       (images "waterfall5-1-1.png" "waterfall5-1-2.png" "waterfall5-1-3.png" "waterfall5-1-4.png")
+       (images "waterfall-trans5-1-1.png" "waterfall-trans5-1-2.png" "waterfall-trans5-1-3.png" "waterfall-trans5-1-4.png")
        (water #t)
        (anim-speed 45))
  (tile (id 192)
-       (images "waterfall5-2-1.png" "waterfall5-2-2.png" "waterfall5-2-3.png" "waterfall5-2-4.png")
+       (images "waterfall-trans5-2-1.png" "waterfall-trans5-2-2.png" "waterfall-trans5-2-3.png" "waterfall-trans5-2-4.png")
        (water #t)
        (anim-speed 45))
  (tile (id 193)
-       (images "waterfall5-3-1.png" "waterfall5-3-2.png" "waterfall5-3-3.png" "waterfall5-3-4.png")
+       (images "waterfall-trans5-3-1.png" "waterfall-trans5-3-2.png" "waterfall-trans5-3-3.png" "waterfall-trans5-3-4.png")
        (water #t)
        (anim-speed 45))
  (tile (id 194)
-       (images "waterfall5-4-1.png" "waterfall5-4-2.png" "waterfall5-4-3.png" "waterfall5-4-4.png")
+       (images "waterfall-trans5-4-1.png" "waterfall-trans5-4-2.png" "waterfall-trans5-4-3.png" "waterfall-trans5-4-4.png")
        (water #t)
        (anim-speed 45))
 
  (tile (id 195)
-       (images "waterfall1-0-0.png" "waterfall1-0-1.png" "waterfall1-0-2.png")
+       (images "waterfall1-0-1.png" "waterfall1-0-2.png" "waterfall1-0-3.png" "waterfall1-0-4.png")
        (water #t)
-       (anim-speed 50))
+       (anim-speed 45))
  (tile (id 196)
-       (images "waterfall1-5-0.png" "waterfall1-5-1.png" "waterfall1-5-2.png")
+       (images "waterfall1-5-1.png" "waterfall1-5-2.png" "waterfall1-5-3.png" "waterfall1-5-4.png")
        (water #t)
-       (anim-speed 50))
+       (anim-speed 45))
  (tile (id 197)
-       (images "waterfall0-0-0.png" "waterfall0-0-1.png" "waterfall0-0-2.png")
+       (images "waterfall0-0-1.png" "waterfall0-0-2.png" "waterfall0-0-3.png" "waterfall0-0-4.png")
        (water #t)
-       (anim-speed 50))
+       (anim-speed 45))
  (tile (id 198)
-       (images "waterfall0-1-0.png" "waterfall0-1-1.png" "waterfall0-1-2.png")
+       (images "waterfall0-1-1.png" "waterfall0-1-2.png" "waterfall0-1-3.png" "waterfall0-1-4.png")
        (water #t)
-       (anim-speed 50))
+       (anim-speed 45))
  (tile (id 199)
-       (images "waterfall0-2-0.png" "waterfall0-2-1.png" "waterfall0-2-2.png")
+       (images "waterfall0-2-1.png" "waterfall0-2-2.png" "waterfall0-2-3.png" "waterfall0-2-4.png")
+       (water #t)
+       (anim-speed 45))
+ 
+ (tile (id 200)
+       (images "water-trans.png")
+       (water #t))
+ (tile (id 201)
+       (images "waves-trans-0.png" "waves-trans-1.png" "waves-trans-2.png")
        (water #t)
        (anim-speed 50))
 
+ (tile (id 275)
+       (images "waterfall1-1-1.png" "waterfall1-1-2.png" "waterfall1-1-3.png" "waterfall1-1-4.png")
+       (water #t)
+       (anim-speed 45))
+ (tile (id 276)
+       (images "waterfall1-2-1.png" "waterfall1-2-2.png" "waterfall1-2-3.png" "waterfall1-2-4.png")
+       (water #t)
+       (anim-speed 45))
+ (tile (id 277)
+       (images "waterfall1-3-1.png" "waterfall1-3-2.png" "waterfall1-3-3.png" "waterfall1-3-4.png")
+       (water #t) 
+       (anim-speed 45))
+ (tile (id 278)
+       (images "waterfall1-4-1.png" "waterfall1-4-2.png" "waterfall1-4-3.png" "waterfall1-4-4.png")
+       (water #t) 
+       (anim-speed 45))
+
+ (tile (id 279)
+       (images "waterfall2-1-1.png" "waterfall2-1-2.png" "waterfall2-1-3.png" "waterfall2-1-4.png")
+       (water #t) 
+       (anim-speed 45))
+ (tile (id 280)
+       (images "waterfall2-2-1.png" "waterfall2-2-2.png" "waterfall2-2-3.png" "waterfall2-2-4.png")
+       (water #t) 
+       (anim-speed 45))
+ (tile (id 281)
+       (images "waterfall2-3-1.png" "waterfall2-3-2.png" "waterfall2-3-3.png" "waterfall2-3-4.png")
+       (water #t) 
+       (anim-speed 45))
+ (tile (id 282)
+       (images "waterfall2-4-1.png" "waterfall2-4-2.png" "waterfall2-4-3.png" "waterfall2-4-4.png")
+       (water #t) 
+       (anim-speed 45))
+
+ (tile (id 283)
+       (images "waterfall3-1-1.png" "waterfall3-1-2.png" "waterfall3-1-3.png" "waterfall3-1-4.png")
+       (water #t) 
+       (anim-speed 45))
+ (tile (id 284)
+       (images "waterfall3-2-1.png" "waterfall3-2-2.png" "waterfall3-2-3.png" "waterfall3-2-4.png")
+       (water #t) 
+       (anim-speed 45))
+ (tile (id 285)
+       (images "waterfall3-3-1.png" "waterfall3-3-2.png" "waterfall3-3-3.png" "waterfall3-3-4.png")
+       (water #t) 
+       (anim-speed 45))
+ (tile (id 286)
+       (images "waterfall3-4-1.png" "waterfall3-4-2.png" "waterfall3-4-3.png" "waterfall3-4-4.png")
+       (water #t) 
+       (anim-speed 45))
+
+ (tile (id 287)
+       (images "waterfall4-1-1.png" "waterfall4-1-2.png" "waterfall4-1-3.png" "waterfall4-1-4.png")
+       (water #t) 
+       (anim-speed 45))
+ (tile (id 288)
+       (images "waterfall4-2-1.png" "waterfall4-2-2.png" "waterfall4-2-3.png" "waterfall4-2-4.png")
+       (water #t) 
+       (anim-speed 45))
+ (tile (id 289)
+       (images "waterfall4-3-1.png" "waterfall4-3-2.png" "waterfall4-3-3.png" "waterfall4-3-4.png")
+       (water #t) 
+       (anim-speed 45))
+ (tile (id 290)
+       (images "waterfall4-4-1.png" "waterfall4-4-2.png" "waterfall4-4-3.png" "waterfall4-4-4.png")
+       (water #t) 
+       (anim-speed 45))
+
+ (tile (id 291)
+       (images "waterfall5-1-1.png" "waterfall5-1-2.png" "waterfall5-1-3.png" "waterfall5-1-4.png")
+       (water #t)
+       (anim-speed 45))
+ (tile (id 292)
+       (images "waterfall5-2-1.png" "waterfall5-2-2.png" "waterfall5-2-3.png" "waterfall5-2-4.png")
+       (water #t)
+       (anim-speed 45))
+ (tile (id 293)
+       (images "waterfall5-3-1.png" "waterfall5-3-2.png" "waterfall5-3-3.png" "waterfall5-3-4.png")
+       (water #t)
+       (anim-speed 45))
+ (tile (id 294)
+       (images "waterfall5-4-1.png" "waterfall5-4-2.png" "waterfall5-4-3.png" "waterfall5-4-4.png")
+       (water #t)
+       (anim-speed 45))
+
       
+ ;; Spike
+ 
+ (tile (id 300)
+       (spike #t)
+       (images "spike.png"))
+
+       
  ;; Jungle
 
  (tile (id 301)
@@ -760,11 +862,6 @@
                "jungle12-3.png"
                "jungle12-2.png"))
 
-                                        ; Spike
- (tile (id 200)
-       (spike #t)
-       (images "spike.png"))
-
 ; Slopes
 
   (tile (id 400)