diff --git a/data/images/objects/train/train.png b/data/images/engine/hud/train.png similarity index 100% rename from data/images/objects/train/train.png rename to data/images/engine/hud/train.png diff --git a/data/images/objects/platforms/vertical-wood-long.png b/data/images/objects/platforms/vertical-wood-long.png new file mode 100644 index 00000000000..fad0787aa35 Binary files /dev/null and b/data/images/objects/platforms/vertical-wood-long.png differ diff --git a/data/images/objects/platforms/vertical-wood-long.sprite b/data/images/objects/platforms/vertical-wood-long.sprite new file mode 100644 index 00000000000..03f3e384186 --- /dev/null +++ b/data/images/objects/platforms/vertical-wood-long.sprite @@ -0,0 +1,6 @@ +(supertux-sprite + (action + (name "default") + (images "vertical-wood-long.png") + ) +) diff --git a/data/images/objects/platforms/wood-fourtiles.png b/data/images/objects/platforms/wood-fourtiles.png new file mode 100644 index 00000000000..a8b193a3427 Binary files /dev/null and b/data/images/objects/platforms/wood-fourtiles.png differ diff --git a/data/images/objects/platforms/wood-fourtiles.sprite b/data/images/objects/platforms/wood-fourtiles.sprite new file mode 100644 index 00000000000..5bff1a5a0f9 --- /dev/null +++ b/data/images/objects/platforms/wood-fourtiles.sprite @@ -0,0 +1,6 @@ +(supertux-sprite + (action + (name "default") + (images "wood-fourtiles.png") + ) +) diff --git a/data/images/objects/platforms/wood-threetiles.png b/data/images/objects/platforms/wood-threetiles.png new file mode 100644 index 00000000000..f59f5c6b73a Binary files /dev/null and b/data/images/objects/platforms/wood-threetiles.png differ diff --git a/data/images/objects/platforms/wood-threetiles.sprite b/data/images/objects/platforms/wood-threetiles.sprite new file mode 100644 index 00000000000..9a5de278e48 --- /dev/null +++ b/data/images/objects/platforms/wood-threetiles.sprite @@ -0,0 +1,6 @@ +(supertux-sprite + (action + (name "default") + (images "wood-threetiles.png") + ) +) diff --git a/data/images/tiles.strf b/data/images/tiles.strf index 29a7ca07c22..a3e8d1a7e1a 100644 --- a/data/images/tiles.strf +++ b/data/images/tiles.strf @@ -21,7 +21,7 @@ ;; next-id: 7631 ;; free/skipped ids (please use before any other): 101 - ;; 2080-2084 are empty tiles, 4619-4660, 4719-4722, 5037-5092, 5205, 5268-5283, 5433-5527, 6962-6977, 7002 7005 7007 7008 7173 + ;; 2080-2084 are empty tiles, 4654-4660, 4719-4722, 5037-5092, 5205, 5268-5283, 5433-5527, 6962-6977, 7002 7005 7007 7008 7173 ;; No group ids are currently skipped! Delete this line if any are and replace it with said ids... (tilegroup @@ -1348,7 +1348,7 @@ 4430 4431 4432 0 4415 4416 4433 4434 4424 4425 4442 4443 - 0 0 5358 5359 + 0 4619 5358 5359 4439 4440 4441 0 4392 4393 4394 0 4417 4418 4419 4420 @@ -1361,7 +1361,7 @@ 4386 4387 4388 0 4371 4372 4389 4390 4380 4381 4398 4399 - 0 0 4391 4407 + 0 4620 4391 4407 4395 4396 4397 0 4404 4405 4406 0 4373 4374 4375 4376 @@ -1628,15 +1628,25 @@ (tilegroup (name (_ "Industrial")) (tiles - 3167 3168 3169 3170 - 3173 3174 3175 3189 - 3179 3180 3181 3190 + 4627 4628 4629 3170 + 4631 4632 4633 3189 + 4635 4636 4637 3190 3185 3186 3187 3188 3191 3192 3193 3194 3197 3198 3199 3200 3203 3204 3205 3206 3171 3172 3183 3184 3177 3178 3176 3182 + 4621 4622 4625 4626 + 4623 4624 0 0 + 4630 4634 4638 0 + 3167 3168 3169 0 + 3173 3174 3175 0 + 3179 3180 3181 0 + 4639 4640 4641 4642 + 4643 4644 4645 4646 + 4647 4648 4649 4650 + 4651 4652 4653 4654 ) ) @@ -3573,9 +3583,9 @@ 1411 ) (attributes - 1 - 1 - 1 + 0 + 0 + 0 ) (images "tiles/castle/pedestal.png") ) @@ -5496,9 +5506,9 @@ 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 - 3191 3192 3193 3194 0 0 - 3197 3198 3199 3200 0 0 - 3203 3204 3205 3206 0 0 + 3191 3192 3193 3194 4621 4622 + 3197 3198 3199 3200 4623 4624 + 3203 3204 3205 3206 4625 4626 ) (attributes 0 0 0 1 17 17 @@ -5507,7 +5517,7 @@ 1 1 17 17 1 1 1 1 17 17 0 0 1024 1024 1024 1024 0 0 - 1024 1024 1024 1024 0 0 + 1024 1024 1024 1024 0 1 ) (datas 0 0 0 0 2 0 @@ -5521,6 +5531,39 @@ (images "tiles/blocks/industrial.png") ) + + (tiles + (width 4)(height 7) + (ids + 4627 4628 4629 4630 + 4631 4632 4633 4634 + 4635 4636 4637 4638 + 4639 4640 4641 4642 + 4643 4644 4645 4646 + 4647 4648 4649 4650 + 4651 4652 4653 4654 + ) + (attributes + 1 1 1 3 + 1 1 1 3 + 1 1 1 3 + 17 17 17 17 + 17 17 17 17 + 17 17 17 17 + 17 17 17 17 + ) + (datas + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + 18 34 32 16 + 33 17 19 35 + 49 67 66 48 + 65 51 50 64 + ) + (images "tiles/blocks/industrial2.png") + ) + (tiles (width 4)(height 2) (ids @@ -6681,7 +6724,7 @@ (ids 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 - 4386 4387 4388 4389 4390 0 0 0 0 + 4386 4387 4388 4389 4390 4620 0 0 0 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4391 4407 4408 4409 4410 4411 ) @@ -6700,7 +6743,7 @@ (ids 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 - 4430 4431 4432 4433 4434 0 0 0 0 + 4430 4431 4432 4433 4434 4619 0 0 0 4439 4440 4441 4442 4443 4444 4445 4446 4447 4392 4393 4394 5358 5359 5360 5361 5362 5363 ) diff --git a/data/images/tiles/blocks/bigblock.png b/data/images/tiles/blocks/bigblock.png index 710396852ba..5710894bab6 100644 Binary files a/data/images/tiles/blocks/bigblock.png and b/data/images/tiles/blocks/bigblock.png differ diff --git a/data/images/tiles/blocks/block11.png b/data/images/tiles/blocks/block11.png index 963c13ff0e0..9bba1fd75a8 100644 Binary files a/data/images/tiles/blocks/block11.png and b/data/images/tiles/blocks/block11.png differ diff --git a/data/images/tiles/blocks/block5.png b/data/images/tiles/blocks/block5.png index 6a1bb168865..567d7849cb3 100644 Binary files a/data/images/tiles/blocks/block5.png and b/data/images/tiles/blocks/block5.png differ diff --git a/data/images/tiles/blocks/bridge_brown.png b/data/images/tiles/blocks/bridge_brown.png index c212350d669..bb54cdf7e17 100644 Binary files a/data/images/tiles/blocks/bridge_brown.png and b/data/images/tiles/blocks/bridge_brown.png differ diff --git a/data/images/tiles/blocks/bridge_ice.png b/data/images/tiles/blocks/bridge_ice.png index f1be71bcb10..1acf5cd169c 100644 Binary files a/data/images/tiles/blocks/bridge_ice.png and b/data/images/tiles/blocks/bridge_ice.png differ diff --git a/data/images/tiles/blocks/industrial.png b/data/images/tiles/blocks/industrial.png index 1b1ab3c41b0..3379b8b8f1f 100644 Binary files a/data/images/tiles/blocks/industrial.png and b/data/images/tiles/blocks/industrial.png differ diff --git a/data/images/tiles/blocks/industrial2.png b/data/images/tiles/blocks/industrial2.png new file mode 100644 index 00000000000..a23741ce1ac Binary files /dev/null and b/data/images/tiles/blocks/industrial2.png differ diff --git a/data/images/tiles/castle/castle_forest.png b/data/images/tiles/castle/castle_forest.png index e81256cca79..38b64d88f2d 100644 Binary files a/data/images/tiles/castle/castle_forest.png and b/data/images/tiles/castle/castle_forest.png differ diff --git a/data/images/tiles/castle/castle_snow.png b/data/images/tiles/castle/castle_snow.png index b0c85aa2c8f..be1c0a2d30b 100644 Binary files a/data/images/tiles/castle/castle_snow.png and b/data/images/tiles/castle/castle_snow.png differ diff --git a/data/images/tiles/castle/nolok-statue-forest.png b/data/images/tiles/castle/nolok-statue-forest.png index de7a1c6b634..0c13444d446 100644 Binary files a/data/images/tiles/castle/nolok-statue-forest.png and b/data/images/tiles/castle/nolok-statue-forest.png differ diff --git a/data/images/tiles/castle/nolok-statue-ghost.png b/data/images/tiles/castle/nolok-statue-ghost.png index 9dfddebfdb7..a45a5785887 100644 Binary files a/data/images/tiles/castle/nolok-statue-ghost.png and b/data/images/tiles/castle/nolok-statue-ghost.png differ diff --git a/data/images/tiles/castle/nolok-statue-snow.png b/data/images/tiles/castle/nolok-statue-snow.png index 98d2b348228..d657cec6bb7 100644 Binary files a/data/images/tiles/castle/nolok-statue-snow.png and b/data/images/tiles/castle/nolok-statue-snow.png differ diff --git a/data/images/tiles/castle/nolok-statue.png b/data/images/tiles/castle/nolok-statue.png index b21d245af82..bbb52e47713 100644 Binary files a/data/images/tiles/castle/nolok-statue.png and b/data/images/tiles/castle/nolok-statue.png differ diff --git a/data/images/tiles/castle/pedestal.png b/data/images/tiles/castle/pedestal.png index fc0e5396524..f22ea6695f5 100644 Binary files a/data/images/tiles/castle/pedestal.png and b/data/images/tiles/castle/pedestal.png differ diff --git a/data/images/tiles/doodads/plant1.png b/data/images/tiles/doodads/deprecated/plant1.png similarity index 100% rename from data/images/tiles/doodads/plant1.png rename to data/images/tiles/doodads/deprecated/plant1.png diff --git a/data/images/tiles/doodads/tux-statue.png b/data/images/tiles/doodads/tux-statue.png index 491daa7c8ef..23b86e5d231 100644 Binary files a/data/images/tiles/doodads/tux-statue.png and b/data/images/tiles/doodads/tux-statue.png differ diff --git a/data/levels/bonus1/train_leaves_in_one_minute.nut b/data/levels/bonus1/train_leaves_in_one_minute.nut index 402338b47e7..43d90c8ba54 100644 --- a/data/levels/bonus1/train_leaves_in_one_minute.nut +++ b/data/levels/bonus1/train_leaves_in_one_minute.nut @@ -16,7 +16,7 @@ class TrainManager { ] constructor(_time = 60) { - image = FloatingImage("images/objects/train/train.png") + image = FloatingImage("images/engine/hud/train.png") image.set_anchor_point(ANCHOR_TOP) image.set_pos(-22, 43)