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 initial versions of peep animation objects #357

Merged
merged 18 commits into from
Dec 22, 2024
Merged

Conversation

AaronVanGeffen
Copy link
Member

@AaronVanGeffen AaronVanGeffen commented Nov 21, 2024

This is a supporting PR to OpenRCT2/OpenRCT2#23328. The objects proposed in this PR were dumped using a Python script.

To do:

  • Order string table by language/key
  • Correct image table to account for rotations
  • Add inline image sprite ids
  • Add legacy positions to animation groups
  • Remove legacy entertainerCostumes array from scenery groups
  • Entertainers: drop unused eatFood animation
  • Deduplicate guest and security animations (inherit from first group?)
  • Format animation sequence in one line?? -> not supported by our formatter
  • Add RCT1 source games where appropriate

I'd prefer this PR to be squash merged into one commit.

@AaronVanGeffen AaronVanGeffen marked this pull request as ready for review December 9, 2024 16:50
@ZeeMaji
Copy link
Contributor

ZeeMaji commented Dec 21, 2024

I noticed that the RCT1 source games were missing from the objects when objects shared between both RCT1 & RCT2 define RCT2 as the primary source game with whatever RCT1 pack they originated in as a second source game. From some research i did these should be the RCT1 source games for all of the peep animation objects.

RCT1:
Guest
Handyman
Mechanic
Security Guard
Entertainer Elephant
Entertainer Panda
Entertainer Tiger

RCT1AA:
Entertainer Roman
Entertainer Gorilla

RCT1LL:
Entertainer Astronaut
Entertainer Knight
Entertainer Snowman

Anything not listed here is RCT2 only (eg: pirate costume).
These should be correct from the research i did, the RCT1 base game only has the base three costumes when i checked the RCT1 demo in a scenario with the roman theming available, the roman & gorilla entertainers are after the standard three in https://github.com/OpenRCT2/OpenRCT2/blob/develop/src/openrct2/rct1/Tables.cpp with the gorilla costume appearing in the RCT1AA DLC scenario PC Player, and the latter ones after it are all from scenery groups that originated in RCT1LL

@AaronVanGeffen
Copy link
Member Author

Good idea. I'll amend my script and redump.

@ZeeMaji
Copy link
Contributor

ZeeMaji commented Dec 21, 2024

They're in the wrong order as the first entry is for the primary source game that's displayed in text on the object selection window, it should be like this:

    "sourceGame": [
        "rct2",
        "rct1ll"
    ],

@AaronVanGeffen
Copy link
Member Author

@ZeeMaji Thanks, I had no idea. I've changed the order to what you suggested.

Copy link
Member

@Gymnasiast Gymnasiast left a comment

Choose a reason for hiding this comment

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

I haven’t extensively checked the objects, but since this already got reviewed by Maji, I think we can proceed.

One request: we generally have the en-GB string on top in the translations. Could you change that order? If not, no big deal.

@AaronVanGeffen AaronVanGeffen merged commit 0299419 into master Dec 22, 2024
4 checks passed
@AaronVanGeffen AaronVanGeffen deleted the peep_anim_obj branch December 22, 2024 15:49
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