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

Revert "Fix strong trainer party members often not evolving due to dividing by 0"

Browse Source 
This reverts commit c59c5ca413.
This commit is contained in:
Flashfyre 2024-03-29 13:52:21 -04:00
parent f0d33c96aa
commit baaa00656e
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/battle-scene.ts
View File

@ -58,7 +58,6 @@ import { initTouchControls } from './touch-controls';
export const bypassLogin = false; export const bypassLogin = false;
export const SEED_OVERRIDE = '';
export const STARTING_LEVEL_OVERRIDE = 0; export const STARTING_LEVEL_OVERRIDE = 0;
export const STARTING_WAVE_OVERRIDE = 0; export const STARTING_WAVE_OVERRIDE = 0;
export const STARTING_BIOME_OVERRIDE = Biome.TOWN; export const STARTING_BIOME_OVERRIDE = Biome.TOWN;
@ -780,7 +779,7 @@ export default class BattleScene extends Phaser.Scene {
reset(clearScene?: boolean): void { reset(clearScene?: boolean): void {
this.gameMode = gameModes[GameModes.CLASSIC]; this.gameMode = gameModes[GameModes.CLASSIC];
this.setSeed(SEED_OVERRIDE || Utils.randomString(24)); this.setSeed(Utils.randomString(24));
console.log('Seed:', this.seed); console.log('Seed:', this.seed);
this.score = 0; this.score = 0;

4
src/data/pokemon-species.ts
View File

@ -498,8 +498,8 @@ export default class PokemonSpecies extends PokemonSpeciesForm {
evolutionChance = Math.min(minChance + easeInFunc(Math.min(level - ev.level, maxLevelDiff) / maxLevelDiff) * (1 - minChance), 1); evolutionChance = Math.min(minChance + easeInFunc(Math.min(level - ev.level, maxLevelDiff) / maxLevelDiff) * (1 - minChance), 1);
} }
} else { } else {
let preferredMinLevel = Math.max((ev.level - 1) + ev.wildDelay * this.getStrengthLevelDiff(strength + 1), 1); let preferredMinLevel = (ev.level - 1) + ev.wildDelay * this.getStrengthLevelDiff(strength + 1);
let evolutionLevel = Math.max(ev.level > 1 ? ev.level : Math.floor(preferredMinLevel / 2), 1); let evolutionLevel = ev.level > 1 ? ev.level : Math.floor(preferredMinLevel / 2);
if (ev.level <= 1 && pokemonPrevolutions.hasOwnProperty(this.speciesId)) { if (ev.level <= 1 && pokemonPrevolutions.hasOwnProperty(this.speciesId)) {
const prevolutionLevel = pokemonEvolutions[pokemonPrevolutions[this.speciesId]].find(ev => ev.speciesId === this.speciesId).level; const prevolutionLevel = pokemonEvolutions[pokemonPrevolutions[this.speciesId]].find(ev => ev.speciesId === this.speciesId).level;

2
src/system/game-data.ts
View File

@ -548,8 +548,6 @@ export class GameData {
scene.setSeed(sessionData.seed || scene.game.config.seed[0]); scene.setSeed(sessionData.seed || scene.game.config.seed[0]);
scene.resetSeed(); scene.resetSeed();
console.log('Seed:', scene.seed);
scene.sessionPlayTime = sessionData.playTime || 0; scene.sessionPlayTime = sessionData.playTime || 0;
const loadPokemonAssets: Promise<void>[] = []; const loadPokemonAssets: Promise<void>[] = [];