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

Game flow rework (pt 6) #2381

Merged
merged 7 commits into from
Jan 25, 2025
Merged

Game flow rework (pt 6) #2381

merged 7 commits into from
Jan 25, 2025

Conversation

rr-
Copy link
Collaborator

@rr- rr- commented Jan 25, 2025

Checklist

  • I have read the coding conventions
  • I have added a changelog entry about what my pull request accomplishes, or it is an internal change
  • I have added a readme entry about my new feature or OG bug fix, or it is a different change

Description

This one is significantly smaller – I only move the demos in TR1 to their own key, removing the "demo" boolean property from individual levels. This now matches TR2 and I'd like to follow-up with cutscenes and the title level, and eventually the Gym (which likely will prove to be the hardest, as it's put before regular levels.)
The TR1 GF level reader is refactored to have a similar structure to TR2.

@rr- rr- added Internal The invisible stuff TR1 labels Jan 25, 2025
@rr- rr- self-assigned this Jan 25, 2025
@rr- rr- requested review from a team as code owners January 25, 2025 14:02
@rr- rr- requested review from lahm86, walkawayy and aredfan and removed request for a team January 25, 2025 14:02
Copy link
Collaborator

@lahm86 lahm86 left a comment

Choose a reason for hiding this comment

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

LGTM.

As an aside, perhaps we should add a guard when starting a demo to verify that the level actually has demo data; currently it crashes if it's missing, but that's the same on develop.

@rr-
Copy link
Collaborator Author

rr- commented Jan 25, 2025

I'll address this and #2383 here.

@rr-
Copy link
Collaborator Author

rr- commented Jan 25, 2025

@lahm86 done

@rr-
Copy link
Collaborator Author

rr- commented Jan 25, 2025

(Just rebasing on top of newest develop.)

@rr- rr- merged commit e94038f into develop Jan 25, 2025
9 checks passed
@rr- rr- deleted the tr2-game-flow branch January 25, 2025 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Internal The invisible stuff TR1
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants