Fix chain fishing shiny rolls #4906
Merged
Conversation
This file contains 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
pkmnsnfrn
previously approved these changes
Jul 5, 2024
src/pokemon.c
Outdated
Comment on lines
1153
to
1154
| if (I_FISHING_CHAIN && gIsFishingEncounter) | ||
| totalRerolls += (2 * gChainFishingDexNavStreak); |
There was a problem hiding this comment.
I feel these two changes still justify their functions, like adding I_FISHING_CHAIN to IsCurrentEncounterFishing and keeping CalculateChainFishingShinyRolls to let users add other multipliers for their streaks, like a charm or a Pokémon ability.
There was a problem hiding this comment.
Imo including I_FISHING_CHAIN in IsCurrentEncounterFishing would be misleading with the current function name. From the name i would expect it to return true even if chain fishing is disabled.
…untering different species does not break the chain, differentiate between max shiny streak and max chain length
tertu-m
approved these changes
Jul 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
According to https://bulbapedia.bulbagarden.net/wiki/Fishing#Generation_VI chain fishing adds 2 shiny rolls per Encounter. The current implementation adds 1 additional roll. Additionally, even with the feature disabled 1 roll is currently added to any fishing encounter.
I've also refactored a bit and removed (imo) redundant functions in a second commit. If these functions are supposed to stay feel free to revert the second commit.
Discord contact info
.cawt