mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-21 14:59:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added Substitute Implementation

Browse Source
This commit is contained in:
Mason 2024-09-26 12:37:44 -04:00
parent bfa2ee0b96
commit 3699f4b37d
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/phases/move-effect-phase.ts
View File

@ -252,7 +252,7 @@ export class MoveEffectPhase extends PokemonPhase {
if (hitResult !== HitResult.NO_EFFECT) { if (hitResult !== HitResult.NO_EFFECT) {
promiseChain promiseChain
.then(this.applyPostApplyEffects(user, target, firstHit, lastHit)) .then(this.applyPostApplyEffects(user, target, firstHit, lastHit))
.then(this.applyHeldItemFlinchCheck(user,target,hitResult)) .then(this.applyHeldItemFlinchCheck(user, target, dealsDamage))
.then(this.applySuccessfulAttkEffects(user, target, firstHit, lastHit, !!isProtected, hitResult, firstTarget, chargeEffect)) .then(this.applySuccessfulAttkEffects(user, target, firstHit, lastHit, !!isProtected, hitResult, firstTarget, chargeEffect))
.then(() => resolve()); .then(() => resolve());
} else { } else {
@ -379,23 +379,25 @@ export class MoveEffectPhase extends PokemonPhase {
return Utils.executeIf(!target.isFainted() || target.canApplyAbility(), () => return Utils.executeIf(!target.isFainted() || target.canApplyAbility(), () =>
applyPostDefendAbAttrs(PostDefendAbAttr, target, user, this.move.getMove(), hitResult) applyPostDefendAbAttrs(PostDefendAbAttr, target, user, this.move.getMove(), hitResult)
.then(() => { .then(() => {
//TODO Add onGetHit BattlerTag lapse type
target.lapseTag(BattlerTagType.BEAK_BLAST_CHARGING);
if (this.move.getMove().category === MoveCategory.PHYSICAL && user.isPlayer() !== target.isPlayer()) {
target.lapseTag(BattlerTagType.SHELL_TRAP);
}
if (!this.move.getMove().hitsSubstitute(user, target)) {
if (!user.isPlayer() && this.move.getMove() instanceof AttackMove) { if (!user.isPlayer() && this.move.getMove() instanceof AttackMove) {
user.scene.applyShuffledModifiers(this.scene, EnemyAttackStatusEffectChanceModifier, false, target); user.scene.applyShuffledModifiers(this.scene, EnemyAttackStatusEffectChanceModifier, false, target);
} }
target.lapseTag(BattlerTagType.BEAK_BLAST_CHARGING);
if (this.move.getMove().category === MoveCategory.PHYSICAL && user.isPlayer() !== target.isPlayer()) {
target.lapseTag(BattlerTagType.SHELL_TRAP);
}
}
}) })
); );
} }
/** /**
* Applies all effects and attributes that require a move to connect with a target, * Applies all effects and attributes that require a move to connect with a target,
* namely reactive effects like Weak Armor, on-hit effects like that of Power-Up Punch, and item stealing effects) * namely reactive effects like Weak Armor, on-hit effects like that of Power-Up Punch, and item stealing effects
* @param user {@linkcode Pokemon} the Pokemon using this phase's invoked move * @param user {@linkcode Pokemon} the Pokemon using this phase's invoked move
* @param target {@linkcode Pokemon} the current target of this phase's invoked move * @param target {@linkcode Pokemon} the current target of this phase's invoked move
* @param firstHit {@linkcode boolean} whether or not this is the first hit in a multi-hit attack * @param firstHit {@linkcode boolean} whether or not this is the first hit in a multi-hit attack
@ -423,12 +425,12 @@ export class MoveEffectPhase extends PokemonPhase {
* Handles checking for and applying Flinches * Handles checking for and applying Flinches
* @param user {@linkcode Pokemon} the Pokemon using this phases invoked move * @param user {@linkcode Pokemon} the Pokemon using this phases invoked move
* @param target {@linkcode Pokemon} the current target of this phases invoked move * @param target {@linkcode Pokemon} the current target of this phases invoked move
* @param hitResult {@linkcode HitResult} the result of the attempted move * @param dealsDamage {@linkcode boolean} if the attempted move successfully dealt damage
* @returns a function to be passed into a then() call * @returns a function to be passed into a then() call
*/ */
applyHeldItemFlinchCheck(user: Pokemon, target: Pokemon, hitResult: HitResult) : () => void { applyHeldItemFlinchCheck(user: Pokemon, target: Pokemon, dealsDamage: boolean) : () => void {
return () => { return () => {
if (hitResult < HitResult.NO_EFFECT && !target.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr)) { if (dealsDamage && !target.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && !this.move.getMove().hitsSubstitute(user, target)) {
const flinched = new Utils.BooleanHolder(false); const flinched = new Utils.BooleanHolder(false);
user.scene.applyModifiers(FlinchChanceModifier, user.isPlayer(), user, flinched); user.scene.applyModifiers(FlinchChanceModifier, user.isPlayer(), user, flinched);
if (flinched.value) { if (flinched.value) {