mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-01 05:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apply Benjie's suggestions

Browse Source 
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
This commit is contained in:
AJ Fontaine 2025-05-28 18:13:57 -04:00 committed by GitHub
parent 071d24974c
commit 02ed139c7d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/data/balance/pokemon-evolutions.ts
View File

@ -198,10 +198,11 @@ export class SpeciesEvolutionCondition {
)?.moveId === cond.move; )?.moveId === cond.move;
case EvoCondKey.NATURE: case EvoCondKey.NATURE:
return cond.nature.includes(pokemon.getNature()); return cond.nature.includes(pokemon.getNature());
case EvoCondKey.RANDOM_FORM: case EvoCondKey.RANDOM_FORM: {
let ret = false; let ret = false;
globalScene.executeWithSeedOffset(() => ret = !randSeedInt(cond.value), pokemon.id); globalScene.executeWithSeedOffset(() => ret = !randSeedInt(cond.value), pokemon.id);
return ret; return ret;
}
case EvoCondKey.SPECIES_CAUGHT: case EvoCondKey.SPECIES_CAUGHT:
return !!globalScene.gameData.dexData[cond.speciesCaught].caughtAttr; return !!globalScene.gameData.dexData[cond.speciesCaught].caughtAttr;
case EvoCondKey.MOVE_USE_COUNT: case EvoCondKey.MOVE_USE_COUNT:
@ -278,7 +279,7 @@ export class SpeciesFormEvolution {
* @param item {@linkcode EvolutionItem} optional, check if the evolution uses a certain item * @param item {@linkcode EvolutionItem} optional, check if the evolution uses a certain item
* @returns whether this evolution can apply to the Pokemon * @returns whether this evolution can apply to the Pokemon
*/ */
public validate(pokemon: Pokemon, forFusion: boolean = false, item?: EvolutionItem): boolean { public validate(pokemon: Pokemon, forFusion = false, item?: EvolutionItem): boolean {
return ( return (
pokemon.level >= this.level && pokemon.level >= this.level &&
// Check form key, using the fusion's form key if we're checking the fusion // Check form key, using the fusion's form key if we're checking the fusion
@ -288,7 +289,7 @@ export class SpeciesFormEvolution {
); );
} }
public isValidItemEvolution(pokemon: Pokemon, forFusion: boolean = false): boolean { public isValidItemEvolution(pokemon: Pokemon, forFusion = false): boolean {
return ( return (
// If an item is given, check if it's the right one // If an item is given, check if it's the right one
!isNullOrUndefined(this.item) && !isNullOrUndefined(this.item) &&