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

Address kev's review comments

Browse Source 
Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
This commit is contained in:
Sirz Benjie 2025-09-06 13:40:22 -05:00
parent 9e49162012
commit 826bf1fd33
No known key found for this signature in database
GPG Key ID: 4A524B4D196C759E
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/data/moves/move.ts
View File

@ -489,7 +489,7 @@ export abstract class Move implements Localizable {
conditionSeq = 4,
): this {
if (typeof restriction === "function") {
this.restrictions.push(new MoveRestriction(restriction));
this.restrictions.push(new MoveRestriction(restriction, i18nkey));
if (alsoCondition) {
let conditionArray: MoveCondition[];
switch (conditionSeq) {
@ -501,7 +501,7 @@ export abstract class Move implements Localizable {
break;
default:
conditionArray = this.conditions;
}
}
conditionArray.push(new MoveCondition((user, _, move) => !restriction(user, move)));
}

14
src/phases/move-phase.ts
View File

@ -536,11 +536,11 @@ export class MovePhase extends PokemonPhase {
// Check if the move will heal
const move = this.move.getMove();
if (
move.findAttr(attr => attr.selfTarget && attr.is("HealStatusEffectAttr") && attr.isOfEffect(StatusEffect.FREEZE))
move.findAttr(
attr => attr.selfTarget && attr.is("HealStatusEffectAttr") && attr.isOfEffect(StatusEffect.FREEZE),
) &&
(move.id !== MoveId.BURN_UP || this.pokemon.isOfType(PokemonType.FIRE, true, true))
) {
// On cartridge, burn up will not cure if it would fail
if (move.id === MoveId.BURN_UP && !this.pokemon.isOfType(PokemonType.FIRE)) {
}
this.thaw = true;
return false;
}
@ -634,7 +634,7 @@ export class MovePhase extends PokemonPhase {
const move = this.move.getMove();
const user = this.pokemon;
const target = this.getActiveTargetPokemon()[0];
return !!move.getAttrs("PreUseInterruptAttr").some(attr => {
return move.getAttrs("PreUseInterruptAttr").some(attr => {
attr.apply(user, target, move);
if (this.cancelled) {
return true;
@ -723,8 +723,8 @@ export class MovePhase extends PokemonPhase {
return;
}
/*
At this point, delayed moves (future sight, wish, doom desire) are issued, and if they occur, are
Then, combined pledge moves are checked for. Interestingly, the "wasMoveEffective" flag is set to false if the delay occurs
At this point, delayed moves (future sight, wish, doom desire) are issued, and, if they occur, the move animations are played.
Then, combined pledge moves are checked for. Interestingly, the "wasMoveEffective" flag is set to false if the combined technique
In either case, the phase should end here without proceeding
*/