random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2024-11-25 16:26:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' into eviolite_weight_bug

Browse Source
This commit is contained in:
Amani H. 2024-10-31 01:14:53 -04:00 committed by GitHub
commit 4fd35aaf4c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

2
src/data/balance/pokemon-evolutions.ts
View File

@ -1443,7 +1443,7 @@ export const pokemonEvolutions: PokemonEvolutions = {
],
[Species.ROCKRUFF]: [
new SpeciesFormEvolution(Species.LYCANROC, "", "midday", 25, null, new SpeciesEvolutionCondition(p => (p.scene.arena.getTimeOfDay() === TimeOfDay.DAWN || p.scene.arena.getTimeOfDay() === TimeOfDay.DAY) && (p.formIndex === 0))),
new SpeciesFormEvolution(Species.LYCANROC, "", "dusk", 25, null, new SpeciesEvolutionCondition(p => p.formIndex === 1)),
new SpeciesFormEvolution(Species.LYCANROC, "own-tempo", "dusk", 25, null, new SpeciesEvolutionCondition(p => p.formIndex === 1)),
new SpeciesFormEvolution(Species.LYCANROC, "", "midnight", 25, null, new SpeciesEvolutionCondition(p => (p.scene.arena.getTimeOfDay() === TimeOfDay.DUSK || p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT) && (p.formIndex === 0)))
],
[Species.STEENEE]: [

2
src/field/arena.ts
View File

@ -794,7 +794,7 @@ export class Arena {
case Biome.VOLCANO:
return 17.637;
case Biome.GRAVEYARD:
return 3.232;
return 13.711;
case Biome.DOJO:
return 6.205;
case Biome.FACTORY:

2
src/ui/menu-ui-handler.ts
View File

@ -32,7 +32,7 @@ let wikiUrl = "https://wiki.pokerogue.net/start";
const discordUrl = "https://discord.gg/uWpTfdKG49";
const githubUrl = "https://github.com/pagefaultgames/pokerogue";
const redditUrl = "https://www.reddit.com/r/pokerogue";
const donateUrl = "https://github.com/sponsors/patapancakes";
const donateUrl = "https://github.com/sponsors/pagefaultgames";
export default class MenuUiHandler extends MessageUiHandler {
private readonly textPadding = 8;