From: Marek Moeckel Date: Tue, 5 Oct 2004 12:21:02 +0000 (+0000) Subject: added spikes that point in different directions X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;ds=sidebyside;h=8858dbcfac53ada5b85955adb238a3efa424adb8;p=supertux.git added spikes that point in different directions out-commented para-background-tiles from supertux.stgt because they crash flexlay SVN-Revision: 1978 --- diff --git a/data/images/tilesets/spike.png b/data/images/tilesets/spike.png deleted file mode 100644 index 14e7e9929..000000000 Binary files a/data/images/tilesets/spike.png and /dev/null differ diff --git a/data/images/tilesets/spike_down.png b/data/images/tilesets/spike_down.png new file mode 100644 index 000000000..f4f31c790 Binary files /dev/null and b/data/images/tilesets/spike_down.png differ diff --git a/data/images/tilesets/spike_left.png b/data/images/tilesets/spike_left.png new file mode 100644 index 000000000..3bcd56fb8 Binary files /dev/null and b/data/images/tilesets/spike_left.png differ diff --git a/data/images/tilesets/spike_right.png b/data/images/tilesets/spike_right.png new file mode 100644 index 000000000..568e5eb00 Binary files /dev/null and b/data/images/tilesets/spike_right.png differ diff --git a/data/images/tilesets/spike_up.png b/data/images/tilesets/spike_up.png new file mode 100644 index 000000000..14e7e9929 Binary files /dev/null and b/data/images/tilesets/spike_up.png differ diff --git a/data/images/tilesets/supertux.stgt b/data/images/tilesets/supertux.stgt index ca1dec196..368b221c6 100644 --- a/data/images/tilesets/supertux.stgt +++ b/data/images/tilesets/supertux.stgt @@ -12,7 +12,7 @@ (tilegroup (name "Classic-Bg") (tiles 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101)) (tilegroup (name "Points") (tiles 132 133)) (tilegroup (name "Bonus") (tiles 44 83 84 102 140 103 104 105 112 128)) - (tilegroup (name "Misc") (tiles 75 76 200 201 79 80 126 127 129 130 134 135 81 300 173 174)) + (tilegroup (name "Misc") (tiles 75 76 200 201 79 80 126 127 129 130 134 135 81 295 296 297 298 173 174)) (tilegroup (name "Pipe") (tiles 53 54 55 56 57 58 59 60)) (tilegroup (name "Grey") (tiles 64 65 66 67 68 69)) (tilegroup (name "Signs") (tiles 136 137 138 139 141 142 143 144)) @@ -535,62 +535,62 @@ (tile (id 148) (images "grasslands4.png")) - (tile (id 149) - (images (region "snow-para-1.png" 0 0 32 32))) - (tile (id 150) - (images (region "snow-para-1.png" 32 0 32 32))) - (tile (id 151) - (images (region "snow-para-1.png" 64 0 32 32))) - - (tile (id 152) - (images (region "snow-para-1.png" 0 32 32 32))) - (tile (id 153) - (images (region "snow-para-1.png" 32 32 32 32))) - (tile (id 154) - (images (region "snow-para-1.png" 64 32 32 32))) - - (tile (id 155) - (images (region "snow-para-1.png" 0 64 32 32))) - (tile (id 156) - (images (region "snow-para-1.png" 32 64 32 32))) - (tile (id 157) - (images (region "snow-para-1.png" 64 64 32 32))) - - (tile (id 158) - (images (region "snow-para-1.png" 96 0 32 32))) - (tile (id 159) - (images (region "snow-para-1.png" 96 32 32 32))) - (tile (id 160) - (images (region "snow-para-1.png" 96 64 32 32))) - - - (tile (id 161) - (images (region "snow-para-2.png" 0 0 32 32))) - (tile (id 162) - (images (region "snow-para-2.png" 32 0 32 32))) - (tile (id 163) - (images (region "snow-para-2.png" 64 0 32 32))) - - (tile (id 164) - (images (region "snow-para-2.png" 0 32 32 32))) - (tile (id 165) - (images (region "snow-para-2.png" 32 32 32 32))) - (tile (id 166) - (images (region "snow-para-2.png" 64 32 32 32))) - - (tile (id 167) - (images (region "snow-para-2.png" 0 64 32 32))) - (tile (id 168) - (images (region "snow-para-2.png" 32 64 32 32))) - (tile (id 169) - (images (region "snow-para-2.png" 64 64 32 32))) - - (tile (id 170) - (images (region "snow-para-2.png" 96 0 32 32))) - (tile (id 171) - (images (region "snow-para-2.png" 96 32 32 32))) - (tile (id 172) - (images (region "snow-para-2.png" 96 64 32 32))) + ;;(tile (id 149) + ;; (images (region "snow-para-1.png" 0 0 32 32))) + ;;(tile (id 150) + ;;(images (region "snow-para-1.png" 32 0 32 32))) + ;;(tile (id 151) +;; (images (region "snow-para-1.png" 64 0 32 32))) +;; + ;;(tile (id 152) + ;;(images (region "snow-para-1.png" 0 32 32 32))) + ;;(tile (id 153) + ;;(images (region "snow-para-1.png" 32 32 32 32))) + ;;(tile (id 154) + ;;(images (region "snow-para-1.png" 64 32 32 32))) +;; + ;;(tile (id 155) + ;;(images (region "snow-para-1.png" 0 64 32 32))) + ;;(tile (id 156) + ;;(images (region "snow-para-1.png" 32 64 32 32))) + ;;(tile (id 157) + ;;(images (region "snow-para-1.png" 64 64 32 32))) +;; + ;;(tile (id 158) + ;;(images (region "snow-para-1.png" 96 0 32 32))) + ;;(tile (id 159) + ;;(images (region "snow-para-1.png" 96 32 32 32))) + ;;(tile (id 160) + ;;(images (region "snow-para-1.png" 96 64 32 32))) + + + ;;(tile (id 161) + ;;(images (region "snow-para-2.png" 0 0 32 32))) + ;;(tile (id 162) + ;;(images (region "snow-para-2.png" 32 0 32 32))) + ;;(tile (id 163) + ;;(images (region "snow-para-2.png" 64 0 32 32))) +;; + ;;(tile (id 164) + ;;(images (region "snow-para-2.png" 0 32 32 32))) + ;;(tile (id 165) + ;;(images (region "snow-para-2.png" 32 32 32 32))) + ;;(tile (id 166) + ;;(images (region "snow-para-2.png" 64 32 32 32))) +;; + ;;(tile (id 167) + ;;(images (region "snow-para-2.png" 0 64 32 32))) + ;;(tile (id 168) + ;;(images (region "snow-para-2.png" 32 64 32 32))) + ;;(tile (id 169) + ;;(images (region "snow-para-2.png" 64 64 32 32))) +;; + ;;(tile (id 170) + ;;(images (region "snow-para-2.png" 96 0 32 32))) + ;;(tile (id 171) + ;;(images (region "snow-para-2.png" 96 32 32 32))) + ;;(tile (id 172) + ;;(images (region "snow-para-2.png" 96 64 32 32))) ;; Lava @@ -841,11 +841,20 @@ (anim-speed 45)) - ;; Spike + ;; Spikes - (tile (id 300) + (tile (id 295) (spike #t) - (images "spike.png")) + (images "spike_up.png")) + (tile (id 296) + (spike #t) + (images "spike_right.png")) + (tile (id 297) + (spike #t) + (images "spike_down.png")) + (tile (id 298) + (spike #t) + (images "spike_left.png")) ;; Jungle