ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add badlands BG and update sea BG

This commit is contained in:
Flashfyre 2023-05-11 10:31:39 -04:00
parent 9f28a067cd
commit ceeb2efd0a
15 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
public/audio/bgm/land.mp3 → public/audio/bgm/badlands.mp3
View File

BIN
public/images/arenas/badlands_a.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
public/images/arenas/badlands_b.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
public/images/arenas/badlands_b_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 767 B

BIN
public/images/arenas/badlands_b_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 764 B

BIN
public/images/arenas/badlands_b_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1008 B

BIN
public/images/arenas/badlands_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 640 B

BIN
public/images/arenas/land_a.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 563 B

BIN
public/images/arenas/land_b.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 895 B

BIN
public/images/arenas/land_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 615 B

BIN
public/images/arenas/sea_a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 928 B

After

Width:  |  Height:  |  Size: 989 B

BIN
public/images/arenas/sea_b.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

7
src/arena.ts
View File

@ -123,7 +123,7 @@ export class Arena {
return Type.WATER; return Type.WATER;
case Biome.MOUNTAIN: case Biome.MOUNTAIN:
return Type.FLYING; return Type.FLYING;
case Biome.LAND: case Biome.BADLANDS:
return Type.GROUND; return Type.GROUND;
case Biome.CAVE: case Biome.CAVE:
case Biome.DESERT: case Biome.DESERT:
@ -189,7 +189,7 @@ export class Arena {
case Biome.BEACH: case Biome.BEACH:
case Biome.LAKE: case Biome.LAKE:
case Biome.MOUNTAIN: case Biome.MOUNTAIN:
case Biome.LAND: case Biome.BADLANDS:
case Biome.DESERT: case Biome.DESERT:
case Biome.MEADOW: case Biome.MEADOW:
case Biome.DOJO: case Biome.DOJO:
@ -276,7 +276,7 @@ export class Arena {
return 2.629; return 2.629;
case Biome.MOUNTAIN: case Biome.MOUNTAIN:
return 4.018; return 4.018;
case Biome.LAND: case Biome.BADLANDS:
return 17.790; return 17.790;
case Biome.CAVE: case Biome.CAVE:
return 14.240; return 14.240;
@ -329,6 +329,7 @@ export function getBiomeKey(biome: Biome): string {
export function getBiomeHasProps(biomeType: Biome): boolean { export function getBiomeHasProps(biomeType: Biome): boolean {
switch (biomeType) { switch (biomeType) {
case Biome.LAKE: case Biome.LAKE:
case Biome.BADLANDS:
case Biome.DESERT: case Biome.DESERT:
return true; return true;
} }

72
src/data/biome.ts
View File

@ -18,7 +18,7 @@ export enum Biome {
LAKE, LAKE,
SEABED, SEABED,
MOUNTAIN, MOUNTAIN,
LAND, BADLANDS,
CAVE, CAVE,
DESERT, DESERT,
ICE_CAVE, ICE_CAVE,
@ -69,8 +69,8 @@ export const biomeLinks: BiomeLinks = {
[Biome.LAKE]: [ Biome.BEACH, Biome.SWAMP ], [Biome.LAKE]: [ Biome.BEACH, Biome.SWAMP ],
[Biome.SEABED]: Biome.CAVE, [Biome.SEABED]: Biome.CAVE,
[Biome.MOUNTAIN]: [ Biome.WASTELAND, Biome.VOLCANO ], [Biome.MOUNTAIN]: [ Biome.WASTELAND, Biome.VOLCANO ],
[Biome.LAND]: [ Biome.DESERT, Biome.MOUNTAIN ], [Biome.BADLANDS]: [ Biome.DESERT, Biome.MOUNTAIN ],
[Biome.CAVE]: [ Biome.LAND, Biome.BEACH ], [Biome.CAVE]: [ Biome.BADLANDS, Biome.BEACH ],
[Biome.DESERT]: Biome.RUINS, [Biome.DESERT]: Biome.RUINS,
[Biome.ICE_CAVE]: Biome.LAKE, [Biome.ICE_CAVE]: Biome.LAKE,
[Biome.MEADOW]: Biome.PLAINS, [Biome.MEADOW]: Biome.PLAINS,
@ -80,7 +80,7 @@ export const biomeLinks: BiomeLinks = {
[Biome.DOJO]: Biome.PLAINS, [Biome.DOJO]: Biome.PLAINS,
[Biome.FACTORY]: Biome.PLAINS, [Biome.FACTORY]: Biome.PLAINS,
[Biome.RUINS]: Biome.FOREST, [Biome.RUINS]: Biome.FOREST,
[Biome.WASTELAND]: Biome.LAND, [Biome.WASTELAND]: Biome.BADLANDS,
[Biome.ABYSS]: Biome.SPACE, [Biome.ABYSS]: Biome.SPACE,
[Biome.SPACE]: Biome.RUINS [Biome.SPACE]: Biome.RUINS
}; };
@ -476,7 +476,7 @@ export const biomePools: BiomePools = {
[BiomePoolTier.BOSS_SUPER_RARE]: [ Species.TORNADUS ], [BiomePoolTier.BOSS_SUPER_RARE]: [ Species.TORNADUS ],
[BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.HO_OH ] [BiomePoolTier.BOSS_ULTRA_RARE]: [ Species.HO_OH ]
}, },
[Biome.LAND]: { [Biome.BADLANDS]: {
[BiomePoolTier.COMMON]: [ [BiomePoolTier.COMMON]: [
{ 1: [ Species.DIGLETT ], 26: [ Species.DUGTRIO ] }, { 1: [ Species.DIGLETT ], 26: [ Species.DUGTRIO ] },
{ 1: [ Species.GEODUDE ], 25: [ Species.GRAVELER ] }, { 1: [ Species.GEODUDE ], 25: [ Species.GRAVELER ] },
@ -857,12 +857,12 @@ export const biomePools: BiomePools = {
] ]
], ],
[ Species.SANDSHREW, Type.GROUND, -1, [ [ Species.SANDSHREW, Type.GROUND, -1, [
[ Biome.LAND, BiomePoolTier.UNCOMMON ], [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ],
[ Biome.DESERT, BiomePoolTier.COMMON ] [ Biome.DESERT, BiomePoolTier.COMMON ]
] ]
], ],
[ Species.SANDSLASH, Type.GROUND, -1, [ [ Species.SANDSLASH, Type.GROUND, -1, [
[ Biome.LAND, BiomePoolTier.UNCOMMON ], [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ],
[ Biome.DESERT, BiomePoolTier.COMMON ], [ Biome.DESERT, BiomePoolTier.COMMON ],
[ Biome.DESERT, BiomePoolTier.BOSS ] [ Biome.DESERT, BiomePoolTier.BOSS ]
] ]
@ -968,12 +968,12 @@ export const biomePools: BiomePools = {
] ]
], ],
[ Species.DIGLETT, Type.GROUND, -1, [ [ Species.DIGLETT, Type.GROUND, -1, [
[ Biome.LAND, BiomePoolTier.COMMON ] [ Biome.BADLANDS, BiomePoolTier.COMMON ]
] ]
], ],
[ Species.DUGTRIO, Type.GROUND, -1, [ [ Species.DUGTRIO, Type.GROUND, -1, [
[ Biome.LAND, BiomePoolTier.COMMON ], [ Biome.BADLANDS, BiomePoolTier.COMMON ],
[ Biome.LAND, BiomePoolTier.BOSS ] [ Biome.BADLANDS, BiomePoolTier.BOSS ]
] ]
], ],
[ Species.MEOWTH, Type.NORMAL, -1, [ [ Species.MEOWTH, Type.NORMAL, -1, [
@ -1089,18 +1089,18 @@ export const biomePools: BiomePools = {
], ],
[ Species.GEODUDE, Type.ROCK, Type.GROUND, [ [ Species.GEODUDE, Type.ROCK, Type.GROUND, [
[ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
[ Biome.LAND, BiomePoolTier.COMMON ], [ Biome.BADLANDS, BiomePoolTier.COMMON ],
[ Biome.CAVE, BiomePoolTier.UNCOMMON ] [ Biome.CAVE, BiomePoolTier.UNCOMMON ]
] ]
], ],
[ Species.GRAVELER, Type.ROCK, Type.GROUND, [ [ Species.GRAVELER, Type.ROCK, Type.GROUND, [
[ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
[ Biome.LAND, BiomePoolTier.COMMON ], [ Biome.BADLANDS, BiomePoolTier.COMMON ],
[ Biome.CAVE, BiomePoolTier.UNCOMMON ] [ Biome.CAVE, BiomePoolTier.UNCOMMON ]
] ]
], ],
[ Species.GOLEM, Type.ROCK, Type.GROUND, [ [ Species.GOLEM, Type.ROCK, Type.GROUND, [
[ Biome.LAND, BiomePoolTier.BOSS ] [ Biome.BADLANDS, BiomePoolTier.BOSS ]
] ]
], ],
[ Species.PONYTA, Type.FIRE, -1, [ [ Species.PONYTA, Type.FIRE, -1, [
@ -1189,7 +1189,7 @@ export const biomePools: BiomePools = {
] ]
], ],
[ Species.ONIX, Type.ROCK, Type.GROUND, [ [ Species.ONIX, Type.ROCK, Type.GROUND, [
[ Biome.LAND, BiomePoolTier.RARE ], [ Biome.BADLANDS, BiomePoolTier.RARE ],
[ Biome.CAVE, BiomePoolTier.RARE ], [ Biome.CAVE, BiomePoolTier.RARE ],
[ Biome.CAVE, BiomePoolTier.BOSS ] [ Biome.CAVE, BiomePoolTier.BOSS ]
] ]
@ -1232,14 +1232,14 @@ export const biomePools: BiomePools = {
] ]
], ],
[ Species.CUBONE, Type.GROUND, -1, [ [ Species.CUBONE, Type.GROUND, -1, [
[ Biome.LAND, BiomePoolTier.COMMON ], [ Biome.BADLANDS, BiomePoolTier.COMMON ],
[ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ] [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ]
] ]
], ],
[ Species.MAROWAK, Type.GROUND, -1, [ [ Species.MAROWAK, Type.GROUND, -1, [
[ Biome.LAND, BiomePoolTier.COMMON ], [ Biome.BADLANDS, BiomePoolTier.COMMON ],
[ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ], [ Biome.GRAVEYARD, BiomePoolTier.UNCOMMON ],
[ Biome.LAND, BiomePoolTier.BOSS ] [ Biome.BADLANDS, BiomePoolTier.BOSS ]
] ]
], ],
[ Species.HITMONLEE, Type.FIGHTING, -1, [ [ Species.HITMONLEE, Type.FIGHTING, -1, [
@ -1267,12 +1267,12 @@ export const biomePools: BiomePools = {
], ],
[ Species.RHYHORN, Type.GROUND, Type.ROCK, [ [ Species.RHYHORN, Type.GROUND, Type.ROCK, [
[ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
[ Biome.LAND, BiomePoolTier.COMMON ] [ Biome.BADLANDS, BiomePoolTier.COMMON ]
] ]
], ],
[ Species.RHYDON, Type.GROUND, Type.ROCK, [ [ Species.RHYDON, Type.GROUND, Type.ROCK, [
[ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
[ Biome.LAND, BiomePoolTier.COMMON ] [ Biome.BADLANDS, BiomePoolTier.COMMON ]
] ]
], ],
[ Species.CHANSEY, Type.NORMAL, -1, [ [ Species.CHANSEY, Type.NORMAL, -1, [
@ -1722,11 +1722,11 @@ export const biomePools: BiomePools = {
] ]
], ],
[ Species.GLIGAR, Type.GROUND, Type.FLYING, [ [ Species.GLIGAR, Type.GROUND, Type.FLYING, [
[ Biome.LAND, BiomePoolTier.RARE ] [ Biome.BADLANDS, BiomePoolTier.RARE ]
] ]
], ],
[ Species.STEELIX, Type.STEEL, Type.GROUND, [ [ Species.STEELIX, Type.STEEL, Type.GROUND, [
[ Biome.LAND, BiomePoolTier.BOSS_RARE ] [ Biome.BADLANDS, BiomePoolTier.BOSS_RARE ]
] ]
], ],
[ Species.SNUBBULL, Type.FAIRY, -1, [ [ Species.SNUBBULL, Type.FAIRY, -1, [
@ -1835,12 +1835,12 @@ export const biomePools: BiomePools = {
] ]
], ],
[ Species.PHANPY, Type.GROUND, -1, [ [ Species.PHANPY, Type.GROUND, -1, [
[ Biome.LAND, BiomePoolTier.COMMON ] [ Biome.BADLANDS, BiomePoolTier.COMMON ]
] ]
], ],
[ Species.DONPHAN, Type.GROUND, -1, [ [ Species.DONPHAN, Type.GROUND, -1, [
[ Biome.LAND, BiomePoolTier.COMMON ], [ Biome.BADLANDS, BiomePoolTier.COMMON ],
[ Biome.LAND, BiomePoolTier.BOSS ] [ Biome.BADLANDS, BiomePoolTier.BOSS ]
] ]
], ],
[ Species.PORYGON2, Type.NORMAL, -1, [ [ Species.PORYGON2, Type.NORMAL, -1, [
@ -2263,12 +2263,12 @@ export const biomePools: BiomePools = {
] ]
], ],
[ Species.NUMEL, Type.FIRE, Type.GROUND, [ [ Species.NUMEL, Type.FIRE, Type.GROUND, [
[ Biome.LAND, BiomePoolTier.UNCOMMON ], [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ],
[ Biome.VOLCANO, BiomePoolTier.COMMON ] [ Biome.VOLCANO, BiomePoolTier.COMMON ]
] ]
], ],
[ Species.CAMERUPT, Type.FIRE, Type.GROUND, [ [ Species.CAMERUPT, Type.FIRE, Type.GROUND, [
[ Biome.LAND, BiomePoolTier.UNCOMMON ], [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ],
[ Biome.VOLCANO, BiomePoolTier.COMMON ], [ Biome.VOLCANO, BiomePoolTier.COMMON ],
[ Biome.VOLCANO, BiomePoolTier.BOSS ] [ Biome.VOLCANO, BiomePoolTier.BOSS ]
] ]
@ -2558,7 +2558,7 @@ export const biomePools: BiomePools = {
] ]
], ],
[ Species.GROUDON, Type.GROUND, -1, [ [ Species.GROUDON, Type.GROUND, -1, [
[ Biome.LAND, BiomePoolTier.BOSS_ULTRA_RARE ] [ Biome.BADLANDS, BiomePoolTier.BOSS_ULTRA_RARE ]
] ]
], ],
[ Species.RAYQUAZA, Type.DRAGON, Type.FLYING, [ [ Species.RAYQUAZA, Type.DRAGON, Type.FLYING, [
@ -2953,7 +2953,7 @@ export const biomePools: BiomePools = {
] ]
], ],
[ Species.RHYPERIOR, Type.GROUND, Type.ROCK, [ [ Species.RHYPERIOR, Type.GROUND, Type.ROCK, [
[ Biome.LAND, BiomePoolTier.BOSS ], [ Biome.BADLANDS, BiomePoolTier.BOSS ],
[ Biome.END, BiomePoolTier.UNCOMMON ] [ Biome.END, BiomePoolTier.UNCOMMON ]
] ]
], ],
@ -2990,7 +2990,7 @@ export const biomePools: BiomePools = {
] ]
], ],
[ Species.GLISCOR, Type.GROUND, Type.FLYING, [ [ Species.GLISCOR, Type.GROUND, Type.FLYING, [
[ Biome.LAND, BiomePoolTier.BOSS ] [ Biome.BADLANDS, BiomePoolTier.BOSS ]
] ]
], ],
[ Species.MAMOSWINE, Type.ICE, Type.GROUND, [ [ Species.MAMOSWINE, Type.ICE, Type.GROUND, [
@ -3235,13 +3235,13 @@ export const biomePools: BiomePools = {
], ],
[ Species.ROGGENROLA, Type.ROCK, -1, [ [ Species.ROGGENROLA, Type.ROCK, -1, [
[ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
[ Biome.LAND, BiomePoolTier.UNCOMMON ], [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ],
[ Biome.CAVE, BiomePoolTier.COMMON ] [ Biome.CAVE, BiomePoolTier.COMMON ]
] ]
], ],
[ Species.BOLDORE, Type.ROCK, -1, [ [ Species.BOLDORE, Type.ROCK, -1, [
[ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ], [ Biome.MOUNTAIN, BiomePoolTier.UNCOMMON ],
[ Biome.LAND, BiomePoolTier.UNCOMMON ], [ Biome.BADLANDS, BiomePoolTier.UNCOMMON ],
[ Biome.CAVE, BiomePoolTier.COMMON ] [ Biome.CAVE, BiomePoolTier.COMMON ]
] ]
], ],
@ -3259,12 +3259,12 @@ export const biomePools: BiomePools = {
] ]
], ],
[ Species.DRILBUR, Type.GROUND, -1, [ [ Species.DRILBUR, Type.GROUND, -1, [
[ Biome.LAND, BiomePoolTier.COMMON ] [ Biome.BADLANDS, BiomePoolTier.COMMON ]
] ]
], ],
[ Species.EXCADRILL, Type.GROUND, Type.STEEL, [ [ Species.EXCADRILL, Type.GROUND, Type.STEEL, [
[ Biome.LAND, BiomePoolTier.COMMON ], [ Biome.BADLANDS, BiomePoolTier.COMMON ],
[ Biome.LAND, BiomePoolTier.BOSS ] [ Biome.BADLANDS, BiomePoolTier.BOSS ]
] ]
], ],
[ Species.AUDINO, Type.NORMAL, -1, [ [ Species.AUDINO, Type.NORMAL, -1, [
@ -3798,8 +3798,8 @@ export const biomePools: BiomePools = {
] ]
], ],
[ Species.LANDORUS, Type.GROUND, Type.FLYING, [ [ Species.LANDORUS, Type.GROUND, Type.FLYING, [
[ Biome.LAND, BiomePoolTier.ULTRA_RARE ], [ Biome.BADLANDS, BiomePoolTier.ULTRA_RARE ],
[ Biome.LAND, BiomePoolTier.BOSS_SUPER_RARE ] [ Biome.BADLANDS, BiomePoolTier.BOSS_SUPER_RARE ]
] ]
], ],
[ Species.KYUREM, Type.DRAGON, Type.ICE, [ [ Species.KYUREM, Type.DRAGON, Type.ICE, [

2
src/data/weather.ts
View File

@ -266,7 +266,7 @@ export function getRandomWeatherType(biome: Biome): WeatherType {
{ weatherType: WeatherType.STRONG_WINDS, weight: 1 } { weatherType: WeatherType.STRONG_WINDS, weight: 1 }
]; ];
break; break;
case Biome.LAND: case Biome.BADLANDS:
weatherPool = [ weatherPool = [
{ weatherType: WeatherType.NONE, weight: 8 }, { weatherType: WeatherType.NONE, weight: 8 },
{ weatherType: WeatherType.SUNNY, weight: 3 }, { weatherType: WeatherType.SUNNY, weight: 3 },