X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=data%2Fimages%2Ftilesets%2Fsupertux.stgt;h=d0db396f18fc8a7272c77fd87002e2e78f94c8fc;hb=4f5c3a7d32de691d568863c2fac7d0e111a310ee;hp=8af9500e14edbc73a3008a6779d2b13a31936f38;hpb=361a9c04420e12ca773a73967d9cb89439502ed3;p=supertux.git

diff --git a/data/images/tilesets/supertux.stgt b/data/images/tilesets/supertux.stgt
index 8af9500e1..d0db396f1 100644
--- a/data/images/tilesets/supertux.stgt
+++ b/data/images/tilesets/supertux.stgt
@@ -12,12 +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))
+ (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-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"))
 
@@ -144,9 +148,9 @@
        (solid #t))
 
  (tile (id 44)
-       (images "coin1.png" "coin2.png" "coin3.png" "coin2.png")
+       (images "coin-1.png" "coin-2.png" "coin-3.png" "coin-4.png" "coin-5.png" "coin-6.png" "coin-7.png" "coin-8.png")
        (distro #t)
-       (anim-speed 45))
+       (anim-speed 50))
  (tile (id 45)
        (images "coin1.png" "coin2.png" "coin3.png" "coin2.png")
        (distro #t)
@@ -275,7 +279,7 @@
        (anim-speed 50))
 
  (tile (id 82)
-;;       (images "distro-0.png" "distro-1.png" "distro-2.png" "distro-3.png")
+       ;;       (images "distro-0.png" "distro-1.png" "distro-2.png" "distro-3.png")
        (images "coin1.png" "coin2.png" "coin3.png" "coin2.png" )
        (anim-speed 45)
        (solid #f)
@@ -482,110 +486,390 @@
        (goal #t)
        (data 1)
        (editor-images "finalgoal.png"))
-(tile (id 133)
+ (tile (id 133)
        (images)
        (goal #t)
        (data 0)
        (editor-images "endseq.png"))
-(tile (id 134)
-      (solid #f)
-      (images "nolok1.png"))
-(tile (id 135)
-      (solid #f)
-      (images "nolok2.png"))
-
-; Signs
-(tile (id 136)
+ (tile (id 134)
+       (solid #f)
+       (images "nolok1.png"))
+ (tile (id 135)
+       (solid #f)
+       (images "nolok2.png"))
+
+                                        ; Signs
+ (tile (id 136)
        (solid #f)
        (images "run1.png"))
-(tile (id 137)
+ (tile (id 137)
        (solid #f)
        (images "run2.png"))
-(tile (id 138)
+ (tile (id 138)
        (solid #f)
        (images "run3.png"))
-(tile (id 139)
+ (tile (id 139)
        (solid #f)
        (images "run4.png"))
-(tile (id 141)
-      (solid #f)
-      (images "sign_right1.png"))
-(tile (id 142)
-      (solid #f)
-      (images "sign_right2.png"))
-(tile (id 143)
-      (solid #f)
-      (images "sign_right3.png"))
-(tile (id 144)
-      (solid #f)
-      (images "sign_right4.png"))
-
-; Grasslands
-
-  (tile (id 145)
-        (images "grasslands1.png"))
-  (tile (id 146)
-        (images "grasslands2.png"))
-  (tile (id 147)
-        (images "grasslands3.png"))
-  (tile (id 148)
-        (images "grasslands4.png"))
-
-; Jungle
-
-  (tile (id 301)
-        (solid #f)
-        (images "jungle1.png"))
-  (tile (id 302)
-        (solid #f)
-        (images "jungle2.png"))
-  (tile (id 303)
-        (solid #f)
-        (images "jungle3.png"))
-  (tile (id 304)
-        (solid #t)
-        (images "jungle4.png"))
-  (tile (id 305)
-        (solid #t)
-        (images "jungle5.png"))
-  (tile (id 306)
-        (solid #t)
-        (images "jungle6.png"))
-  (tile (id 307)
-        (solid #t)
-        (images "jungle7.png"))
-  (tile (id 308)
-        (solid #t)
-        (images "jungle8.png"))
-  (tile (id 309)
-        (solid #t)
-        (images "jungle9.png"))
-  (tile (id 310)
-        (solid #t)
-        (images "jungle10.png"))
-  (tile (id 311)
-        (solid #t)
-        (images "jungle11.png"))
-  (tile (id 312)
-        (solid #t)
-	(anim-speed 300)
-        (images "jungle12-1.png")
-        (images "jungle12-1.png")
-        (images "jungle12-1.png")
-        (images "jungle12-1.png")
-        (images "jungle12-2.png")
-        (images "jungle12-3.png")
-        (images "jungle12-4.png")
-        (images "jungle12-4.png")
-        (images "jungle12-4.png")
-        (images "jungle12-4.png")
-        (images "jungle12-3.png")
-        (images "jungle12-2.png"))
-
-; Spike
-  (tile (id 200)
-        (spike #t)
-        (images "spike.png"))
+ (tile (id 141)
+       (solid #f)
+       (images "sign_right1.png"))
+ (tile (id 142)
+       (solid #f)
+       (images "sign_right2.png"))
+ (tile (id 143)
+       (solid #f)
+       (images "sign_right3.png"))
+ (tile (id 144)
+       (solid #f)
+       (images "sign_right4.png"))
+
+ ;; Grasslands
+
+ (tile (id 145)
+       (images "grasslands1.png"))
+ (tile (id 146)
+       (images "grasslands2.png"))
+ (tile (id 147)
+       (images "grasslands3.png"))
+ (tile (id 148)
+       (images "grasslands4.png"))
+
+ (tile (id 149)
+       (images (region "snow-para-1.png" 0 0 32 32)))
+ (tile (id 150)
+       (images (region "snow-para-1.png" 32 0 32 32)))
+ (tile (id 151)
+       (images (region "snow-para-1.png" 64 0 32 32)))
+
+ (tile (id 152)
+       (images (region "snow-para-1.png" 0 32 32 32)))
+ (tile (id 153)
+       (images (region "snow-para-1.png" 32 32 32 32)))
+ (tile (id 154)
+       (images (region "snow-para-1.png" 64 32 32 32)))
+
+ (tile (id 155)
+       (images (region "snow-para-1.png" 0 64 32 32)))
+ (tile (id 156)
+       (images (region "snow-para-1.png" 32 64 32 32)))
+ (tile (id 157)
+       (images (region "snow-para-1.png" 64 64 32 32)))
+
+ (tile (id 158)
+       (images (region "snow-para-1.png" 96 0 32 32)))
+ (tile (id 159)
+       (images (region "snow-para-1.png" 96 32 32 32)))
+ (tile (id 160)
+       (images (region "snow-para-1.png" 96 64 32 32)))
+
+
+ (tile (id 161)
+       (images (region "snow-para-2.png" 0 0 32 32)))
+ (tile (id 162)
+       (images (region "snow-para-2.png" 32 0 32 32)))
+ (tile (id 163)
+       (images (region "snow-para-2.png" 64 0 32 32)))
+
+ (tile (id 164)
+       (images (region "snow-para-2.png" 0 32 32 32)))
+ (tile (id 165)
+       (images (region "snow-para-2.png" 32 32 32 32)))
+ (tile (id 166)
+       (images (region "snow-para-2.png" 64 32 32 32)))
+
+ (tile (id 167)
+       (images (region "snow-para-2.png" 0 64 32 32)))
+ (tile (id 168)
+       (images (region "snow-para-2.png" 32 64 32 32)))
+ (tile (id 169)
+       (images (region "snow-para-2.png" 64 64 32 32)))
+
+ (tile (id 170)
+       (images (region "snow-para-2.png" 96 0 32 32)))
+ (tile (id 171)
+       (images (region "snow-para-2.png" 96 32 32 32)))
+ (tile (id 172)
+       (images (region "snow-para-2.png" 96 64 32 32)))
+
+ ;; Lava
+ 
+ (tile (id 173)
+       (images "lava1-1.png" "lava1-2.png" "lava1-3.png" "lava1-4.png")
+       (water #t)
+       (anim-speed 120))
+ (tile (id 174)
+       (images "lava2-1.png" "lava2-2.png" "lava2-3.png" "lava2-4.png")
+       (water #t)
+       (anim-speed 120))
+       
+ ;; WaterFall
+ (tile (id 175)
+       (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 "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 "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 "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 "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 "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 "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 "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 "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 "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 "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 "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 "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 "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 "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 "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 "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 "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 "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 "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-1.png" "waterfall1-0-2.png" "waterfall1-0-3.png" "waterfall1-0-4.png")
+       (water #t)
+       (anim-speed 45))
+ (tile (id 196)
+       (images "waterfall1-5-1.png" "waterfall1-5-2.png" "waterfall1-5-3.png" "waterfall1-5-4.png")
+       (water #t)
+       (anim-speed 45))
+ (tile (id 197)
+       (images "waterfall0-0-1.png" "waterfall0-0-2.png" "waterfall0-0-3.png" "waterfall0-0-4.png")
+       (water #t)
+       (anim-speed 45))
+ (tile (id 198)
+       (images "waterfall0-1-1.png" "waterfall0-1-2.png" "waterfall0-1-3.png" "waterfall0-1-4.png")
+       (water #t)
+       (anim-speed 45))
+ (tile (id 199)
+       (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)
+       (solid #f)
+       (images "jungle1.png"))
+ (tile (id 302)
+       (solid #f)
+       (images "jungle2.png"))
+ (tile (id 303)
+       (solid #f)
+       (images "jungle3.png"))
+ (tile (id 304)
+       (solid #t)
+       (images "jungle4.png"))
+ (tile (id 305)
+       (solid #t)
+       (images "jungle5.png"))
+ (tile (id 306)
+       (solid #t)
+       (images "jungle6.png"))
+ (tile (id 307)
+       (solid #t)
+       (images "jungle7.png"))
+ (tile (id 308)
+       (solid #t)
+       (images "jungle8.png"))
+ (tile (id 309)
+       (solid #t)
+       (images "jungle9.png"))
+ (tile (id 310)
+       (solid #t)
+       (images "jungle10.png"))
+ (tile (id 311)
+       (solid #t)
+       (images "jungle11.png"))
+ (tile (id 312)
+       (solid #t)
+       (anim-speed 300)
+       (images "jungle12-1.png"
+               "jungle12-1.png"
+               "jungle12-1.png"
+               "jungle12-1.png"
+               "jungle12-2.png"
+               "jungle12-3.png"
+               "jungle12-4.png"
+               "jungle12-4.png"
+               "jungle12-4.png"
+               "jungle12-4.png"
+               "jungle12-3.png"
+               "jungle12-2.png"))
+
+; Slopes
+
+  (tile (id 400)
+        (slope-angle 45)
+        (images "slope-right.png"))
+  (tile (id 401)
+        (slope-angle 135)
+        (images "slope-left.png"))
 
  )