Add 'Allow Nana' option to Powershield Training#338
Open
slefforge wants to merge 1 commit into
Open
Conversation
Owner
|
I suggest that we instead find a way to despawn/respawn nana during the event, when the option is flipped, rather than hack this in. My initial idea is to always start the event with nana, change the setting name to "Popo Only" or something, force a KO when the option is flipped, then immediately despawn nana if the option is on. |
slefforge
force-pushed
the
powershield-allow-nana
branch
2 times, most recently
from
f79b89f to
fb26c5c
Compare
Author
|
Good suggestion. This approach is simpler. |
AlexanderHarrison
requested changes
Jun 9, 2026
| void ChangeRandomFireDelayMax(GOBJ *event_menu, int value); | ||
| int GetRandomLaserDelay(void); | ||
| void ChangeAllowNana(GOBJ *event_menu, int value); | ||
| void SaveOption(GOBJ *event_menu, int value); |
| .OnChange = SaveOption, | ||
| }, | ||
| { | ||
| .kind = OPTKIND_STRING, |
Owner
There was a problem hiding this comment.
change to OPTKIND_TOGGLE
| .name = "Laser Height", | ||
| .desc = {"Change the laser height."}, | ||
| .values = Options_LaserHeight, | ||
| .OnChange = SaveOption, |
Owner
There was a problem hiding this comment.
remove SaveOption callbacks and the unused function below
|
|
||
| static void PutOnGround(GOBJ *ft); | ||
|
|
||
| void Event_Init(GOBJ *event_gobj) { |
Comment on lines
+158
to
+172
| if (player_data->kind == FTKIND_POPO) { | ||
| if (Options_Main[6].kind != OPTKIND_STRING) { | ||
| EventOption temp = Options_Main[6]; | ||
| Options_Main[6] = Options_Main[7]; | ||
| Options_Main[7] = temp; | ||
| } | ||
| Menu_Main.option_num = 8; | ||
| } else { | ||
| if (Options_Main[6].kind != OPTKIND_FUNC) { | ||
| EventOption temp = Options_Main[6]; | ||
| Options_Main[6] = Options_Main[7]; | ||
| Options_Main[7] = temp; | ||
| } | ||
| Menu_Main.option_num = 7; | ||
| } |
Owner
There was a problem hiding this comment.
Just disable the option if the player isn't ice climbers for now. I'll add a built-in way to hide options before the next stable release. No need to overcomplicate it for now.
Comment on lines
+174
to
+176
| bool disable_random_bounds = Options_Main[OPT_FIRE_SPEED].val != FIRE_SPEED_RANDOM; | ||
| Options_Main[OPT_FIRE_DELAY_RANDOM_MIN].disable = disable_random_bounds; | ||
| Options_Main[OPT_FIRE_DELAY_RANDOM_MAX].disable = disable_random_bounds; |
| } | ||
|
|
||
| void SaveOption(GOBJ *event_menu, int value) { | ||
| } |
slefforge
force-pushed
the
powershield-allow-nana
branch
from
fb26c5c to
d223bac
Compare
Author
|
let me know if that looks good |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
added an option to toggle between both climbers / sopo for the powershield event. I added a menu option in the event that only appears when you're playing as ice climbers. when you toggle it, it effectively resets the event but with the correct sopo bool.
most of this code is the logic for ensuring that the other event settings persist when this is toggled.