From 31f8084e3062e88bbf59f17608158c11c0825177 Mon Sep 17 00:00:00 2001 From: LMH Date: Wed, 3 Apr 2013 11:17:47 -1000 Subject: [PATCH] Reworked naming scheme for 'icy' worldmap graphics to resolve issues with some add-ons --- data/images/{icy_world.strf => ice_world.strf} | 78 ++++++++++----------- data/images/worldmap/{icy => ice}/cave_cracks.png | Bin data/images/worldmap/{icy => ice}/crystal.png | Bin data/images/worldmap/{icy => ice}/gimp/cracks.xcf | Bin .../images/worldmap/{icy => ice}/gimp/crystals.xcf | Bin data/images/worldmap/{icy => ice}/gimp/icecave.xcf | Bin data/images/worldmap/{icy => ice}/gimp/land.xcf | Bin .../images/worldmap/{icy => ice}/gimp/mountain.xcf | Bin .../images/worldmap/{icy => ice}/gimp/thin_ice.xcf | Bin data/images/worldmap/{icy => ice}/icecave.png | Bin data/images/worldmap/{icy => ice}/land.png | Bin data/images/worldmap/{icy => ice}/mountain.png | Bin data/images/worldmap/{icy => ice}/thin_ice.png | Bin data/images/worldmap/{icy => ice}/woodconcave.png | Bin data/images/worldmap/{icy => ice}/woodconvex.png | Bin .../images/worldmap/{generic => shared}/bridge.png | Bin .../images/worldmap/{generic => shared}/castle.png | Bin .../worldmap/{generic => shared}/gimp/bridge.xcf | Bin .../worldmap/{generic => shared}/gimp/castle.xcf | Bin .../worldmap/{generic => shared}/gimp/paths.xcf | Bin .../worldmap/{generic => shared}/gimp/pier.xcf | Bin .../{generic => shared}/gimp/shalow_water.xcf | Bin .../{generic => shared}/gimp/surf-test.xcf | Bin .../worldmap/{generic => shared}/gimp/surf.xcf | Bin .../worldmap/{generic => shared}/gimp/water.xcf | Bin .../{generic => shared}/invisible_paths-editor.png | Bin data/images/worldmap/{generic => shared}/pier.png | Bin data/images/worldmap/{generic => shared}/roads.png | Bin .../worldmap/{generic => shared}/shallow_water.png | Bin .../worldmap/{generic => shared}/surf-01.png | Bin .../worldmap/{generic => shared}/surf-02.png | Bin .../worldmap/{generic => shared}/surf-03.png | Bin .../worldmap/{generic => shared}/surf-04.png | Bin .../worldmap/{generic => shared}/water_01.png | Bin .../worldmap/{generic => shared}/water_02.png | Bin .../worldmap/{generic => shared}/water_03.png | Bin .../worldmap/{generic => shared}/water_04.png | Bin .../worldmap/{generic => shared}/water_05.png | Bin .../worldmap/{generic => shared}/water_06.png | Bin .../worldmap/{generic => shared}/water_07.png | Bin .../worldmap/{generic => shared}/water_08.png | Bin .../worldmap/{generic => shared}/water_09.png | Bin .../worldmap/{generic => shared}/water_10.png | Bin .../worldmap/{generic => shared}/water_11.png | Bin .../worldmap/{generic => shared}/water_12.png | Bin .../worldmap/{generic => shared}/water_13.png | Bin .../worldmap/{generic => shared}/water_14.png | Bin .../worldmap/{generic => shared}/water_15.png | Bin .../worldmap/{generic => shared}/water_16.png | Bin data/levels/world1/worldmap.stwm | 2 +- 50 files changed, 40 insertions(+), 40 deletions(-) rename data/images/{icy_world.strf => ice_world.strf} (70%) rename data/images/worldmap/{icy => ice}/cave_cracks.png (100%) rename data/images/worldmap/{icy => ice}/crystal.png (100%) rename data/images/worldmap/{icy => ice}/gimp/cracks.xcf (100%) rename data/images/worldmap/{icy => ice}/gimp/crystals.xcf (100%) rename data/images/worldmap/{icy => ice}/gimp/icecave.xcf (100%) rename data/images/worldmap/{icy => ice}/gimp/land.xcf (100%) rename data/images/worldmap/{icy => ice}/gimp/mountain.xcf (100%) rename data/images/worldmap/{icy => ice}/gimp/thin_ice.xcf (100%) rename data/images/worldmap/{icy => ice}/icecave.png (100%) rename data/images/worldmap/{icy => ice}/land.png (100%) rename data/images/worldmap/{icy => ice}/mountain.png (100%) rename data/images/worldmap/{icy => ice}/thin_ice.png (100%) rename data/images/worldmap/{icy => ice}/woodconcave.png (100%) rename data/images/worldmap/{icy => ice}/woodconvex.png (100%) rename data/images/worldmap/{generic => shared}/bridge.png (100%) rename data/images/worldmap/{generic => shared}/castle.png (100%) rename data/images/worldmap/{generic => shared}/gimp/bridge.xcf (100%) rename data/images/worldmap/{generic => shared}/gimp/castle.xcf (100%) rename data/images/worldmap/{generic => shared}/gimp/paths.xcf (100%) rename data/images/worldmap/{generic => shared}/gimp/pier.xcf (100%) rename data/images/worldmap/{generic => shared}/gimp/shalow_water.xcf (100%) rename data/images/worldmap/{generic => shared}/gimp/surf-test.xcf (100%) rename data/images/worldmap/{generic => shared}/gimp/surf.xcf (100%) rename data/images/worldmap/{generic => shared}/gimp/water.xcf (100%) rename data/images/worldmap/{generic => shared}/invisible_paths-editor.png (100%) rename data/images/worldmap/{generic => shared}/pier.png (100%) rename data/images/worldmap/{generic => shared}/roads.png (100%) rename data/images/worldmap/{generic => shared}/shallow_water.png (100%) rename data/images/worldmap/{generic => shared}/surf-01.png (100%) rename data/images/worldmap/{generic => shared}/surf-02.png (100%) rename data/images/worldmap/{generic => shared}/surf-03.png (100%) rename data/images/worldmap/{generic => shared}/surf-04.png (100%) rename data/images/worldmap/{generic => shared}/water_01.png (100%) rename data/images/worldmap/{generic => shared}/water_02.png (100%) rename data/images/worldmap/{generic => shared}/water_03.png (100%) rename data/images/worldmap/{generic => shared}/water_04.png (100%) rename data/images/worldmap/{generic => shared}/water_05.png (100%) rename data/images/worldmap/{generic => shared}/water_06.png (100%) rename data/images/worldmap/{generic => shared}/water_07.png (100%) rename data/images/worldmap/{generic => shared}/water_08.png (100%) rename data/images/worldmap/{generic => shared}/water_09.png (100%) rename data/images/worldmap/{generic => shared}/water_10.png (100%) rename data/images/worldmap/{generic => shared}/water_11.png (100%) rename data/images/worldmap/{generic => shared}/water_12.png (100%) rename data/images/worldmap/{generic => shared}/water_13.png (100%) rename data/images/worldmap/{generic => shared}/water_14.png (100%) rename data/images/worldmap/{generic => shared}/water_15.png (100%) rename data/images/worldmap/{generic => shared}/water_16.png (100%) diff --git a/data/images/icy_world.strf b/data/images/ice_world.strf similarity index 70% rename from data/images/icy_world.strf rename to data/images/ice_world.strf index c6673096d..faa74a950 100644 --- a/data/images/icy_world.strf +++ b/data/images/ice_world.strf @@ -1,7 +1,7 @@ (supertux-tiles -;; icy tiles- next id: 257 +;; ice tiles- next id: 257 (tilegroup (name "Ice Cave & Crystal") (tiles @@ -24,7 +24,7 @@ ) (tiles (width 3)(height 9) - (images "worldmap/icy/icecave.png") + (images "worldmap/ice/icecave.png") (ids 149 150 151 152 153 154 @@ -39,7 +39,7 @@ ) (tiles (width 3)(height 5) - (images "worldmap/icy/crystal.png") + (images "worldmap/ice/crystal.png") (ids 234 235 236 237 238 239 @@ -82,7 +82,7 @@ ) (tiles (width 3)(height 3) - (images "worldmap/icy/woodconvex.png") + (images "worldmap/ice/woodconvex.png") (ids 136 137 138 139 140 141 @@ -91,7 +91,7 @@ ) (tiles (width 2)(height 2) - (images "worldmap/icy/woodconcave.png") + (images "worldmap/ice/woodconcave.png") (ids 145 146 147 148 @@ -99,7 +99,7 @@ ) (tiles (width 4)(height 7) - (images "worldmap/icy/mountain.png") + (images "worldmap/ice/mountain.png") (ids 170 181 184 187 171 182 185 188 @@ -112,7 +112,7 @@ ) (tiles (width 3)(height 5) - (images "worldmap/icy/thin_ice.png") + (images "worldmap/ice/thin_ice.png") (ids 204 205 206 207 208 209 @@ -123,7 +123,7 @@ ) (tiles (width 3)(height 5) - (images "worldmap/icy/cave_cracks.png") + (images "worldmap/ice/cave_cracks.png") (ids 219 220 221 222 223 224 @@ -151,7 +151,7 @@ ) (tiles (width 5)(height 9) - (images "worldmap/icy/land.png") + (images "worldmap/ice/land.png") (ids 101 102 103 110 111 104 105 106 112 113 @@ -177,7 +177,7 @@ ) -;; generic tiles- ids available: 90-100 +;; shared tiles- ids available: 90-100 (tilegroup (name "Castle") (tiles @@ -188,7 +188,7 @@ ) (tiles (width 3)(height 3) - (images "worldmap/generic/castle.png") + (images "worldmap/shared/castle.png") (ids 60 61 62 63 64 65 @@ -219,7 +219,7 @@ ) (tiles (width 4)(height 5) - (images "worldmap/generic/roads.png") + (images "worldmap/shared/roads.png") (ids 10 11 12 13 14 15 16 17 @@ -238,9 +238,9 @@ (tiles (width 4)(height 4) (images - (region "worldmap/generic/roads.png" 96 128 32 32) + (region "worldmap/shared/roads.png" 96 128 32 32) ) - (editor-images "worldmap/generic/invisible_paths-editor.png") + (editor-images "worldmap/shared/invisible_paths-editor.png") (ids 30 31 32 33 34 35 36 37 @@ -256,7 +256,7 @@ ) (tiles (width 3)(height 4) - (images "worldmap/generic/bridge.png") + (images "worldmap/shared/bridge.png") (ids 46 47 48 49 50 51 @@ -272,7 +272,7 @@ ) (tiles (width 2)(height 4) - (images "worldmap/generic/pier.png") + (images "worldmap/shared/pier.png") (ids 52 54 53 55 @@ -302,22 +302,22 @@ ) (tile (id 1) - (images "worldmap/generic/water_01.png" - "worldmap/generic/water_02.png" - "worldmap/generic/water_03.png" - "worldmap/generic/water_04.png" - "worldmap/generic/water_05.png" - "worldmap/generic/water_06.png" - "worldmap/generic/water_07.png" - "worldmap/generic/water_08.png" - "worldmap/generic/water_09.png" - "worldmap/generic/water_10.png" - "worldmap/generic/water_11.png" - "worldmap/generic/water_12.png" - "worldmap/generic/water_13.png" - "worldmap/generic/water_14.png" - "worldmap/generic/water_15.png" - "worldmap/generic/water_16.png" + (images "worldmap/shared/water_01.png" + "worldmap/shared/water_02.png" + "worldmap/shared/water_03.png" + "worldmap/shared/water_04.png" + "worldmap/shared/water_05.png" + "worldmap/shared/water_06.png" + "worldmap/shared/water_07.png" + "worldmap/shared/water_08.png" + "worldmap/shared/water_09.png" + "worldmap/shared/water_10.png" + "worldmap/shared/water_11.png" + "worldmap/shared/water_12.png" + "worldmap/shared/water_13.png" + "worldmap/shared/water_14.png" + "worldmap/shared/water_15.png" + "worldmap/shared/water_16.png" ) ) (tiles @@ -326,17 +326,17 @@ 9 2 3 4 5 6 7 8 ) - (image "worldmap/generic/surf-01.png" - "worldmap/generic/surf-02.png" - "worldmap/generic/surf-03.png" - "worldmap/generic/surf-04.png" - "worldmap/generic/surf-03.png" - "worldmap/generic/surf-02.png" + (image "worldmap/shared/surf-01.png" + "worldmap/shared/surf-02.png" + "worldmap/shared/surf-03.png" + "worldmap/shared/surf-04.png" + "worldmap/shared/surf-03.png" + "worldmap/shared/surf-02.png" ) ) (tiles (width 3)(height 5) - (images "worldmap/generic/shallow_water.png") + (images "worldmap/shared/shallow_water.png") (ids 69 70 71 72 73 74 diff --git a/data/images/worldmap/icy/cave_cracks.png b/data/images/worldmap/ice/cave_cracks.png similarity index 100% rename from data/images/worldmap/icy/cave_cracks.png rename to data/images/worldmap/ice/cave_cracks.png diff --git a/data/images/worldmap/icy/crystal.png b/data/images/worldmap/ice/crystal.png similarity index 100% rename from data/images/worldmap/icy/crystal.png rename to data/images/worldmap/ice/crystal.png diff --git a/data/images/worldmap/icy/gimp/cracks.xcf b/data/images/worldmap/ice/gimp/cracks.xcf similarity index 100% rename from data/images/worldmap/icy/gimp/cracks.xcf rename to data/images/worldmap/ice/gimp/cracks.xcf diff --git a/data/images/worldmap/icy/gimp/crystals.xcf b/data/images/worldmap/ice/gimp/crystals.xcf similarity index 100% rename from data/images/worldmap/icy/gimp/crystals.xcf rename to data/images/worldmap/ice/gimp/crystals.xcf diff --git a/data/images/worldmap/icy/gimp/icecave.xcf b/data/images/worldmap/ice/gimp/icecave.xcf similarity index 100% rename from data/images/worldmap/icy/gimp/icecave.xcf rename to data/images/worldmap/ice/gimp/icecave.xcf diff --git a/data/images/worldmap/icy/gimp/land.xcf b/data/images/worldmap/ice/gimp/land.xcf similarity index 100% rename from data/images/worldmap/icy/gimp/land.xcf rename to data/images/worldmap/ice/gimp/land.xcf diff --git a/data/images/worldmap/icy/gimp/mountain.xcf b/data/images/worldmap/ice/gimp/mountain.xcf similarity index 100% rename from data/images/worldmap/icy/gimp/mountain.xcf rename to data/images/worldmap/ice/gimp/mountain.xcf diff --git a/data/images/worldmap/icy/gimp/thin_ice.xcf b/data/images/worldmap/ice/gimp/thin_ice.xcf similarity index 100% rename from data/images/worldmap/icy/gimp/thin_ice.xcf rename to data/images/worldmap/ice/gimp/thin_ice.xcf diff --git a/data/images/worldmap/icy/icecave.png b/data/images/worldmap/ice/icecave.png similarity index 100% rename from data/images/worldmap/icy/icecave.png rename to data/images/worldmap/ice/icecave.png diff --git a/data/images/worldmap/icy/land.png b/data/images/worldmap/ice/land.png similarity index 100% rename from data/images/worldmap/icy/land.png rename to data/images/worldmap/ice/land.png diff --git a/data/images/worldmap/icy/mountain.png b/data/images/worldmap/ice/mountain.png similarity index 100% rename from data/images/worldmap/icy/mountain.png rename to data/images/worldmap/ice/mountain.png diff --git a/data/images/worldmap/icy/thin_ice.png b/data/images/worldmap/ice/thin_ice.png similarity index 100% rename from data/images/worldmap/icy/thin_ice.png rename to data/images/worldmap/ice/thin_ice.png diff --git a/data/images/worldmap/icy/woodconcave.png b/data/images/worldmap/ice/woodconcave.png similarity index 100% rename from data/images/worldmap/icy/woodconcave.png rename to data/images/worldmap/ice/woodconcave.png diff --git a/data/images/worldmap/icy/woodconvex.png b/data/images/worldmap/ice/woodconvex.png similarity index 100% rename from data/images/worldmap/icy/woodconvex.png rename to data/images/worldmap/ice/woodconvex.png diff --git a/data/images/worldmap/generic/bridge.png b/data/images/worldmap/shared/bridge.png similarity index 100% rename from data/images/worldmap/generic/bridge.png rename to data/images/worldmap/shared/bridge.png diff --git a/data/images/worldmap/generic/castle.png b/data/images/worldmap/shared/castle.png similarity index 100% rename from data/images/worldmap/generic/castle.png rename to data/images/worldmap/shared/castle.png diff --git a/data/images/worldmap/generic/gimp/bridge.xcf b/data/images/worldmap/shared/gimp/bridge.xcf similarity index 100% rename from data/images/worldmap/generic/gimp/bridge.xcf rename to data/images/worldmap/shared/gimp/bridge.xcf diff --git a/data/images/worldmap/generic/gimp/castle.xcf b/data/images/worldmap/shared/gimp/castle.xcf similarity index 100% rename from data/images/worldmap/generic/gimp/castle.xcf rename to data/images/worldmap/shared/gimp/castle.xcf diff --git a/data/images/worldmap/generic/gimp/paths.xcf b/data/images/worldmap/shared/gimp/paths.xcf similarity index 100% rename from data/images/worldmap/generic/gimp/paths.xcf rename to data/images/worldmap/shared/gimp/paths.xcf diff --git a/data/images/worldmap/generic/gimp/pier.xcf b/data/images/worldmap/shared/gimp/pier.xcf similarity index 100% rename from data/images/worldmap/generic/gimp/pier.xcf rename to data/images/worldmap/shared/gimp/pier.xcf diff --git a/data/images/worldmap/generic/gimp/shalow_water.xcf b/data/images/worldmap/shared/gimp/shalow_water.xcf similarity index 100% rename from data/images/worldmap/generic/gimp/shalow_water.xcf rename to data/images/worldmap/shared/gimp/shalow_water.xcf diff --git a/data/images/worldmap/generic/gimp/surf-test.xcf b/data/images/worldmap/shared/gimp/surf-test.xcf similarity index 100% rename from data/images/worldmap/generic/gimp/surf-test.xcf rename to data/images/worldmap/shared/gimp/surf-test.xcf diff --git a/data/images/worldmap/generic/gimp/surf.xcf b/data/images/worldmap/shared/gimp/surf.xcf similarity index 100% rename from data/images/worldmap/generic/gimp/surf.xcf rename to data/images/worldmap/shared/gimp/surf.xcf diff --git a/data/images/worldmap/generic/gimp/water.xcf b/data/images/worldmap/shared/gimp/water.xcf similarity index 100% rename from data/images/worldmap/generic/gimp/water.xcf rename to data/images/worldmap/shared/gimp/water.xcf diff --git a/data/images/worldmap/generic/invisible_paths-editor.png b/data/images/worldmap/shared/invisible_paths-editor.png similarity index 100% rename from data/images/worldmap/generic/invisible_paths-editor.png rename to data/images/worldmap/shared/invisible_paths-editor.png diff --git a/data/images/worldmap/generic/pier.png b/data/images/worldmap/shared/pier.png similarity index 100% rename from data/images/worldmap/generic/pier.png rename to data/images/worldmap/shared/pier.png diff --git a/data/images/worldmap/generic/roads.png b/data/images/worldmap/shared/roads.png similarity index 100% rename from data/images/worldmap/generic/roads.png rename to data/images/worldmap/shared/roads.png diff --git a/data/images/worldmap/generic/shallow_water.png b/data/images/worldmap/shared/shallow_water.png similarity index 100% rename from data/images/worldmap/generic/shallow_water.png rename to data/images/worldmap/shared/shallow_water.png diff --git a/data/images/worldmap/generic/surf-01.png b/data/images/worldmap/shared/surf-01.png similarity index 100% rename from data/images/worldmap/generic/surf-01.png rename to data/images/worldmap/shared/surf-01.png diff --git a/data/images/worldmap/generic/surf-02.png b/data/images/worldmap/shared/surf-02.png similarity index 100% rename from data/images/worldmap/generic/surf-02.png rename to data/images/worldmap/shared/surf-02.png diff --git a/data/images/worldmap/generic/surf-03.png b/data/images/worldmap/shared/surf-03.png similarity index 100% rename from data/images/worldmap/generic/surf-03.png rename to data/images/worldmap/shared/surf-03.png diff --git a/data/images/worldmap/generic/surf-04.png b/data/images/worldmap/shared/surf-04.png similarity index 100% rename from data/images/worldmap/generic/surf-04.png rename to data/images/worldmap/shared/surf-04.png diff --git a/data/images/worldmap/generic/water_01.png b/data/images/worldmap/shared/water_01.png similarity index 100% rename from data/images/worldmap/generic/water_01.png rename to data/images/worldmap/shared/water_01.png diff --git a/data/images/worldmap/generic/water_02.png b/data/images/worldmap/shared/water_02.png similarity index 100% rename from data/images/worldmap/generic/water_02.png rename to data/images/worldmap/shared/water_02.png diff --git a/data/images/worldmap/generic/water_03.png b/data/images/worldmap/shared/water_03.png similarity index 100% rename from data/images/worldmap/generic/water_03.png rename to data/images/worldmap/shared/water_03.png diff --git a/data/images/worldmap/generic/water_04.png b/data/images/worldmap/shared/water_04.png similarity index 100% rename from data/images/worldmap/generic/water_04.png rename to data/images/worldmap/shared/water_04.png diff --git a/data/images/worldmap/generic/water_05.png b/data/images/worldmap/shared/water_05.png similarity index 100% rename from data/images/worldmap/generic/water_05.png rename to data/images/worldmap/shared/water_05.png diff --git a/data/images/worldmap/generic/water_06.png b/data/images/worldmap/shared/water_06.png similarity index 100% rename from data/images/worldmap/generic/water_06.png rename to data/images/worldmap/shared/water_06.png diff --git a/data/images/worldmap/generic/water_07.png b/data/images/worldmap/shared/water_07.png similarity index 100% rename from data/images/worldmap/generic/water_07.png rename to data/images/worldmap/shared/water_07.png diff --git a/data/images/worldmap/generic/water_08.png b/data/images/worldmap/shared/water_08.png similarity index 100% rename from data/images/worldmap/generic/water_08.png rename to data/images/worldmap/shared/water_08.png diff --git a/data/images/worldmap/generic/water_09.png b/data/images/worldmap/shared/water_09.png similarity index 100% rename from data/images/worldmap/generic/water_09.png rename to data/images/worldmap/shared/water_09.png diff --git a/data/images/worldmap/generic/water_10.png b/data/images/worldmap/shared/water_10.png similarity index 100% rename from data/images/worldmap/generic/water_10.png rename to data/images/worldmap/shared/water_10.png diff --git a/data/images/worldmap/generic/water_11.png b/data/images/worldmap/shared/water_11.png similarity index 100% rename from data/images/worldmap/generic/water_11.png rename to data/images/worldmap/shared/water_11.png diff --git a/data/images/worldmap/generic/water_12.png b/data/images/worldmap/shared/water_12.png similarity index 100% rename from data/images/worldmap/generic/water_12.png rename to data/images/worldmap/shared/water_12.png diff --git a/data/images/worldmap/generic/water_13.png b/data/images/worldmap/shared/water_13.png similarity index 100% rename from data/images/worldmap/generic/water_13.png rename to data/images/worldmap/shared/water_13.png diff --git a/data/images/worldmap/generic/water_14.png b/data/images/worldmap/shared/water_14.png similarity index 100% rename from data/images/worldmap/generic/water_14.png rename to data/images/worldmap/shared/water_14.png diff --git a/data/images/worldmap/generic/water_15.png b/data/images/worldmap/shared/water_15.png similarity index 100% rename from data/images/worldmap/generic/water_15.png rename to data/images/worldmap/shared/water_15.png diff --git a/data/images/worldmap/generic/water_16.png b/data/images/worldmap/shared/water_16.png similarity index 100% rename from data/images/worldmap/generic/water_16.png rename to data/images/worldmap/shared/water_16.png diff --git a/data/levels/world1/worldmap.stwm b/data/levels/world1/worldmap.stwm index 22009ef7e..7e63f71b7 100644 --- a/data/levels/world1/worldmap.stwm +++ b/data/levels/world1/worldmap.stwm @@ -794,5 +794,5 @@ (y 5) ) ) - (tileset "images/icy_world.strf") + (tileset "images/ice_world.strf") ) -- 2.11.0