X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=data%2Fimages%2Ftilesets%2Fsupertux.stgt;h=75906def0bf2c73e2d9f84ab3d84cfb9cdda2abc;hb=06c1b8f0466c30ec6a81c2f45c3755fb0dc724a0;hp=a6097a5ebd0e658e0e4241048b92d7980fa4f06e;hpb=168cbf6f283fa1f1fe46b55a86453b019ea30ede;p=supertux.git

diff --git a/data/images/tilesets/supertux.stgt b/data/images/tilesets/supertux.stgt
index a6097a5eb..75906def0 100644
--- a/data/images/tilesets/supertux.stgt
+++ b/data/images/tilesets/supertux.stgt
@@ -1,23 +1,27 @@
 ;; -*- mode: scheme -*-
 
 (supertux-tiles
- (properties 
+ (properties
   (id 0))
  ;; Zero tile
  (tilegroup (name "Snow") (tiles 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 30 31))
- (tilegroup (name "Snow (More)") (tiles 122 123 124 125 113 114 115 116 117 118))
+ (tilegroup (name "Snow (More)") (tiles 122 123 124 125 113 114 115 116 117 118 202 203 204 205 206 207 208 208 210))
  (tilegroup (name "Darksnow") (tiles 32 33 34 35 36 37 38 39 40 41 42 43))
- (tilegroup (name "Block") (tiles 27 28 29 47 48 49 50 51 52 61 62 77 78))
+ (tilegroup (name "Block") (tiles 27 28 29 47 48 49 50 51 52 61 62 77 78 211 212 213))
  (tilegroup (name "Background") (tiles 24 25 63 70 71 72 73 74 106 107 108 109 110 111))
  (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 295 296 297 298 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,17 +148,17 @@
        (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))
- (tile (id 45)
-       (images "coin1.png" "coin2.png" "coin3.png" "coin2.png")
-       (distro #t)
-       (anim-speed 45))
- (tile (id 46)
-       (images "coin1.png" "coin2.png" "coin3.png" "coin2.png")
-       (distro #t)
-       (anim-speed 45))
+       (anim-speed 50))
+; (tile (id 45)
+;       (images "coin1.png" "coin2.png" "coin3.png" "coin2.png")
+;       (distro #t)
+;       (anim-speed 45))
+; (tile (id 46)
+;       (images "coin1.png" "coin2.png" "coin3.png" "coin2.png")
+;       (distro #t)
+;       (anim-speed 45))
 
  (tile (id 47)
        (images "block4.png")
@@ -242,7 +246,7 @@
  (tile (id 74)
        (images "backgroundtile5.png")
        (solid #t))
- 
+
  (tile (id 75)
        (images "water.png")
        (water #t))
@@ -254,7 +258,7 @@
  ;; Normal brick
  (tile (id 77)
        (images "brick0.png")
-       (brick #t)    
+       (brick #t)
        (next-tile 0)
        (solid #t))
  (tile (id 78)
@@ -286,12 +290,12 @@
                 "bonus2-3.png" "bonus2-2.png" "bonus2-1.png" "bonus2-1.png" "bonus2-1.png")
        (anim-speed 50)
        (fullbox #t)
-       (solid #t) 
+       (solid #t)
        (next-tile 84)
        (data 1))
 
  (tile (id 84)
-       (solid #t) 
+       (solid #t)
        (images "bonus2-d.png"))
 
 
@@ -345,7 +349,7 @@
  ;; Brick with bonus content
  (tile (id 104)
        (images "brick0.png")
-       (brick #t)    
+       (brick #t)
        (data 1)
        (next-tile 84)
        (solid #t))
@@ -523,25 +527,339 @@
  ;; Grasslands
 
  (tile (id 145)
+       (solid #t)
        (images "grasslands1.png"))
  (tile (id 146)
+       (solid #t)
        (images "grasslands2.png"))
  (tile (id 147)
+       (solid #t)
        (images "grasslands3.png"))
  (tile (id 148)
+       (solid #t)
        (images "grasslands4.png"))
 
- (tile (id 149)
-       (images (region "snow-para-1.png" 0 0 32 32)))
+ ;;(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))
 
- (tile (id 150)
-       (images (region "snow-para-1.png" 32 0 32 32)))
+ ;; 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 151)
-       (images (region "snow-para-1.png" 0 32 32 32)))
+ (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 202)
+       (images "snow1b.png")
+       (solid #f))
+ (tile (id 203)
+       (images "snow7b.png")
+       (solid #t))
+ (tile (id 204)
+       (images "snow7c.png")
+       (solid #t))
+ (tile (id 205)
+       (images "snow15b.png")
+       (solid #t))
+ (tile (id 206)
+       (images "snow14b.png")
+       (solid #t))
+ (tile (id 207)
+       (images "snow18b.png")
+       (solid #t))
+ (tile (id 208)
+       (images "snow19b.png")
+       (solid #t))
+ (tile (id 209)
+       (images "snowbg1b.png")
+       (solid #t))
+ (tile (id 210)
+       (images "snowbg3b.png")
+       (solid #t))
+ (tile (id 211)
+       (images "block1b.png")
+       (solid #t))
+ (tile (id 212)
+       (images "block2b.png")
+       (solid #t))
+ (tile (id 213)
+       (images "block3b.png")
+       (solid #t))
+
+ (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))
+
+
+ ;; Spikes
+
+ (tile (id 295)
+       (spike #t)
+       (images "spike_up.png"))
+ (tile (id 296)
+       (spike #t)
+       (images "spike_right.png"))
+ (tile (id 297)
+       (spike #t)
+       (images "spike_down.png"))     
+ (tile (id 298)
+       (spike #t)
+       (images "spike_left.png"))
 
- (tile (id 152)
-       (images (region "snow-para-1.png" 32 32 32 32)))
 
  ;; Jungle
 
@@ -594,10 +912,72 @@
                "jungle12-3.png"
                "jungle12-2.png"))
 
-                                        ; Spike
- (tile (id 200)
-       (spike #t)
-       (images "spike.png"))
+; More Jungle Stuff
+
+ (tile (id 313)
+       (images "stone1_1.png"))
+ (tile (id 314)
+       (images "stone1_2.png"))
+ (tile (id 315)
+       (solid #t)
+       (images "stone1_3.png"))
+ (tile (id 316)
+       (solid #t)
+       (images "stone1_4.png"))
+ (tile (id 317)
+       (images "stone2_1.png"))
+ (tile (id 318)
+       (images "stone2_2.png"))
+ (tile (id 319)
+       (solid #t)
+       (images "stone2_3.png"))
+ (tile (id 320)
+       (solid #t)
+       (images "stone2_4.png"))
+ (tile (id 321)
+       (solid #t)
+       (images "grey_jungle.png"))
+ (tile (id 322)
+       (images "plant1.png"))
+ (tile (id 323)
+       (images "liane1.png"))
+ (tile (id 324)
+       (images "liane2.png"))
+ (tile (id 325)
+       (images "liane3.png"))
+ (tile (id 326)
+       (images "liane4.png"))
+ (tile (id 327)
+       (images "liane5.png"))
+ (tile (id 328)
+       (images "liane6.png"))
+ (tile (id 329)
+       (images "liane7.png"))
+ (tile (id 330)
+       (images "liane8.png"))
+ (tile (id 331)
+       (images "tree_left.png"))
+ (tile (id 332)
+       (images "tree_left_top.png"))
+ (tile (id 333)
+       (images "tree_right.png"))
+ (tile (id 334)
+       (images "tree_right_top.png"))
+ (tile (id 335)
+       (solid #t)
+       (images "tree_branch1.png"))
+ (tile (id 336)
+       (images "tree_branch2.png"))
+
+
+; Slopes
+
+  (tile (id 400)
+        (slope-angle 45)
+        (images "slope-right.png"))
+  (tile (id 401)
+        (slope-angle 135)
+        (images "slope-left.png"))
 
  )