From 9fd5b7502674ce0a53c444137ae2a743dc6d6fae Mon Sep 17 00:00:00 2001 From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Date: Tue, 24 Sep 2024 20:25:04 -0400 Subject: [PATCH 1/4] Update src/modifier/modifier-type.ts Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> --- src/modifier/modifier-type.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 0afc06e1d59..1026c6d72c8 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -2444,7 +2444,7 @@ export class ModifierTypeOption { /** * Calculates the team's luck value. * @param party The player's party. - * @returns A value between 0 and 14, or 0 if the player is in Daily Run mode. + * @returns A number between 0 and 14 based on the party's total luck value, or a random number between 0 and 14 if the player is in Daily Run mode. */ export function getPartyLuckValue(party: Pokemon[]): integer { if (party[0].scene.gameMode.isDaily) { From dd972376d5789bf819af515f510d2217580bd154 Mon Sep 17 00:00:00 2001 From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Date: Tue, 24 Sep 2024 20:26:59 -0400 Subject: [PATCH 2/4] Remove IntegerHolder (1/2) --- src/field/pokemon.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index c58be8a23d6..06e01029d3a 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1913,7 +1913,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (!this.shiny || (!variantData.hasOwnProperty(variantDataIndex) && !variantData.hasOwnProperty(this.species.speciesId))) { return 0; } - const rand = new Utils.IntegerHolder(0); + const rand = new Utils.NumberHolder(0); this.scene.executeWithSeedOffset(() => { rand.value = Utils.randSeedInt(10); }, this.id, this.scene.waveSeed); From 05f5baeaae501ea29011104da046dee38aac3ba0 Mon Sep 17 00:00:00 2001 From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Date: Tue, 24 Sep 2024 20:28:43 -0400 Subject: [PATCH 3/4] Remove IntegerHolder (2/2) --- src/modifier/modifier-type.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 1026c6d72c8..9dd998c601d 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -2448,7 +2448,7 @@ export class ModifierTypeOption { */ export function getPartyLuckValue(party: Pokemon[]): integer { if (party[0].scene.gameMode.isDaily) { - const DailyLuck = new Utils.IntegerHolder(0); + const DailyLuck = new Utils.NumberHolder(0); party[0].scene.executeWithSeedOffset(() => { DailyLuck.value = Utils.randSeedInt(15); // Random number between 0 and 14 }, 0, party[0].scene.seed); From c7b9ac8d03646acc93f3d32e3842d5ccdcca3262 Mon Sep 17 00:00:00 2001 From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Date: Tue, 24 Sep 2024 20:33:09 -0400 Subject: [PATCH 4/4] Remove unnecessary function --- src/test/utils/helpers/modifiersHelper.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/test/utils/helpers/modifiersHelper.ts b/src/test/utils/helpers/modifiersHelper.ts index c8bb80d6566..c38bf5770a8 100644 --- a/src/test/utils/helpers/modifiersHelper.ts +++ b/src/test/utils/helpers/modifiersHelper.ts @@ -15,13 +15,6 @@ export class ModifierHelper extends GameManagerHelper { return this; } - checkHasRun(modifier: ModifierTypeKeys): boolean { - if (itemPoolChecks.get(modifier) === undefined) { - return false; - } - return true; - } - /** * `get`s a value from the `itemPoolChecks` map. *