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

cleaning up WeatherChange and ForceSwitchOut

Browse Source
This commit is contained in:
DustinLin 2024-07-18 15:39:48 -04:00
parent 977abd33ba
commit eccd844a83
1 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/data/move.ts
View File

@ -2218,26 +2218,8 @@ export class WeatherChangeAttr extends MoveEffectAttr {
getCondition(): MoveConditionFunc {
// adding clause CHILLY_RECEPTION, so move doesn't fail when it's already snowing: since the move still allows a switch out
return (user, target, move) => {
return (user, target, move) => !user.scene.arena.weather || (user.scene.arena.weather.weatherType !== this.weatherType && !user.scene.arena.weather.isImmutable());
if (move.id === Moves.CHILLY_RECEPTION) {
// in the case of CHILLY_RECEPTION: if trySetWeather(...) === False AND getSwitchOut() === False, then it's false
// know that in this case a ForceSwithcOutAttr must exist, so no error checking needed
// if can't switch out, and it's snowing, then move fails
if ( move.getAttrs(ForceSwitchOutAttr)[0].getSwitchOutCondition()(user, target, move) === false && user.scene.arena.weather?.weatherType === WeatherType.SNOW ) {
return false;
}
// else if can set weather to snow, or can switch out, then move succeeds
return user.scene.arena.trySetWeather(this.weatherType, true) || move.getAttrs(ForceSwitchOutAttr)[0].getSwitchOutCondition()(user, target, move);
}
return !user.scene.arena.weather || (user.scene.arena.weather.weatherType !== this.weatherType && !user.scene.arena.weather.isImmutable());
};
}
}
@ -4764,15 +4746,8 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
}
getCondition(): MoveConditionFunc {
return (user, target, move) => {
return (user, target, move) => (move.category !== MoveCategory.STATUS || this.getSwitchOutCondition()(user, target, move));
// add bypass here for CHILLY, since it's a status move that shouldn't fail when getSwitchOutCondition fails (moves like u_turn aren't STATUS so they still pass)
if (move.id === Moves.CHILLY_RECEPTION) {
return true;
}
return (move.category !== MoveCategory.STATUS || this.getSwitchOutCondition()(user, target, move));
};
}
getFailedText(user: Pokemon, target: Pokemon, move: Move, cancelled: Utils.BooleanHolder): string | null {