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

Fully implement Flower Gift and Victory Star

Browse Source
This commit is contained in:
Sirz Benjie 2025-01-30 15:56:53 -06:00
parent 4a1033ce5a
commit c39fb8e694
No known key found for this signature in database
GPG Key ID: 4A524B4D196C759E
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/data/ability.ts
View File

@ -5616,7 +5616,6 @@ export function applyStatMultiplierAbAttrs(
* @param statValue {@linkcode Utils.NumberHolder} the value of the checked stat * @param statValue {@linkcode Utils.NumberHolder} the value of the checked stat
* @param checkedPokemon {@linkcode Pokemon} the Pokemon with the checked stat * @param checkedPokemon {@linkcode Pokemon} the Pokemon with the checked stat
* @param ignore {@linkcode boolean} Whether or not the ability should be ignored by the pokemon or its move. * @param ignore {@linkcode boolean} Whether or not the ability should be ignored by the pokemon or its move.
*
* @param args unused * @param args unused
*/ */
export function applyAllyStatMultiplierAbAttrs(attrType: Constructor<AllyStatMultiplierAbAttr>, export function applyAllyStatMultiplierAbAttrs(attrType: Constructor<AllyStatMultiplierAbAttr>,

2
src/field/pokemon.ts
View File

@ -5057,7 +5057,7 @@ export class EnemyPokemon extends Pokemon {
return move.category !== MoveCategory.STATUS return move.category !== MoveCategory.STATUS
&& moveTargets.some(p => { && moveTargets.some(p => {
const doesNotFail = move.applyConditions(this, p, move) || [ Moves.SUCKER_PUNCH, Moves.UPPER_HAND, Moves.THUNDERCLAP ].includes(move.id); const doesNotFail = move.applyConditions(this, p, move) || [ Moves.SUCKER_PUNCH, Moves.UPPER_HAND, Moves.THUNDERCLAP ].includes(move.id);
return doesNotFail && p.getAttackDamage(this, move, !p.battleData.abilityRevealed, false, !p.getAlly()?.battleData.abilityRevealed, isCritical).damage >= p.hp; return doesNotFail && p.getAttackDamage(this, move, !p.battleData.abilityRevealed, false, !p.getAlly()?.battleData.abilityRevealed, false, isCritical).damage >= p.hp;
}); });
}, this); }, this);