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

Removed duplicate class member so biome won't yell at meeeeeee

Browse Source
This commit is contained in:
Bertie690 2025-08-03 22:58:52 -04:00
parent 6077cfff17
commit 8a4b89d04b
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/battle-scene.ts
View File

@ -69,8 +69,8 @@ import { HeldItemPoolType, RewardPoolType } from "#enums/reward-pool-type";
import { ShopCursorTarget } from "#enums/shop-cursor-target"; import { ShopCursorTarget } from "#enums/shop-cursor-target";
import { SpeciesId } from "#enums/species-id"; import { SpeciesId } from "#enums/species-id";
import { StatusEffect } from "#enums/status-effect"; import { StatusEffect } from "#enums/status-effect";
import { TrainerItemId } from "#enums/trainer-item-id";
import { TextStyle } from "#enums/text-style"; import { TextStyle } from "#enums/text-style";
import { TrainerItemId } from "#enums/trainer-item-id";
import type { TrainerSlot } from "#enums/trainer-slot"; import type { TrainerSlot } from "#enums/trainer-slot";
import { TrainerType } from "#enums/trainer-type"; import { TrainerType } from "#enums/trainer-type";
import { TrainerVariant } from "#enums/trainer-variant"; import { TrainerVariant } from "#enums/trainer-variant";
@ -2643,6 +2643,8 @@ export class BattleScene extends SceneBase {
this.playSound(soundName); this.playSound(soundName);
} }
// TODO: fix later
// @ts-expect-error
if (!reward.shouldApply(params)) { if (!reward.shouldApply(params)) {
return false; return false;
} }
@ -2780,7 +2782,6 @@ export class BattleScene extends SceneBase {
}); });
} }
// TODO @Wlowscha: Fix this // TODO @Wlowscha: Fix this
/** /**
* Attempt to discard one or more copies of a held item. * Attempt to discard one or more copies of a held item.
@ -2799,23 +2800,6 @@ export class BattleScene extends SceneBase {
return this.removeModifier(itemModifier); return this.removeModifier(itemModifier);
} }
/**
* Attempt to discard one or more copies of a held item.
* @param itemModifier - The {@linkcode PokemonHeldItemModifier} being discarded
* @param discardQuantity - The number of copies to remove (up to the amount currently held); default `1`
* @returns Whether the item was successfully discarded.
* Removing fewer items than requested is still considered a success.
*/
tryDiscardHeldItemModifier(itemModifier: PokemonHeldItemModifier, discardQuantity = 1): boolean {
const countTaken = Math.min(discardQuantity, itemModifier.stackCount);
itemModifier.stackCount -= countTaken;
if (itemModifier.stackCount > 0) {
return true;
}
return this.removeModifier(itemModifier);
}
canTransferHeldItemModifier(itemModifier: PokemonHeldItemModifier, target: Pokemon, transferQuantity = 1): boolean { canTransferHeldItemModifier(itemModifier: PokemonHeldItemModifier, target: Pokemon, transferQuantity = 1): boolean {
const mod = itemModifier.clone() as PokemonHeldItemModifier; const mod = itemModifier.clone() as PokemonHeldItemModifier;

1
src/ui/party-ui-handler.ts
View File

@ -2160,6 +2160,7 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container {
* @remarks * @remarks
* This will also reveal the button if it is currently hidden. * This will also reveal the button if it is currently hidden.
*/ */
// TODO: Reminder to fix
public toggleIcon(partyMode: PartyUiMode.MODIFIER_TRANSFER | PartyUiMode.DISCARD): void { public toggleIcon(partyMode: PartyUiMode.MODIFIER_TRANSFER | PartyUiMode.DISCARD): void {
this.setActive(true).setVisible(true); this.setActive(true).setVisible(true);
switch (partyMode) { switch (partyMode) {