Glued some "Jungle" tiles together to reduce texture size

Reorganized "Snow" tilegroup layout

SVN-Revision: 3644

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index 8b6c646..e4a5c67 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -1,7 +1,25 @@
 (supertux-tiles
   (tilegroup
     (name "Snow")
-    (tiles 7 8 9 202 13 14 15 204 10 11 12 16 17 18 205 22 21 19 203 23 20 207 208 31 30 114 113 115 116 0 0 117 118 0 0 122 209 123 0 124 210 125 0 1345 1346 1344 0 33 32 34 0 35 37 39 0 38 36 43 0 40 41 42 0 119 121 120 0 1539)
+    (tiles
+      7  8  9  202 
+      13 14 15 204 
+      10 11 12 0
+      16 17 18 205 
+      30 31 114 113 
+      21 22 19 203 
+      20 23 207 208 
+      115 116 0 0 
+      117 118 0 0 
+      122 209 123 0 
+      124 210 125 0 
+      1345 1346 1344 0 
+      33 32 34 0 
+      35 37 39 0 
+      38 36 43 0 
+      40 41 42 0 
+      119 121 120 0 
+      1539 0 0 0)
   )
   (tilegroup
     (name "Snow (Paralax Background)")
@@ -66,7 +84,13 @@
   )
   (tilegroup
     (name "Jungle")
-    (tiles 301 302 303 312 304 305 306 0 307 308 309 0 310 311 0 0)
+    (tiles
+      301 302 303 0 
+      304 305 306 0
+      307 308 309 0
+      311 310 0   0
+      312 0   0   0
+    )
   )
   (tilegroup
     (name "Slopes")
@@ -1697,79 +1721,24 @@
     )
     (hurts #t)
   )
-  (tile
-    (id 301)
-    (images
-      "tiles/jungle/jungle1.png"
-    )
-  )
-  (tile
-    (id 302)
-    (images
-      "tiles/jungle/jungle2.png"
-    )
-  )
-  (tile
-    (id 303)
-    (images
-      "tiles/jungle/jungle3.png"
-    )
-  )
-  (tile
-    (id 304)
-    (images
-      "tiles/jungle/jungle4.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 305)
-    (images
-      "tiles/jungle/jungle5.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 306)
-    (images
-      "tiles/jungle/jungle6.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 307)
-    (images
-      "tiles/jungle/jungle7.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 308)
-    (images
-      "tiles/jungle/jungle8.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 309)
-    (images
-      "tiles/jungle/jungle9.png"
-    )
-    (solid #t)
-  )
-  (tile
-    (id 310)
-    (images
-      "tiles/jungle/jungle10.png"
-    )
-    (solid #t)
+
+  (tiles
+    (width 3)
+    (height 3)
+    (ids  301 302 303
+          304 305 306
+          307 308 309)
+    (attributes 0 0 0
+                1 1 1
+                1 1 1)
+    (image "tiles/jungle/convex.png")
   )
-  (tile
-    (id 311)
-    (images
-      "tiles/jungle/jungle11.png"
-    )
-    (solid #t)
+  (tiles
+    (width 2)
+    (height 1)
+    (ids  311 310)
+    (attributes 1 1)
+    (image "tiles/jungle/concave.png")
   )
   (tile
     (id 312)

diff --git a/data/images/tiles/jungle/concave.png b/data/images/tiles/jungle/concave.png
new file mode 100644 (file)
index 0000000..14c7814
Binary files /dev/null and b/data/images/tiles/jungle/concave.png differ

diff --git a/data/images/tiles/jungle/convex.png b/data/images/tiles/jungle/convex.png
new file mode 100644 (file)
index 0000000..0cb3395
Binary files /dev/null and b/data/images/tiles/jungle/convex.png differ

diff --git a/data/images/tiles/jungle/jungle1.png b/data/images/tiles/jungle/jungle1.png
deleted file mode 100644 (file)
index b7e298f..0000000
Binary files a/data/images/tiles/jungle/jungle1.png and /dev/null differ

diff --git a/data/images/tiles/jungle/jungle10.png b/data/images/tiles/jungle/jungle10.png
deleted file mode 100644 (file)
index 027a40d..0000000
Binary files a/data/images/tiles/jungle/jungle10.png and /dev/null differ

diff --git a/data/images/tiles/jungle/jungle11.png b/data/images/tiles/jungle/jungle11.png
deleted file mode 100644 (file)
index 1eb6fc7..0000000
Binary files a/data/images/tiles/jungle/jungle11.png and /dev/null differ

diff --git a/data/images/tiles/jungle/jungle2.png b/data/images/tiles/jungle/jungle2.png
deleted file mode 100644 (file)
index 46e9447..0000000
Binary files a/data/images/tiles/jungle/jungle2.png and /dev/null differ

diff --git a/data/images/tiles/jungle/jungle3.png b/data/images/tiles/jungle/jungle3.png
deleted file mode 100644 (file)
index 164ed6e..0000000
Binary files a/data/images/tiles/jungle/jungle3.png and /dev/null differ

diff --git a/data/images/tiles/jungle/jungle4.png b/data/images/tiles/jungle/jungle4.png
deleted file mode 100644 (file)
index c1d8934..0000000
Binary files a/data/images/tiles/jungle/jungle4.png and /dev/null differ

diff --git a/data/images/tiles/jungle/jungle5.png b/data/images/tiles/jungle/jungle5.png
deleted file mode 100644 (file)
index 86906dc..0000000
Binary files a/data/images/tiles/jungle/jungle5.png and /dev/null differ

diff --git a/data/images/tiles/jungle/jungle6.png b/data/images/tiles/jungle/jungle6.png
deleted file mode 100644 (file)
index 0936dd2..0000000
Binary files a/data/images/tiles/jungle/jungle6.png and /dev/null differ

diff --git a/data/images/tiles/jungle/jungle7.png b/data/images/tiles/jungle/jungle7.png
deleted file mode 100644 (file)
index cc658bb..0000000
Binary files a/data/images/tiles/jungle/jungle7.png and /dev/null differ

diff --git a/data/images/tiles/jungle/jungle8.png b/data/images/tiles/jungle/jungle8.png
deleted file mode 100644 (file)
index 1b50623..0000000
Binary files a/data/images/tiles/jungle/jungle8.png and /dev/null differ

diff --git a/data/images/tiles/jungle/jungle9.png b/data/images/tiles/jungle/jungle9.png
deleted file mode 100644 (file)
index 52b7396..0000000
Binary files a/data/images/tiles/jungle/jungle9.png and /dev/null differ