diff --git a/README.md b/README.md index d08107867c2..7095a36cfc7 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,7 @@ Check out our [Trello Board](https://trello.com/b/z10B703R/pokerogue-board) to s - Arata Iiyoshi - Atsuhiro Ishizuna - Pokémon Black/White 2 + - Firel (Additional biome themes) - edifette (Title screen music) ### 🎵 Sound Effects diff --git a/public/audio/bgm/laboratory.mp3 b/public/audio/bgm/laboratory.mp3 index 62694e3e063..38b2b71b62a 100644 Binary files a/public/audio/bgm/laboratory.mp3 and b/public/audio/bgm/laboratory.mp3 differ diff --git a/public/audio/bgm/metropolis.mp3 b/public/audio/bgm/metropolis.mp3 index 3300317d650..ff67771bdb9 100644 Binary files a/public/audio/bgm/metropolis.mp3 and b/public/audio/bgm/metropolis.mp3 differ diff --git a/public/images/arenas/island_a.png b/public/images/arenas/island_a.png new file mode 100644 index 00000000000..e48675aa59b Binary files /dev/null and b/public/images/arenas/island_a.png differ diff --git a/public/images/arenas/island_b.png b/public/images/arenas/island_b.png new file mode 100644 index 00000000000..53bd4f1fe4c Binary files /dev/null and b/public/images/arenas/island_b.png differ diff --git a/public/images/arenas/island_b_1.png b/public/images/arenas/island_b_1.png new file mode 100644 index 00000000000..8619e406a3f Binary files /dev/null and b/public/images/arenas/island_b_1.png differ diff --git a/public/images/arenas/island_b_2.png b/public/images/arenas/island_b_2.png new file mode 100644 index 00000000000..b6dfa077346 Binary files /dev/null and b/public/images/arenas/island_b_2.png differ diff --git a/public/images/arenas/island_b_3.png b/public/images/arenas/island_b_3.png new file mode 100644 index 00000000000..192c06950ae Binary files /dev/null and b/public/images/arenas/island_b_3.png differ diff --git a/public/images/arenas/island_bg.png b/public/images/arenas/island_bg.png new file mode 100644 index 00000000000..5ecb6d8100d Binary files /dev/null and b/public/images/arenas/island_bg.png differ diff --git a/public/images/arenas/jungle_a.png b/public/images/arenas/jungle_a.png new file mode 100644 index 00000000000..5501593d9e1 Binary files /dev/null and b/public/images/arenas/jungle_a.png differ diff --git a/public/images/arenas/jungle_b.png b/public/images/arenas/jungle_b.png new file mode 100644 index 00000000000..29ec524298c Binary files /dev/null and b/public/images/arenas/jungle_b.png differ diff --git a/public/images/arenas/jungle_b_1.png b/public/images/arenas/jungle_b_1.png new file mode 100644 index 00000000000..462bd0df264 Binary files /dev/null and b/public/images/arenas/jungle_b_1.png differ diff --git a/public/images/arenas/jungle_b_2.png b/public/images/arenas/jungle_b_2.png new file mode 100644 index 00000000000..1a395af55ae Binary files /dev/null and b/public/images/arenas/jungle_b_2.png differ diff --git a/public/images/arenas/jungle_b_3.png b/public/images/arenas/jungle_b_3.png new file mode 100644 index 00000000000..e579f4013ce Binary files /dev/null and b/public/images/arenas/jungle_b_3.png differ diff --git a/public/images/arenas/jungle_bg.png b/public/images/arenas/jungle_bg.png new file mode 100644 index 00000000000..ff2cda1c9da Binary files /dev/null and b/public/images/arenas/jungle_bg.png differ diff --git a/public/images/arenas/laboratory_a.png b/public/images/arenas/laboratory_a.png index c9875ae407b..628a6919ebb 100644 Binary files a/public/images/arenas/laboratory_a.png and b/public/images/arenas/laboratory_a.png differ diff --git a/public/images/arenas/laboratory_b.png b/public/images/arenas/laboratory_b.png index 3cd2832268f..eabd398bada 100644 Binary files a/public/images/arenas/laboratory_b.png and b/public/images/arenas/laboratory_b.png differ diff --git a/public/images/arenas/laboratory_b_1.png b/public/images/arenas/laboratory_b_1.png index f9f7567a178..b3ee7875943 100644 Binary files a/public/images/arenas/laboratory_b_1.png and b/public/images/arenas/laboratory_b_1.png differ diff --git a/public/images/arenas/laboratory_b_2.png b/public/images/arenas/laboratory_b_2.png index d5b783ce0f9..66ce17d947b 100644 Binary files a/public/images/arenas/laboratory_b_2.png and b/public/images/arenas/laboratory_b_2.png differ diff --git a/public/images/arenas/laboratory_b_3.png b/public/images/arenas/laboratory_b_3.png index 90954be71e7..99b23e95a1f 100644 Binary files a/public/images/arenas/laboratory_b_3.png and b/public/images/arenas/laboratory_b_3.png differ diff --git a/public/images/arenas/laboratory_bg.png b/public/images/arenas/laboratory_bg.png index d94de95a0aa..331e15f8db7 100644 Binary files a/public/images/arenas/laboratory_bg.png and b/public/images/arenas/laboratory_bg.png differ diff --git a/public/images/arenas/metropolis_a.png b/public/images/arenas/metropolis_a.png new file mode 100644 index 00000000000..5a51c500702 Binary files /dev/null and b/public/images/arenas/metropolis_a.png differ diff --git a/public/images/arenas/metropolis_b.png b/public/images/arenas/metropolis_b.png new file mode 100644 index 00000000000..638899f3e53 Binary files /dev/null and b/public/images/arenas/metropolis_b.png differ diff --git a/public/images/arenas/metropolis_b_1.png b/public/images/arenas/metropolis_b_1.png new file mode 100644 index 00000000000..6e543b4c55e Binary files /dev/null and b/public/images/arenas/metropolis_b_1.png differ diff --git a/public/images/arenas/metropolis_b_2.png b/public/images/arenas/metropolis_b_2.png new file mode 100644 index 00000000000..bc609ddb300 Binary files /dev/null and b/public/images/arenas/metropolis_b_2.png differ diff --git a/public/images/arenas/metropolis_b_3.png b/public/images/arenas/metropolis_b_3.png new file mode 100644 index 00000000000..c29a3b7bb7c Binary files /dev/null and b/public/images/arenas/metropolis_b_3.png differ diff --git a/public/images/arenas/metropolis_bg.png b/public/images/arenas/metropolis_bg.png new file mode 100644 index 00000000000..b84c5aa494d Binary files /dev/null and b/public/images/arenas/metropolis_bg.png differ diff --git a/public/images/arenas/snowy_forest_a.png b/public/images/arenas/snowy_forest_a.png index 7fcc26245b0..c44abbbce51 100644 Binary files a/public/images/arenas/snowy_forest_a.png and b/public/images/arenas/snowy_forest_a.png differ diff --git a/public/images/arenas/snowy_forest_b.png b/public/images/arenas/snowy_forest_b.png index 88025db58b8..e4ae9f4b180 100644 Binary files a/public/images/arenas/snowy_forest_b.png and b/public/images/arenas/snowy_forest_b.png differ diff --git a/public/images/arenas/snowy_forest_b_1.png b/public/images/arenas/snowy_forest_b_1.png new file mode 100644 index 00000000000..f47f4f91508 Binary files /dev/null and b/public/images/arenas/snowy_forest_b_1.png differ diff --git a/public/images/arenas/snowy_forest_b_2.png b/public/images/arenas/snowy_forest_b_2.png new file mode 100644 index 00000000000..5bc27fc5161 Binary files /dev/null and b/public/images/arenas/snowy_forest_b_2.png differ diff --git a/public/images/arenas/snowy_forest_b_3.png b/public/images/arenas/snowy_forest_b_3.png new file mode 100644 index 00000000000..521870232de Binary files /dev/null and b/public/images/arenas/snowy_forest_b_3.png differ diff --git a/public/images/arenas/snowy_forest_bg.png b/public/images/arenas/snowy_forest_bg.png index bfe7545c9e9..c449ddb32ee 100644 Binary files a/public/images/arenas/snowy_forest_bg.png and b/public/images/arenas/snowy_forest_bg.png differ diff --git a/src/field/arena.ts b/src/field/arena.ts index 5101ffd29eb..46b16eed8d3 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -582,7 +582,7 @@ export class Arena { case Biome.TALL_GRASS: return 9.608; case Biome.METROPOLIS: - return 4.867; + return 141.470; case Biome.FOREST: return 4.294; case Biome.SEA: @@ -636,7 +636,7 @@ export class Arena { case Biome.ISLAND: return 2.751; case Biome.LABORATORY: - return 0.797; + return 114.862; case Biome.SLUM: return 1.221; case Biome.SNOWY_FOREST: @@ -646,19 +646,12 @@ export class Arena { } export function getBiomeKey(biome: Biome): string { - switch (biome) { - case Biome.METROPOLIS: - return 'slum'; - case Biome.JUNGLE: - return 'tall_grass'; - case Biome.ISLAND: - return 'beach'; - } return Biome[biome].toLowerCase(); } export function getBiomeHasProps(biomeType: Biome): boolean { switch (biomeType) { + case Biome.METROPOLIS: case Biome.BEACH: case Biome.LAKE: case Biome.SEABED: @@ -676,8 +669,11 @@ export function getBiomeHasProps(biomeType: Biome): boolean { case Biome.WASTELAND: case Biome.ABYSS: case Biome.CONSTRUCTION_SITE: + case Biome.JUNGLE: case Biome.FAIRY_CAVE: case Biome.TEMPLE: + case Biome.SNOWY_FOREST: + case Biome.ISLAND: case Biome.LABORATORY: case Biome.END: return true;