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

diff --git a/data/images/tilesets/supertux.stgt b/data/images/tilesets/supertux.stgt
index ca1dec196..75906def0 100644
--- a/data/images/tilesets/supertux.stgt
+++ b/data/images/tilesets/supertux.stgt
@@ -12,7 +12,7 @@
  (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 200 201 79 80 126 127 129 130 134 135 81 300 173 174))
+ (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))
@@ -151,14 +151,14 @@
        (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 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 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")
@@ -527,70 +527,74 @@
  ;; 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 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)))
+ ;;(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
 
@@ -841,11 +845,20 @@
        (anim-speed 45))
 
 
- ;; Spike
+ ;; Spikes
 
- (tile (id 300)
+ (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.png"))
+       (images "spike_down.png"))     
+ (tile (id 298)
+       (spike #t)
+       (images "spike_left.png"))
 
 
  ;; Jungle
@@ -899,6 +912,64 @@
                "jungle12-3.png"
                "jungle12-2.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)