diff --git a/src/data/move.ts b/src/data/move.ts index c32ec1d9a4a..e3fbc129115 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -624,7 +624,8 @@ export class HealAttr extends MoveEffectAttr { } getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { - return Math.round((1 - (this.selfTarget ? user : target).getHpRatio()) * 20); + let score = ((1 - (this.selfTarget ? user : target).getHpRatio()) * 20) - this.healRatio * 10; + return Math.round(score / (1 - this.healRatio / 2)); } } diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index 00271e9f488..d85061f8b2b 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -1465,6 +1465,10 @@ export class PokemonFormChangeItemModifier extends PokemonHeldItemModifier { return ret; } + getTransferrable(withinParty: boolean) { + return withinParty; + } + getMaxHeldItemCount(pokemon: Pokemon): integer { return 1; }