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

Convert End of Cycle enhancements to ShipInit #945

Merged
merged 3 commits into from
Jan 14, 2025

Conversation

balloondude2
Copy link
Contributor

@balloondude2 balloondude2 commented Jan 14, 2025

This converts the End of Cycle enhancements to the new ShipInit pattern.

Additionally, clears the appropriate flags for the Song of Time cutscene ammo loss.

Adds a Reset function to properly clear the Ammo types in between Song of Time cutscenes.

Build Artifacts

Copy link
Contributor

@Archez Archez left a comment

Choose a reason for hiding this comment

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

Don't forget to also remove RegisterEndOfCycleSaveHooks from the header file and the Enhancements.cpp


void EnTest6_Reset(void) {
for (int i = 0; i < ARRAY_COUNT(sSoTCsAmmoDrops); i++) {
sSoTCsAmmoDrops[i].type = SOTCS_AMMO_DROP_NONE;
Copy link
Contributor

Choose a reason for hiding this comment

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

Good find!

CLEAR_EVENTINF(EVENTINF_THREEDAYRESET_LOST_BOMB_AMMO);
CLEAR_EVENTINF(EVENTINF_THREEDAYRESET_LOST_NUT_AMMO);
CLEAR_EVENTINF(EVENTINF_THREEDAYRESET_LOST_STICK_AMMO);
CLEAR_EVENTINF(EVENTINF_THREEDAYRESET_LOST_ARROW_AMMO);
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice touch to add these!

@balloondude2
Copy link
Contributor Author

Don't forget to also remove RegisterEndOfCycleSaveHooks from the header file and the Enhancements.cpp

Got it removed from these spots

@Archez Archez merged commit a7fbf30 into HarbourMasters:develop Jan 14, 2025
5 checks passed
@balloondude2 balloondude2 deleted the ship-init branch January 14, 2025 23:42
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.

2 participants