SuperTux · Frostwithasideofsalt · Jan 20, 2025 · Jan 20, 2025 · Jan 20, 2025 · Jan 20, 2025
diff --git a/data/images/objects/train/train.png → data/images/engine/hud/train.png b/data/images/objects/train/train.png → 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
diff --git a/data/images/objects/platforms/vertical-wood-long.sprite 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
diff --git a/data/images/objects/platforms/wood-fourtiles.sprite 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
diff --git a/data/images/objects/platforms/wood-threetiles.sprite 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
@@ -20,8 +20,8 @@
   )
 
   ;; 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
+  ;; free/skipped ids (please use before any other): 
+  ;; 4654-4660, 5048-5092, 5463-5527
   ;; No group ids are currently skipped! Delete this line if any are and replace it with said ids...
 
   (tilegroup
@@ -1343,12 +1343,24 @@
       2897 2898 2899 2900
       2901 2902 2903 2904
 
+      5037 4720 4638 7173
+      7008 7007 7005 7002
+      6962 6963 6964 6965
+      6966 6967 6968 6969
+      6970 6971 6972 6973
+      6974 6975 6976 6977
+      5433 5434 5435 5436
+      5437 5438 5439 5440
+      5441 5442 5443 5444
+      5445 5446 5447 5448
+      5449 5450 5451 5452
+
       4412 4413 4414 0
       4421 4422 4423 0
       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 +1373,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 +1640,40 @@
   (tilegroup
     (name (_ "Industrial"))
     (tiles
-      3167 3168 3169 3170
-      3173 3174 3175 3189
-      3179 3180 3181 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
+    2080 2081 2082 2083
+    3183 2084 4621 3184
+    4622 4623 4624 4625
+    5268 5269 5270 0
+    5271 5272 5273 0
+    5274 5275 0    0
+    3185 3186 3171 3172
+    3191 3192 3177 3178
+    3170 4628 3182 3176
+
+    3189 4629 4630 0
+    4626 3167 3168 3169
+    4627 3173 3174 3175
+    3190 3179 3180 3181
+    5460 5461 5462 5463
+    3199 3200 3197 3198
+    3193 3194 3203 3204 
+    5038 5039 5040 0
+    5045 5046 5047 0
+    0    4721 4722 0
+    5041 5042 5043 5044
+    5276 5277 5278 5279
+    5280 5281 5282 5283
+
+    5459 5205 5453 5454
+    5455 5456 5457 5458
+
+    4631 4632 4633 4651
+    4637 0   4639 4634
+    4643 4644 4645 4652
+    4649 4640 4650 4646
+    4647 4648 4653 4654
+    4641 4635 4642 4636 
+
     )
   )
 
@@ -3573,9 +3610,9 @@
       1411
     )
     (attributes
-      1
-      1
-      1
+      0
+      0
+      0
     )
     (images "tiles/castle/pedestal.png")
   )
@@ -5144,7 +5181,50 @@
     )
     (images "tiles/pipe/green.png")
   )
-
+  (tiles
+    (width 4)
+    (height 11)
+    (ids
+      5037 4720 4638 7173
+      7008 7007 7005 7002
+      6962 6963 6964 6965
+      6966 6967 6968 6969
+      6970 6971 6972 6973
+      6974 6975 6976 6977
+      5433 5434 5435 5436
+      5437 5438 5439 5440
+      5441 5442 5443 5444
+      5445 5446 5447 5448
+      5449 5450 5451 5452
+    )
+    (attributes
+      1    1    1    1
+      1    1    1    1
+      1    1    1    1
+      1    1    1    1
+      1    1    1    1
+      1    1    1    1
+      1    1    1    1
+      17   1    1    17
+      1    1    1    1
+      1    1    1    1
+      17   1    1    17
+    )
+    (datas
+      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    0    0    0
+      2    0    0    0
+      0    0    0    0
+      0    0    0    0
+      1    0    0    3
+    )
+    (images "tiles/pipe/grey.png")
+  )
   (tiles
     (width 4)
     (height 11)
@@ -5490,49 +5570,81 @@
   )
 
   (tiles
-    (width 6)(height 7)
+    (width 10)(height 9)
     (ids
-      3167 3168 3169 3170 3171 3172
-      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
+    2080 2081 2082 2083 3171 3172 3167 3168 3169 3189
+    3183 2084 4621 3184 3177 3178 3173 3174 3175 4626 
+    4622 4623 4624 4625 3182 3176 3179 3180 3181 4627
+
+    4631 4632 4633 4634 4635 4636 4628 4629 4630 3190
+    4637 0    4639 4640 4641 4642 3185 3186 3197 3198
+    4643 4644 4645 4646 4647 4648 3191 3192 3203 3204
+    4649 4650 4651 4652 4653 4654 3170 0    3199 3200
+
+    0    4721 4722 0    5038 5039 5040 0    3193 3194
+    5041 5042 5043 5044 5045 5046 5047 0    0   0
     )
     (attributes
-      0    0    0    1   17   17
-      0    0    0    1   17   17
-      0    0    0    1    1    1
-      1    1   17   17    1    1
-      1    1   17   17    0    0
-      1024 1024 1024 1024 0    0
-      1024 1024 1024 1024 0    0
+    1    1    1    1    17   17   0    0    0    1
+    1    1    1    1    17   17   0    0    0    1
+    1    1    1    1    1    1    0    0    0    1
+    0    0    0    0    0    0    1    0    0    1
+    0    0    0    0    0    0    1    1    1024 1024
+    0    0    0    0    0    0    1    1    1024 1024   
+    0    0    0    0    0    0    1    0    17    17
+    17   17   17   17   0    3    0    0    17    17
+    17   1    1    17   0    0    0    0    0    0
+
     )
     (datas
-      0    0    0    0    2    0
-      0    0    0    0    1    3
-      0    0    0    0    0    0
-      0    0    2    0    0    0
-      0    0    1    3    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    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    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    0    0    0    0    0    0    0    2    0
+    0    18   16   0    0    0    0    0    1    3
+    34    0    0   32   0    0    0    0    0    0
     )
     (images "tiles/blocks/industrial.png")
   )
 
+
   (tiles
-    (width 4)(height 2)
+    (width 4)(height 8)
     (ids
-      3261 3262 3263 3264
-      3265 3266 3267 3268
+      5276 5277 5278 5279
+      5280 5281 5282 5283
+      5459 5205 5453 5454
+      5455 5456 5457 5458
+      5460 5461 5462 5463
+      5268 5269 5270 0
+      5271 5272 5273 0
+      5274 5275 0    0
+
     )
     (attributes
-      1 1 0 0
-      1 1 0 0
+      17  1   1   17
+      00  17  17  0 
+      17  17   1   1
+      1   1   17  17 
+      0   0   0   0 
+      1   1   1   0 
+      1   1   1   0 
+      1   1   0   0 
     )
-    (images "tiles/snow/deprecated/custom.png")
-    (deprecated #t)
+    (datas
+     17 0  0  19
+     0  33 35 0
+     2  0  0  0
+     0  0  1  3
+     0  0  0  0
+     0  0  0  0
+     0  0  0  0
+     0  0  0  0
+    )
+    (images "tiles/blocks/industrial2.png")
   )
 (tiles
     (width 3)(height 1)
@@ -6681,7 +6793,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 +6812,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
diff --git a/data/images/tiles/blocks/block11.png b/data/images/tiles/blocks/block11.png
diff --git a/data/images/tiles/blocks/block5.png b/data/images/tiles/blocks/block5.png
diff --git a/data/images/tiles/blocks/bridge_brown.png b/data/images/tiles/blocks/bridge_brown.png
diff --git a/data/images/tiles/blocks/bridge_ice.png b/data/images/tiles/blocks/bridge_ice.png
diff --git a/data/images/tiles/blocks/industrial.png b/data/images/tiles/blocks/industrial.png
diff --git a/data/images/tiles/blocks/industrial2.png b/data/images/tiles/blocks/industrial2.png
diff --git a/data/images/tiles/castle/castle_forest.png b/data/images/tiles/castle/castle_forest.png
diff --git a/data/images/tiles/castle/castle_snow.png b/data/images/tiles/castle/castle_snow.png
diff --git a/data/images/tiles/castle/nolok-statue-forest.png b/data/images/tiles/castle/nolok-statue-forest.png
diff --git a/data/images/tiles/castle/nolok-statue-ghost.png b/data/images/tiles/castle/nolok-statue-ghost.png
diff --git a/data/images/tiles/castle/nolok-statue-snow.png b/data/images/tiles/castle/nolok-statue-snow.png
diff --git a/data/images/tiles/castle/nolok-statue.png b/data/images/tiles/castle/nolok-statue.png
diff --git a/data/images/tiles/castle/pedestal.png b/data/images/tiles/castle/pedestal.png
diff --git a/data/images/tiles/doodads/plant1.png → ...mages/tiles/doodads/deprecated/plant1.png b/data/images/tiles/doodads/plant1.png → ...mages/tiles/doodads/deprecated/plant1.png
diff --git a/data/images/tiles/doodads/tux-statue.png b/data/images/tiles/doodads/tux-statue.png
diff --git a/data/images/tiles/pipe/grey.png b/data/images/tiles/pipe/grey.png
diff --git 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)