From: LMH Date: Wed, 3 Apr 2013 21:17:47 +0000 (-1000) Subject: Reworked naming scheme for 'icy' worldmap graphics to resolve issues with some add-ons X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=31f8084e3062e88bbf59f17608158c11c0825177;p=supertux.git Reworked naming scheme for 'icy' worldmap graphics to resolve issues with some add-ons --- diff --git a/data/images/ice_world.strf b/data/images/ice_world.strf new file mode 100644 index 000000000..faa74a950 --- /dev/null +++ b/data/images/ice_world.strf @@ -0,0 +1,348 @@ +(supertux-tiles + + +;; ice tiles- next id: 257 +(tilegroup + (name "Ice Cave & Crystal") + (tiles + 149 150 151 0 + 152 153 154 0 + 155 156 157 0 + 158 159 162 0 + 160 161 163 0 + 164 165 166 0 + 167 168 169 0 + 198 199 200 0 + 201 202 203 0 + + 234 235 236 0 + 237 238 239 0 + 240 241 242 0 + 243 244 245 0 + 246 247 248 0 + ) +) +(tiles + (width 3)(height 9) + (images "worldmap/ice/icecave.png") + (ids + 149 150 151 + 152 153 154 + 155 156 157 + 158 159 162 + 160 161 163 + 164 165 166 + 167 168 169 + 198 199 200 + 201 202 203 + ) +) +(tiles + (width 3)(height 5) + (images "worldmap/ice/crystal.png") + (ids + 234 235 236 + 237 238 239 + 240 241 242 + 243 244 245 + 246 247 248 + ) +) + +(tilegroup + (name "Embellishments") + (tiles + 136 137 138 0 + 139 140 141 0 + 142 143 144 0 + + 145 146 0 0 + 147 148 0 0 + + 170 181 184 187 + 171 182 185 188 + 172 183 186 189 + 173 175 177 179 + 174 176 178 180 + 190 193 196 192 + 191 194 197 195 + + 204 205 206 0 + 207 208 209 0 + 210 211 212 0 + 213 214 217 0 + 215 216 218 0 + + 219 220 221 0 + 222 223 224 0 + 225 226 227 0 + 228 229 230 0 + 231 232 233 0 + ) +) +(tiles + (width 3)(height 3) + (images "worldmap/ice/woodconvex.png") + (ids + 136 137 138 + 139 140 141 + 142 143 144 + ) +) +(tiles + (width 2)(height 2) + (images "worldmap/ice/woodconcave.png") + (ids + 145 146 + 147 148 + ) +) +(tiles + (width 4)(height 7) + (images "worldmap/ice/mountain.png") + (ids + 170 181 184 187 + 171 182 185 188 + 172 183 186 189 + 173 175 177 179 + 174 176 178 180 + 190 193 196 192 + 191 194 197 195 + ) +) +(tiles + (width 3)(height 5) + (images "worldmap/ice/thin_ice.png") + (ids + 204 205 206 + 207 208 209 + 210 211 212 + 213 214 217 + 215 216 218 + ) +) +(tiles + (width 3)(height 5) + (images "worldmap/ice/cave_cracks.png") + (ids + 219 220 221 + 222 223 224 + 225 226 227 + 228 229 230 + 231 232 233 + ) +) + +(tilegroup + (name "Ice") + (tiles + 101 102 103 127 + 104 105 106 128 + 107 108 109 129 + 110 111 114 115 + 112 113 123 116 + 117 118 119 0 + 120 121 122 135 + 124 125 126 134 + 132 131 130 133 + 249 250 253 254 + 251 252 255 256 + ) +) +(tiles + (width 5)(height 9) + (images "worldmap/ice/land.png") + (ids + 101 102 103 110 111 + 104 105 106 112 113 + 107 108 109 114 115 + 117 118 119 123 116 + 120 121 122 127 135 + 124 125 126 128 134 + 132 131 130 129 133 + 249 250 253 254 0 + 251 252 255 256 0 + ) + (datas + 0 0 0 0 0 + 0 0 0 0 0 + 0 0 0 0 0 + 0 0 0 0 18 + 0 0 0 0 0 + 0 0 0 0 0 + 0 0 0 0 0 + 0 0 0 0 0 + 0 0 0 0 0 + ) +) + + +;; shared tiles- ids available: 90-100 +(tilegroup + (name "Castle") + (tiles + 60 61 62 0 + 63 64 65 0 + 66 67 68 0 + ) +) +(tiles + (width 3)(height 3) + (images "worldmap/shared/castle.png") + (ids + 60 61 62 + 63 64 65 + 66 67 68 + ) +) + +(tilegroup + (name "Pathing") + (tiles + 10 11 12 13 + 14 15 16 17 + 18 19 20 21 + 22 23 24 25 + 26 27 28 29 + + 30 31 32 33 + 34 35 36 37 + 38 39 40 41 + 42 43 44 45 + + 46 47 48 49 + 84 85 86 50 + 87 58 59 51 + 88 52 54 56 + 89 53 55 57 + ) +) +(tiles + (width 4)(height 5) + (images "worldmap/shared/roads.png") + (ids + 10 11 12 13 + 14 15 16 17 + 18 19 20 21 + 22 23 24 25 + 26 27 28 29 + ) + (datas + 6 10 23 30 + 5 9 29 27 + 20 18 12 3 + 17 24 31 0 + 20 18 17 24 + ) +) +(tiles + (width 4)(height 4) + (images + (region "worldmap/shared/roads.png" 96 128 32 32) + ) + (editor-images "worldmap/shared/invisible_paths-editor.png") + (ids + 30 31 32 33 + 34 35 36 37 + 38 39 40 41 + 42 43 44 45 + ) + (datas + 6 10 23 30 + 5 9 29 27 + 20 18 12 3 + 17 24 31 0 + ) +) +(tiles + (width 3)(height 4) + (images "worldmap/shared/bridge.png") + (ids + 46 47 48 + 49 50 51 + 84 85 86 + 87 88 89 + ) + (datas + 12 12 12 + 3 3 3 + 12 12 12 + 3 3 3 + ) +) +(tiles + (width 2)(height 4) + (images "worldmap/shared/pier.png") + (ids + 52 54 + 53 55 + 56 57 + 58 59 + ) + (datas + 3 3 + 3 3 + 12 12 + 12 12 + ) +) + +(tilegroup + (name "Water") + (tiles + 1 2 3 4 + 5 6 7 8 + + 69 70 71 0 + 72 73 74 0 + 75 76 77 0 + 78 79 82 0 + 80 81 83 0 + ) +) +(tile + (id 1) + (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 + (width 4)(height 2)(fps 4) + (ids + 9 2 3 4 + 5 6 7 8 + ) + (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/shared/shallow_water.png") + (ids + 69 70 71 + 72 73 74 + 75 76 77 + 78 79 82 + 80 81 83 + ) +) +) diff --git a/data/images/icy_world.strf b/data/images/icy_world.strf deleted file mode 100644 index c6673096d..000000000 --- a/data/images/icy_world.strf +++ /dev/null @@ -1,348 +0,0 @@ -(supertux-tiles - - -;; icy tiles- next id: 257 -(tilegroup - (name "Ice Cave & Crystal") - (tiles - 149 150 151 0 - 152 153 154 0 - 155 156 157 0 - 158 159 162 0 - 160 161 163 0 - 164 165 166 0 - 167 168 169 0 - 198 199 200 0 - 201 202 203 0 - - 234 235 236 0 - 237 238 239 0 - 240 241 242 0 - 243 244 245 0 - 246 247 248 0 - ) -) -(tiles - (width 3)(height 9) - (images "worldmap/icy/icecave.png") - (ids - 149 150 151 - 152 153 154 - 155 156 157 - 158 159 162 - 160 161 163 - 164 165 166 - 167 168 169 - 198 199 200 - 201 202 203 - ) -) -(tiles - (width 3)(height 5) - (images "worldmap/icy/crystal.png") - (ids - 234 235 236 - 237 238 239 - 240 241 242 - 243 244 245 - 246 247 248 - ) -) - -(tilegroup - (name "Embellishments") - (tiles - 136 137 138 0 - 139 140 141 0 - 142 143 144 0 - - 145 146 0 0 - 147 148 0 0 - - 170 181 184 187 - 171 182 185 188 - 172 183 186 189 - 173 175 177 179 - 174 176 178 180 - 190 193 196 192 - 191 194 197 195 - - 204 205 206 0 - 207 208 209 0 - 210 211 212 0 - 213 214 217 0 - 215 216 218 0 - - 219 220 221 0 - 222 223 224 0 - 225 226 227 0 - 228 229 230 0 - 231 232 233 0 - ) -) -(tiles - (width 3)(height 3) - (images "worldmap/icy/woodconvex.png") - (ids - 136 137 138 - 139 140 141 - 142 143 144 - ) -) -(tiles - (width 2)(height 2) - (images "worldmap/icy/woodconcave.png") - (ids - 145 146 - 147 148 - ) -) -(tiles - (width 4)(height 7) - (images "worldmap/icy/mountain.png") - (ids - 170 181 184 187 - 171 182 185 188 - 172 183 186 189 - 173 175 177 179 - 174 176 178 180 - 190 193 196 192 - 191 194 197 195 - ) -) -(tiles - (width 3)(height 5) - (images "worldmap/icy/thin_ice.png") - (ids - 204 205 206 - 207 208 209 - 210 211 212 - 213 214 217 - 215 216 218 - ) -) -(tiles - (width 3)(height 5) - (images "worldmap/icy/cave_cracks.png") - (ids - 219 220 221 - 222 223 224 - 225 226 227 - 228 229 230 - 231 232 233 - ) -) - -(tilegroup - (name "Ice") - (tiles - 101 102 103 127 - 104 105 106 128 - 107 108 109 129 - 110 111 114 115 - 112 113 123 116 - 117 118 119 0 - 120 121 122 135 - 124 125 126 134 - 132 131 130 133 - 249 250 253 254 - 251 252 255 256 - ) -) -(tiles - (width 5)(height 9) - (images "worldmap/icy/land.png") - (ids - 101 102 103 110 111 - 104 105 106 112 113 - 107 108 109 114 115 - 117 118 119 123 116 - 120 121 122 127 135 - 124 125 126 128 134 - 132 131 130 129 133 - 249 250 253 254 0 - 251 252 255 256 0 - ) - (datas - 0 0 0 0 0 - 0 0 0 0 0 - 0 0 0 0 0 - 0 0 0 0 18 - 0 0 0 0 0 - 0 0 0 0 0 - 0 0 0 0 0 - 0 0 0 0 0 - 0 0 0 0 0 - ) -) - - -;; generic tiles- ids available: 90-100 -(tilegroup - (name "Castle") - (tiles - 60 61 62 0 - 63 64 65 0 - 66 67 68 0 - ) -) -(tiles - (width 3)(height 3) - (images "worldmap/generic/castle.png") - (ids - 60 61 62 - 63 64 65 - 66 67 68 - ) -) - -(tilegroup - (name "Pathing") - (tiles - 10 11 12 13 - 14 15 16 17 - 18 19 20 21 - 22 23 24 25 - 26 27 28 29 - - 30 31 32 33 - 34 35 36 37 - 38 39 40 41 - 42 43 44 45 - - 46 47 48 49 - 84 85 86 50 - 87 58 59 51 - 88 52 54 56 - 89 53 55 57 - ) -) -(tiles - (width 4)(height 5) - (images "worldmap/generic/roads.png") - (ids - 10 11 12 13 - 14 15 16 17 - 18 19 20 21 - 22 23 24 25 - 26 27 28 29 - ) - (datas - 6 10 23 30 - 5 9 29 27 - 20 18 12 3 - 17 24 31 0 - 20 18 17 24 - ) -) -(tiles - (width 4)(height 4) - (images - (region "worldmap/generic/roads.png" 96 128 32 32) - ) - (editor-images "worldmap/generic/invisible_paths-editor.png") - (ids - 30 31 32 33 - 34 35 36 37 - 38 39 40 41 - 42 43 44 45 - ) - (datas - 6 10 23 30 - 5 9 29 27 - 20 18 12 3 - 17 24 31 0 - ) -) -(tiles - (width 3)(height 4) - (images "worldmap/generic/bridge.png") - (ids - 46 47 48 - 49 50 51 - 84 85 86 - 87 88 89 - ) - (datas - 12 12 12 - 3 3 3 - 12 12 12 - 3 3 3 - ) -) -(tiles - (width 2)(height 4) - (images "worldmap/generic/pier.png") - (ids - 52 54 - 53 55 - 56 57 - 58 59 - ) - (datas - 3 3 - 3 3 - 12 12 - 12 12 - ) -) - -(tilegroup - (name "Water") - (tiles - 1 2 3 4 - 5 6 7 8 - - 69 70 71 0 - 72 73 74 0 - 75 76 77 0 - 78 79 82 0 - 80 81 83 0 - ) -) -(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" - ) -) -(tiles - (width 4)(height 2)(fps 4) - (ids - 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" - ) -) -(tiles - (width 3)(height 5) - (images "worldmap/generic/shallow_water.png") - (ids - 69 70 71 - 72 73 74 - 75 76 77 - 78 79 82 - 80 81 83 - ) -) -) diff --git a/data/images/worldmap/generic/bridge.png b/data/images/worldmap/generic/bridge.png deleted file mode 100644 index e6a219db4..000000000 Binary files a/data/images/worldmap/generic/bridge.png and /dev/null differ diff --git a/data/images/worldmap/generic/castle.png b/data/images/worldmap/generic/castle.png deleted file mode 100644 index 5b9f83f7f..000000000 Binary files a/data/images/worldmap/generic/castle.png and /dev/null differ diff --git a/data/images/worldmap/generic/gimp/bridge.xcf b/data/images/worldmap/generic/gimp/bridge.xcf deleted file mode 100644 index 2797fb51f..000000000 Binary files a/data/images/worldmap/generic/gimp/bridge.xcf and /dev/null differ diff --git a/data/images/worldmap/generic/gimp/castle.xcf b/data/images/worldmap/generic/gimp/castle.xcf deleted file mode 100644 index beb79f47e..000000000 Binary files a/data/images/worldmap/generic/gimp/castle.xcf and /dev/null differ diff --git a/data/images/worldmap/generic/gimp/paths.xcf b/data/images/worldmap/generic/gimp/paths.xcf deleted file mode 100644 index f3bfaae25..000000000 Binary files a/data/images/worldmap/generic/gimp/paths.xcf and /dev/null differ diff --git a/data/images/worldmap/generic/gimp/pier.xcf b/data/images/worldmap/generic/gimp/pier.xcf deleted file mode 100644 index c1c749c19..000000000 Binary files a/data/images/worldmap/generic/gimp/pier.xcf and /dev/null differ diff --git a/data/images/worldmap/generic/gimp/shalow_water.xcf b/data/images/worldmap/generic/gimp/shalow_water.xcf deleted file mode 100644 index e2dfe8a73..000000000 Binary files a/data/images/worldmap/generic/gimp/shalow_water.xcf and /dev/null differ diff --git a/data/images/worldmap/generic/gimp/surf-test.xcf b/data/images/worldmap/generic/gimp/surf-test.xcf deleted file mode 100644 index 4d00dc7f9..000000000 Binary files a/data/images/worldmap/generic/gimp/surf-test.xcf and /dev/null differ diff --git a/data/images/worldmap/generic/gimp/surf.xcf b/data/images/worldmap/generic/gimp/surf.xcf deleted file mode 100644 index 9be6e48ce..000000000 Binary files a/data/images/worldmap/generic/gimp/surf.xcf and /dev/null differ diff --git a/data/images/worldmap/generic/gimp/water.xcf b/data/images/worldmap/generic/gimp/water.xcf deleted file mode 100644 index 50027f05c..000000000 Binary files a/data/images/worldmap/generic/gimp/water.xcf and /dev/null differ diff --git a/data/images/worldmap/generic/invisible_paths-editor.png b/data/images/worldmap/generic/invisible_paths-editor.png deleted file mode 100644 index 68ae66d47..000000000 Binary files a/data/images/worldmap/generic/invisible_paths-editor.png and /dev/null differ diff --git a/data/images/worldmap/generic/pier.png b/data/images/worldmap/generic/pier.png deleted file mode 100644 index 6a2a92710..000000000 Binary files a/data/images/worldmap/generic/pier.png and /dev/null differ diff --git a/data/images/worldmap/generic/roads.png b/data/images/worldmap/generic/roads.png deleted file mode 100644 index 1e52983b8..000000000 Binary files a/data/images/worldmap/generic/roads.png and /dev/null differ diff --git a/data/images/worldmap/generic/shallow_water.png b/data/images/worldmap/generic/shallow_water.png deleted file mode 100644 index 776ac3c1b..000000000 Binary files a/data/images/worldmap/generic/shallow_water.png and /dev/null differ diff --git a/data/images/worldmap/generic/surf-01.png b/data/images/worldmap/generic/surf-01.png deleted file mode 100644 index e50a1e813..000000000 Binary files a/data/images/worldmap/generic/surf-01.png and /dev/null differ diff --git a/data/images/worldmap/generic/surf-02.png b/data/images/worldmap/generic/surf-02.png deleted file mode 100644 index e18cefeb2..000000000 Binary files a/data/images/worldmap/generic/surf-02.png and /dev/null differ diff --git a/data/images/worldmap/generic/surf-03.png b/data/images/worldmap/generic/surf-03.png deleted file mode 100644 index 47de3d790..000000000 Binary files a/data/images/worldmap/generic/surf-03.png and /dev/null differ diff --git a/data/images/worldmap/generic/surf-04.png b/data/images/worldmap/generic/surf-04.png deleted file mode 100644 index c564952de..000000000 Binary files a/data/images/worldmap/generic/surf-04.png and /dev/null differ diff --git a/data/images/worldmap/generic/water_01.png b/data/images/worldmap/generic/water_01.png deleted file mode 100644 index b9fe04563..000000000 Binary files a/data/images/worldmap/generic/water_01.png and /dev/null differ diff --git a/data/images/worldmap/generic/water_02.png b/data/images/worldmap/generic/water_02.png deleted file mode 100644 index c5665e179..000000000 Binary files a/data/images/worldmap/generic/water_02.png and /dev/null differ diff --git a/data/images/worldmap/generic/water_03.png b/data/images/worldmap/generic/water_03.png deleted file mode 100644 index d99818571..000000000 Binary files a/data/images/worldmap/generic/water_03.png and /dev/null differ diff --git a/data/images/worldmap/generic/water_04.png b/data/images/worldmap/generic/water_04.png deleted file mode 100644 index aa30aa277..000000000 Binary files a/data/images/worldmap/generic/water_04.png and /dev/null differ diff --git a/data/images/worldmap/generic/water_05.png b/data/images/worldmap/generic/water_05.png deleted file mode 100644 index 57bb5fe50..000000000 Binary files a/data/images/worldmap/generic/water_05.png and /dev/null differ diff --git a/data/images/worldmap/generic/water_06.png b/data/images/worldmap/generic/water_06.png deleted file mode 100644 index d0fc6201e..000000000 Binary files a/data/images/worldmap/generic/water_06.png and /dev/null differ diff --git a/data/images/worldmap/generic/water_07.png b/data/images/worldmap/generic/water_07.png deleted file mode 100644 index d8b853431..000000000 Binary files a/data/images/worldmap/generic/water_07.png and /dev/null differ diff --git a/data/images/worldmap/generic/water_08.png b/data/images/worldmap/generic/water_08.png deleted file mode 100644 index 11cae5ce3..000000000 Binary files a/data/images/worldmap/generic/water_08.png and /dev/null differ diff --git a/data/images/worldmap/generic/water_09.png b/data/images/worldmap/generic/water_09.png deleted file mode 100644 index 02bc59acf..000000000 Binary files a/data/images/worldmap/generic/water_09.png and /dev/null differ diff --git a/data/images/worldmap/generic/water_10.png b/data/images/worldmap/generic/water_10.png deleted file mode 100644 index 5980262e7..000000000 Binary files a/data/images/worldmap/generic/water_10.png and /dev/null differ diff --git a/data/images/worldmap/generic/water_11.png b/data/images/worldmap/generic/water_11.png deleted file mode 100644 index e4f132247..000000000 Binary files a/data/images/worldmap/generic/water_11.png and /dev/null differ diff --git a/data/images/worldmap/generic/water_12.png b/data/images/worldmap/generic/water_12.png deleted file mode 100644 index 0362b74cf..000000000 Binary files a/data/images/worldmap/generic/water_12.png and /dev/null differ diff --git a/data/images/worldmap/generic/water_13.png b/data/images/worldmap/generic/water_13.png deleted file mode 100644 index 2ef91eefc..000000000 Binary files a/data/images/worldmap/generic/water_13.png and /dev/null differ diff --git a/data/images/worldmap/generic/water_14.png b/data/images/worldmap/generic/water_14.png deleted file mode 100644 index 1b1eb7c14..000000000 Binary files a/data/images/worldmap/generic/water_14.png and /dev/null differ diff --git a/data/images/worldmap/generic/water_15.png b/data/images/worldmap/generic/water_15.png deleted file mode 100644 index f3ae94b07..000000000 Binary files a/data/images/worldmap/generic/water_15.png and /dev/null differ diff --git a/data/images/worldmap/generic/water_16.png b/data/images/worldmap/generic/water_16.png deleted file mode 100644 index 8e22f9811..000000000 Binary files a/data/images/worldmap/generic/water_16.png and /dev/null differ diff --git a/data/images/worldmap/ice/cave_cracks.png b/data/images/worldmap/ice/cave_cracks.png new file mode 100644 index 000000000..28d2cc9ea Binary files /dev/null and b/data/images/worldmap/ice/cave_cracks.png differ diff --git a/data/images/worldmap/ice/crystal.png b/data/images/worldmap/ice/crystal.png new file mode 100644 index 000000000..8509d4226 Binary files /dev/null and b/data/images/worldmap/ice/crystal.png differ diff --git a/data/images/worldmap/ice/gimp/cracks.xcf b/data/images/worldmap/ice/gimp/cracks.xcf new file mode 100644 index 000000000..dc6a42c17 Binary files /dev/null and b/data/images/worldmap/ice/gimp/cracks.xcf differ diff --git a/data/images/worldmap/ice/gimp/crystals.xcf b/data/images/worldmap/ice/gimp/crystals.xcf new file mode 100644 index 000000000..bb12659d5 Binary files /dev/null and b/data/images/worldmap/ice/gimp/crystals.xcf differ diff --git a/data/images/worldmap/ice/gimp/icecave.xcf b/data/images/worldmap/ice/gimp/icecave.xcf new file mode 100644 index 000000000..5890ca068 Binary files /dev/null and b/data/images/worldmap/ice/gimp/icecave.xcf differ diff --git a/data/images/worldmap/ice/gimp/land.xcf b/data/images/worldmap/ice/gimp/land.xcf new file mode 100644 index 000000000..e07f9b19a Binary files /dev/null and b/data/images/worldmap/ice/gimp/land.xcf differ diff --git a/data/images/worldmap/ice/gimp/mountain.xcf b/data/images/worldmap/ice/gimp/mountain.xcf new file mode 100644 index 000000000..cba848421 Binary files /dev/null and b/data/images/worldmap/ice/gimp/mountain.xcf differ diff --git a/data/images/worldmap/ice/gimp/thin_ice.xcf b/data/images/worldmap/ice/gimp/thin_ice.xcf new file mode 100644 index 000000000..5300d1221 Binary files /dev/null and b/data/images/worldmap/ice/gimp/thin_ice.xcf differ diff --git a/data/images/worldmap/ice/icecave.png b/data/images/worldmap/ice/icecave.png new file mode 100644 index 000000000..f86dce651 Binary files /dev/null and b/data/images/worldmap/ice/icecave.png differ diff --git a/data/images/worldmap/ice/land.png b/data/images/worldmap/ice/land.png new file mode 100644 index 000000000..bfef2683d Binary files /dev/null and b/data/images/worldmap/ice/land.png differ diff --git a/data/images/worldmap/ice/mountain.png b/data/images/worldmap/ice/mountain.png new file mode 100644 index 000000000..148df753e Binary files /dev/null and b/data/images/worldmap/ice/mountain.png differ diff --git a/data/images/worldmap/ice/thin_ice.png b/data/images/worldmap/ice/thin_ice.png new file mode 100644 index 000000000..ac0adda8f Binary files /dev/null and b/data/images/worldmap/ice/thin_ice.png differ diff --git a/data/images/worldmap/ice/woodconcave.png b/data/images/worldmap/ice/woodconcave.png new file mode 100644 index 000000000..dc0007a17 Binary files /dev/null and b/data/images/worldmap/ice/woodconcave.png differ diff --git a/data/images/worldmap/ice/woodconvex.png b/data/images/worldmap/ice/woodconvex.png new file mode 100644 index 000000000..6088c7a6c Binary files /dev/null and b/data/images/worldmap/ice/woodconvex.png differ diff --git a/data/images/worldmap/icy/cave_cracks.png b/data/images/worldmap/icy/cave_cracks.png deleted file mode 100644 index 28d2cc9ea..000000000 Binary files a/data/images/worldmap/icy/cave_cracks.png and /dev/null differ diff --git a/data/images/worldmap/icy/crystal.png b/data/images/worldmap/icy/crystal.png deleted file mode 100644 index 8509d4226..000000000 Binary files a/data/images/worldmap/icy/crystal.png and /dev/null differ diff --git a/data/images/worldmap/icy/gimp/cracks.xcf b/data/images/worldmap/icy/gimp/cracks.xcf deleted file mode 100644 index dc6a42c17..000000000 Binary files a/data/images/worldmap/icy/gimp/cracks.xcf and /dev/null differ diff --git a/data/images/worldmap/icy/gimp/crystals.xcf b/data/images/worldmap/icy/gimp/crystals.xcf deleted file mode 100644 index bb12659d5..000000000 Binary files a/data/images/worldmap/icy/gimp/crystals.xcf and /dev/null differ diff --git a/data/images/worldmap/icy/gimp/icecave.xcf b/data/images/worldmap/icy/gimp/icecave.xcf deleted file mode 100644 index 5890ca068..000000000 Binary files a/data/images/worldmap/icy/gimp/icecave.xcf and /dev/null differ diff --git a/data/images/worldmap/icy/gimp/land.xcf b/data/images/worldmap/icy/gimp/land.xcf deleted file mode 100644 index e07f9b19a..000000000 Binary files a/data/images/worldmap/icy/gimp/land.xcf and /dev/null differ diff --git a/data/images/worldmap/icy/gimp/mountain.xcf b/data/images/worldmap/icy/gimp/mountain.xcf deleted file mode 100644 index cba848421..000000000 Binary files a/data/images/worldmap/icy/gimp/mountain.xcf and /dev/null differ diff --git a/data/images/worldmap/icy/gimp/thin_ice.xcf b/data/images/worldmap/icy/gimp/thin_ice.xcf deleted file mode 100644 index 5300d1221..000000000 Binary files a/data/images/worldmap/icy/gimp/thin_ice.xcf and /dev/null differ diff --git a/data/images/worldmap/icy/icecave.png b/data/images/worldmap/icy/icecave.png deleted file mode 100644 index f86dce651..000000000 Binary files a/data/images/worldmap/icy/icecave.png and /dev/null differ diff --git a/data/images/worldmap/icy/land.png b/data/images/worldmap/icy/land.png deleted file mode 100644 index bfef2683d..000000000 Binary files a/data/images/worldmap/icy/land.png and /dev/null differ diff --git a/data/images/worldmap/icy/mountain.png b/data/images/worldmap/icy/mountain.png deleted file mode 100644 index 148df753e..000000000 Binary files a/data/images/worldmap/icy/mountain.png and /dev/null differ diff --git a/data/images/worldmap/icy/thin_ice.png b/data/images/worldmap/icy/thin_ice.png deleted file mode 100644 index ac0adda8f..000000000 Binary files a/data/images/worldmap/icy/thin_ice.png and /dev/null differ diff --git a/data/images/worldmap/icy/woodconcave.png b/data/images/worldmap/icy/woodconcave.png deleted file mode 100644 index dc0007a17..000000000 Binary files a/data/images/worldmap/icy/woodconcave.png and /dev/null differ diff --git a/data/images/worldmap/icy/woodconvex.png b/data/images/worldmap/icy/woodconvex.png deleted file mode 100644 index 6088c7a6c..000000000 Binary files a/data/images/worldmap/icy/woodconvex.png and /dev/null differ diff --git a/data/images/worldmap/shared/bridge.png b/data/images/worldmap/shared/bridge.png new file mode 100644 index 000000000..e6a219db4 Binary files /dev/null and b/data/images/worldmap/shared/bridge.png differ diff --git a/data/images/worldmap/shared/castle.png b/data/images/worldmap/shared/castle.png new file mode 100644 index 000000000..5b9f83f7f Binary files /dev/null and b/data/images/worldmap/shared/castle.png differ diff --git a/data/images/worldmap/shared/gimp/bridge.xcf b/data/images/worldmap/shared/gimp/bridge.xcf new file mode 100644 index 000000000..2797fb51f Binary files /dev/null and b/data/images/worldmap/shared/gimp/bridge.xcf differ diff --git a/data/images/worldmap/shared/gimp/castle.xcf b/data/images/worldmap/shared/gimp/castle.xcf new file mode 100644 index 000000000..beb79f47e Binary files /dev/null and b/data/images/worldmap/shared/gimp/castle.xcf differ diff --git a/data/images/worldmap/shared/gimp/paths.xcf b/data/images/worldmap/shared/gimp/paths.xcf new file mode 100644 index 000000000..f3bfaae25 Binary files /dev/null and b/data/images/worldmap/shared/gimp/paths.xcf differ diff --git a/data/images/worldmap/shared/gimp/pier.xcf b/data/images/worldmap/shared/gimp/pier.xcf new file mode 100644 index 000000000..c1c749c19 Binary files /dev/null and b/data/images/worldmap/shared/gimp/pier.xcf differ diff --git a/data/images/worldmap/shared/gimp/shalow_water.xcf b/data/images/worldmap/shared/gimp/shalow_water.xcf new file mode 100644 index 000000000..e2dfe8a73 Binary files /dev/null and b/data/images/worldmap/shared/gimp/shalow_water.xcf differ diff --git a/data/images/worldmap/shared/gimp/surf-test.xcf b/data/images/worldmap/shared/gimp/surf-test.xcf new file mode 100644 index 000000000..4d00dc7f9 Binary files /dev/null and b/data/images/worldmap/shared/gimp/surf-test.xcf differ diff --git a/data/images/worldmap/shared/gimp/surf.xcf b/data/images/worldmap/shared/gimp/surf.xcf new file mode 100644 index 000000000..9be6e48ce Binary files /dev/null and b/data/images/worldmap/shared/gimp/surf.xcf differ diff --git a/data/images/worldmap/shared/gimp/water.xcf b/data/images/worldmap/shared/gimp/water.xcf new file mode 100644 index 000000000..50027f05c Binary files /dev/null and b/data/images/worldmap/shared/gimp/water.xcf differ diff --git a/data/images/worldmap/shared/invisible_paths-editor.png b/data/images/worldmap/shared/invisible_paths-editor.png new file mode 100644 index 000000000..68ae66d47 Binary files /dev/null and b/data/images/worldmap/shared/invisible_paths-editor.png differ diff --git a/data/images/worldmap/shared/pier.png b/data/images/worldmap/shared/pier.png new file mode 100644 index 000000000..6a2a92710 Binary files /dev/null and b/data/images/worldmap/shared/pier.png differ diff --git a/data/images/worldmap/shared/roads.png b/data/images/worldmap/shared/roads.png new file mode 100644 index 000000000..1e52983b8 Binary files /dev/null and b/data/images/worldmap/shared/roads.png differ diff --git a/data/images/worldmap/shared/shallow_water.png b/data/images/worldmap/shared/shallow_water.png new file mode 100644 index 000000000..776ac3c1b Binary files /dev/null and b/data/images/worldmap/shared/shallow_water.png differ diff --git a/data/images/worldmap/shared/surf-01.png b/data/images/worldmap/shared/surf-01.png new file mode 100644 index 000000000..e50a1e813 Binary files /dev/null and b/data/images/worldmap/shared/surf-01.png differ diff --git a/data/images/worldmap/shared/surf-02.png b/data/images/worldmap/shared/surf-02.png new file mode 100644 index 000000000..e18cefeb2 Binary files /dev/null and b/data/images/worldmap/shared/surf-02.png differ diff --git a/data/images/worldmap/shared/surf-03.png b/data/images/worldmap/shared/surf-03.png new file mode 100644 index 000000000..47de3d790 Binary files /dev/null and b/data/images/worldmap/shared/surf-03.png differ diff --git a/data/images/worldmap/shared/surf-04.png b/data/images/worldmap/shared/surf-04.png new file mode 100644 index 000000000..c564952de Binary files /dev/null and b/data/images/worldmap/shared/surf-04.png differ diff --git a/data/images/worldmap/shared/water_01.png b/data/images/worldmap/shared/water_01.png new file mode 100644 index 000000000..b9fe04563 Binary files /dev/null and b/data/images/worldmap/shared/water_01.png differ diff --git a/data/images/worldmap/shared/water_02.png b/data/images/worldmap/shared/water_02.png new file mode 100644 index 000000000..c5665e179 Binary files /dev/null and b/data/images/worldmap/shared/water_02.png differ diff --git a/data/images/worldmap/shared/water_03.png b/data/images/worldmap/shared/water_03.png new file mode 100644 index 000000000..d99818571 Binary files /dev/null and b/data/images/worldmap/shared/water_03.png differ diff --git a/data/images/worldmap/shared/water_04.png b/data/images/worldmap/shared/water_04.png new file mode 100644 index 000000000..aa30aa277 Binary files /dev/null and b/data/images/worldmap/shared/water_04.png differ diff --git a/data/images/worldmap/shared/water_05.png b/data/images/worldmap/shared/water_05.png new file mode 100644 index 000000000..57bb5fe50 Binary files /dev/null and b/data/images/worldmap/shared/water_05.png differ diff --git a/data/images/worldmap/shared/water_06.png b/data/images/worldmap/shared/water_06.png new file mode 100644 index 000000000..d0fc6201e Binary files /dev/null and b/data/images/worldmap/shared/water_06.png differ diff --git a/data/images/worldmap/shared/water_07.png b/data/images/worldmap/shared/water_07.png new file mode 100644 index 000000000..d8b853431 Binary files /dev/null and b/data/images/worldmap/shared/water_07.png differ diff --git a/data/images/worldmap/shared/water_08.png b/data/images/worldmap/shared/water_08.png new file mode 100644 index 000000000..11cae5ce3 Binary files /dev/null and b/data/images/worldmap/shared/water_08.png differ diff --git a/data/images/worldmap/shared/water_09.png b/data/images/worldmap/shared/water_09.png new file mode 100644 index 000000000..02bc59acf Binary files /dev/null and b/data/images/worldmap/shared/water_09.png differ diff --git a/data/images/worldmap/shared/water_10.png b/data/images/worldmap/shared/water_10.png new file mode 100644 index 000000000..5980262e7 Binary files /dev/null and b/data/images/worldmap/shared/water_10.png differ diff --git a/data/images/worldmap/shared/water_11.png b/data/images/worldmap/shared/water_11.png new file mode 100644 index 000000000..e4f132247 Binary files /dev/null and b/data/images/worldmap/shared/water_11.png differ diff --git a/data/images/worldmap/shared/water_12.png b/data/images/worldmap/shared/water_12.png new file mode 100644 index 000000000..0362b74cf Binary files /dev/null and b/data/images/worldmap/shared/water_12.png differ diff --git a/data/images/worldmap/shared/water_13.png b/data/images/worldmap/shared/water_13.png new file mode 100644 index 000000000..2ef91eefc Binary files /dev/null and b/data/images/worldmap/shared/water_13.png differ diff --git a/data/images/worldmap/shared/water_14.png b/data/images/worldmap/shared/water_14.png new file mode 100644 index 000000000..1b1eb7c14 Binary files /dev/null and b/data/images/worldmap/shared/water_14.png differ diff --git a/data/images/worldmap/shared/water_15.png b/data/images/worldmap/shared/water_15.png new file mode 100644 index 000000000..f3ae94b07 Binary files /dev/null and b/data/images/worldmap/shared/water_15.png differ diff --git a/data/images/worldmap/shared/water_16.png b/data/images/worldmap/shared/water_16.png new file mode 100644 index 000000000..8e22f9811 Binary files /dev/null and b/data/images/worldmap/shared/water_16.png differ 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") )