Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-06-02 22:08:36 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge dfdaaf26b3 into 6765d8422d

Browse Source
This commit is contained in:
André Bastos Dias 2026-06-02 14:06:03 +01:00 committed by GitHub
commit df779d9f22
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/text/abilities.ts
View File

@ -911,7 +911,7 @@ export const AbilitiesText: { [id: IDEntry]: AbilityText } = {
desc: "Pokemon making contact with this Pokemon have their Ability changed to Lingering Aroma. Does not affect Pokemon with the As One, Battle Bond, Comatose, Disguise, Gulp Missile, Ice Face, Lingering Aroma, Multitype, Power Construct, RKS System, Schooling, Shields Down, Stance Change, or Zen Mode Abilities.",
},
changeAbility: " A lingering aroma clings to [TARGET]!",
changeAbility: " A lingering aroma clings to [POKEMON]!",
},
liquidooze: {
name: "Liquid Ooze",
@ -1106,7 +1106,7 @@ export const AbilitiesText: { [id: IDEntry]: AbilityText } = {
desc: "Pokemon making contact with this Pokemon have their Ability changed to Mummy. Does not affect Pokemon with the Multitype or Mummy Abilities.",
},
changeAbility: " [TARGET]'s Ability became Mummy!",
changeAbility: " [POKEMON]'s Ability became Mummy!",
},
myceliummight: {
name: "Mycelium Might",

19
sim/pokemon.ts
View File

@ -1924,18 +1924,13 @@ export class Pokemon {
this.ability = ability.id;
this.abilityState = this.battle.initEffectState({ id: ability.id, target: this });
if (sourceEffect && !isFromFormeChange && !isTransform) {
switch (sourceEffect.id) {
case 'mummy':
case 'lingeringaroma':
this.battle.add('-activate', source, sourceEffect.fullname, this, '[ability] ' + oldAbility.name);
break;
default:
if (source) {
this.battle.add('-ability', this, ability.name, oldAbility.name, `[from] ${sourceEffect.fullname}`, `[of] ${source}`);
} else {
this.battle.add('-ability', this, ability.name, oldAbility.name, `[from] ${sourceEffect.fullname}`);
}
break;
if (sourceEffect.effectType === 'Ability' && this !== this.battle.effectState.target) {
this.battle.add('-activate', source, sourceEffect.fullname);
}
if (source) {
this.battle.add('-ability', this, ability.name, oldAbility.name, `[from] ${sourceEffect.fullname}`, `[of] ${source}`);
} else {
this.battle.add('-ability', this, ability.name, oldAbility.name, `[from] ${sourceEffect.fullname}`);
}
}
if (ability.id && this.battle.gen > 3 &&