Skip to content

Enemy rando cleanup#6327

Merged
serprex merged 18 commits intoHarbourMasters:developfrom
Pepe20129:enemy_rando_cleanup
Mar 17, 2026
Merged

Enemy rando cleanup#6327
serprex merged 18 commits intoHarbourMasters:developfrom
Pepe20129:enemy_rando_cleanup

Conversation

@Pepe20129
Copy link
Copy Markdown
Contributor

@Pepe20129 Pepe20129 commented Mar 5, 2026

Aside from a general cleanup, greatly reduces the intrusiveness of enemy randomizer (no more extra parameter in Actor_Spawn + smaller stuff) & fixes the door in the forest temple upper stalfos fight opening too soon.

Build Artifacts

@serprex serprex self-requested a review March 5, 2026 22:09
Copy link
Copy Markdown
Contributor

@garrettjoecox garrettjoecox left a comment

Choose a reason for hiding this comment

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

Love to see this. For what it's worth ShouldActorInit already exists and you should be able to use that instead of your VB_SPAWN_ACTOR_ENTRY and most of the rest of the newly introduced VBs.

I have a proof of concept using this on 2ship here https://github.com/HarbourMasters/2ship2harkinian/pull/1564/changes

@Pepe20129
Copy link
Copy Markdown
Contributor Author

Pepe20129 commented Mar 6, 2026

Love to see this. For what it's worth ShouldActorInit already exists and you should be able to use that instead of your VB_SPAWN_ACTOR_ENTRY and most of the rest of the newly introduced VBs.

I think it's better to do it this way as it prevents future accidental interference with other features that spawn enemies.

serprex
serprex previously approved these changes Mar 8, 2026
Comment thread soh/soh/Enhancements/enemyrandomizer.cpp Outdated
Comment thread soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c Outdated
@serprex serprex self-requested a review March 8, 2026 23:25
@serprex serprex dismissed their stale review March 8, 2026 23:25

issues arose during testing

@serprex
Copy link
Copy Markdown
Member

serprex commented Mar 9, 2026

getting all the headers fixed will be painful if it's working on your system. I'll push fix later today

@serprex serprex merged commit b35883e into HarbourMasters:develop Mar 17, 2026
6 checks passed
@Pepe20129 Pepe20129 deleted the enemy_rando_cleanup branch March 17, 2026 20:24
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