Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New industrial tiles, New Tux statue, other misc tile changes #3185

Draft
wants to merge 13 commits into
base: master
Choose a base branch
from
Draft
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions data/images/objects/platforms/vertical-wood-long.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
(supertux-sprite
(action
(name "default")
(images "vertical-wood-long.png")
)
)
Binary file added data/images/objects/platforms/wood-fourtiles.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions data/images/objects/platforms/wood-fourtiles.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
(supertux-sprite
(action
(name "default")
(images "wood-fourtiles.png")
)
)
Binary file added data/images/objects/platforms/wood-threetiles.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions data/images/objects/platforms/wood-threetiles.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
(supertux-sprite
(action
(name "default")
(images "wood-threetiles.png")
)
)
73 changes: 58 additions & 15 deletions data/images/tiles.strf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
)
)

Expand Down Expand Up @@ -3573,9 +3583,9 @@
1411
)
(attributes
1
1
1
0
0
0
)
(images "tiles/castle/pedestal.png")
)
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
)
Expand All @@ -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
)
Expand Down
Binary file modified data/images/tiles/blocks/bigblock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/tiles/blocks/block11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/tiles/blocks/block5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/tiles/blocks/bridge_brown.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/tiles/blocks/bridge_ice.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/tiles/blocks/industrial.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/tiles/blocks/industrial2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/tiles/castle/castle_forest.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/tiles/castle/castle_snow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/tiles/castle/nolok-statue-forest.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/tiles/castle/nolok-statue-ghost.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/tiles/castle/nolok-statue-snow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/tiles/castle/nolok-statue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/tiles/castle/pedestal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/tiles/doodads/tux-statue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion data/levels/bonus1/train_leaves_in_one_minute.nut
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down