move changes to the right branch

[supertux.git] / data / images / tiles.strf

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index dc14c4d..547e1ac 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -268,7 +268,7 @@
   )
   (tilegroup
     (name "Block")
-    (tiles 27 28 29 47 48 50 49 211 77 51 52 212 78 62 61 213 44 83 84 102 140 103 104 105 112 128 1311)
+    (tiles 27 28 29 47 48 50 49 211 77 51 52 212 78 62 61 213 44 83 84 102 140 103 104 105 112 128 1311 2153)
   )
   (tilegroup
     (name "Background")
@@ -309,9 +309,11 @@
     (tiles
       53   55   1744 0
       54   56   1745 0
-      57   58   0    0
-      59   60   0    0
-      1742 1743)
+      57   58   2085 2086
+      59   60   2087 2088
+      1742 1743 2089 2090
+      2143 2144 2145 0
+      2146 2147 2148 0)
   )
   (tilegroup
     (name "Pole")
@@ -319,8 +321,8 @@
       1348 1720 1719 1718
       79   80   1347 1722
       1349 1717 1721 0
-      2001 2002 0    0
-      2003 2004 0    0
+      2001 2002 2149 2150
+      2003 2004 2151 2152
     )
   )
   (tilegroup
@@ -5523,20 +5525,38 @@
     )
     (image "tiles/castle/stonewindow.png")
   )
+  
+  (tile
+    (id 1517)
+    (images
+        "tiles/castle/walltorch/flame-0.png"
+        "tiles/castle/walltorch/flame-0.png"
+        "tiles/castle/walltorch/flame-1.png"
+        "tiles/castle/walltorch/flame-1.png"
+        "tiles/castle/walltorch/flame-2.png"
+        "tiles/castle/walltorch/flame-2.png"
+        "tiles/castle/walltorch/flame-3.png"
+        "tiles/castle/walltorch/flame-3.png"        
+        "tiles/castle/walltorch/flame-4.png"
+        "tiles/castle/walltorch/flame-4.png"        
+        "tiles/castle/walltorch/flame-5.png" 
+        "tiles/castle/walltorch/flame-5.png"
+        "tiles/castle/walltorch/flame-6.png"
+        "tiles/castle/walltorch/flame-6.png"
+    )
+    (anim-fps 10)
+  )
   (tiles
     (width 1)
-    (height 2)
+    (height 1)
     (ids
-      1517
       1518
     )
     (attributes
       0
-      0
     )
-    (image "tiles/castle/walltorch.png")
+    (image "tiles/castle/walltorch/flame-base-0.png")
   )
-
   (tiles
     (width 4)
     (height 3)
@@ -6841,5 +6861,38 @@
     )
   )
 
-;; next-id: 2143
+  (tiles
+    (width  3)
+    (height 2)
+    (ids 2143 2144 2145
+         2146 2147 2148
+    )
+    (attributes
+     1 1 1
+     1 1 1
+    )
+    (image "tiles/pipe/blueh.png")
+  )
+
+  (tiles
+    (width 2)
+    (height 2)
+    (ids 
+      2149 2150
+      2151 2152
+    )
+    (attributes
+      0 0
+      0 0
+    )
+    (image "tiles/pole/bend.png")
+  )
+   
+  (tile
+    (id 2153)
+    (unisolid #t)
+    (editor-images "tiles/auxiliary/invisible-unisolid-editor.png")
+  )
+
+;; next-id: 2154
 )