merged new collision detection branch back into mainline

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

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index 5c5c796..8030851 100644 (file)
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -177,9 +177,9 @@
            75   200  173  129
            295  296  297  298
            81   126  127  0
-           1355 134  135  0
-           1356 0    0    0
-           1411 0    0    0
+           1355 1809 1812 0
+           1356 1810 1813 0
+           1411 1811 1814 0
          )
   )
   (tilegroup
@@ -233,7 +233,13 @@
            1504 1505 1506 0
            1511 1512 0    0
            1513 1514 0    0
-           1515 1516 )
+           1515 1516 0    0   
+           1762 1763 0    0
+           1764 1765 0    0
+           1766 1767 0    0
+           1768 1769 0    0
+           1770 1771 0    0
+           1772 1773 0    0)
   )
   (tilegroup
     (name "Signs")
@@ -312,11 +318,19 @@
            1643 1644 1645
            )
   )
-  (tilegroup
-    (name "Castle Door")
+ (tilegroup
+    (name "Castle")
     (tiles 1519 1520 1521 1522
            1523 1524 1525 1526
            1527 1528 1529 1530
+
+           1774 1775 1776 1777 1778
+          1779 1780 1781 1782 1783
+          1784 1785 1786 1787 1788
+          1789 1790 1791 1792 1793
+          1794 1795 1796 1797 1798
+          1799 1800 1801 1802 1803
+          1804 1805 1806 1807 1808
            )
   )
   (tile
@@ -5872,116 +5886,152 @@
                 1 1)
     (image "tiles/pipe/mirrored.png")
   )
-  (tile
-    (id 1746)
-    (images
-      (region "tiles/forest/branch.png" 64 0 32 32)
-    )
-    (solid #f)
+;unisolid Branches. Tile ID  1746-1761
+  (tiles
+     (width 4)
+     (height 6)
+     (ids    0    0 1746 1747
+          1760 1761 1748 1749       
+             0    0 1750 1751
+          1752 1753    0    0
+          1754 1755 1756 1757
+          1758 1759    0    0)
+    (attributes 0 0 0 0
+                3 3 3 3
+                0 0 0 0
+                0 0 0 0
+                3 3 3 3
+                0 0 0 0)
+     (image "tiles/forest/branch.png") 
   )
   (tile
-    (id 1747)
+    (id 1762)
     (images
-      (region "tiles/forest/branch.png" 96 0 32 32)
+      (region "tiles/castle/column.png" 0 0 32 32)
     )
-    (solid #f)
+    (solid #t)
   )
   (tile
-    (id 1748)
+    (id 1763)
     (images
-      (region "tiles/forest/branch.png" 64 32 32 32)
+      (region "tiles/castle/column.png" 32 0 32 32)
     )
-    (unisolid #t)
+    (solid #t)
   )
   (tile
-    (id 1749)
+    (id 1764)
     (images
-      (region "tiles/forest/branch.png" 96 32 32 32)
+      (region "tiles/castle/column.png" 0 32 32 32)
     )
-    (unisolid #t)
+    (solid #t)
   )
   (tile
-    (id 1750)
+    (id 1765)
     (images
-      (region "tiles/forest/branch.png" 64 64 32 32)
+      (region "tiles/castle/column.png" 32 32 32 32)
     )
-    (solid #f)
+    (solid #t)
   )
   (tile
-    (id 1751)
+    (id 1766)
     (images
-      (region "tiles/forest/branch.png" 96 64 32 32)
+      (region "tiles/castle/column.png" 0 64 32 32)
     )
-    (solid #f)
+    (solid #t)
   )
   (tile
-    (id 1752)
+    (id 1767)
     (images
-      (region "tiles/forest/branch.png" 0 96 32 32)
+      (region "tiles/castle/column.png" 32 64 32 32)
     )
-    (solid #f)
+    (solid #t)
   )
   (tile
-    (id 1753)
+    (id 1768)
     (images
-      (region "tiles/forest/branch.png" 32 96 32 32)
+      (region "tiles/castle/column.png" 0 96 32 32)
     )
-    (solid #f)
+    (solid #t)
   )
   (tile
-    (id 1754)
+    (id 1769)
     (images
-      (region "tiles/forest/branch.png" 0 128 32 32)
+      (region "tiles/castle/column.png" 32 96 32 32)
     )
-    (unisolid #t)
+    (solid #t)
   )
   (tile
-    (id 1755)
+    (id 1770)
     (images
-      (region "tiles/forest/branch.png" 32 128 32 32)
+      (region "tiles/castle/column.png" 0 128 32 32)
     )
-    (unisolid #t)
+    (solid #t)
   )
   (tile
-    (id 1756)
+    (id 1771)
     (images
-      (region "tiles/forest/branch.png" 64 128 32 32)
+      (region "tiles/castle/column.png" 32 128 32 32)
     )
-    (unisolid #t)
+    (solid #t)
   )
   (tile
-    (id 1757)
+    (id 1772)
     (images
-      (region "tiles/forest/branch.png" 96 128 32 32)
+      (region "tiles/castle/column.png" 0 160 32 32)
     )
-    (unisolid #t)
+    (solid #t)
   )
   (tile
-    (id 1758)
+    (id 1773)
     (images
-      (region "tiles/forest/branch.png" 0 160 32 32)
+      (region "tiles/castle/column.png" 32 160 32 32)
     )
-    (solid #f)
+    (solid #t)
   )
-  (tile
-    (id 1759)
-    (images
-      (region "tiles/forest/branch.png" 32 160 32 32)
-    )
-    (solid #f)
+ 
+  (tiles
+     (width  5)
+     (height 7)
+     (ids 1774 1775 1776 1777 1778
+          1779 1780 1781 1782 1783
+          1784 1785 1786 1787 1788
+          1789 1790 1791 1792 1793
+          1794 1795 1796 1797 1798
+          1799 1800 1801 1802 1803
+          1804 1805 1806 1807 1808)
+
+    (attributes 0 0 0 0 0
+                1 1 1 1 1
+                1 1 1 1 1
+                1 1 1 1 1
+                1 1 1 1 1
+                1 1 1 1 1
+                1 1 1 1 1)
+     (image "tiles/castle/brown.png")
   )
-  (tile
-    (id 1760)
-    (images
-      (region "tiles/forest/branch.png" 0 32 32 32)
-    )
-    (unisolid #t)
+
+;Statue of Nolok, Tile ID 1809-1814
+  (tiles
+     (width 1)
+     (height 3)
+     (ids 1809
+          1810
+          1811)
+    (attributes 0
+                0
+                0)
+     (image "tiles/doodads/nolok1.png") 
   )
-  (tile
-    (id 1761)
-    (images
-      (region "tiles/forest/branch.png" 32 32 32 32)
-    )
-    (unisolid #t)
+  (tiles
+     (width 1)
+     (height 3)
+     (ids 1812
+          1813
+          1814)
+    (attributes 0
+                0
+                0)
+     (image "tiles/doodads/nolok2.png") 
   )
+
 )