From: LMH Date: Thu, 8 Aug 2013 08:02:22 +0000 (-1000) Subject: Fixed coloring of snow celing slopes and reorganized snow tilegroup some X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=8900dc89274b899265d945284a78122cffeaa937;p=supertux.git Fixed coloring of snow celing slopes and reorganized snow tilegroup some --- diff --git a/data/images/tiles.strf b/data/images/tiles.strf index 3e61d2a1f..e83c9c60a 100644 --- a/data/images/tiles.strf +++ b/data/images/tiles.strf @@ -325,8 +325,31 @@ 30 31 114 113 21 22 19 203 20 23 207 208 - 115 116 214 0 - 117 118 0 0 + 2134 115 116 214 + 2135 117 118 1539 + + 2909 2910 2913 2914 + 2911 2912 2915 2916 + 2917 2918 2921 2922 + 2919 2920 2923 2924 + 1844 1837 1838 1843 + 1846 1839 1840 1845 + 1848 1841 1842 1847 + 1850 1826 1827 1849 + 1829 1830 1831 1832 + 1833 1834 1835 1836 + + 2121 2122 2123 0 + 2126 2127 2128 0 + 2131 2132 2133 0 + 2124 2125 0 0 + 2129 2130 0 0 + + 2925 2926 2929 2930 + 2940 2928 2931 2937 + 2941 2933 2935 2938 + 2942 2934 2936 2939 + 122 209 123 0 124 210 125 0 1345 1346 1344 0 @@ -335,19 +358,6 @@ 38 36 43 1739 40 41 42 1815 119 121 120 1816 - 1539 0 0 0 - 0 1826 1827 0 - 1829 1830 1831 1832 - 1833 1834 1835 1836 - 1837 1838 1843 1844 - 1839 1840 1845 1846 - 1841 1842 1847 1848 - 0 0 1849 1850 - - 2909 2910 2913 2914 - 2911 2912 2915 2916 - 2917 2918 2921 2922 - 2919 2920 2923 2924 2050 2051 2060 2061 2055 2056 2065 2066 @@ -356,22 +366,12 @@ 2062 2063 2064 0 0 2067 2068 2069 0 2072 2073 2074 - 2075 2079 2076 0 - 2077 2073 2078 0 - - 2070 2071 0 0 + 2075 2079 2076 2070 + 2077 2073 2078 2071 2085 2086 0 0 2087 2088 0 0 2089 2090 0 0 - - 2121 2122 2123 0 - 2126 2127 2128 0 - 2131 2132 2133 0 - - 2124 2125 0 0 - 2129 2130 0 0 - 2134 2135 0 0 2019 2140 2141 2142 2020 2178 0 0 @@ -397,12 +397,6 @@ 2387 2388 2389 2397 2390 2391 2392 2398 2393 2394 2395 2399 - - 2925 2926 2929 2930 - 2927 2928 2931 2932 - 2933 2935 2937 2940 - 2934 2936 2938 2941 - 0 0 2939 2942 ) ) (tilegroup @@ -915,28 +909,32 @@ (solid #t) ) (tiles - (width 11) - (height 4) + (width 13) + (height 5) (ids - 7 8 9 0 1826 1827 0 1837 1838 1843 1844 - 13 14 15 1829 1830 1831 1832 1839 1840 1845 1846 - 10 11 12 1833 1834 1835 1836 1841 1842 1847 1848 - 16 17 18 0 0 0 0 0 0 1849 1850 + 7 8 9 0 1826 1827 0 1837 1838 1843 1844 2937 2940 + 13 14 15 1829 1830 1831 1832 1839 1840 1845 1846 2938 2941 + 10 11 12 1833 1834 1835 1836 1841 1842 1847 1848 2939 2942 + 16 17 18 2925 2926 2929 2930 2933 2935 1849 1850 0 0 + 0 0 0 2927 2928 2931 2932 2934 2936 0 0 0 0 ) (attributes - 0 0 0 0 0 0 0 0 0 0 0 - 1 1 1 17 17 17 17 17 17 17 17 - 1 1 1 1 1 1 1 1 1 17 17 - 0 0 0 0 0 0 0 0 0 1 1 + 0 0 0 0 0 0 0 0 0 0 0 17 17 + 1 1 1 17 17 17 17 17 17 17 17 17 17 + 1 1 1 1 1 1 1 1 1 17 17 0 0 + 0 0 0 17 17 17 17 17 17 1 1 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 ) (datas - 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 18 34 32 16 2 0 66 48 - 0 0 0 0 0 0 0 0 0 50 64 - 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 49 67 + 0 0 0 18 34 32 16 2 0 66 48 65 51 + 0 0 0 0 0 0 0 0 0 50 64 0 0 + 0 0 0 33 17 19 35 1 3 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 ) (image "tiles/snow/convex.png") ) + (tiles (width 2) (height 3) @@ -3904,26 +3902,6 @@ ) (image "tiles/snow/slope_transitions.png" ) ) - - (tiles - (width 8)(height 3) - (ids - 2925 2926 2929 2930 2933 2935 2937 2940 - 2927 2928 2931 2932 2934 2936 2938 2941 - 0 0 0 0 0 0 2939 2942 - ) - (attributes - 17 17 17 17 17 17 17 17 - 0 0 0 0 0 0 17 17 - 0 0 0 0 0 0 0 0 - ) - (datas - 33 17 19 35 1 3 49 67 - 0 0 0 0 0 0 65 51 - 0 0 0 0 0 0 0 0 - ) - (image "tiles/snow/slope-upper.png" ) - ) ;; next-id: 2949 ) diff --git a/data/images/tiles/snow/convex.png b/data/images/tiles/snow/convex.png index 4899211ce..111f0c445 100644 Binary files a/data/images/tiles/snow/convex.png and b/data/images/tiles/snow/convex.png differ diff --git a/data/images/tiles/snow/slope-upper.png b/data/images/tiles/snow/slope-upper.png deleted file mode 100644 index b823e1203..000000000 Binary files a/data/images/tiles/snow/slope-upper.png and /dev/null differ