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

Merge branch 'daily-standardization' of https://github.com/RedstonewolfX/pokerogue into daily-standardization

Browse Source
This commit is contained in:
RedstonewolfX 2024-09-25 12:04:41 -04:00
commit a226a370ee
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/field/pokemon.ts
View File

@ -1913,7 +1913,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
if (!this.shiny || (!variantData.hasOwnProperty(variantDataIndex) && !variantData.hasOwnProperty(this.species.speciesId))) { if (!this.shiny || (!variantData.hasOwnProperty(variantDataIndex) && !variantData.hasOwnProperty(this.species.speciesId))) {
return 0; return 0;
} }
const rand = new Utils.IntegerHolder(0); const rand = new Utils.NumberHolder(0);
this.scene.executeWithSeedOffset(() => { this.scene.executeWithSeedOffset(() => {
rand.value = Utils.randSeedInt(10); rand.value = Utils.randSeedInt(10);
}, this.id, this.scene.waveSeed); }, this.id, this.scene.waveSeed);

4
src/modifier/modifier-type.ts
View File

@ -2444,11 +2444,11 @@ export class ModifierTypeOption {
/** /**
* Calculates the team's luck value. * Calculates the team's luck value.
* @param party The player's party. * @param party The player's party.
* @returns A value between 0 and 14, or 0 if the player is in Daily Run mode. * @returns A number between 0 and 14 based on the party's total luck value, or a random number between 0 and 14 if the player is in Daily Run mode.
*/ */
export function getPartyLuckValue(party: Pokemon[]): integer { export function getPartyLuckValue(party: Pokemon[]): integer {
if (party[0].scene.gameMode.isDaily) { if (party[0].scene.gameMode.isDaily) {
const DailyLuck = new Utils.IntegerHolder(0); const DailyLuck = new Utils.NumberHolder(0);
party[0].scene.executeWithSeedOffset(() => { party[0].scene.executeWithSeedOffset(() => {
DailyLuck.value = Utils.randSeedInt(15); // Random number between 0 and 14 DailyLuck.value = Utils.randSeedInt(15); // Random number between 0 and 14
}, 0, party[0].scene.seed); }, 0, party[0].scene.seed);

7
src/test/utils/helpers/modifiersHelper.ts
View File

@ -15,13 +15,6 @@ export class ModifierHelper extends GameManagerHelper {
return this; return this;
} }
checkHasRun(modifier: ModifierTypeKeys): boolean {
if (itemPoolChecks.get(modifier) === undefined) {
return false;
}
return true;
}
/** /**
* `get`s a value from the `itemPoolChecks` map. * `get`s a value from the `itemPoolChecks` map.
* *