Merge branch 'beta' into mystery-encounters-translations
This commit is contained in:
commit
b3536e1e66
|
@ -55,7 +55,7 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to
|
||||||
- Pokémon Sword/Shield
|
- Pokémon Sword/Shield
|
||||||
- Pokémon Legends: Arceus
|
- Pokémon Legends: Arceus
|
||||||
- Pokémon Scarlet/Violet
|
- Pokémon Scarlet/Violet
|
||||||
- Firel (Custom Laboratory, Metropolis, Seabed, and Space biome music)
|
- Firel (Custom Ice Cave, Laboratory, Metropolis, Plains, Power Plant, Seabed, Space, and Volcano biome music)
|
||||||
- Lmz (Custom Jungle biome music)
|
- Lmz (Custom Jungle biome music)
|
||||||
- Andr06 (Custom Slum and Sea biome music)
|
- Andr06 (Custom Slum and Sea biome music)
|
||||||
|
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -746,7 +746,7 @@ export class Arena {
|
||||||
case Biome.TOWN:
|
case Biome.TOWN:
|
||||||
return 7.288;
|
return 7.288;
|
||||||
case Biome.PLAINS:
|
case Biome.PLAINS:
|
||||||
return 7.693;
|
return 17.485;
|
||||||
case Biome.GRASS:
|
case Biome.GRASS:
|
||||||
return 1.995;
|
return 1.995;
|
||||||
case Biome.TALL_GRASS:
|
case Biome.TALL_GRASS:
|
||||||
|
@ -774,13 +774,13 @@ export class Arena {
|
||||||
case Biome.DESERT:
|
case Biome.DESERT:
|
||||||
return 1.143;
|
return 1.143;
|
||||||
case Biome.ICE_CAVE:
|
case Biome.ICE_CAVE:
|
||||||
return 15.010;
|
return 0.000;
|
||||||
case Biome.MEADOW:
|
case Biome.MEADOW:
|
||||||
return 3.891;
|
return 3.891;
|
||||||
case Biome.POWER_PLANT:
|
case Biome.POWER_PLANT:
|
||||||
return 2.810;
|
return 9.447;
|
||||||
case Biome.VOLCANO:
|
case Biome.VOLCANO:
|
||||||
return 5.116;
|
return 17.637;
|
||||||
case Biome.GRAVEYARD:
|
case Biome.GRAVEYARD:
|
||||||
return 3.232;
|
return 3.232;
|
||||||
case Biome.DOJO:
|
case Biome.DOJO:
|
||||||
|
|
|
@ -108,7 +108,7 @@
|
||||||
"forest": "PMD EoS Dusk Forest",
|
"forest": "PMD EoS Dusk Forest",
|
||||||
"grass": "PMD EoS Apple Woods",
|
"grass": "PMD EoS Apple Woods",
|
||||||
"graveyard": "PMD EoS Mystifying Forest",
|
"graveyard": "PMD EoS Mystifying Forest",
|
||||||
"ice_cave": "PMD EoS Vast Ice Mountain",
|
"ice_cave": "Firel - -60F",
|
||||||
"island": "PMD EoS Craggy Coast",
|
"island": "PMD EoS Craggy Coast",
|
||||||
"jungle": "Lmz - Jungle",
|
"jungle": "Lmz - Jungle",
|
||||||
"laboratory": "Firel - Laboratory",
|
"laboratory": "Firel - Laboratory",
|
||||||
|
@ -116,8 +116,8 @@
|
||||||
"meadow": "PMD EoS Sky Peak Forest",
|
"meadow": "PMD EoS Sky Peak Forest",
|
||||||
"metropolis": "Firel - Metropolis",
|
"metropolis": "Firel - Metropolis",
|
||||||
"mountain": "PMD EoS Mt. Horn",
|
"mountain": "PMD EoS Mt. Horn",
|
||||||
"plains": "PMD EoS Sky Peak Prairie",
|
"plains": "Firel - Route 888",
|
||||||
"power_plant": "PMD EoS Far Amp Plains",
|
"power_plant": "Firel - The Klink",
|
||||||
"ruins": "PMD EoS Deep Sealed Ruin",
|
"ruins": "PMD EoS Deep Sealed Ruin",
|
||||||
"sea": "Andr06 - Marine Mystique",
|
"sea": "Andr06 - Marine Mystique",
|
||||||
"seabed": "Firel - Seabed",
|
"seabed": "Firel - Seabed",
|
||||||
|
@ -128,7 +128,7 @@
|
||||||
"tall_grass": "PMD EoS Foggy Forest",
|
"tall_grass": "PMD EoS Foggy Forest",
|
||||||
"temple": "PMD EoS Aegis Cave",
|
"temple": "PMD EoS Aegis Cave",
|
||||||
"town": "PMD EoS Random Dungeon Theme 3",
|
"town": "PMD EoS Random Dungeon Theme 3",
|
||||||
"volcano": "PMD EoS Steam Cave",
|
"volcano": "Firel - Twisturn Volcano",
|
||||||
"wasteland": "PMD EoS Hidden Highland",
|
"wasteland": "PMD EoS Hidden Highland",
|
||||||
"encounter_ace_trainer": "BW Trainers' Eyes Meet (Ace Trainer)",
|
"encounter_ace_trainer": "BW Trainers' Eyes Meet (Ace Trainer)",
|
||||||
"encounter_backpacker": "BW Trainers' Eyes Meet (Backpacker)",
|
"encounter_backpacker": "BW Trainers' Eyes Meet (Backpacker)",
|
||||||
|
|
Loading…
Reference in New Issue