Skip to content

Commit

Permalink
Add Rock Tileset, Update Rock-related Sprites, and Update Signs (#2960)
Browse files Browse the repository at this point in the history
This request is focused on adding to the game a new rock-themed tileset, but has many extra features and tweaks. 

New features:
- Conversion file to turn the addon rock tiles into vanilla rock tiles
- Updated sprites for the carryable rock object along an extra 3x3 size for it
- Blocky rock tiles similar to the rock sprites
- Platforms and falling platforms sprites updated with current in-game tiles
- New sprites for falling platforms made from the rock tileset
- Redesigned rock sign and all other signs as well
- Normal, Wall and Hanging sign bases added as tiles
- Transparent sign icons as decals to use with the bases
- Snow, Forest and Corrupted overlay decals for signs

Tweaks:
- Weak and Unstable tiles (hay, ice, crumbling stone, thin ice and skulls) added to the "Bonus+Block" tilegroup
- Removed the duplicated 2x2 crystal tiles in the tilegroup
- Filled the empty gaps on the ice cave slopes in the tilegroup

Todo list:
- [x] Add the jagged rock tile images
- [x] Update rock object sprites
- [x] Add rock platform sprites for the falling platforms
- [x] Update the old platform sprites to fit the new game style
- [x] Update the .strf and .satc files with the new tile IDs
- [x] Rearrange tile IDs so they don't conflict with #2894 
- [x] Add a conversion file to turn the addon rock tiles into vanilla rock tiles
- [x] Add rock block tiles and 3x3 carryable rock
- [x] Add weak and unstable tiles as actual tiles
- [x] Update sign designs
- [x] Add wall and hanging sign variants
  • Loading branch information
Eauix authored Oct 17, 2024
1 parent fd79c60 commit 624d2b9
Show file tree
Hide file tree
Showing 122 changed files with 648 additions and 32 deletions.
181 changes: 181 additions & 0 deletions data/images/autotiles.satc
Original file line number Diff line number Diff line change
Expand Up @@ -6107,4 +6107,185 @@
(mask "11111*0*")
)
)

(autotileset
(name "jrock_a")
(default 7317)

;; CENTER
(autotile
(id 7317)
(alt-id
(id 7324)
(weight 0.5)
)
(solid #t)
(mask "***11111")
)

;; LEFT
(autotile
(id 7316)
(solid #t)
(mask "***01011")
)

;; RIGHT
(autotile
(id 7318)
(solid #t)
(mask "***10110")
)

;; THIN
(autotile
(id 7319)
(solid #t)
(mask "***00010")
)

;; B LEFT
(autotile
(id 7320)
(solid #t)
(mask "***01*0*")
)

;; B CENTER
(autotile
(id 7321)
(solid #t)
(mask "***11*0*")
)

;; B RIGHT
(autotile
(id 7322)
(solid #t)
(mask "***10*0*")
)

;; B THIN
(autotile
(id 7323)
(solid #t)
(mask "***00*0*")
)

;; CORNER TL
(autotile
(id 7325)
(solid #t)
(mask "***11110")
)

;; CORNER TR
(autotile
(id 7326)
(solid #t)
(mask "***11011")
)

;; CORNER BL
(autotile
(id 7327)
(solid #t)
(mask "***10111")
)

;; CORNER BR
(autotile
(id 7328)
(solid #t)
(mask "***01111")
)

;; CORNER THIN TL
(autotile
(id 7329)
(solid #t)
(mask "***01010")
)

;; CORNER THIN TR
(autotile
(id 7330)
(solid #t)
(mask "***10010")
)

;; CORNER THIN TC
(autotile
(id 7331)
(solid #t)
(mask "***11010")
)

;; CORNER THIN BL
(autotile
(id 7332)
(solid #t)
(mask "***00011")
)

;; CORNER THIN BR
(autotile
(id 7333)
(solid #t)
(mask "***00110")
)

;; CORNER THIN BC
(autotile
(id 7334)
(solid #t)
(mask "***00111")
)

;; CORNER "S"
(autotile
(id 7335)
(solid #t)
(mask "***01110")
)

;; CORNER "Z"
(autotile
(id 7336)
(solid #t)
(mask "***10011")
)

;; DECO TILES -----------

;; DECO LEFT
(autotile
(id 7312)
(solid #f)
(mask "*****011")
)

;; DECO CENTER
(autotile
(id 7313)
(solid #f)
(mask "*****111")
)

;; DECO RIGHT
(autotile
(id 7314)
(solid #f)
(mask "*****110")
)

;; DECO THIN
(autotile
(id 7315)
(solid #f)
(mask "*****010")
)

)

)
29 changes: 17 additions & 12 deletions data/images/converters/data.stcd
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
(supertux-converter-data
(nightly_all_tiles.sttc
(title (_ "Nightly Tiles"))
(author "SuperTux Team")
(description (_ "For levels, created in previous Nightly builds."))
)
(pre-0.6.3_crystal_tiles.sttc
(title (_ "Pre-0.6.3 Crystal Tiles"))
(author "tylerandari12")
(description (_ "For levels, created in pre-0.6.3 versions, which use crystal tiles."))
)
)
(supertux-converter-data
(nightly_all_tiles.sttc
(title (_ "Nightly Tiles"))
(author "SuperTux Team")
(description (_ "For levels, created in previous Nightly builds."))
)
(pre-0.6.3_crystal_tiles.sttc
(title (_ "Pre-0.6.3 Crystal Tiles"))
(author "tylerandari12")
(description (_ "For levels, created in pre-0.6.3 versions, which use crystal tiles."))
)
(rock_tiles_addon_to_vanilla.sttc
(title (_ "Jagged Rock Tiles from Addon"))
(author "Eauix")
(description (_ "For levels, created with the rock tiles addon, converts their IDs to vanilla rock tile IDs"))
)
)
82 changes: 82 additions & 0 deletions data/images/converters/rock_tiles_addon_to_vanilla.sttc
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
56001 -> 7312
56002 -> 7313
56003 -> 7314
56004 -> 7315
56005 -> 7316
56006 -> 7317
56007 -> 7318
56008 -> 7319
56009 -> 7320
56010 -> 7321
56011 -> 7322
56012 -> 7323
56013 -> 7324
56014 -> 7325
56015 -> 7326
56016 -> 7327
56017 -> 7328
56018 -> 7329
56019 -> 7330
56020 -> 7331
56021 -> 7332
56022 -> 7333
56023 -> 7334
56024 -> 7335
56025 -> 7336
56026 -> 7337
56027 -> 7338
56028 -> 7339
56029 -> 7340
56030 -> 7341
56031 -> 7342
56032 -> 7343
56033 -> 7344
56034 -> 7345
56035 -> 7346
56036 -> 7347
56037 -> 7348
56038 -> 7349
56039 -> 7350
56040 -> 7351
56041 -> 7352
56042 -> 7353
56043 -> 7354
56044 -> 7355
56045 -> 7356
56046 -> 7357
56047 -> 7358
56048 -> 7359
56049 -> 7360
56050 -> 7361
56051 -> 7362
56052 -> 7363
56053 -> 7364
56054 -> 7365
56055 -> 7366
56056 -> 7367
56057 -> 7368
56058 -> 7369
56059 -> 7370
56060 -> 7371
56061 -> 7372
56062 -> 7373
56063 -> 7374
56064 -> 7375
56065 -> 7376
56066 -> 7377
56067 -> 7378
56068 -> 7379
56069 -> 7380
56070 -> 7381
56071 -> 7382
56072 -> 7383
56073 -> 7384
56074 -> 7385
56075 -> 7386
56076 -> 7387
56077 -> 7388
56078 -> 7389
56079 -> 7390
56080 -> 7391
56081 -> 7392
56082 -> 7393
Binary file added data/images/decal/sign_icons/bombhold.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/decal/sign_icons/color_cyan.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/decal/sign_icons/color_green.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/decal/sign_icons/color_magenta.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/decal/sign_icons/color_yellow.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/decal/sign_icons/danger.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/decal/sign_icons/down.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/decal/sign_icons/icehold.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/decal/sign_icons/left.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/decal/sign_icons/leftdown.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/decal/sign_icons/leftup.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/decal/sign_icons/needrock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/decal/sign_icons/overlay_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 added data/images/decal/sign_icons/overlay_forest_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/decal/sign_icons/overlay_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 added data/images/decal/sign_icons/overlay_snow_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/decal/sign_icons/platform.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/decal/sign_icons/platform_wood.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/decal/sign_icons/right.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/decal/sign_icons/rightdown.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/decal/sign_icons/rightup.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/decal/sign_icons/run.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/decal/sign_icons/trampoline.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/decal/sign_icons/up.png
Binary file added data/images/decal/sign_icons/walljump.png
Binary file modified data/images/objects/bonus_block/bonus-rock.png
Binary file modified data/images/objects/fallblock/branchleft.png
Binary file modified data/images/objects/fallblock/branchright.png
Binary file modified data/images/objects/fallblock/cave-2x3.png
Binary file modified data/images/objects/fallblock/cave-3x2.png
Binary file modified data/images/objects/fallblock/cave-3x4.png
Binary file modified data/images/objects/fallblock/cave-4x3.png
Binary file modified data/images/objects/fallblock/cave-4x4.png
Binary file modified data/images/objects/fallblock/cave-4x6.png
Binary file modified data/images/objects/fallblock/cave-5x3.png
Binary file modified data/images/objects/fallblock/cave-5x7.png
Binary file modified data/images/objects/fallblock/cave-6x4.png
7 changes: 7 additions & 0 deletions data/images/objects/fallblock/rockblock-0.5x0.5.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(supertux-sprite
(action
(name "normal")
(hitbox 0 0 16 16)
(images "rockblock-0.5x0.5.png")
)
)
Binary file added data/images/objects/fallblock/rockblock-1x1.png
7 changes: 7 additions & 0 deletions data/images/objects/fallblock/rockblock-1x1.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(supertux-sprite
(action
(name "normal")
(hitbox 0 0 32 32)
(images "rockblock-1x1.png")
)
)
Binary file added data/images/objects/fallblock/rockblock-1x2.png
7 changes: 7 additions & 0 deletions data/images/objects/fallblock/rockblock-1x2.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(supertux-sprite
(action
(name "normal")
(hitbox 0 0 32 64)
(images "rockblock-1x2.png")
)
)
Binary file added data/images/objects/fallblock/rockblock-1x3.png
7 changes: 7 additions & 0 deletions data/images/objects/fallblock/rockblock-1x3.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(supertux-sprite
(action
(name "normal")
(hitbox 0 0 32 96)
(images "rockblock-1x3.png")
)
)
Binary file added data/images/objects/fallblock/rockblock-2x1.png
7 changes: 7 additions & 0 deletions data/images/objects/fallblock/rockblock-2x1.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(supertux-sprite
(action
(name "normal")
(hitbox 0 0 64 32)
(images "rockblock-2x1.png")
)
)
Binary file added data/images/objects/fallblock/rockblock-2x2.png
7 changes: 7 additions & 0 deletions data/images/objects/fallblock/rockblock-2x2.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(supertux-sprite
(action
(name "normal")
(hitbox 0 0 64 64)
(images "rockblock-2x2.png")
)
)
Binary file added data/images/objects/fallblock/rockblock-2x3.png
7 changes: 7 additions & 0 deletions data/images/objects/fallblock/rockblock-2x3.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(supertux-sprite
(action
(name "normal")
(hitbox 0 0 64 96)
(images "rockblock-2x3.png")
)
)
Binary file added data/images/objects/fallblock/rockblock-3x1.png
7 changes: 7 additions & 0 deletions data/images/objects/fallblock/rockblock-3x1.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(supertux-sprite
(action
(name "normal")
(hitbox 0 0 96 32)
(images "rockblock-3x1.png")
)
)
Binary file added data/images/objects/fallblock/rockblock-3x2.png
7 changes: 7 additions & 0 deletions data/images/objects/fallblock/rockblock-3x2.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(supertux-sprite
(action
(name "normal")
(hitbox 0 0 96 64)
(images "rockblock-3x2.png")
)
)
Binary file added data/images/objects/fallblock/rockblock-3x3.png
7 changes: 7 additions & 0 deletions data/images/objects/fallblock/rockblock-3x3.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(supertux-sprite
(action
(name "normal")
(hitbox 0 0 96 96)
(images "rockblock-3x3.png")
)
)
7 changes: 7 additions & 0 deletions data/images/objects/fallblock/rockplatform-0.5x0.5.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(supertux-sprite
(action
(name "normal")
(hitbox 8 8 16 16)
(images "rockplatform-0.5x0.5.png")
)
)
Loading

0 comments on commit 624d2b9

Please sign in to comment.