Skip to content

G2: Get rid of all possible instances of SPR_G2_CHAR_BEGIN +#18232

Merged
Gymnasiast merged 6 commits into
OpenRCT2:developfrom
karst:g2-reorg
Nov 3, 2022
Merged

G2: Get rid of all possible instances of SPR_G2_CHAR_BEGIN +#18232
Gymnasiast merged 6 commits into
OpenRCT2:developfrom
karst:g2-reorg

Conversation

@karst

@karst karst commented Oct 6, 2022

Copy link
Copy Markdown
Member

The goal of this PR is to get rid of all possible instances of SPR_G2_CHAR_BEGIN + this will allow me to reorganize G2 in a future PR to have everything together under their own tabs like Icons, Characters, Track Additions and New Track types, this will allow future additions to be more organized in this file as well as G2 is becoming a mess as is.

It seems that the junior coaster has 15 unused sprites in g2 (that aren't listed in sprites.h, or anywhere for that matter), (flat to steep diagonal (including lift chain)). I do not know if there's plans for these so I have left these in for now. I can easily just put these with the rest of the Jr RC pieces and skip over these.

@karst karst marked this pull request as draft October 6, 2022 23:47
@karst karst marked this pull request as ready for review October 7, 2022 21:35
@karst karst changed the title Reorganize G2 G2: Get rid of all possible instances of SPR_G2_CHAR_BEGIN + Oct 7, 2022
@karst

karst commented Oct 10, 2022

Copy link
Copy Markdown
Member Author

When graphics asset packs are added and it needs to replace something in G2 and G2 gets changed (G2 version), something new gets added, we are gonna need a versioning system so G2 doesn't get messed up if someone is making a graphics pack for the game.
This ofcourse would not be necessary if the graphics pack would only touch on G1's graphics.

Or perhaps even better would be to not use numbers at all for graphics replacements and instead use sprite id's like wooden_rc_booster_nw_se, then you wouldn't run into any issues with versioning. But to implement that someone will need to go through G1 entirely and label every single sprite available (not necesssary but would make things alot cleaner).

@IntelOrca

Copy link
Copy Markdown
Contributor

@karst we are not sure yet how this is going to work. Everything will eventually end up in object files, so there will not be a g1 or g2.

@karst

karst commented Oct 23, 2022

Copy link
Copy Markdown
Member Author

I've got the next part for this one lined up. So once this is merged I can immediately create a new PR for doing the sorting (on which I am gonna need feedback to see if there's a more logical order or if it's correct the way I did it).

@Gymnasiast Gymnasiast added good-first-issue Low hanging fruits good for people new to open source or OpenRCT2. hacktoberfest-accepted and removed good-first-issue Low hanging fruits good for people new to open source or OpenRCT2. labels Oct 29, 2022
@karst

karst commented Nov 2, 2022

Copy link
Copy Markdown
Member Author

Rebased for the jr coaster extra track removal.

@Gymnasiast Gymnasiast merged commit 2e053a7 into OpenRCT2:develop Nov 3, 2022
@Gymnasiast Gymnasiast added this to the v0.4.3 milestone Nov 3, 2022
@karst karst deleted the g2-reorg branch November 26, 2022 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants