X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=data%2Fimages%2Ftilesets%2Fsupertux.stgt;h=90d41dfe9f37353b57ea7b1a9a823acd0c99834b;hb=85a82103f643f8c377c5d43987fc01bc93a1f24d;hp=68d2dc059437964351e285a16dfb529083887e70;hpb=92e2fa3eab8939c017f47f613a762eeb7b115f67;p=supertux.git

diff --git a/data/images/tilesets/supertux.stgt b/data/images/tilesets/supertux.stgt
index 68d2dc059..90d41dfe9 100644
--- a/data/images/tilesets/supertux.stgt
+++ b/data/images/tilesets/supertux.stgt
@@ -5,9 +5,19 @@
   (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 "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))
- (tilegroup (name "Oldschool-Background") (tiles 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101))
+ (tilegroup (name "Block") (tiles 27 28 29 47 48 49 50 51 52 61 62 77 78))
+ (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 "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))
  (tile (id 0)
        (images "notile.png"))
 
@@ -29,7 +39,8 @@
        (solid #t))
  (tile (id 11)
        (images "snow5.png")
-       (solid #t))
+       (solid #t)
+       (ice #t))
  (tile (id 12)
        (images "snow6.png")
        (solid #t))
@@ -133,17 +144,17 @@
        (solid #t))
 
  (tile (id 44)
-       (images "coin1.png" "coin2.png" "coin3.png")
+       (images "coin1.png" "coin2.png" "coin3.png" "coin2.png")
        (distro #t)
-       (anim-speed 25))
+       (anim-speed 45))
  (tile (id 45)
-       (images "coin1.png" "coin2.png" "coin3.png")
+       (images "coin1.png" "coin2.png" "coin3.png" "coin2.png")
        (distro #t)
-       (anim-speed 25))
+       (anim-speed 45))
  (tile (id 46)
-       (images "coin1.png" "coin2.png" "coin3.png")
+       (images "coin1.png" "coin2.png" "coin3.png" "coin2.png")
        (distro #t)
-       (anim-speed 25))
+       (anim-speed 45))
 
  (tile (id 47)
        (images "block4.png")
@@ -232,103 +243,120 @@
        (images "backgroundtile5.png")
        (solid #t))
  
-  (tile (id 75)
-        (images "water.png"))
-  (tile (id 76)
-        (images "waves-0.png" "waves-1.png" "waves-2.png")
-	(anim-speed 25))
-
-  ;; Normal brick
-  (tile (id 77)
-        (images "brick0.png")
-	(brick #t)    
-        (next-tile 0)
-        (solid #t))
-  (tile (id 78)
-        (images "brick1.png")
-        (brick #t)
-        (next-tile 0)
-        (solid #t))
-
-  (tile (id 79)
-        (images "pole.png")
-	(solid #f))
-  (tile (id 80)
-        (images "poletop.png")
-	(solid #f))
-  (tile (id 81)
-        (images "flag-0.png" "flag-1.png")
-	(solid #f))
-
-  (tile (id 82)
-        (images "distro-0.png" "distro-1.png" "distro-2.png" "distro-3.png")
-	(solid #f)
-        (distro #t))
-
-  (tile (id 83)
-        (images  "bonus2-1.png" "bonus2-2.png" "bonus2-3.png" "bonus2-4.png" "bonus2-5.png" "bonus2-4.png"
-                "bonus2-3.png" "bonus2-2.png" "bonus2-1.png" "bonus2-1.png" "bonus2-1.png")
-        (fullbox #t)
-        (solid #t) 
-        (next-tile 84)
-        (data 1))
-
-  (tile (id 84)
-        (solid #t) 
-        (images "bonus2-d.png"))
-
-
-  (tile (id 85) (images "cloud-00.png"))
-  (tile (id 86) (images "cloud-01.png"))
-  (tile (id 87) (images "cloud-02.png"))
-  (tile (id 88) (images "cloud-03.png"))
-  (tile (id 89) (images "cloud-10.png"))
-  (tile (id 90) (images "cloud-11.png"))
-  (tile (id 91) (images "cloud-12.png"))
-  (tile (id 92) (images "cloud-13.png"))
-
-  (tile (id 93)  (images "bkgd-00.png"))
-  (tile (id 94)  (images "bkgd-01.png"))
-  (tile (id 95)  (images "bkgd-02.png"))
-  (tile (id 96)  (images "bkgd-03.png"))
-  (tile (id 97)  (images "bkgd-10.png"))
-  (tile (id 98)  (images "bkgd-11.png"))
-  (tile (id 99)  (images "bkgd-12.png"))
-  (tile (id 100) (images "bkgd-13.png"))
-  (tile (id 101) (images "bkgd-00.png"))
-
-  (tile (id 102)
-        (images "bonus2-1.png" "bonus2-2.png" "bonus2-3.png" "bonus2-4.png" "bonus2-5.png" "bonus2-4.png"
-                "bonus2-3.png" "bonus2-2.png" "bonus2-1.png" "bonus2-1.png" "bonus2-1.png")
-        (editor-images "bonus-flower.png")
-        (solid #t)
-        (fullbox #t)
-        (data 2)
-        (next-tile 84))
-  (tile (id 103)
-        (images "bonus2-1.png" "bonus2-2.png" "bonus2-3.png" "bonus2-4.png" "bonus2-5.png" "bonus2-4.png"
+ (tile (id 75)
+       (images "water.png")
+       (water #t))
+ (tile (id 76)
+       (images "waves-0.png" "waves-1.png" "waves-2.png")
+       (water #t)
+       (anim-speed 50))
+
+ ;; Normal brick
+ (tile (id 77)
+       (images "brick0.png")
+       (brick #t)    
+       (next-tile 0)
+       (solid #t))
+ (tile (id 78)
+       (images "brick1.png")
+       (brick #t)
+       (next-tile 0)
+       (solid #t))
+
+ (tile (id 79)
+       (images "pole.png")
+       (solid #f))
+ (tile (id 80)
+       (images "poletop.png")
+       (solid #f))
+ (tile (id 81)
+       (images "flag-0.png" "flag-1.png")
+       (solid #f)
+       (anim-speed 50))
+
+ (tile (id 82)
+;;       (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)
+       (distro #t))
+
+ (tile (id 83)
+       (images  "bonus2-1.png" "bonus2-2.png" "bonus2-3.png" "bonus2-4.png" "bonus2-5.png" "bonus2-4.png"
                 "bonus2-3.png" "bonus2-2.png" "bonus2-1.png" "bonus2-1.png" "bonus2-1.png")
-        (editor-images "bonus-herring.png")
-        (solid #t)
-        (fullbox #t)
-        (data 3)
-        (next-tile 84))
-
-  ;; Brick with bonus content
-  (tile (id 104)
-        (images "brick0.png")
-	(brick #t)    
-        (data 1)
-        (next-tile 84)
-        (solid #t))
-
-  ;; Brick with bonus content
-  (tile (id 105)
-        (images "brick1.png")
-        (brick #t)
-        (data 1)
-        (next-tile 84)
-        (solid #t))
+       (anim-speed 50)
+       (fullbox #t)
+       (solid #t) 
+       (next-tile 84)
+       (data 1))
+
+ (tile (id 84)
+       (solid #t) 
+       (images "bonus2-d.png"))
+
+
+ (tile (id 85) (images "cloud-00.png"))
+ (tile (id 86) (images "cloud-01.png"))
+ (tile (id 87) (images "cloud-02.png"))
+ (tile (id 88) (images "cloud-03.png"))
+ (tile (id 89) (images "cloud-10.png"))
+ (tile (id 90) (images "cloud-11.png"))
+ (tile (id 91) (images "cloud-12.png"))
+ (tile (id 92) (images "cloud-13.png"))
+
+ (tile (id 93)  (images "bkgd-00.png"))
+ (tile (id 94)  (images "bkgd-01.png"))
+ (tile (id 95)  (images "bkgd-02.png"))
+ (tile (id 96)  (images "bkgd-03.png"))
+ (tile (id 97)  (images "bkgd-10.png"))
+ (tile (id 98)  (images "bkgd-11.png"))
+ (tile (id 99)  (images "bkgd-12.png"))
+ (tile (id 100) (images "bkgd-13.png"))
+ (tile (id 101) (images "bkgd-00.png"))
+
+ (tile (id 102)
+       (images "bonus2-1.png" "bonus2-2.png" "bonus2-3.png" "bonus2-4.png" "bonus2-5.png" "bonus2-4.png"
+               "bonus2-3.png" "bonus2-2.png" "bonus2-1.png" "bonus2-1.png" "bonus2-1.png")
+       (anim-speed 50)
+       (editor-images "bonus-fireflower.png")
+       (solid #t)
+       (fullbox #t)
+       (data 2)
+       (next-tile 84))
+ (tile (id 140)
+       (images "bonus2-1.png" "bonus2-2.png" "bonus2-3.png" "bonus2-4.png" "bonus2-5.png" "bonus2-4.png"
+               "bonus2-3.png" "bonus2-2.png" "bonus2-1.png" "bonus2-1.png" "bonus2-1.png")
+       (anim-speed 50)
+       (editor-images "bonus-iceflower.png")
+       (solid #t)
+       (fullbox #t)
+       (data 5)
+       (next-tile 84))
+ (tile (id 103)
+       (images "bonus2-1.png" "bonus2-2.png" "bonus2-3.png" "bonus2-4.png" "bonus2-5.png" "bonus2-4.png"
+               "bonus2-3.png" "bonus2-2.png" "bonus2-1.png" "bonus2-1.png" "bonus2-1.png")
+       (anim-speed 50)
+       (editor-images "bonus-herring.png")
+       (solid #t)
+       (fullbox #t)
+       (data 3)
+       (next-tile 84))
+
+ ;; Brick with bonus content
+ (tile (id 104)
+       (images "brick0.png")
+       (brick #t)    
+       (data 1)
+       (next-tile 84)
+       (solid #t))
+
+ ;; Brick with bonus content
+ (tile (id 105)
+       (images "brick1.png")
+       (brick #t)
+       (data 1)
+       (next-tile 84)
+       (solid #t))
 
  (tile (id 106)
        (images "background1.png")
@@ -385,4 +413,179 @@
  (tile (id 121)
        (images "darksnow15.png")
        (solid #t))
- )
\ No newline at end of file
+
+ (tile (id 122)
+       (images "snowbg1.png")
+       (solid #t))
+ (tile (id 123)
+       (images "snowbg2.png")
+       (solid #t))
+ (tile (id 124)
+       (images "snowbg3.png")
+       (solid #t))
+ (tile (id 125)
+       (images "snowbg4.png")
+       (solid #t))
+
+ (tile (id 126)
+       (images "exitbg.png")
+       (solid #f))
+ (tile (id 127)
+       (images "exitfg.png")
+       (solid #f))
+
+ (tile (id 128)
+       (images "bonus2-1.png" "bonus2-2.png" "bonus2-3.png" "bonus2-4.png" "bonus2-5.png" "bonus2-4.png"
+               "bonus2-3.png" "bonus2-2.png" "bonus2-1.png" "bonus2-1.png" "bonus2-1.png")
+       (anim-speed 50)
+       (editor-images "bonus-1up.png")
+       (solid #t)
+       (fullbox #t)
+       (data 4)
+       (next-tile 84))
+
+ (tile (id 129)
+       (anim-speed 50)
+       (images "goal1-1.png"
+               "goal1-2.png"
+               "goal1-2.png"
+               "goal1-3.png"
+               "goal1-4.png"
+               "goal1-5.png"
+               "goal1-4.png"
+               "goal1-3.png"
+               "goal1-2.png"
+               "goal1-2.png"
+               "goal1-1.png"
+               "goal1-1.png"
+               ))
+
+ (tile (id 130)
+       (anim-speed 50)
+       (images "goal2-1.png"
+               "goal2-2.png"
+               "goal2-2.png"
+               "goal2-3.png"
+               "goal2-4.png"
+               "goal2-5.png"
+               "goal2-4.png"
+               "goal2-3.png"
+               "goal2-2.png"
+               "goal2-2.png"
+               "goal2-1.png"
+               "goal2-1.png"))
+
+ (tile (id 131)
+       (images "black.png"))
+ (tile (id 132)
+       (images)
+       (goal #t)
+       (data 1)
+       (editor-images "finalgoal.png"))
+(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)
+       (solid #f)
+       (images "run1.png"))
+(tile (id 137)
+       (solid #f)
+       (images "run2.png"))
+(tile (id 138)
+       (solid #f)
+       (images "run3.png"))
+(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"))
+
+ )
+