mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-20 07:12:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge up to date

Browse Source
This commit is contained in:
Lylian 2024-10-10 15:40:47 +02:00
parent 1a287e7a6f
commit 57bbeb1acf
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/move.ts
View File

@ -6245,7 +6245,7 @@ export class AbilityChangeAttr extends MoveEffectAttr {
if (pokemon.breakIllusion()) { if (pokemon.breakIllusion()) {
pokemon.scene.queueMessage(i18next.t("abilityTriggers:illusionBreak", { pokemonName: getPokemonNameWithAffix(pokemon) })); pokemon.scene.queueMessage(i18next.t("abilityTriggers:illusionBreak", { pokemonName: getPokemonNameWithAffix(pokemon) }));
} }
user.scene.queueMessage(i18next.t("moveTriggers:acquiredAbility", {pokemonName: getPokemonNameWithAffix(pokemon), abilityName: allAbilities[this.ability].name})); user.scene.queueMessage(i18next.t("moveTriggers:acquiredAbility", { pokemonName: getPokemonNameWithAffix(pokemon), abilityName: allAbilities[this.ability].name }));
return true; return true;
} }

4
src/field/pokemon.ts
View File

@ -438,7 +438,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
} else { } else {
let availables: Species[] = []; let availables: Species[] = [];
if (this.isBoss()) { if (this.isBoss()) {
availables = [Species.ENTEI, Species.RAIKOU, Species.SUICUNE]; availables = [ Species.ENTEI, Species.RAIKOU, Species.SUICUNE ];
} else { } else {
const area: Species[] = [ const area: Species[] = [
Species.HOUNDOUR, Species.SABLEYE, Species.PURRLOIN, Species.PAWNIARD, Species.NICKIT, Species.HOUNDOUR, Species.SABLEYE, Species.PURRLOIN, Species.PAWNIARD, Species.NICKIT,
@ -485,7 +485,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
this.variant = this.battleData.illusion.variant!; this.variant = this.battleData.illusion.variant!;
this.fusionVariant = this.battleData.illusion.fusionVariant!; this.fusionVariant = this.battleData.illusion.fusionVariant!;
this.fusionShiny = this.battleData.illusion.fusionShiny!; this.fusionShiny = this.battleData.illusion.fusionShiny!;
this.battleData.illusion = {active: false, available: false}; this.battleData.illusion = { active: false, available: false };
if (this.isOnField()) { if (this.isOnField()) {
this.scene.playSound("PRSFX- Transform"); this.scene.playSound("PRSFX- Transform");
} }

2
src/ui/party-ui-handler.ts
View File

@ -468,7 +468,7 @@ export default class PartyUiHandler extends MessageUiHandler {
this.clearOptions(); this.clearOptions();
ui.playSelect(); ui.playSelect();
pokemon.pauseEvolutions = !pokemon.pauseEvolutions; pokemon.pauseEvolutions = !pokemon.pauseEvolutions;
this.showText(i18next.t(pokemon.pauseEvolutions? "partyUiHandler:pausedEvolutions" : "partyUiHandler:unpausedEvolutions", { pokemonName: getPokemonNameWithAffix(pokemon, false) }), undefined, () => this.showText("", 0), null, true); this.showText(i18next.t(pokemon.pauseEvolutions ? "partyUiHandler:pausedEvolutions" : "partyUiHandler:unpausedEvolutions", { pokemonName: getPokemonNameWithAffix(pokemon, false) }), undefined, () => this.showText("", 0), null, true);
} else if (option === PartyOption.UNSPLICE) { } else if (option === PartyOption.UNSPLICE) {
this.clearOptions(); this.clearOptions();
ui.playSelect(); ui.playSelect();