From ce455f961885ef7aa382ed670f048e6943561e78 Mon Sep 17 00:00:00 2001 From: Stephen Groundwater Date: Fri, 23 Jun 2006 14:27:18 +0000 Subject: [PATCH] Applied AnMaster's patch for editor cleanup related to powerups, workaround for some problems in the editor. Fixed editor layout, several of the trees were wrong. Reorderd the tiles inside misc. Reorderd pole to be simpler to use. SVN-Revision: 3699 --- data/images/powerups/egg/egg.sprite | 1 + data/images/powerups/fireflower/fireflower.sprite | 1 + data/images/tiles.strf | 60 ++++++++++++----------- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/data/images/powerups/egg/egg.sprite b/data/images/powerups/egg/egg.sprite index de0d0f83b..899b94899 100644 --- a/data/images/powerups/egg/egg.sprite +++ b/data/images/powerups/egg/egg.sprite @@ -1,3 +1,4 @@ (supertux-sprite (action + (name "default") (images "egg.png"))) diff --git a/data/images/powerups/fireflower/fireflower.sprite b/data/images/powerups/fireflower/fireflower.sprite index 65980bcdd..72b848144 100644 --- a/data/images/powerups/fireflower/fireflower.sprite +++ b/data/images/powerups/fireflower/fireflower.sprite @@ -1,5 +1,6 @@ (supertux-sprite (action + (name "default") (images "fire_flower-0.png" "fire_flower-1.png" "fire_flower-2.png" diff --git a/data/images/tiles.strf b/data/images/tiles.strf index 71f4afe18..54e3c760b 100644 --- a/data/images/tiles.strf +++ b/data/images/tiles.strf @@ -23,13 +23,13 @@ ) (tilegroup (name "Snow (Paralax Background)") - (tiles 149 160 151 158 - 152 153 154 159 - 155 156 157 0 - 161 162 163 170 - 164 165 166 171 - 167 168 169 0 - 1342 1343 0 0 ) + (tiles 149 160 151 158 + 152 153 154 159 + 155 156 157 0 + 161 162 163 170 + 164 165 166 171 + 167 168 169 1343 + 0 0 0 1342 ) ) (tilegroup (name "Forest (Foreground)") @@ -47,7 +47,7 @@ 1049 1050 1055 1056 1042 1043 1057 1058 1034 1035 1029 1030 - 1041 1040 1031 1032 + 1040 1041 1031 1032 1036 1037 0 1038 1020 1021 1022 1044 1023 1024 1025 1033 @@ -98,18 +98,20 @@ 1185 1186 1187 1188 1191 1192 1193 1194 1197 1198 1199 1200 - 1191 1192 1193 1194 - 1197 1198 1199 1200 1203 1204 1205 1206 1209 1210 1211 1212 - 1177 0 1219 1220 - 1183 0 1225 1226 - 1189 1190 1217 1218 - 1195 0 1223 1224 - 1201 1190 1229 1230 - 1195 0 1235 1236 + 0 0 1219 1220 + 0 0 1225 1226 + 0 0 1217 1218 + 0 0 1223 1224 + 0 1228 1229 1230 + 0 1234 1235 1236 + 1177 0 0 0 + 1183 0 0 0 + 1189 1190 0 0 + 1195 1196 0 0 1201 1202 0 0 - 1207 0 0 0 + 1207 1208 0 0 1213 1214 0 0 0 1240 1241 1242 1243 1244 1245 1246 @@ -165,26 +167,28 @@ ) (tilegroup (name "Misc") - (tiles 75 76 200 201 - 174 126 127 130 - 173 134 135 129 + (tiles 76 201 174 130 + 75 200 173 129 295 296 297 298 - 81 80 1347 1348 - 0 0 0 0 - 0 0 0 0 - 0 0 0 0 - 1355 0 0 0 + 81 126 127 0 + 1355 134 135 0 1356 0 0 0 - 1569 0 0 0 + 1411 0 0 0 ) ) (tilegroup (name "Pipe") - (tiles 53 55 0 0 54 56 0 0 57 58 0 0 59 60 0 0) + (tiles 53 55 0 0 + 54 56 0 0 + 57 58 0 0 + 59 60 0 0) ) (tilegroup (name "Pole") - (tiles 79 80 1347 1348 1349 1717 1718 1719 1720 1721 1722) + (tiles 1348 1720 1719 1718 + 79 80 1347 1722 + 1349 1717 1721 + ) ) (tilegroup (name "Stone Brick Walls") -- 2.11.0