Compare commits

..

1 Commits

Author SHA1 Message Date
Matilde Simões
18b51484f3
Merge ba8126c86d into 1e306e25b5 2025-06-19 20:14:36 -04:00
3 changed files with 11 additions and 4 deletions

View File

@ -306,6 +306,13 @@ export class BlockRecoilDamageAttr extends AbAttr {
): void { ): void {
cancelled.value = true; cancelled.value = true;
} }
getTriggerMessage(pokemon: Pokemon, abilityName: string, ..._args: any[]) {
return i18next.t("abilityTriggers:blockRecoilDamage", {
pokemonName: getPokemonNameWithAffix(pokemon),
abilityName: abilityName,
});
}
} }
/** /**

View File

@ -751,7 +751,7 @@ export async function catchPokemon(
UiMode.POKEDEX_PAGE, UiMode.POKEDEX_PAGE,
pokemon.species, pokemon.species,
pokemon.formIndex, pokemon.formIndex,
[attributes], attributes,
null, null,
() => { () => {
globalScene.ui.setMode(UiMode.MESSAGE).then(() => { globalScene.ui.setMode(UiMode.MESSAGE).then(() => {

View File

@ -2500,14 +2500,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
} }
atkScore *= 1.25; //give more value for the pokemon's typing atkScore *= 1.25; //give more value for the pokemon's typing
const moveset = this.moveset; const moveset = this.moveset;
let moveAtkScoreLength = 0; let moveAtkScoreLenght = 0;
for (const move of moveset) { for (const move of moveset) {
if (move.getMove().category === MoveCategory.SPECIAL || move.getMove().category === MoveCategory.PHYSICAL) { if (move.getMove().category === MoveCategory.SPECIAL || move.getMove().category === MoveCategory.PHYSICAL) {
atkScore += opponent.getAttackTypeEffectiveness(move.getMove().type, this, false, true, undefined, true); atkScore += opponent.getAttackTypeEffectiveness(move.getMove().type, this, false, true, undefined, true);
moveAtkScoreLength++; moveAtkScoreLenght++;
} }
} }
atkScore = atkScore / (moveAtkScoreLength + 1); //calculate the median for the attack score atkScore = atkScore / (moveAtkScoreLenght + 1); //calculate the median for the attack score
/** /**
* Based on this Pokemon's HP ratio compared to that of the opponent. * Based on this Pokemon's HP ratio compared to that of the opponent.
* This ratio is multiplied by 1.5 if this Pokemon outspeeds the opponent; * This ratio is multiplied by 1.5 if this Pokemon outspeeds the opponent;