From 57ece2c1d78a9509ec812a32d7c25e0d92045a1e Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Sun, 28 Apr 2024 20:41:38 -0400 Subject: [PATCH] Revert "Add shiny and variant debug override" This reverts commit 21482a641b594ec7b9bcecf94c8e181d99907d18. --- src/battle-scene.ts | 2 -- src/field/pokemon.ts | 12 +++--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index ecb309382a3..3954e48782e 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -76,8 +76,6 @@ export const MOVE_OVERRIDE = Moves.NONE; export const OPP_SPECIES_OVERRIDE = 0; export const OPP_ABILITY_OVERRIDE = Abilities.NONE; export const OPP_MOVE_OVERRIDE = Moves.NONE; -export const OPP_SHINY_OVERRIDE = true; -export const OPP_VARIANT_OVERRIDE = 0; const DEBUG_RNG = false; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 4e20bad407b..d2a8e4226df 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1,5 +1,5 @@ import Phaser from 'phaser'; -import BattleScene, { ABILITY_OVERRIDE, AnySound, MOVE_OVERRIDE, OPP_ABILITY_OVERRIDE, OPP_MOVE_OVERRIDE, OPP_SHINY_OVERRIDE, OPP_VARIANT_OVERRIDE } from '../battle-scene'; +import BattleScene, { ABILITY_OVERRIDE, AnySound, MOVE_OVERRIDE, OPP_ABILITY_OVERRIDE, OPP_MOVE_OVERRIDE } from '../battle-scene'; import { Variant, VariantSet, variantColorCache } from '#app/data/variant'; import { variantData } from '#app/data/variant'; import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from '../ui/battle-info'; @@ -2546,15 +2546,9 @@ export class EnemyPokemon extends Pokemon { this.generateAndPopulateMoveset(); this.trySetShiny(); - if (OPP_SHINY_OVERRIDE) { - this.shiny = true; - this.initShinySparkle(); - } - if (this.shiny) { + + if (this.shiny) this.variant = this.generateVariant(); - if (OPP_VARIANT_OVERRIDE) - this.variant = OPP_VARIANT_OVERRIDE; - } this.luck = (this.shiny ? this.variant + 1 : 0) + (this.fusionShiny ? this.fusionVariant + 1 : 0);