diff --git a/src/battle-tooltips.ts b/src/battle-tooltips.ts index d724f9a212..fe658de5f3 100644 --- a/src/battle-tooltips.ts +++ b/src/battle-tooltips.ts @@ -1784,6 +1784,13 @@ class BattleTooltips { value.setRange(isGKLK ? 20 : 40, 120); } } + // Base power based on times hit + if (move.id === 'ragefist') { + value.set(Math.min(350, 50 + 50 * pokemon.timesAttacked), + pokemon.timesAttacked > 0 + ? `Hit ${pokemon.timesAttacked} time${pokemon.timesAttacked > 1 ? 's' : ''}` + : undefined); + } if (!value.value) return value; // Other ability boosts diff --git a/src/battle.ts b/src/battle.ts index 9eb90ae77a..7f88009ef6 100644 --- a/src/battle.ts +++ b/src/battle.ts @@ -103,6 +103,7 @@ export class Pokemon implements PokemonDetails, PokemonHealth { /** [[moveName, ppUsed]] */ moveTrack: [string, number][] = []; statusData = {sleepTurns: 0, toxicTurns: 0}; + timesAttacked = 0; sprite: PokemonSprite; @@ -1682,6 +1683,7 @@ export class Battle { break; } } else { + poke.timesAttacked += 1; let damageinfo = '' + Pokemon.getFormattedRange(range, damage[1] === 100 ? 0 : 1, '\u2013'); if (damage[1] !== 100) { let hover = '' + ((damage[0] < 0) ? '\u2212' : '') + @@ -2416,6 +2418,7 @@ export class Battle { poke.boosts = {...tpoke.boosts}; poke.copyTypesFrom(tpoke); poke.ability = tpoke.ability; + poke.timesAttacked = tpoke.timesAttacked; const targetForme = tpoke.volatiles.formechange; const speciesForme = (targetForme && !targetForme[1].endsWith('-Gmax')) ? targetForme[1] : tpoke.speciesForme; const pokemon = tpoke;