From: LMH Date: Thu, 26 Jan 2012 00:57:08 +0000 (-1000) Subject: Pipe Graphics: bends, joints, and windows added, matched green pipe style to that... X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=4776a6674a909b700f8d9193a355511703defac1;p=supertux.git Pipe Graphics: bends, joints, and windows added, matched green pipe style to that of blue pipe, added masking tiles for edges --- diff --git a/data/images/tiles.strf b/data/images/tiles.strf index 8335606da..c20712661 100644 --- a/data/images/tiles.strf +++ b/data/images/tiles.strf @@ -15,6 +15,42 @@ ;; src/tile.cpp, unisolid is 3 not 2 (supertux-tiles (tilegroup + (name "Pipe: Green") + (tiles + 57 58 2841 2842 + 59 60 2843 2844 + 1742 1743 2845 2846 + 53 55 1744 2847 + 54 56 1745 2848 + 2849 2851 2852 2853 + 2850 2854 2855 2856 + 2857 2858 2859 2860 + 2861 2862 2863 2864 + 2865 2866 2867 2868 + 2869 2870 2871 2872)) + + (tilegroup + (name "Pipe: Blue") + (tiles + 2085 2086 2873 2874 + 2087 2088 2875 2876 + 2089 2090 2877 2878 + 2143 2144 2145 2879 + 2146 2147 2148 2880 + 2881 2883 2884 2885 + 2882 2886 2887 2888 + 2889 2890 2891 2892 + 2893 2894 2895 2896 + 2897 2898 2899 2900 + 2901 2902 2903 2904)) + + (tilegroup + (name "Pipe Mask") + (tiles + 2905 2906 + 2907 2908)) + + (tilegroup (name "Test") (tiles 2203 2204 2205 0 @@ -513,17 +549,6 @@ ) ) (tilegroup - (name "Pipe") - (tiles - 53 55 1744 0 - 54 56 1745 0 - 57 58 2085 2086 - 59 60 2087 2088 - 1742 1743 2089 2090 - 2143 2144 2145 0 - 2146 2147 2148 0) - ) - (tilegroup (name "Pole") (tiles 1348 1720 1719 1718 @@ -968,34 +993,6 @@ ) (image "tiles/blocks/bigblock.png") ) - (tiles - (width 3) - (height 2) - (ids - 53 55 1744 - 54 56 1745 - ) - (attributes - 1 1 1 - 1 1 1 - ) - (image "tiles/pipe/pipeh.png") - ) - (tiles - (width 2) - (height 3) - (ids - 57 58 - 59 60 - 1742 1743 - ) - (attributes - 1 1 - 1 1 - 1 1 - ) - (image "tiles/pipe/pipev.png") - ) (tile (id 61) (images @@ -3270,7 +3267,7 @@ (attributes 3 3 ) - (image "tiles/pipe/pipev.png") + (image "tiles/pipe/green.png") ) (tiles (width 1) @@ -3300,20 +3297,6 @@ ) (image "tiles/snow/unisolid.png") ) - (tiles - (width 2) - (height 3) - (ids 2085 2086 - 2087 2088 - 2089 2090 - ) - (attributes - 1 1 - 1 1 - 1 1 - ) - (image "tiles/pipe/blue.png") - ) (tiles (width 4) @@ -3397,19 +3380,6 @@ ) (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 @@ -3695,5 +3665,108 @@ (editor-images "tiles/auxiliary/invisible-unisolid-slopes.png") ) -;; next-id: 2840 + (tiles + (width 4) + (height 11) + (ids + 57 58 2841 2842 + 59 60 2843 2844 + 1742 1743 2845 2846 + 53 55 1744 2847 + 54 56 1745 2848 + 2849 2851 2852 2853 + 2850 2854 2855 2856 + 2857 2858 2859 2860 + 2861 2862 2863 2864 + 2865 2866 2867 2868 + 2869 2870 2871 2872 + ) + (attributes + 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 + 17 1 1 17 + 1 1 1 1 + 1 1 1 1 + 17 1 1 17 + ) + (datas + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 2 0 0 0 + 0 0 0 0 + 0 0 0 0 + 1 0 0 3 + ) + (image "tiles/pipe/green.png") + ) + + (tiles + (width 4) + (height 11) + (ids + 2085 2086 2873 2874 + 2087 2088 2875 2876 + 2089 2090 2877 2878 + 2143 2144 2145 2879 + 2146 2147 2148 2880 + 2881 2883 2884 2885 + 2882 2886 2887 2888 + 2889 2890 2891 2892 + 2893 2894 2895 2896 + 2897 2898 2899 2900 + 2901 2902 2903 2904 + ) + (attributes + 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 + 17 1 1 17 + 1 1 1 1 + 1 1 1 1 + 17 1 1 17 + ) + (datas + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 2 0 0 0 + 0 0 0 0 + 0 0 0 0 + 1 0 0 3 + ) + (image "tiles/pipe/blue.png") + ) + + (tiles + (width 2) + (height 2) + (ids + 2905 2906 + 2907 2908 + ) + (attributes + 0 0 + 0 0 + ) + (image "tiles/pipe/mask.png") + ) +;; next-id: 2909 ) diff --git a/data/images/tiles/pipe/blue.png b/data/images/tiles/pipe/blue.png old mode 100644 new mode 100755 index 164719489..2cd4dc461 Binary files a/data/images/tiles/pipe/blue.png and b/data/images/tiles/pipe/blue.png differ diff --git a/data/images/tiles/pipe/blueh.png b/data/images/tiles/pipe/blueh.png deleted file mode 100644 index 3df8f75ba..000000000 Binary files a/data/images/tiles/pipe/blueh.png and /dev/null differ diff --git a/data/images/tiles/pipe/colors.xcf b/data/images/tiles/pipe/colors.xcf new file mode 100755 index 000000000..0bac5915b Binary files /dev/null and b/data/images/tiles/pipe/colors.xcf differ diff --git a/data/images/tiles/pipe/green.png b/data/images/tiles/pipe/green.png new file mode 100644 index 000000000..043fa47dd Binary files /dev/null and b/data/images/tiles/pipe/green.png differ diff --git a/data/images/tiles/pipe/mask.png b/data/images/tiles/pipe/mask.png new file mode 100755 index 000000000..29d98b2bd Binary files /dev/null and b/data/images/tiles/pipe/mask.png differ diff --git a/data/images/tiles/pipe/pipeh.png b/data/images/tiles/pipe/pipeh.png deleted file mode 100644 index 828cf2aa4..000000000 Binary files a/data/images/tiles/pipe/pipeh.png and /dev/null differ diff --git a/data/images/tiles/pipe/pipev.png b/data/images/tiles/pipe/pipev.png deleted file mode 100644 index d0b91bcc0..000000000 Binary files a/data/images/tiles/pipe/pipev.png and /dev/null differ