Fixed inputs of restorePokemonHp

This commit is contained in:
Wlowscha 2025-08-08 00:58:31 +02:00
parent 949467f9f4
commit f83eb054f4
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04

View File

@ -349,7 +349,6 @@ export class HeldItemReward extends PokemonReward {
soundName, soundName,
); );
this.itemId = itemId; this.itemId = itemId;
this.id = RewardId.HELD_ITEM;
} }
get name(): string { get name(): string {
@ -375,7 +374,6 @@ export class TrainerItemReward extends Reward {
constructor(itemId: TrainerItemId, group?: string, soundName?: string) { constructor(itemId: TrainerItemId, group?: string, soundName?: string) {
super("", "", group, soundName); super("", "", group, soundName);
this.itemId = itemId; this.itemId = itemId;
this.id = RewardId.TRAINER_ITEM;
} }
get name(): string { get name(): string {
@ -396,11 +394,6 @@ export class TrainerItemReward extends Reward {
} }
export class LapsingTrainerItemReward extends TrainerItemReward { export class LapsingTrainerItemReward extends TrainerItemReward {
constructor(itemId: TrainerItemId, id?: RewardId) {
super(itemId);
this.id = id ?? RewardId.TRAINER_ITEM;
}
apply(): boolean { apply(): boolean {
return globalScene.trainerItems.add(this.itemId, allTrainerItems[this.itemId].getMaxStackCount()); return globalScene.trainerItems.add(this.itemId, allTrainerItems[this.itemId].getMaxStackCount());
} }
@ -554,7 +547,10 @@ export class PokemonHpRestoreReward extends PokemonReward {
} }
apply({ pokemon }: PokemonRewardParams): boolean { apply({ pokemon }: PokemonRewardParams): boolean {
return restorePokemonHp(pokemon, this.restorePercent, this.restorePoints, this.healStatus, false); return restorePokemonHp(pokemon, this.restorePercent, {
pointsToRestore: this.restorePoints,
healStatus: this.healStatus,
});
} }
} }
@ -591,7 +587,7 @@ export class PokemonReviveReward extends PokemonHpRestoreReward {
} }
apply({ pokemon }: PokemonRewardParams): boolean { apply({ pokemon }: PokemonRewardParams): boolean {
return restorePokemonHp(pokemon, this.restorePercent, 0, false, true); return restorePokemonHp(pokemon, this.restorePercent, { fainted: true });
} }
} }
@ -603,7 +599,7 @@ export class AllPokemonFullReviveReward extends Reward {
apply(): boolean { apply(): boolean {
for (const pokemon of globalScene.getPlayerParty()) { for (const pokemon of globalScene.getPlayerParty()) {
restorePokemonHp(pokemon, 100, 0, false, true); restorePokemonHp(pokemon, 100, { fainted: true });
} }
return true; return true;