ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Add shiny and variant debug override" 

This reverts commit 21482a641b.
This commit is contained in:
Flashfyre 2024-04-28 20:41:38 -04:00
parent 0b438d0ff4
commit 57ece2c1d7
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle-scene.ts
View File

@ -76,8 +76,6 @@ export const MOVE_OVERRIDE = Moves.NONE;
export const OPP_SPECIES_OVERRIDE = 0; export const OPP_SPECIES_OVERRIDE = 0;
export const OPP_ABILITY_OVERRIDE = Abilities.NONE; export const OPP_ABILITY_OVERRIDE = Abilities.NONE;
export const OPP_MOVE_OVERRIDE = Moves.NONE; export const OPP_MOVE_OVERRIDE = Moves.NONE;
export const OPP_SHINY_OVERRIDE = true;
export const OPP_VARIANT_OVERRIDE = 0;
const DEBUG_RNG = false; const DEBUG_RNG = false;

12
src/field/pokemon.ts
View File

@ -1,5 +1,5 @@
import Phaser from 'phaser'; 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 { Variant, VariantSet, variantColorCache } from '#app/data/variant';
import { variantData } from '#app/data/variant'; import { variantData } from '#app/data/variant';
import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from '../ui/battle-info'; import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from '../ui/battle-info';
@ -2546,15 +2546,9 @@ export class EnemyPokemon extends Pokemon {
this.generateAndPopulateMoveset(); this.generateAndPopulateMoveset();
this.trySetShiny(); this.trySetShiny();
if (OPP_SHINY_OVERRIDE) {
this.shiny = true; if (this.shiny)
this.initShinySparkle();
}
if (this.shiny) {
this.variant = this.generateVariant(); 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); this.luck = (this.shiny ? this.variant + 1 : 0) + (this.fusionShiny ? this.fusionVariant + 1 : 0);