mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-19 05:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' into egg-move-scripts

Browse Source
This commit is contained in:
Bertie690 2025-08-12 20:15:57 -04:00 committed by GitHub
commit e420b976cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/audio/bgm/desert.mp3
View File

Binary file not shown.

BIN
public/audio/bgm/fairy_cave.mp3
View File

Binary file not shown.

34
src/data/trainers/trainer-config.ts
View File

@ -1865,27 +1865,43 @@ export const trainerConfigs: TrainerConfigs = {
.setPartyMemberFunc(
0,
getRandomPartyMemberFunc([
SpeciesId.METAPOD,
SpeciesId.LEDYBA,
SpeciesId.CLEFFA,
SpeciesId.WOOPER,
SpeciesId.TEDDIURSA,
SpeciesId.REMORAID,
SpeciesId.HOUNDOUR,
SpeciesId.SILCOON,
SpeciesId.PLUSLE,
SpeciesId.VOLBEAT,
SpeciesId.PACHIRISU,
SpeciesId.SILCOON,
SpeciesId.METAPOD,
SpeciesId.IGGLYBUFF,
SpeciesId.SPINDA,
SpeciesId.BONSLY,
SpeciesId.PETILIL,
SpeciesId.EEVEE,
SpeciesId.SPRITZEE,
SpeciesId.MILCERY,
SpeciesId.PICHU,
]),
)
.setPartyMemberFunc(
1,
getRandomPartyMemberFunc(
[
SpeciesId.KAKUNA,
SpeciesId.SPINARAK,
SpeciesId.IGGLYBUFF,
SpeciesId.PALDEA_WOOPER,
SpeciesId.PHANPY,
SpeciesId.MANTYKE,
SpeciesId.ELECTRIKE,
SpeciesId.CASCOON,
SpeciesId.MINUN,
SpeciesId.ILLUMISE,
SpeciesId.EMOLGA,
SpeciesId.CASCOON,
SpeciesId.KAKUNA,
SpeciesId.CLEFFA,
SpeciesId.SPINDA,
SpeciesId.MIME_JR,
SpeciesId.COTTONEE,
SpeciesId.SWIRLIX,
SpeciesId.FIDOUGH,
SpeciesId.EEVEE,
],
TrainerSlot.TRAINER_PARTNER,

4
src/field/arena.ts
View File

@ -895,7 +895,7 @@ export class Arena {
case BiomeId.CAVE:
return 14.24;
case BiomeId.DESERT:
return 1.143;
return 9.02;
case BiomeId.ICE_CAVE:
return 0.0;
case BiomeId.MEADOW:
@ -923,7 +923,7 @@ export class Arena {
case BiomeId.JUNGLE:
return 0.0;
case BiomeId.FAIRY_CAVE:
return 4.542;
return 0.0;
case BiomeId.TEMPLE:
return 2.547;
case BiomeId.ISLAND: