From 8858dbcfac53ada5b85955adb238a3efa424adb8 Mon Sep 17 00:00:00 2001 From: Marek Moeckel Date: Tue, 5 Oct 2004 12:21:02 +0000 Subject: [PATCH] added spikes that point in different directions out-commented para-background-tiles from supertux.stgt because they crash flexlay SVN-Revision: 1978 --- data/images/tilesets/spike_down.png | Bin 0 -> 1792 bytes data/images/tilesets/spike_left.png | Bin 0 -> 1753 bytes data/images/tilesets/spike_right.png | Bin 0 -> 1793 bytes data/images/tilesets/{spike.png => spike_up.png} | Bin data/images/tilesets/supertux.stgt | 129 ++++++++++++----------- 5 files changed, 69 insertions(+), 60 deletions(-) create mode 100644 data/images/tilesets/spike_down.png create mode 100644 data/images/tilesets/spike_left.png create mode 100644 data/images/tilesets/spike_right.png rename data/images/tilesets/{spike.png => spike_up.png} (100%) diff --git a/data/images/tilesets/spike_down.png b/data/images/tilesets/spike_down.png new file mode 100644 index 0000000000000000000000000000000000000000..f4f31c7909fee46d708158d69cb113bf219a8be9 GIT binary patch literal 1792 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 literal 0 HcmV?d00001 diff --git a/data/images/tilesets/spike.png b/data/images/tilesets/spike_up.png similarity index 100% rename from data/images/tilesets/spike.png rename to data/images/tilesets/spike_up.png 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 -- 2.11.0