random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-05-02 22:44:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

logging some new changes

Browse Source
This commit is contained in:
PrabbyDD 2024-11-06 09:11:38 -08:00
parent 34d2a9c400
commit 622e133ab5
4 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/data/ability.ts
View File

@ -2710,7 +2710,6 @@ export class PreStatStageChangeAbAttr extends AbAttr {
*/ */
// TODO: CODE INTERACTION WITH MAGIC BOUNCE AS WELL // TODO: CODE INTERACTION WITH MAGIC BOUNCE AS WELL
// TODO: CODE INTERACTION WITH STICKY WEB // TODO: CODE INTERACTION WITH STICKY WEB
// TODO: PREVENT REFLECTION FROM OPPONENT MIRROR ARMOR FOR INFINITE LOOP
export class ReflectStatStageChangeAbAttr extends PreStatStageChangeAbAttr { export class ReflectStatStageChangeAbAttr extends PreStatStageChangeAbAttr {
/** {@linkcode BattleStat} to reflect */ /** {@linkcode BattleStat} to reflect */
private reflectedStat? : BattleStat; private reflectedStat? : BattleStat;
@ -2733,7 +2732,7 @@ export class ReflectStatStageChangeAbAttr extends PreStatStageChangeAbAttr {
const stages = _args[1]; const stages = _args[1];
this.reflectedStat = stat; this.reflectedStat = stat;
if (!_simulated) { if (!_simulated) {
attacker.scene.unshiftPhase(new StatStageChangePhase(attacker.scene, attacker.getBattlerIndex(), false, [ stat ], stages)); attacker.scene.unshiftPhase(new StatStageChangePhase(attacker.scene, attacker.getBattlerIndex(), false, [ stat ], stages, true, false, true, null, true));
} }
cancelled.value = true; cancelled.value = true;
return true; return true;

4
src/data/move.ts
View File

@ -8087,8 +8087,8 @@ export function initMoves() {
new StatusMove(Moves.WILL_O_WISP, Type.FIRE, 85, 15, -1, 0, 3) new StatusMove(Moves.WILL_O_WISP, Type.FIRE, 85, 15, -1, 0, 3)
.attr(StatusEffectAttr, StatusEffect.BURN), .attr(StatusEffectAttr, StatusEffect.BURN),
new StatusMove(Moves.MEMENTO, Type.DARK, 100, 10, -1, 0, 3) new StatusMove(Moves.MEMENTO, Type.DARK, 100, 10, -1, 0, 3)
.attr(SacrificialAttrOnHit) .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -2)
.attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -2), .attr(SacrificialAttrOnHit),
new AttackMove(Moves.FACADE, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 3) new AttackMove(Moves.FACADE, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, 0, 3)
.attr(MovePowerMultiplierAttr, (user, target, move) => user.status .attr(MovePowerMultiplierAttr, (user, target, move) => user.status
&& (user.status.effect === StatusEffect.BURN || user.status.effect === StatusEffect.POISON || user.status.effect === StatusEffect.TOXIC || user.status.effect === StatusEffect.PARALYSIS) ? 2 : 1) && (user.status.effect === StatusEffect.BURN || user.status.effect === StatusEffect.POISON || user.status.effect === StatusEffect.TOXIC || user.status.effect === StatusEffect.PARALYSIS) ? 2 : 1)

13
src/phases/stat-stage-change-phase.ts
View File

@ -22,9 +22,10 @@ export class StatStageChangePhase extends PokemonPhase {
private ignoreAbilities: boolean; private ignoreAbilities: boolean;
private canBeCopied: boolean; private canBeCopied: boolean;
private onChange: StatStageChangeCallback | null; private onChange: StatStageChangeCallback | null;
private comingFromMirrorArmorUser: boolean;
constructor(scene: BattleScene, battlerIndex: BattlerIndex, selfTarget: boolean, stats: BattleStat[], stages: integer, showMessage: boolean = true, ignoreAbilities: boolean = false, canBeCopied: boolean = true, onChange: StatStageChangeCallback | null = null) { constructor(scene: BattleScene, battlerIndex: BattlerIndex, selfTarget: boolean, stats: BattleStat[], stages: integer, showMessage: boolean = true, ignoreAbilities: boolean = false, canBeCopied: boolean = true, onChange: StatStageChangeCallback | null = null, comingFromMirrorArmorUser: boolean = false) {
super(scene, battlerIndex); super(scene, battlerIndex);
this.selfTarget = selfTarget; this.selfTarget = selfTarget;
@ -34,6 +35,7 @@ export class StatStageChangePhase extends PokemonPhase {
this.ignoreAbilities = ignoreAbilities; this.ignoreAbilities = ignoreAbilities;
this.canBeCopied = canBeCopied; this.canBeCopied = canBeCopied;
this.onChange = onChange; this.onChange = onChange;
this.comingFromMirrorArmorUser = comingFromMirrorArmorUser;
} }
start() { start() {
@ -42,7 +44,7 @@ export class StatStageChangePhase extends PokemonPhase {
if (this.stats.length > 1) { if (this.stats.length > 1) {
for (let i = 0; i < this.stats.length; i++) { for (let i = 0; i < this.stats.length; i++) {
const stat = [ this.stats[i] ]; const stat = [ this.stats[i] ];
this.scene.unshiftPhase(new StatStageChangePhase(this.scene, this.battlerIndex, this.selfTarget, stat, this.stages, this.showMessage, this.ignoreAbilities, this.canBeCopied, this.onChange)); this.scene.unshiftPhase(new StatStageChangePhase(this.scene, this.battlerIndex, this.selfTarget, stat, this.stages, this.showMessage, this.ignoreAbilities, this.canBeCopied, this.onChange, this.comingFromMirrorArmorUser));
} }
return this.end(); return this.end();
} }
@ -62,6 +64,7 @@ export class StatStageChangePhase extends PokemonPhase {
if (this.scene.currentBattle.double && this.scene.getEnemyField().length === 2) { if (this.scene.currentBattle.double && this.scene.getEnemyField().length === 2) {
opponentPokemon = this.scene.getEnemyField()[this.scene.currentBattle.lastEnemyInvolved]; opponentPokemon = this.scene.getEnemyField()[this.scene.currentBattle.lastEnemyInvolved];
} else { } else {
console.log("ENEMY POKEMANS", this.scene.getEnemyField());
opponentPokemon = this.scene.getEnemyPokemon(); opponentPokemon = this.scene.getEnemyPokemon();
} }
} else { } else {
@ -95,13 +98,13 @@ export class StatStageChangePhase extends PokemonPhase {
if (!cancelled.value && !this.selfTarget && stages.value < 0) { if (!cancelled.value && !this.selfTarget && stages.value < 0) {
applyPreStatStageChangeAbAttrs(ProtectStatAbAttr, pokemon, stat, cancelled, simulate); applyPreStatStageChangeAbAttrs(ProtectStatAbAttr, pokemon, stat, cancelled, simulate);
// TODO: CODE INTERACTION WITH MAGIC BOUNCE AS WELL // TODO: CODE INTERACTION WITH MAGIC BOUNCE AS WELL
// TODO: CODE INTERACTION WITH STICKY WEB // TODO: CODE INTERACTION WITH STICKY WEB
// TODO: PREVENT REFLECTION FROM OPPONENT MIRROR ARMOR FOR INFINITE LOOP
// TODO: FIX INTERACTION WITH MEMENTO, SHOULD LOWER OPPONENT STATS THEN DIE // TODO: FIX INTERACTION WITH MEMENTO, SHOULD LOWER OPPONENT STATS THEN DIE
/** Potential stat reflection due to Mirror Armor, does not apply to Octolock end of turn effect */ /** Potential stat reflection due to Mirror Armor, does not apply to Octolock end of turn effect */
if (opponentPokemon !== undefined && !pokemon.findTag(t => t instanceof OctolockTag)) { console.log("I AM HEREE", opponentPokemon);
if (opponentPokemon !== undefined && !pokemon.findTag(t => t instanceof OctolockTag) && !this.comingFromMirrorArmorUser) {
applyPreStatStageChangeAbAttrs(ReflectStatStageChangeAbAttr, pokemon, stat, cancelled, simulate, opponentPokemon, this.stages); applyPreStatStageChangeAbAttrs(ReflectStatStageChangeAbAttr, pokemon, stat, cancelled, simulate, opponentPokemon, this.stages);
} }
} }

23
src/test/abilities/mirror_armor.test.ts
View File

@ -1,4 +1,5 @@
//test memnto as well and double battles and multiple stats and octolock //test memnto as well and double battles and multiple stats and octolock
// test mirror armor infinite loop as well
import { Stat } from "#enums/stat"; import { Stat } from "#enums/stat";
import { Abilities } from "#enums/abilities"; import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves"; import { Moves } from "#enums/moves";
@ -49,7 +50,7 @@ describe("Ability - Mirror Armor", () => {
expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1); expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1);
expect(userPokemon.getStatStage(Stat.ATK)).toBe(0); expect(userPokemon.getStatStage(Stat.ATK)).toBe(0);
}); }, 20000);
it("Enemy side + single battle Intimidate - player loses stats", async () => { it("Enemy side + single battle Intimidate - player loses stats", async () => {
game.override.enemyAbility(Abilities.MIRROR_ARMOR); game.override.enemyAbility(Abilities.MIRROR_ARMOR);
@ -66,7 +67,7 @@ describe("Ability - Mirror Armor", () => {
expect(userPokemon.getStatStage(Stat.ATK)).toBe(-1); expect(userPokemon.getStatStage(Stat.ATK)).toBe(-1);
expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0); expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
}); }, 20000);
it("Player side + double battle Intimidate - opponents each lose -2 atk", async () => { it("Player side + double battle Intimidate - opponents each lose -2 atk", async () => {
game.override.battleType("double"); game.override.battleType("double");
@ -88,7 +89,7 @@ describe("Ability - Mirror Armor", () => {
expect(enemy2.getStatStage(Stat.ATK)).toBe(-2); expect(enemy2.getStatStage(Stat.ATK)).toBe(-2);
expect(player1.getStatStage(Stat.ATK)).toBe(0); expect(player1.getStatStage(Stat.ATK)).toBe(0);
expect(player2.getStatStage(Stat.ATK)).toBe(0); expect(player2.getStatStage(Stat.ATK)).toBe(0);
}); }, 20000);
it("Enemy side + double battle Intimidate - players each lose -2 atk", async () => { it("Enemy side + double battle Intimidate - players each lose -2 atk", async () => {
game.override.battleType("double"); game.override.battleType("double");
@ -110,7 +111,7 @@ describe("Ability - Mirror Armor", () => {
expect(enemy2.getStatStage(Stat.ATK)).toBe(0); expect(enemy2.getStatStage(Stat.ATK)).toBe(0);
expect(player1.getStatStage(Stat.ATK)).toBe(-2); expect(player1.getStatStage(Stat.ATK)).toBe(-2);
expect(player2.getStatStage(Stat.ATK)).toBe(-2); expect(player2.getStatStage(Stat.ATK)).toBe(-2);
}); }, 20000);
it("Player side + single battle Intimidate + Tickle - opponent loses stats", async () => { it("Player side + single battle Intimidate + Tickle - opponent loses stats", async () => {
game.override.ability(Abilities.MIRROR_ARMOR); game.override.ability(Abilities.MIRROR_ARMOR);
@ -129,7 +130,7 @@ describe("Ability - Mirror Armor", () => {
expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-2); expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-2);
expect(userPokemon.getStatStage(Stat.ATK)).toBe(0); expect(userPokemon.getStatStage(Stat.ATK)).toBe(0);
expect(userPokemon.getStatStage(Stat.DEF)).toBe(0); expect(userPokemon.getStatStage(Stat.DEF)).toBe(0);
}); }, 20000);
it("Player side + double battle Intimidate + Tickle - opponents each lose -3 atk, -1 def", async () => { it("Player side + double battle Intimidate + Tickle - opponents each lose -3 atk, -1 def", async () => {
game.override.battleType("double"); game.override.battleType("double");
@ -155,7 +156,7 @@ describe("Ability - Mirror Armor", () => {
expect(enemy2.getStatStage(Stat.ATK)).toBe(-3); expect(enemy2.getStatStage(Stat.ATK)).toBe(-3);
expect(enemy2.getStatStage(Stat.DEF)).toBe(-1); expect(enemy2.getStatStage(Stat.DEF)).toBe(-1);
}); }, 20000);
it("Enemy side + single battle Intimidate + Tickle - player loses stats", async () => { it("Enemy side + single battle Intimidate + Tickle - player loses stats", async () => {
game.override.enemyAbility(Abilities.MIRROR_ARMOR); game.override.enemyAbility(Abilities.MIRROR_ARMOR);
@ -174,7 +175,7 @@ describe("Ability - Mirror Armor", () => {
expect(userPokemon.getStatStage(Stat.ATK)).toBe(-2); expect(userPokemon.getStatStage(Stat.ATK)).toBe(-2);
expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0); expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(0); expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(0);
}); }, 20000);
it("Player side + single battle Intimidate + oppoenent has white smoke - no one loses stats", async () => { it("Player side + single battle Intimidate + oppoenent has white smoke - no one loses stats", async () => {
game.override.enemyAbility(Abilities.WHITE_SMOKE); game.override.enemyAbility(Abilities.WHITE_SMOKE);
@ -193,7 +194,7 @@ describe("Ability - Mirror Armor", () => {
expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0); expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
expect(userPokemon.getStatStage(Stat.ATK)).toBe(0); expect(userPokemon.getStatStage(Stat.ATK)).toBe(0);
expect(userPokemon.getStatStage(Stat.DEF)).toBe(0); expect(userPokemon.getStatStage(Stat.DEF)).toBe(0);
}); }, 20000);
it("Enemy side + single battle Intimidate + player has white smoke - no one loses stats", async () => { it("Enemy side + single battle Intimidate + player has white smoke - no one loses stats", async () => {
game.override.ability(Abilities.WHITE_SMOKE); game.override.ability(Abilities.WHITE_SMOKE);
@ -212,7 +213,7 @@ describe("Ability - Mirror Armor", () => {
expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0); expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(0);
expect(userPokemon.getStatStage(Stat.ATK)).toBe(0); expect(userPokemon.getStatStage(Stat.ATK)).toBe(0);
expect(userPokemon.getStatStage(Stat.DEF)).toBe(0); expect(userPokemon.getStatStage(Stat.DEF)).toBe(0);
}); }, 20000);
it("Player side + single battle + opponent uses octolock - does not interact with mirror armor, player loses stats", async () => { it("Player side + single battle + opponent uses octolock - does not interact with mirror armor, player loses stats", async () => {
game.override.ability(Abilities.MIRROR_ARMOR); game.override.ability(Abilities.MIRROR_ARMOR);
@ -230,7 +231,7 @@ describe("Ability - Mirror Armor", () => {
expect(enemyPokemon.getStatStage(Stat.SPDEF)).toBe(0); expect(enemyPokemon.getStatStage(Stat.SPDEF)).toBe(0);
expect(userPokemon.getStatStage(Stat.DEF)).toBe(-1); expect(userPokemon.getStatStage(Stat.DEF)).toBe(-1);
expect(userPokemon.getStatStage(Stat.SPDEF)).toBe(-1); expect(userPokemon.getStatStage(Stat.SPDEF)).toBe(-1);
}); }, 20000);
it("Enemy side + single battle + player uses octolock - does not interact with mirror armor, opponent loses stats", async () => { it("Enemy side + single battle + player uses octolock - does not interact with mirror armor, opponent loses stats", async () => {
game.override.enemyAbility(Abilities.MIRROR_ARMOR); game.override.enemyAbility(Abilities.MIRROR_ARMOR);
@ -248,7 +249,7 @@ describe("Ability - Mirror Armor", () => {
expect(userPokemon.getStatStage(Stat.SPDEF)).toBe(0); expect(userPokemon.getStatStage(Stat.SPDEF)).toBe(0);
expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(-1); expect(enemyPokemon.getStatStage(Stat.DEF)).toBe(-1);
expect(enemyPokemon.getStatStage(Stat.SPDEF)).toBe(-1); expect(enemyPokemon.getStatStage(Stat.SPDEF)).toBe(-1);
}); }, 20000);
// it("traps the target pokemon", async () => { // it("traps the target pokemon", async () => {
// await game.classicMode.startBattle([ Species.GRAPPLOCT ]); // await game.classicMode.startBattle([ Species.GRAPPLOCT ]);