From fc7d7092029aa465c41a5f85158bc860b0cd9cd5 Mon Sep 17 00:00:00 2001 From: ImperialSympathizer <110984302+ben-lear@users.noreply.github.com> Date: Fri, 19 Jul 2024 17:24:21 -0400 Subject: [PATCH 1/7] Update src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- .../mystery-encounters/encounters/fiery-fallout-encounter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts index 705ba3296a4..96a2fad1b15 100644 --- a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts +++ b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts @@ -36,7 +36,7 @@ const DAMAGE_PERCENTAGE: number = 20; export const FieryFalloutEncounter: IMysteryEncounter = MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.FIERY_FALLOUT) .withEncounterTier(MysteryEncounterTier.COMMON) - .withSceneWaveRangeRequirement(40, 180) // waves 10 to 180 + .withSceneWaveRangeRequirement(40, 180) .withCatchAllowed(true) .withIntroSpriteConfigs([]) // Set in onInit() .withAnimations(EncounterAnim.MAGMA_BG, EncounterAnim.MAGMA_SPOUT) From d2874e29ac2c56a071608f9939423783267fc26a Mon Sep 17 00:00:00 2001 From: ImperialSympathizer <110984302+ben-lear@users.noreply.github.com> Date: Fri, 19 Jul 2024 17:24:33 -0400 Subject: [PATCH 2/7] Update src/test/utils/overridesHelper.ts Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- src/test/utils/overridesHelper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/utils/overridesHelper.ts b/src/test/utils/overridesHelper.ts index 97caeafd7a6..15a8cc9aa99 100644 --- a/src/test/utils/overridesHelper.ts +++ b/src/test/utils/overridesHelper.ts @@ -54,7 +54,7 @@ export class OverridesHelper { * @param wave the wave (index) to set. Classic: `1`-`200` * @returns spy instance */ - startingWave(wave: number): MockInstance { + startingWave(wave: number) { const spy = vi.spyOn(Overrides, "STARTING_WAVE_OVERRIDE", "get").mockReturnValue(wave); this.log(`Starting wave set to ${wave}!`); return spy; From 1e7c3b575fa3f699c147390d298319a5965834b6 Mon Sep 17 00:00:00 2001 From: ImperialSympathizer <110984302+ben-lear@users.noreply.github.com> Date: Fri, 19 Jul 2024 17:24:43 -0400 Subject: [PATCH 3/7] Update src/test/utils/overridesHelper.ts Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- src/test/utils/overridesHelper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/utils/overridesHelper.ts b/src/test/utils/overridesHelper.ts index 15a8cc9aa99..3c341808036 100644 --- a/src/test/utils/overridesHelper.ts +++ b/src/test/utils/overridesHelper.ts @@ -76,7 +76,7 @@ export class OverridesHelper { * @param type weather type to set * @returns spy instance */ - weather(type: WeatherType): MockInstance { + weather(type: WeatherType) { const spy = vi.spyOn(Overrides, "WEATHER_OVERRIDE", "get").mockReturnValue(type); this.log(`Weather set to ${Weather[type]} (=${type})!`); return spy; From 6a697b193eafe9cc37eff818170da01428c2e3e7 Mon Sep 17 00:00:00 2001 From: ImperialSympathizer <110984302+ben-lear@users.noreply.github.com> Date: Fri, 19 Jul 2024 17:24:52 -0400 Subject: [PATCH 4/7] Update src/test/utils/overridesHelper.ts Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- src/test/utils/overridesHelper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/utils/overridesHelper.ts b/src/test/utils/overridesHelper.ts index 3c341808036..52f53d697ad 100644 --- a/src/test/utils/overridesHelper.ts +++ b/src/test/utils/overridesHelper.ts @@ -87,7 +87,7 @@ export class OverridesHelper { * @param seed the seed to set * @returns spy instance */ - seed(seed: string): MockInstance { + seed(seed: string) { const spy = vi.spyOn(this.game.scene, "resetSeed").mockImplementation(() => { this.game.scene.waveSeed = seed; Phaser.Math.RND.sow([seed]); From f80901f7b94e76f187eb671c85862538a0e15c0f Mon Sep 17 00:00:00 2001 From: ImperialSympathizer <110984302+ben-lear@users.noreply.github.com> Date: Fri, 19 Jul 2024 17:25:03 -0400 Subject: [PATCH 5/7] Update src/test/utils/overridesHelper.ts Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- src/test/utils/overridesHelper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/utils/overridesHelper.ts b/src/test/utils/overridesHelper.ts index 52f53d697ad..2b60813ef53 100644 --- a/src/test/utils/overridesHelper.ts +++ b/src/test/utils/overridesHelper.ts @@ -20,7 +20,7 @@ export class OverridesHelper { * @param percentage the encounter chance in % * @returns spy instance */ - mysteryEncounterChance(percentage: number): MockInstance { + mysteryEncounterChance(percentage: number) { const maxRate: number = 256; // 100% const rate = maxRate * (percentage / 100); const spy = vi.spyOn(Overrides, "MYSTERY_ENCOUNTER_RATE_OVERRIDE", "get").mockReturnValue(rate); From 12cd014e1163ad318691cbf13615ed9b05393c5a Mon Sep 17 00:00:00 2001 From: ImperialSympathizer <110984302+ben-lear@users.noreply.github.com> Date: Fri, 19 Jul 2024 17:26:18 -0400 Subject: [PATCH 6/7] Update src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- .../mystery-encounters/encounters/fiery-fallout-encounter.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts index 96a2fad1b15..b99a7092902 100644 --- a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts +++ b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts @@ -186,7 +186,8 @@ export const FieryFalloutEncounter: IMysteryEncounter = // Burn random member const burnable = nonFireTypes.filter(p => isNullOrUndefined(p.status) || isNullOrUndefined(p.status.effect) || p.status?.effect === StatusEffect.BURN); if (burnable?.length > 0) { - const chosenPokemon = burnable[randSeedInt(burnable.length - 1)]; + const roll = randSeedInt(burnable.length); + const chosenPokemon = burnable[roll]; if (chosenPokemon.trySetStatus(StatusEffect.BURN)) { // Burn applied encounter.setDialogueToken("burnedPokemon", chosenPokemon.name); From 9bcaf6a336a4ef4be95fc70f364ec820d63f115e Mon Sep 17 00:00:00 2001 From: ImperialSympathizer <110984302+ben-lear@users.noreply.github.com> Date: Fri, 19 Jul 2024 17:26:40 -0400 Subject: [PATCH 7/7] Update src/data/battle-anims.ts Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- src/data/battle-anims.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/data/battle-anims.ts b/src/data/battle-anims.ts index 3f00a012ee3..6f2f293d099 100644 --- a/src/data/battle-anims.ts +++ b/src/data/battle-anims.ts @@ -1038,8 +1038,7 @@ export abstract class BattleAnim { let t = 0; for (const frame of frames) { - let x = frame.x; - let y = frame.y; + let { x , y } = frame; const scaleX = (frame.zoomX / 100) * (!frame.mirror ? 1 : -1); const scaleY = (frame.zoomY / 100); x += targetInitialX;