[Balance] Multi Lens damage reduction on fixed-damage moves (#4896)
This commit is contained in:
parent
ae8efeedf8
commit
07f08877c1
|
@ -2622,6 +2622,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
|
||||||
const fixedDamage = new Utils.IntegerHolder(0);
|
const fixedDamage = new Utils.IntegerHolder(0);
|
||||||
applyMoveAttrs(FixedDamageAttr, source, this, move, fixedDamage);
|
applyMoveAttrs(FixedDamageAttr, source, this, move, fixedDamage);
|
||||||
if (fixedDamage.value) {
|
if (fixedDamage.value) {
|
||||||
|
const multiLensMultiplier = new Utils.NumberHolder(1);
|
||||||
|
source.scene.applyModifiers(PokemonMultiHitModifier, source.isPlayer(), source, move.id, null, multiLensMultiplier);
|
||||||
|
fixedDamage.value = Utils.toDmgValue(fixedDamage.value * multiLensMultiplier.value);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
cancelled: false,
|
cancelled: false,
|
||||||
result: HitResult.EFFECTIVE,
|
result: HitResult.EFFECTIVE,
|
||||||
|
|
|
@ -2727,10 +2727,18 @@ export class PokemonMultiHitModifier extends PokemonHeldItemModifier {
|
||||||
* Additional strikes beyond that are given a 0.25x damage multiplier
|
* Additional strikes beyond that are given a 0.25x damage multiplier
|
||||||
*/
|
*/
|
||||||
private applyDamageModifier(pokemon: Pokemon, damageMultiplier: NumberHolder): boolean {
|
private applyDamageModifier(pokemon: Pokemon, damageMultiplier: NumberHolder): boolean {
|
||||||
damageMultiplier.value = (pokemon.turnData.hitsLeft === pokemon.turnData.hitCount)
|
if (pokemon.turnData.hitsLeft === pokemon.turnData.hitCount) {
|
||||||
? (1 - (0.25 * this.getStackCount()))
|
// Reduce first hit by 25% for each stack count
|
||||||
: 0.25;
|
damageMultiplier.value *= 1 - 0.25 * this.getStackCount();
|
||||||
return true;
|
return true;
|
||||||
|
} else if (pokemon.turnData.hitCount - pokemon.turnData.hitsLeft !== this.getStackCount() + 1) {
|
||||||
|
// Deal 25% damage for each remaining Multi Lens hit
|
||||||
|
damageMultiplier.value *= 0.25;
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
// An extra hit not caused by Multi Lens -- assume it is Parental Bond
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
getMaxHeldItemCount(pokemon: Pokemon): number {
|
getMaxHeldItemCount(pokemon: Pokemon): number {
|
||||||
|
|
|
@ -313,7 +313,7 @@ describe("Abilities - Parental Bond", () => {
|
||||||
|
|
||||||
await game.phaseInterceptor.to("MoveEndPhase", false);
|
await game.phaseInterceptor.to("MoveEndPhase", false);
|
||||||
|
|
||||||
expect(enemyPokemon.hp).toBe(enemyStartingHp - 300);
|
expect(enemyPokemon.hp).toBe(enemyStartingHp - 200);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -32,8 +32,8 @@ describe("Items - Multi Lens", () => {
|
||||||
.enemySpecies(Species.SNORLAX)
|
.enemySpecies(Species.SNORLAX)
|
||||||
.enemyAbility(Abilities.BALL_FETCH)
|
.enemyAbility(Abilities.BALL_FETCH)
|
||||||
.enemyMoveset(Moves.SPLASH)
|
.enemyMoveset(Moves.SPLASH)
|
||||||
.startingLevel(100)
|
.startingLevel(99) // Check for proper rounding on Seismic Toss damage reduction
|
||||||
.enemyLevel(100);
|
.enemyLevel(99);
|
||||||
});
|
});
|
||||||
|
|
||||||
it.each([
|
it.each([
|
||||||
|
@ -114,4 +114,25 @@ describe("Items - Multi Lens", () => {
|
||||||
|
|
||||||
expect(magikarp.turnData.hitCount).toBe(2);
|
expect(magikarp.turnData.hitCount).toBe(2);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should enhance fixed-damage moves while also applying damage reduction", async () => {
|
||||||
|
game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }])
|
||||||
|
.moveset(Moves.SEISMIC_TOSS);
|
||||||
|
|
||||||
|
await game.classicMode.startBattle([ Species.MAGIKARP ]);
|
||||||
|
|
||||||
|
const playerPokemon = game.scene.getPlayerPokemon()!;
|
||||||
|
const enemyPokemon = game.scene.getEnemyPokemon()!;
|
||||||
|
const spy = vi.spyOn(enemyPokemon, "getAttackDamage");
|
||||||
|
|
||||||
|
game.move.select(Moves.SEISMIC_TOSS);
|
||||||
|
await game.setTurnOrder([ BattlerIndex.PLAYER, BattlerIndex.ENEMY ]);
|
||||||
|
|
||||||
|
await game.phaseInterceptor.to("MoveEndPhase");
|
||||||
|
const damageResults = spy.mock.results.map(result => result.value?.damage);
|
||||||
|
|
||||||
|
expect(damageResults).toHaveLength(2);
|
||||||
|
expect(damageResults[0]).toBe(Math.floor(playerPokemon.level * 0.75));
|
||||||
|
expect(damageResults[1]).toBe(Math.floor(playerPokemon.level * 0.25));
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue