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

Fixing function calls.

Browse Source
This commit is contained in:
frutescens 2024-11-17 16:38:36 -08:00
parent 0158ca0729
commit a7aad1e479
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modifier/modifier.ts
View File

@ -1405,7 +1405,7 @@ export class CritBoosterModifier extends PokemonHeldItemModifier {
* @returns always `true` * @returns always `true`
*/ */
override apply(pokemon: Pokemon, critStage: NumberHolder): boolean { override apply(pokemon: Pokemon, critStage: NumberHolder): boolean {
if (this.getSecondaryChanceMultiplier(pokemon) === 0) { if (super.getSecondaryChanceMultiplier(pokemon) === 0) {
return false; return false;
} }
critStage.value += this.stageIncrement; critStage.value += this.stageIncrement;
@ -1454,7 +1454,7 @@ export class SpeciesCritBoosterModifier extends CritBoosterModifier {
* @returns `true` if the critical-hit level can be incremented, false otherwise * @returns `true` if the critical-hit level can be incremented, false otherwise
*/ */
override shouldApply(pokemon: Pokemon, critStage: NumberHolder): boolean { override shouldApply(pokemon: Pokemon, critStage: NumberHolder): boolean {
return super.shouldApply(pokemon, critStage) && this.getSecondaryChanceMultiplier(pokemon) !== 0 && (this.species.includes(pokemon.getSpeciesForm(true).speciesId) || (pokemon.isFusion() && this.species.includes(pokemon.getFusionSpeciesForm(true).speciesId))); return super.shouldApply(pokemon, critStage) && super.getSecondaryChanceMultiplier(pokemon) !== 0 && (this.species.includes(pokemon.getSpeciesForm(true).speciesId) || (pokemon.isFusion() && this.species.includes(pokemon.getFusionSpeciesForm(true).speciesId)));
} }
} }
@ -2671,7 +2671,7 @@ export class PokemonMoveAccuracyBoosterModifier extends PokemonHeldItemModifier
* @returns always `true` * @returns always `true`
*/ */
override apply(pokemon: Pokemon, moveAccuracy: NumberHolder): boolean { override apply(pokemon: Pokemon, moveAccuracy: NumberHolder): boolean {
if (this.getSecondaryChanceMultiplier(pokemon)) { if (super.getSecondaryChanceMultiplier(pokemon)) {
return false; return false;
} }
moveAccuracy.value = Math.min(moveAccuracy.value + this.accuracyAmount * this.getStackCount(), 100); moveAccuracy.value = Math.min(moveAccuracy.value + this.accuracyAmount * this.getStackCount(), 100);
@ -2711,7 +2711,7 @@ export class PokemonMultiHitModifier extends PokemonHeldItemModifier {
* @returns always `true` * @returns always `true`
*/ */
override apply(pokemon: Pokemon, moveId: Moves, count: NumberHolder | null = null, damageMultiplier: NumberHolder | null = null): boolean { override apply(pokemon: Pokemon, moveId: Moves, count: NumberHolder | null = null, damageMultiplier: NumberHolder | null = null): boolean {
if (this.getSecondaryChanceMultiplier(pokemon) === 0) { if (super.getSecondaryChanceMultiplier(pokemon) === 0) {
return false; return false;
} }
const move = allMoves[moveId]; const move = allMoves[moveId];
@ -2904,7 +2904,7 @@ export class DamageMoneyRewardModifier extends PokemonHeldItemModifier {
* @returns always `true` * @returns always `true`
*/ */
override apply(pokemon: Pokemon, multiplier: NumberHolder): boolean { override apply(pokemon: Pokemon, multiplier: NumberHolder): boolean {
if (this.getSecondaryChanceMultiplier(pokemon) === 0) { if (super.getSecondaryChanceMultiplier(pokemon) === 0) {
return false; return false;
} }
const battleScene = pokemon.scene; const battleScene = pokemon.scene;