From: LMH <lmh.0013@gmail.com>
Date: Tue, 27 Aug 2013 07:34:54 +0000 (-1000)
Subject: Spikes for all directions
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e65f5050d359acf9ecf48f9a80ee2e218d6b5835;p=supertux.git

Spikes for all directions
---

diff --git a/data/images/tiles.strf b/data/images/tiles.strf
index 48ecece66..b7d00e6b2 100644
--- a/data/images/tiles.strf
+++ b/data/images/tiles.strf
@@ -392,17 +392,14 @@
       2075 2079 2076 2070
       2077 2073 2078 2071
 
-      2085 2086 0 0
-      2087 2088 0 0
-      2089 2090 0 0
-
       2019 2140 2141 2142
-      2020 2178  0 0 
+      2020 0 0 0
+      
+      2178 3038 3039 3040
 
-      2155 2156 2157 0
-      2163 2164 2165 0
-      2158 2159 2154 0
-      2160 2161 2162 0
+      2155 2156 2157 2163
+      2158 2159 2154 2164
+      2160 2161 2162 2165
 
       2166 2167 2168 2169
       2170 2171 2172 2173
@@ -754,25 +751,25 @@
     )
   )
   (tilegroup
-    (name "Waterfall-trans")
-    (tiles
-      191 192 193 194
-      187 188 189 190
-      183 184 185 186
-      179 180 181 182
-      175 176 177 178)
-  )
-  (tilegroup
-    (name "Waterfall")
+    (name "Water")
     (tiles
+      2019 2140 2141 2142
+      2020 0    0    0
+
       291 292 293 294
       287 288 289 290
       283 284 285 286
       279 280 281 282
       275 276 277 278
 
-      195 0   196 0
-      197 198 199 0)
+      195 0   196 75
+      197 198 199 76
+
+      191 192 193 194
+      187 188 189 190
+      183 184 185 186
+      179 180 181 182
+      175 176 177 178)
   )
   (tilegroup
     (name "Icebridge")
@@ -852,8 +849,8 @@
       2111 2112 2113    0
       2116 2117 2118    0
       2094 2095 2109 2110
-      2099 2100 2104 2120
-      2114 2115 2119 2105
+      2099 2100 2104 2105
+      2114 2115 2119 2120
 
       2380 2381 2382 2383
       2212 2213 2214 2215
@@ -3498,11 +3495,11 @@
     )
     (attributes
       1 1 1 1 1
-      1 1 1 0 0
-      1 1 1 0 0
-      1 1 1 0 0
-      1 1 1 0 0
-      1 1 1 0 1024
+      1 1 1 1 1
+      1 1 1 1 0
+      1 1 1 1 1
+      1 1 1 1024 1024
+      1 1 1 1024 1024
     )
     (image "tiles/snowcastle/foreground.png")
   )
@@ -3581,9 +3578,11 @@
      0 0 0 0)
     (image "tiles/snow/unisolid3.png"))
 
-  (tile
-    (id 2178)
-    (hurts #t)
+  (tiles
+    (width 4)
+    (height 1)
+    (ids 2178 3038 3039 3040)
+    (attributes 1024 1024 1024 1024)
     (images
       "tiles/snow/spike.png"))
 
@@ -4016,5 +4015,5 @@
     (image "tiles/pole/diagonals.png")
   )
 
-;; next-id: 3038
+;; next-id: 3041
 )
diff --git a/data/images/tiles/snow/spike.png b/data/images/tiles/snow/spike.png
index 1ca0d83f3..9cf61eb8f 100644
Binary files a/data/images/tiles/snow/spike.png and b/data/images/tiles/snow/spike.png differ
diff --git a/data/images/tiles/snowcastle/foreground.png b/data/images/tiles/snowcastle/foreground.png
index 74d373cba..abec185bb 100644
Binary files a/data/images/tiles/snowcastle/foreground.png and b/data/images/tiles/snowcastle/foreground.png differ