Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Balance] Remove from trainers: Pika/Eevee forms before 30, BB Gren, Rival starter HA #4863

Merged
merged 3 commits into from
Nov 15, 2024
Merged

[Balance] Remove from trainers: Pika/Eevee forms before 30, BB Gren, Rival starter HA #4863

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b52fda3
Remove Pika/Eevee forms from Trainers before wave 30, and BB Gren
Fontbane Nov 14, 2024
95324a2
Fix `egg` test
DayKev Nov 14, 2024
32bb203
Ban hidden ability from Rival starter
Fontbane Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/battle-scene.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1397,10 +1397,19 @@
case Species.PALDEA_TAUROS:
return Utils.randSeedInt(species.forms.length);
case Species.PIKACHU:
if (this.currentBattle.battleType === BattleType.TRAINER && this.currentBattle.waveIndex < 30) {
return 0;
Fontbane marked this conversation as resolved.
Show resolved Hide resolved
}
return Utils.randSeedInt(8);
case Species.EEVEE:
if (this.currentBattle.battleType === BattleType.TRAINER && this.currentBattle.waveIndex < 30) {

Check failure on line 1405 in src/battle-scene.ts

View workflow job for this annotation

GitHub Actions / Run Tests (1) / Shard 1 of 10

src/test/eggs/egg.test.ts > Egg Generation Tests > should generate egg moves, species, shinyness, and ability unpredictably for the egg gacha 

TypeError: Cannot read properties of null (reading 'battleType')
 ❯ BattleScene.getSpeciesFormIndex src/battle-scene.ts:1405:32
 ❯ new Pokemon src/field/pokemon.ts:228:37
 ❯ new PlayerPokemon src/field/pokemon.ts:4140:5
 ❯ BattleScene.addPlayerPokemon src/battle-scene.ts:886:21
 ❯ generatePlayerPokemonHelper src/data/egg.ts:236:19
 ❯ src/data/egg.ts:249:7
 ❯ BattleScene.executeWithSeedOffset src/battle-scene.ts:1555:5
 ❯ Egg.generatePlayerPokemon src/data/egg.ts:248:11
 ❯ src/test/eggs/egg.test.ts:347:31
return 0; // No Partner Eevee for Wave 12 Preschoolers
}
return Utils.randSeedInt(2);
case Species.GRENINJA:
if (this.currentBattle.battleType === BattleType.TRAINER) {
return 0; // Don't give trainers Battle Bond Greninja
}
return Utils.randSeedInt(2);
case Species.ZYGARDE:
return Utils.randSeedInt(4);
Expand Down
Loading