mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-12-16 06:45:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Bug] Fix capped rare candy friendship gain (#6565)

Browse Source 
* correctly cap rare candy friendship gain

* use correct var for achv
This commit is contained in:
Fabi 2025-09-23 15:14:22 +02:00 committed by GitHub
parent 8d5ba221d8
commit 84aa8601fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/field/pokemon.ts
View File

@ -5853,7 +5853,7 @@ export class PlayerPokemon extends Pokemon {
* For fusions, candy progress for each species in the fusion is halved. * For fusions, candy progress for each species in the fusion is halved.
* *
* @param friendship - The amount of friendship to add. Negative values will reduce friendship, though not below 0. * @param friendship - The amount of friendship to add. Negative values will reduce friendship, though not below 0.
* @param capped - If true, don't allow the friendship gain to exceed 200. Used to cap friendship gains from rare candies. * @param capped - If true, don't allow the friendship gain to exceed {@linkcode RARE_CANDY_FRIENDSHIP_CAP}. Used to cap friendship gains from rare candies.
*/ */
addFriendship(friendship: number, capped = false): void { addFriendship(friendship: number, capped = false): void {
// Short-circuit friendship loss, which doesn't impact candy friendship // Short-circuit friendship loss, which doesn't impact candy friendship
@ -5874,13 +5874,16 @@ export class PlayerPokemon extends Pokemon {
friendship = amount.value; friendship = amount.value;
const newFriendship = this.friendship + friendship; const newFriendship = this.friendship + friendship;
// If capped is true, only adjust friendship if the new friendship is less than or equal to 200. /** If capped is true, don't allow friendship gain to exceed {@linkcode RARE_CANDY_FRIENDSHIP_CAP} */
if (!capped || newFriendship <= RARE_CANDY_FRIENDSHIP_CAP) { const finalFriendship =
this.friendship = Math.min(newFriendship, 255); capped && newFriendship > RARE_CANDY_FRIENDSHIP_CAP
if (newFriendship >= 255) { ? Math.max(RARE_CANDY_FRIENDSHIP_CAP, this.friendship)
globalScene.validateAchv(achvs.MAX_FRIENDSHIP); : newFriendship;
awardRibbonsToSpeciesLine(this.species.speciesId, RibbonData.FRIENDSHIP);
} this.friendship = Math.min(finalFriendship, 255);
if (this.friendship >= 255) {
globalScene.validateAchv(achvs.MAX_FRIENDSHIP);
awardRibbonsToSpeciesLine(this.species.speciesId, RibbonData.FRIENDSHIP);
} }
let candyFriendshipMultiplier = globalScene.gameMode.isClassic let candyFriendshipMultiplier = globalScene.gameMode.isClassic