IAmChrisAMA
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/IshanP02/pokerogue

pull/148/head
Ishan Patel 2024-04-15 16:25:34 -04:00
parent 1c077d1506 a0fd462b5c
commit 10c27336d4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/ability.ts
View File

@ -1155,6 +1155,8 @@ export class PostSummonFormChangeAbAttr extends PostSummonAbAttr {
export class TraceAbAttr extends PostSummonAbAttr { export class TraceAbAttr extends PostSummonAbAttr {
applyPostSummon(pokemon: Pokemon, passive: boolean, args: any[]): boolean { applyPostSummon(pokemon: Pokemon, passive: boolean, args: any[]): boolean {
const targets = pokemon.getOpponents(); const targets = pokemon.getOpponents();
if (!targets.length)
return false;
let target: Pokemon; let target: Pokemon;
if (targets.length > 1) if (targets.length > 1)
pokemon.scene.executeWithSeedOffset(() => target = Utils.randSeedItem(targets), pokemon.scene.currentBattle.waveIndex); pokemon.scene.executeWithSeedOffset(() => target = Utils.randSeedItem(targets), pokemon.scene.currentBattle.waveIndex);

6
src/data/move.ts
View File

@ -2828,16 +2828,16 @@ export class NaturePowerAttr extends OverrideMoveEffectAttr {
case TerrainType.NONE: case TerrainType.NONE:
switch (user.scene.arena.biomeType) { switch (user.scene.arena.biomeType) {
case Biome.TOWN: case Biome.TOWN:
moveId = Moves.TRI_ATTACK; moveId = Moves.ROUND;
break; break;
case Biome.METROPOLIS: case Biome.METROPOLIS:
moveId = Moves.DARK_PULSE; moveId = Moves.TRI_ATTACK;
break; break;
case Biome.SLUM: case Biome.SLUM:
moveId = Moves.SLUDGE_BOMB; moveId = Moves.SLUDGE_BOMB;
break; break;
case Biome.PLAINS: case Biome.PLAINS:
moveId = Moves.ROUND; moveId = Moves.SILVER_WIND;
break; break;
case Biome.GRASS: case Biome.GRASS:
moveId = Moves.GRASS_KNOT; moveId = Moves.GRASS_KNOT;