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

Add Rock Tileset, Update Rock-related Sprites, and Update Signs #2960

Merged
merged 32 commits into from
Oct 17, 2024

Conversation

Eauix
Copy link
Contributor

@Eauix Eauix commented May 30, 2024

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:

  • Add the jagged rock tile images
  • Update rock object sprites
  • Add rock platform sprites for the falling platforms
  • Update the old platform sprites to fit the new game style
  • Update the .strf and .satc files with the new tile IDs
  • Rearrange tile IDs so they don't conflict with Tileset additions + minor fixes #2894
  • Add a conversion file to turn the addon rock tiles into vanilla rock tiles
  • Add rock block tiles and 3x3 carryable rock
  • Add weak and unstable tiles as actual tiles
  • Update sign designs
  • Add wall and hanging sign variants

@Eauix
Copy link
Contributor Author

Eauix commented May 30, 2024

There's a problem with changing the rock object type to "large" in the editor, it selects .png file instead of the .sprite file, I might try to find a solution for this, if changing this behavior requires recompiling the game I will need some help.

(Edit: This is no longer an issue because the new images are the same size as the hitboxes)

@Eauix Eauix changed the title [WIP] Add Jagged Rock tileset, and some changes to rock-related sprites. Add Jagged Rock tileset, and some changes to rock-related sprites. May 30, 2024
@Eauix Eauix marked this pull request as ready for review May 30, 2024 21:08
@Rusty-Box Rusty-Box self-requested a review May 31, 2024 16:05
Copy link
Member

@weluvgoatz weluvgoatz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really love this tileset, just don't know where it could be used in the game. Also, I think the previous portable rock sprites might be better to use; I know they're called "rocks", but they really resemble building blocks, so having them be square/simple design would be more beneficial imo.

@Eauix
Copy link
Contributor Author

Eauix commented Jun 1, 2024

I really love this tileset, just don't know where it could be used in the game. Also, I think the previous portable rock sprites might be better to use; I know they're called "rocks", but they really resemble building blocks, so having them be square/simple design would be more beneficial imo.

The tiles blend well with forest levels, and could also be used in world 3 as a rocky sea shore.

About the rock objects, I may revert them or draw a simpler shape for their sprite if needed.

@Alasdairbugs
Copy link
Contributor

I really love this tileset, just don't know where it could be used in the game. Also, I think the previous portable rock sprites might be better to use; I know they're called "rocks", but they really resemble building blocks, so having them be square/simple design would be more beneficial imo.

disagree; these rock tiles could be used to make drawable rock objects of any shape/size/quirk. it looks more distinctive than the current ones

@Rusty-Box
Copy link
Member

I see World 3 benefitting from these, specifically the beach setting. World 2 already has a bunch of things going for it for v0.7 so they most likely won't appear anywhere there. Could be useful for the bonus islands, outside of story mode.

For portable rocks I agree with Daniel, but I see them working if adjusted to stand out more as an interactable object. Right now they look too close to the tileset which could lead to some general confusion as they may blend in too well.

@weluvgoatz
Copy link
Member

Now that you mention it, I think it would work well in World 3.

@Eauix
Copy link
Contributor Author

Eauix commented Jun 2, 2024

Ok, now the rock sprites are done!

@weluvgoatz weluvgoatz self-requested a review June 2, 2024 20:21
Copy link
Member

@Rusty-Box Rusty-Box left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still have an open PR that also adds a bunch more tiles to the game (that being #2894) so you might have to change your tile IDs here, but I'd wait with that until this one is finalized to prevent ID conflicts.

Once I know concrete how many IDs mine adds, I'll tell you more regarding which IDs are free to use without issues.

@Eauix
Copy link
Contributor Author

Eauix commented Jun 7, 2024

I still have an open PR that also adds a bunch more tiles to the game (that being #2894) so you might have to change your tile IDs here, but I'd wait with that until this one is finalized to prevent ID conflicts.

Once I know concrete how many IDs mine adds, I'll tell you more regarding which IDs are free to use without issues.

Yeah I noticed that only after defining all my IDs, I will wait for your update and then I'll redefine it

@Narre
Copy link
Contributor

Narre commented Jun 21, 2024

Please don't use CRLF line endings, just WHYYYYY? (in autotiles.satc)

@Eauix
Copy link
Contributor Author

Eauix commented Jun 21, 2024

Please don't use CRLF line endings, just WHYYYYY? (in autotiles.satc)

Huh, this explains why the diff considered the file to be entirely replaced. Until now I had no idea that such a thing existed, like, going from one line to other line can be done in different ways? Bruh!

I will try to find a way of fixing it

@Narre
Copy link
Contributor

Narre commented Jun 21, 2024

According to file, there are two different line endings in there (CRLF, the Windows way, and CR, the Apple way). Ideally, you should convert all line endings to LF (the Linux way), which is most commonly used in SuperTux.

image

@MatusGuy
Copy link
Member

MatusGuy commented Jun 21, 2024

I will try to find a way of fixing it

In your text editor you should be able to specify if you want to use CRLF or LF.

@Eauix
Copy link
Contributor Author

Eauix commented Jun 21, 2024

Okay, the CRLF it is fixed now!

@Eauix
Copy link
Contributor Author

Eauix commented Jun 21, 2024

I still have an open PR that also adds a bunch more tiles to the game (that being #2894) so you might have to change your tile IDs here, but I'd wait with that until this one is finalized to prevent ID conflicts.

Once I know concrete how many IDs mine adds, I'll tell you more regarding which IDs are free to use without issues.

I've been thinking of leaving some free/skipped IDs for you to work with, like around 200 or 300 IDs, leaving the headers like this

  ;; next-id: 7558
  ;; free/skipped ids (please use before any other): 101, 7195-7494

But idk if this is a bad decision, considering that the ideal is always using those skipped IDs whenever they are present, and not creating more of them, I'll let you decide

@Rusty-Box
Copy link
Member

I've been thinking of leaving some free/skipped IDs for you to work with, like around 200 or 300 IDs, leaving the headers like this

I would advise against that.

However, my PR is almost done, I wanna make sure it ready by the end of the day so you can adjust yours pretty soon. Been quite busy lately so it fell to the way side a bit.

@Eauix
Copy link
Contributor Author

Eauix commented Jun 21, 2024

However, my PR is almost done, I wanna make sure it ready by the end of the day so you can adjust yours pretty soon.

Oh, okay then

@Eauix
Copy link
Contributor Author

Eauix commented Jul 2, 2024

As #2894 has been closed, i'll start working on redefining the rock tile IDs

@Eauix
Copy link
Contributor Author

Eauix commented Jul 2, 2024

I'm going to start it from the beginning, due to lots of conflicts

@Eauix Eauix requested a review from mrkubax10 July 6, 2024 17:19
@Eauix Eauix changed the title Add Jagged Rock tileset, and some changes to rock-related sprites. Add Jagged Rock tileset, and many changes to rock-related sprites. Aug 3, 2024
@Eauix Eauix changed the title Add Jagged Rock tileset, and many changes to rock-related sprites. Add Rock Tileset, Update Rock-related Sprites, and Update Signs Aug 12, 2024
@Eauix
Copy link
Contributor Author

Eauix commented Aug 31, 2024

Okay, after adding these overlays, I can say now that the PR is complete and ready for a review!

@MatusGuy MatusGuy merged commit 624d2b9 into SuperTux:master Oct 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants