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

updated stakeout implementation

Browse Source
This commit is contained in:
Luc 2024-04-29 15:31:28 -04:00
parent b21bdd2d3b
commit 3b4c12967a
1 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/data/ability.ts
View File

@ -929,31 +929,6 @@ export class MoveTypePowerBoostAbAttr extends MovePowerBoostAbAttr {
} }
} }
export class StakeoutAbAttr extends MovePowerBoostAbAttr {
constructor(powerMultiplier: number = 2) {
const condition: PokemonAttackCondition = (user, target, move) => {
if(user.scene.currentBattle.turnCommands[target.getBattlerIndex()].command === Command.POKEMON) // covers hard switching
return true;
// find what move the target's slot used this turn and check if it's a switch-in move.
const moveId = user.scene.currentBattle.turnCommands[target.getBattlerIndex()]?.move?.move
if(moveId){
const targetMove = allMoves[moveId];
const usedSwitchMove = targetMove.findAttr(attr => attr instanceof ForceSwitchOutAttr) as ForceSwitchOutAttr;
if(usedSwitchMove && usedSwitchMove.returnUser() && usedSwitchMove?.isSelfSwitch?.() && target.battleSummonData?.turnCount === 1){ // check if the move switches the user out
if(usedSwitchMove.returnUser().id === target.id) // dont activate if the move was used by the target (meaning it hasnt switched out yet)
return false;
return true;
}
}
return false;
};
super(condition, powerMultiplier);
}
}
export class AnalyticAbAttr extends MovePowerBoostAbAttr { export class AnalyticAbAttr extends MovePowerBoostAbAttr {
constructor(powerMultiplier: number = 1.3) { constructor(powerMultiplier: number = 1.3) {
const condition: PokemonAttackCondition = (user, target, move) => { const condition: PokemonAttackCondition = (user, target, move) => {
@ -3079,7 +3054,7 @@ export function initAbilities() {
.attr(NoFusionAbilityAbAttr) .attr(NoFusionAbilityAbAttr)
.partial(), .partial(),
new Ability(Abilities.STAKEOUT, 7) new Ability(Abilities.STAKEOUT, 7)
.attr(StakeoutAbAttr), .attr(MovePowerBoostAbAttr, (user, target, move) => user.scene.currentBattle.turnCommands[target.getBattlerIndex()].command === Command.POKEMON || target.battleSummonData.turnCount === 0, 2),
new Ability(Abilities.WATER_BUBBLE, 7) new Ability(Abilities.WATER_BUBBLE, 7)
.attr(ReceivedTypeDamageMultiplierAbAttr, Type.FIRE, 0.5) .attr(ReceivedTypeDamageMultiplierAbAttr, Type.FIRE, 0.5)
.attr(MoveTypePowerBoostAbAttr, Type.WATER, 1) .attr(MoveTypePowerBoostAbAttr, Type.WATER, 1)