mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-09-24 07:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge add410062e into 8d5ba221d8

Browse Source
This commit is contained in:
Bertie690 2025-09-22 21:44:46 -04:00 committed by GitHub
commit 7ec044e12f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/battle-scene.ts
View File

@ -151,8 +151,6 @@ import Phaser from "phaser";
import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; import SoundFade from "phaser3-rex-plugins/plugins/soundfade";
import type UIPlugin from "phaser3-rex-plugins/templates/ui/ui-plugin"; import type UIPlugin from "phaser3-rex-plugins/templates/ui/ui-plugin";
const DEBUG_RNG = false;
export interface PokeballCounts { export interface PokeballCounts {
[pb: string]: number; [pb: string]: number;
} }
@ -312,7 +310,6 @@ export class BattleScene extends SceneBase {
private bgmCache: Set<string> = new Set(); private bgmCache: Set<string> = new Set();
private playTimeTimer: Phaser.Time.TimerEvent; private playTimeTimer: Phaser.Time.TimerEvent;
public rngCounter = 0;
public rngSeedOverride = ""; public rngSeedOverride = "";
public rngOffset = 0; public rngOffset = 0;
@ -359,20 +356,6 @@ export class BattleScene extends SceneBase {
} }
async preload() { async preload() {
if (DEBUG_RNG) {
const originalRealInRange = Phaser.Math.RND.realInRange;
Phaser.Math.RND.realInRange = function (min: number, max: number): number {
const ret = originalRealInRange.apply(this, [min, max]);
const args = ["RNG", ++this.rngCounter, ret / (max - min), `min: ${min} / max: ${max}`];
args.push(`seed: ${this.rngSeedOverride || this.waveSeed || this.seed}`);
if (this.rngOffset) {
args.push(`offset: ${this.rngOffset}`);
}
console.log(...args);
return ret;
};
}
/** /**
* These moves serve as fallback animations for other moves without loaded animations, and * These moves serve as fallback animations for other moves without loaded animations, and
* must be loaded prior to game start. * must be loaded prior to game start.
@ -1103,7 +1086,6 @@ export class BattleScene extends SceneBase {
setSeed(seed: string): void { setSeed(seed: string): void {
this.seed = seed; this.seed = seed;
this.rngCounter = 0;
this.waveCycleOffset = this.getGeneratedWaveCycleOffset(); this.waveCycleOffset = this.getGeneratedWaveCycleOffset();
this.offsetGym = this.gameMode.isClassic && this.getGeneratedOffsetGym(); this.offsetGym = this.gameMode.isClassic && this.getGeneratedOffsetGym();
} }
@ -1823,24 +1805,20 @@ export class BattleScene extends SceneBase {
this.waveSeed = shiftCharCodes(this.seed, wave); this.waveSeed = shiftCharCodes(this.seed, wave);
Phaser.Math.RND.sow([this.waveSeed]); Phaser.Math.RND.sow([this.waveSeed]);
console.log("Wave Seed:", this.waveSeed, wave); console.log("Wave Seed:", this.waveSeed, wave);
this.rngCounter = 0;
} }
executeWithSeedOffset(func: () => void, offset: number, seedOverride?: string): void { executeWithSeedOffset(func: () => void, offset: number, seedOverride?: string): void {
if (!func) { if (!func) {
return; return;
} }
const tempRngCounter = this.rngCounter;
const tempRngOffset = this.rngOffset; const tempRngOffset = this.rngOffset;
const tempRngSeedOverride = this.rngSeedOverride; const tempRngSeedOverride = this.rngSeedOverride;
const state = Phaser.Math.RND.state(); const state = Phaser.Math.RND.state();
Phaser.Math.RND.sow([shiftCharCodes(seedOverride || this.seed, offset)]); Phaser.Math.RND.sow([shiftCharCodes(seedOverride || this.seed, offset)]);
this.rngCounter = 0;
this.rngOffset = offset; this.rngOffset = offset;
this.rngSeedOverride = seedOverride || ""; this.rngSeedOverride = seedOverride || "";
func(); func();
Phaser.Math.RND.state(state); Phaser.Math.RND.state(state);
this.rngCounter = tempRngCounter;
this.rngOffset = tempRngOffset; this.rngOffset = tempRngOffset;
this.rngSeedOverride = tempRngSeedOverride; this.rngSeedOverride = tempRngSeedOverride;
} }

5
src/battle.ts
View File

@ -97,8 +97,6 @@ export class Battle {
*/ */
public failedRunAway = false; public failedRunAway = false;
private rngCounter = 0;
constructor(gameMode: GameMode, waveIndex: number, battleType: BattleType, trainer?: Trainer, double = false) { constructor(gameMode: GameMode, waveIndex: number, battleType: BattleType, trainer?: Trainer, double = false) {
this.gameMode = gameMode; this.gameMode = gameMode;
this.waveIndex = waveIndex; this.waveIndex = waveIndex;
@ -440,7 +438,6 @@ export class Battle {
if (range <= 1) { if (range <= 1) {
return min; return min;
} }
const tempRngCounter = globalScene.rngCounter;
const tempSeedOverride = globalScene.rngSeedOverride; const tempSeedOverride = globalScene.rngSeedOverride;
const state = Phaser.Math.RND.state(); const state = Phaser.Math.RND.state();
if (this.battleSeedState) { if (this.battleSeedState) {
@ -449,12 +446,10 @@ export class Battle {
Phaser.Math.RND.sow([shiftCharCodes(this.battleSeed, this.turn << 6)]); Phaser.Math.RND.sow([shiftCharCodes(this.battleSeed, this.turn << 6)]);
console.log("Battle Seed:", this.battleSeed); console.log("Battle Seed:", this.battleSeed);
} }
globalScene.rngCounter = this.rngCounter++;
globalScene.rngSeedOverride = this.battleSeed; globalScene.rngSeedOverride = this.battleSeed;
const ret = randSeedInt(range, min); const ret = randSeedInt(range, min);
this.battleSeedState = Phaser.Math.RND.state(); this.battleSeedState = Phaser.Math.RND.state();
Phaser.Math.RND.state(state); Phaser.Math.RND.state(state);
globalScene.rngCounter = tempRngCounter;
globalScene.rngSeedOverride = tempSeedOverride; globalScene.rngSeedOverride = tempSeedOverride;
return ret; return ret;
} }

1
test/phases/select-modifier-phase.test.ts
View File

@ -118,7 +118,6 @@ describe("SelectModifierPhase", () => {
scene.waveSeed = shiftCharCodes(scene.seed, 5); scene.waveSeed = shiftCharCodes(scene.seed, 5);
Phaser.Math.RND.sow([scene.waveSeed]); Phaser.Math.RND.sow([scene.waveSeed]);
console.log("Wave Seed:", scene.waveSeed, 5); console.log("Wave Seed:", scene.waveSeed, 5);
scene.rngCounter = 0;
}); });
game.move.select(MoveId.FISSURE); game.move.select(MoveId.FISSURE);