Skip to content

Commit

Permalink
Update worldmap tiles to fit art style + deprecation (SuperTux#2735)
Browse files Browse the repository at this point in the history
* Update worldmap tiles for all theme

Also deprecate old assets [ci skip]

* Update some more worldmap tiles [ci skip]

* Add underground forest + ruin decoration [ci skip]

* Update Halloween worldmap tiles [ci skip]

* Minor tweaks to ruins + better ladder [ci skip]

* Minor tweaks to worldmap roads sprites [ci skip]

* Add campfire sprites for worldmaps [ci skip]

* Add granito village tiles [ci skip]

* Add more decorative corrupted roots [ci skip]

* Deprecate some more stuff [ci skip]

* Minor tile tweak to story mode worldmaps [ci skip]

* Update autotiles_ice_world.satc

[ci skip]

Co-Authored-By: Prune Juice <[email protected]>

* Fingers-crossed this deprecation thing works [ci skip]

* Basic corrupted variants of tower, ruin and village tiles [ci skip]

Adding extra details later! This is mainly to get the tile IDs down!

* Fix corrupted tower tiles not showing in tilegroup [ci skip]

* Finalize corrupted ruin, village and tower [ci skip]

Also, improve the Christmas decoration tiles.

---------

Co-authored-by: Prune Juice <[email protected]>
  • Loading branch information
Rusty-Box and tylerandari13 authored Sep 10, 2024
1 parent 850ff3d commit bd250ef
Show file tree
Hide file tree
Showing 147 changed files with 1,597 additions and 464 deletions.
1,106 changes: 1,106 additions & 0 deletions data/images/autotiles_ice_world.satc

Large diffs are not rendered by default.

397 changes: 277 additions & 120 deletions data/images/ice_world.strf

Large diffs are not rendered by default.

192 changes: 96 additions & 96 deletions data/images/worldmap.strf

Large diffs are not rendered by default.

Binary file modified data/images/worldmap/christmas/snowman.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/worldmap/christmas/woodconcave.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/worldmap/christmas/woodconvex.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/worldmap/common/campfire-0.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/worldmap/common/campfire-1.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/worldmap/common/campfire-2.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/worldmap/common/campfire-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions data/images/worldmap/common/campfire.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
(supertux-sprite
(action
(name "default")
(fps 14)
(hitbox 0 16 32 32)
(images "campfire-0.png"
"campfire-1.png"
"campfire-2.png"
"campfire-3.png")
)
)
100 changes: 0 additions & 100 deletions data/images/worldmap/common/laddertux.sprite

This file was deleted.

Binary file removed data/images/worldmap/common/laddertux1.png
Binary file not shown.
Binary file removed data/images/worldmap/common/laddertux2.png
Binary file not shown.
Binary file removed data/images/worldmap/common/laddertux3.png
Binary file not shown.
Binary file removed data/images/worldmap/common/laddertux4.png
Binary file not shown.
Binary file removed data/images/worldmap/common/laddertux5.png
Binary file not shown.
Binary file removed data/images/worldmap/common/laddertux6.png
Binary file not shown.
Binary file removed data/images/worldmap/common/laddertux7.png
Binary file not shown.
Binary file removed data/images/worldmap/common/laddertux8.png
Binary file not shown.
Binary file removed data/images/worldmap/common/level_star.png
Binary file not shown.
Binary file removed data/images/worldmap/common/level_star1.png
Binary file not shown.
Binary file removed data/images/worldmap/common/level_star2.png
Binary file not shown.
Binary file removed data/images/worldmap/common/level_star3.png
Binary file not shown.
Binary file removed data/images/worldmap/common/level_star4.png
Binary file not shown.
Binary file removed data/images/worldmap/common/level_star5.png
Binary file not shown.
Binary file removed data/images/worldmap/common/n_stone.png
Binary file not shown.
12 changes: 0 additions & 12 deletions data/images/worldmap/common/n_stone.sprite

This file was deleted.

Binary file removed data/images/worldmap/common/shroom.png
Binary file not shown.
47 changes: 0 additions & 47 deletions data/images/worldmap/common/shroom.sprite

This file was deleted.

Binary file removed data/images/worldmap/common/shroom1.png
Binary file not shown.
Binary file removed data/images/worldmap/common/shroom2.png
Binary file not shown.
Binary file removed data/images/worldmap/common/shroom3.png
Diff not rendered.
Binary file removed data/images/worldmap/common/shroom4.png
Diff not rendered.
Binary file removed data/images/worldmap/common/shroom5.png
Diff not rendered.
Binary file removed data/images/worldmap/common/shroom6.png
Diff not rendered.
Binary file removed data/images/worldmap/common/smoke1.png
Diff not rendered.
Binary file removed data/images/worldmap/common/smoke2.png
Diff not rendered.
Binary file removed data/images/worldmap/common/smoke3.png
Diff not rendered.
Binary file removed data/images/worldmap/common/smoke4.png
Diff not rendered.
Binary file removed data/images/worldmap/common/specialtile.png
Diff not rendered.
6 changes: 0 additions & 6 deletions data/images/worldmap/common/specialtile.sprite

This file was deleted.

Binary file removed data/images/worldmap/common/torch.png
Diff not rendered.
25 changes: 0 additions & 25 deletions data/images/worldmap/common/torch.sprite

This file was deleted.

Binary file removed data/images/worldmap/common/torch1.png
Diff not rendered.
25 changes: 0 additions & 25 deletions data/images/worldmap/common/torch1.sprite

This file was deleted.

Binary file removed data/images/worldmap/common/torch2.png
Diff not rendered.
Binary file removed data/images/worldmap/common/torch3.png
Diff not rendered.
Binary file removed data/images/worldmap/common/torch4.png
Diff not rendered.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added data/images/worldmap/forest/cave_rocks.png
Binary file added data/images/worldmap/forest/corrupt_roots.png
Binary file modified data/images/worldmap/forest/land.png
Binary file modified data/images/worldmap/forest/land_ghost.png
Binary file modified data/images/worldmap/forest/land_mix.png
Binary file removed data/images/worldmap/forest/land_underground.png
Diff not rendered.
14 changes: 0 additions & 14 deletions data/images/worldmap/forest/leveldots/door.sprite

This file was deleted.

Binary file removed data/images/worldmap/forest/leveldots/doorclosed.png
Diff not rendered.
Binary file removed data/images/worldmap/forest/leveldots/dooropen.png
Diff not rendered.
14 changes: 0 additions & 14 deletions data/images/worldmap/forest/small_air.sprite

This file was deleted.

Binary file modified data/images/worldmap/forest/trees_bushes.png
Binary file added data/images/worldmap/forest/underground.png
Binary file added data/images/worldmap/halloween/pumpkin_hut.png
Binary file modified data/images/worldmap/halloween/scarecrow.png
Binary file modified data/images/worldmap/halloween/tiles.png
Binary file added data/images/worldmap/halloween/trees.png
Binary file added data/images/worldmap/ice/cave_crystal.png
Binary file added data/images/worldmap/ice/deprecated/icecave.png
Binary file added data/images/worldmap/ice/ice_cave.png
Binary file added data/images/worldmap/ice/ice_cave2.png
Binary file modified data/images/worldmap/ice/ice_cliff.png
Binary file modified data/images/worldmap/ice/land.png
Binary file modified data/images/worldmap/ice/mountain.png
Binary file modified data/images/worldmap/ice/thin_ice.png
Binary file modified data/images/worldmap/ice/woodconcave.png
Binary file modified data/images/worldmap/ice/woodconvex.png
Binary file added data/images/worldmap/shared/black.png
Binary file modified data/images/worldmap/shared/bridge.png
Binary file modified data/images/worldmap/shared/ladder.png
Binary file modified data/images/worldmap/shared/pier.png
Binary file modified data/images/worldmap/shared/roads.png
Binary file modified data/images/worldmap/shared/roads_border.png
Binary file added data/images/worldmap/shared/ruin_deco.png
Binary file modified data/images/worldmap/shared/tower.png
Binary file added data/images/worldmap/shared/village.png
Binary file modified data/images/worldmap/shared/water_01.png
Binary file modified data/images/worldmap/shared/water_02.png
Binary file modified data/images/worldmap/shared/water_03.png
Binary file modified data/images/worldmap/shared/water_04.png
Binary file modified data/images/worldmap/shared/water_05.png
Binary file modified data/images/worldmap/shared/water_06.png
Binary file modified data/images/worldmap/shared/water_07.png
Binary file modified data/images/worldmap/shared/water_08.png
Binary file modified data/images/worldmap/shared/water_09.png
Binary file modified data/images/worldmap/shared/water_10.png
Binary file modified data/images/worldmap/shared/water_11.png
Binary file modified data/images/worldmap/shared/water_12.png
Binary file modified data/images/worldmap/shared/water_13.png
Binary file modified data/images/worldmap/shared/water_14.png
Binary file modified data/images/worldmap/shared/water_15.png
Binary file modified data/images/worldmap/shared/water_16.png
Loading

0 comments on commit bd250ef

Please sign in to comment.