diff --git a/public/audio/bgm/land.mp3 b/public/audio/bgm/badlands.mp3 similarity index 100% rename from public/audio/bgm/land.mp3 rename to public/audio/bgm/badlands.mp3 diff --git a/public/images/arenas/badlands_a.png b/public/images/arenas/badlands_a.png new file mode 100644 index 00000000000..2e404d30253 Binary files /dev/null and b/public/images/arenas/badlands_a.png differ diff --git a/public/images/arenas/badlands_b.png b/public/images/arenas/badlands_b.png new file mode 100644 index 00000000000..6232eddfede Binary files /dev/null and b/public/images/arenas/badlands_b.png differ diff --git a/public/images/arenas/badlands_b_1.png b/public/images/arenas/badlands_b_1.png new file mode 100644 index 00000000000..a4cbe062061 Binary files /dev/null and b/public/images/arenas/badlands_b_1.png differ diff --git a/public/images/arenas/badlands_b_2.png b/public/images/arenas/badlands_b_2.png new file mode 100644 index 00000000000..64396591282 Binary files /dev/null and b/public/images/arenas/badlands_b_2.png differ diff --git a/public/images/arenas/badlands_b_3.png b/public/images/arenas/badlands_b_3.png new file mode 100644 index 00000000000..ba8553182fd Binary files /dev/null and b/public/images/arenas/badlands_b_3.png differ diff --git a/public/images/arenas/badlands_bg.png b/public/images/arenas/badlands_bg.png new file mode 100644 index 00000000000..2a8c8ab0954 Binary files /dev/null and b/public/images/arenas/badlands_bg.png differ diff --git a/public/images/arenas/land_a.png b/public/images/arenas/land_a.png deleted file mode 100644 index ae96801df2c..00000000000 Binary files a/public/images/arenas/land_a.png and /dev/null differ diff --git a/public/images/arenas/land_b.png b/public/images/arenas/land_b.png deleted file mode 100644 index 85a1b051efd..00000000000 Binary files a/public/images/arenas/land_b.png and /dev/null differ diff --git a/public/images/arenas/land_bg.png b/public/images/arenas/land_bg.png deleted file mode 100644 index 5d7166375a8..00000000000 Binary files a/public/images/arenas/land_bg.png and /dev/null differ diff --git a/public/images/arenas/sea_a.png b/public/images/arenas/sea_a.png index b027f7c7190..ef93c3159d5 100644 Binary files a/public/images/arenas/sea_a.png and b/public/images/arenas/sea_a.png differ diff --git a/public/images/arenas/sea_b.png b/public/images/arenas/sea_b.png index 56e0443c053..17081770fb6 100644 Binary files a/public/images/arenas/sea_b.png and b/public/images/arenas/sea_b.png differ diff --git a/src/arena.ts b/src/arena.ts index 0ad43bf0b99..83e13c12777 100644 --- a/src/arena.ts +++ b/src/arena.ts @@ -123,7 +123,7 @@ export class Arena { return Type.WATER; case Biome.MOUNTAIN: return Type.FLYING; - case Biome.LAND: + case Biome.BADLANDS: return Type.GROUND; case Biome.CAVE: case Biome.DESERT: @@ -189,7 +189,7 @@ export class Arena { case Biome.BEACH: case Biome.LAKE: case Biome.MOUNTAIN: - case Biome.LAND: + case Biome.BADLANDS: case Biome.DESERT: case Biome.MEADOW: case Biome.DOJO: @@ -276,7 +276,7 @@ export class Arena { return 2.629; case Biome.MOUNTAIN: return 4.018; - case Biome.LAND: + case Biome.BADLANDS: return 17.790; case Biome.CAVE: return 14.240; @@ -329,6 +329,7 @@ export function getBiomeKey(biome: Biome): string { export function getBiomeHasProps(biomeType: Biome): boolean { switch (biomeType) { case Biome.LAKE: + case Biome.BADLANDS: case Biome.DESERT: return true; } diff --git a/src/data/biome.ts b/src/data/biome.ts index 8579879bb03..59dd2c53194 100644 --- a/src/data/biome.ts +++ b/src/data/biome.ts @@ -18,7 +18,7 @@ export enum Biome { LAKE, SEABED, MOUNTAIN, - LAND, + BADLANDS, CAVE, DESERT, ICE_CAVE, @@ -69,8 +69,8 @@ export const biomeLinks: BiomeLinks = { [Biome.LAKE]: [ Biome.BEACH, Biome.SWAMP ], [Biome.SEABED]: Biome.CAVE, [Biome.MOUNTAIN]: [ Biome.WASTELAND, Biome.VOLCANO ], - [Biome.LAND]: [ Biome.DESERT, Biome.MOUNTAIN ], - [Biome.CAVE]: [ Biome.LAND, Biome.BEACH ], + [Biome.BADLANDS]: [ Biome.DESERT, Biome.MOUNTAIN ], + [Biome.CAVE]: [ Biome.BADLANDS, Biome.BEACH ], [Biome.DESERT]: Biome.RUINS, [Biome.ICE_CAVE]: Biome.LAKE, [Biome.MEADOW]: Biome.PLAINS, @@ -80,7 +80,7 @@ export const biomeLinks: BiomeLinks = { [Biome.DOJO]: Biome.PLAINS, [Biome.FACTORY]: Biome.PLAINS, [Biome.RUINS]: Biome.FOREST, - [Biome.WASTELAND]: Biome.LAND, + [Biome.WASTELAND]: Biome.BADLANDS, [Biome.ABYSS]: Biome.SPACE, [Biome.SPACE]: Biome.RUINS }; @@ -476,7 +476,7 @@ export const biomePools: BiomePools = { [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.TORNADUS ], [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.HO_OH ] }, - [Biome.LAND]: { + [Biome.BADLANDS]: { [BiomePoolTier.COMMON]: [ { 1: [ Species.DIGLETT ], 26: [ Species.DUGTRIO ] }, { 1: [ Species.GEODUDE ], 25: [ Species.GRAVELER ] }, @@ -857,12 +857,12 @@ export const biomePools: BiomePools = { ] ], [ Species.SANDSHREW, Type.GROUND, -1, [ - [ Biome.LAND, BiomePoolTier.UNCOMMON ], + [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ], [ Biome.DESERT, BiomePoolTier.COMMON ] ] ], [ Species.SANDSLASH, Type.GROUND, -1, [ - [ Biome.LAND, BiomePoolTier.UNCOMMON ], + [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ], [ Biome.DESERT, BiomePoolTier.COMMON ], [ Biome.DESERT, BiomePoolTier.BOSS ] ] @@ -968,12 +968,12 @@ export const biomePools: BiomePools = { ] ], [ Species.DIGLETT, Type.GROUND, -1, [ - [ Biome.LAND, BiomePoolTier.COMMON ] + [ Biome.BADLANDS, BiomePoolTier.COMMON ] ] ], [ Species.DUGTRIO, Type.GROUND, -1, [ - [ Biome.LAND, BiomePoolTier.COMMON ], - [ Biome.LAND, BiomePoolTier.BOSS ] + [ Biome.BADLANDS, BiomePoolTier.COMMON ], + [ Biome.BADLANDS, BiomePoolTier.BOSS ] ] ], [ Species.MEOWTH, Type.NORMAL, -1, [ @@ -1089,18 +1089,18 @@ export const biomePools: BiomePools = { ], [ Species.GEODUDE, Type.ROCK, Type.GROUND, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], - [ Biome.LAND, BiomePoolTier.COMMON ], + [ Biome.BADLANDS, BiomePoolTier.COMMON ], [ Biome.CAVE, BiomePoolTier.UNCOMMON ] ] ], [ Species.GRAVELER, Type.ROCK, Type.GROUND, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], - [ Biome.LAND, BiomePoolTier.COMMON ], + [ Biome.BADLANDS, BiomePoolTier.COMMON ], [ Biome.CAVE, BiomePoolTier.UNCOMMON ] ] ], [ Species.GOLEM, Type.ROCK, Type.GROUND, [ - [ Biome.LAND, BiomePoolTier.BOSS ] + [ Biome.BADLANDS, BiomePoolTier.BOSS ] ] ], [ Species.PONYTA, Type.FIRE, -1, [ @@ -1189,7 +1189,7 @@ export const biomePools: BiomePools = { ] ], [ Species.ONIX, Type.ROCK, Type.GROUND, [ - [ Biome.LAND, BiomePoolTier.RARE ], + [ Biome.BADLANDS, BiomePoolTier.RARE ], [ Biome.CAVE, BiomePoolTier.RARE ], [ Biome.CAVE, BiomePoolTier.BOSS ] ] @@ -1232,14 +1232,14 @@ export const biomePools: BiomePools = { ] ], [ Species.CUBONE, Type.GROUND, -1, [ - [ Biome.LAND, BiomePoolTier.COMMON ], + [ Biome.BADLANDS, BiomePoolTier.COMMON ], [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ] ] ], [ Species.MAROWAK, Type.GROUND, -1, [ - [ Biome.LAND, BiomePoolTier.COMMON ], + [ Biome.BADLANDS, BiomePoolTier.COMMON ], [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ], - [ Biome.LAND, BiomePoolTier.BOSS ] + [ Biome.BADLANDS, BiomePoolTier.BOSS ] ] ], [ Species.HITMONLEE, Type.FIGHTING, -1, [ @@ -1267,12 +1267,12 @@ export const biomePools: BiomePools = { ], [ Species.RHYHORN, Type.GROUND, Type.ROCK, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], - [ Biome.LAND, BiomePoolTier.COMMON ] + [ Biome.BADLANDS, BiomePoolTier.COMMON ] ] ], [ Species.RHYDON, Type.GROUND, Type.ROCK, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], - [ Biome.LAND, BiomePoolTier.COMMON ] + [ Biome.BADLANDS, BiomePoolTier.COMMON ] ] ], [ Species.CHANSEY, Type.NORMAL, -1, [ @@ -1722,11 +1722,11 @@ export const biomePools: BiomePools = { ] ], [ Species.GLIGAR, Type.GROUND, Type.FLYING, [ - [ Biome.LAND, BiomePoolTier.RARE ] + [ Biome.BADLANDS, BiomePoolTier.RARE ] ] ], [ Species.STEELIX, Type.STEEL, Type.GROUND, [ - [ Biome.LAND, BiomePoolTier.BOSS_RARE ] + [ Biome.BADLANDS, BiomePoolTier.BOSS_RARE ] ] ], [ Species.SNUBBULL, Type.FAIRY, -1, [ @@ -1835,12 +1835,12 @@ export const biomePools: BiomePools = { ] ], [ Species.PHANPY, Type.GROUND, -1, [ - [ Biome.LAND, BiomePoolTier.COMMON ] + [ Biome.BADLANDS, BiomePoolTier.COMMON ] ] ], [ Species.DONPHAN, Type.GROUND, -1, [ - [ Biome.LAND, BiomePoolTier.COMMON ], - [ Biome.LAND, BiomePoolTier.BOSS ] + [ Biome.BADLANDS, BiomePoolTier.COMMON ], + [ Biome.BADLANDS, BiomePoolTier.BOSS ] ] ], [ Species.PORYGON2, Type.NORMAL, -1, [ @@ -2263,12 +2263,12 @@ export const biomePools: BiomePools = { ] ], [ Species.NUMEL, Type.FIRE, Type.GROUND, [ - [ Biome.LAND, BiomePoolTier.UNCOMMON ], + [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ], [ Biome.VOLCANO, BiomePoolTier.COMMON ] ] ], [ Species.CAMERUPT, Type.FIRE, Type.GROUND, [ - [ Biome.LAND, BiomePoolTier.UNCOMMON ], + [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ], [ Biome.VOLCANO, BiomePoolTier.COMMON ], [ Biome.VOLCANO, BiomePoolTier.BOSS ] ] @@ -2558,7 +2558,7 @@ export const biomePools: BiomePools = { ] ], [ Species.GROUDON, Type.GROUND, -1, [ - [ Biome.LAND, BiomePoolTier.BOSS_ULTRA_RARE ] + [ Biome.BADLANDS, BiomePoolTier.BOSS_ULTRA_RARE ] ] ], [ Species.RAYQUAZA, Type.DRAGON, Type.FLYING, [ @@ -2953,7 +2953,7 @@ export const biomePools: BiomePools = { ] ], [ Species.RHYPERIOR, Type.GROUND, Type.ROCK, [ - [ Biome.LAND, BiomePoolTier.BOSS ], + [ Biome.BADLANDS, BiomePoolTier.BOSS ], [ Biome.END, BiomePoolTier.UNCOMMON ] ] ], @@ -2990,7 +2990,7 @@ export const biomePools: BiomePools = { ] ], [ Species.GLISCOR, Type.GROUND, Type.FLYING, [ - [ Biome.LAND, BiomePoolTier.BOSS ] + [ Biome.BADLANDS, BiomePoolTier.BOSS ] ] ], [ Species.MAMOSWINE, Type.ICE, Type.GROUND, [ @@ -3235,13 +3235,13 @@ export const biomePools: BiomePools = { ], [ Species.ROGGENROLA, Type.ROCK, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], - [ Biome.LAND, BiomePoolTier.UNCOMMON ], + [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ], [ Biome.CAVE, BiomePoolTier.COMMON ] ] ], [ Species.BOLDORE, Type.ROCK, -1, [ [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], - [ Biome.LAND, BiomePoolTier.UNCOMMON ], + [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ], [ Biome.CAVE, BiomePoolTier.COMMON ] ] ], @@ -3259,12 +3259,12 @@ export const biomePools: BiomePools = { ] ], [ Species.DRILBUR, Type.GROUND, -1, [ - [ Biome.LAND, BiomePoolTier.COMMON ] + [ Biome.BADLANDS, BiomePoolTier.COMMON ] ] ], [ Species.EXCADRILL, Type.GROUND, Type.STEEL, [ - [ Biome.LAND, BiomePoolTier.COMMON ], - [ Biome.LAND, BiomePoolTier.BOSS ] + [ Biome.BADLANDS, BiomePoolTier.COMMON ], + [ Biome.BADLANDS, BiomePoolTier.BOSS ] ] ], [ Species.AUDINO, Type.NORMAL, -1, [ @@ -3798,8 +3798,8 @@ export const biomePools: BiomePools = { ] ], [ Species.LANDORUS, Type.GROUND, Type.FLYING, [ - [ Biome.LAND, BiomePoolTier.ULTRA_RARE ], - [ Biome.LAND, BiomePoolTier.BOSS_SUPER_RARE ] + [ Biome.BADLANDS, BiomePoolTier.ULTRA_RARE ], + [ Biome.BADLANDS, BiomePoolTier.BOSS_SUPER_RARE ] ] ], [ Species.KYUREM, Type.DRAGON, Type.ICE, [ diff --git a/src/data/weather.ts b/src/data/weather.ts index ca4bbf2583a..ca64b62e5c5 100644 --- a/src/data/weather.ts +++ b/src/data/weather.ts @@ -266,7 +266,7 @@ export function getRandomWeatherType(biome: Biome): WeatherType { { weatherType: WeatherType.STRONG_WINDS, weight: 1 } ]; break; - case Biome.LAND: + case Biome.BADLANDS: weatherPool = [ { weatherType: WeatherType.NONE, weight: 8 }, { weatherType: WeatherType.SUNNY, weight: 3 },