Skip to content

Commit

Permalink
Merge branch 'beta' into multi-lens-rework
Browse files Browse the repository at this point in the history
  • Loading branch information
@innerthunder
innerthunder committed Nov 11, 2024
2 parents 8570630 + 6feb634 commit 6ad2420
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 80 deletions.
11 changes: 8 additions & 3 deletions src/data/move.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8516,7 +8516,8 @@ export function initMoves() {
new StatusMove(Moves.HELPING_HAND, Type.NORMAL, -1, 20, -1, 5, 3)
.attr(AddBattlerTagAttr, BattlerTagType.HELPING_HAND)
.ignoresSubstitute()
.target(MoveTarget.NEAR_ALLY),
.target(MoveTarget.NEAR_ALLY)
.condition(failIfSingleBattle),
new StatusMove(Moves.TRICK, Type.PSYCHIC, 100, 10, -1, 0, 3)
.unimplemented(),
new StatusMove(Moves.ROLE_PLAY, Type.PSYCHIC, -1, 10, -1, 0, 3)
Expand Down Expand Up @@ -9208,6 +9209,7 @@ export function initMoves() {
.target(MoveTarget.ALL_NEAR_ENEMIES)
.attr(RemoveHeldItemAttr, true),
new StatusMove(Moves.QUASH, Type.DARK, 100, 15, -1, 0, 5)
.condition(failIfSingleBattle)
.unimplemented(),
new AttackMove(Moves.ACROBATICS, Type.FLYING, MoveCategory.PHYSICAL, 55, 100, 15, -1, 0, 5)
.attr(MovePowerMultiplierAttr, (user, target, move) => Math.max(1, 2 - 0.2 * user.getHeldItems().filter(i => i.isTransferable).reduce((v, m) => v + m.stackCount, 0))),
Expand Down Expand Up @@ -9495,6 +9497,7 @@ export function initMoves() {
new StatusMove(Moves.AROMATIC_MIST, Type.FAIRY, -1, 20, -1, 0, 6)
.attr(StatStageChangeAttr, [ Stat.SPDEF ], 1)
.ignoresSubstitute()
.condition(failIfSingleBattle)
.target(MoveTarget.NEAR_ALLY),
new StatusMove(Moves.EERIE_IMPULSE, Type.ELECTRIC, 100, 15, -1, 0, 6)
.attr(StatStageChangeAttr, [ Stat.SPATK ], -2),
Expand Down Expand Up @@ -9723,7 +9726,8 @@ export function initMoves() {
new AttackMove(Moves.LEAFAGE, Type.GRASS, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 7)
.makesContact(false),
new StatusMove(Moves.SPOTLIGHT, Type.NORMAL, -1, 15, -1, 3, 7)
.attr(AddBattlerTagAttr, BattlerTagType.CENTER_OF_ATTENTION, false),
.attr(AddBattlerTagAttr, BattlerTagType.CENTER_OF_ATTENTION, false)
.condition(failIfSingleBattle),
new StatusMove(Moves.TOXIC_THREAD, Type.POISON, 100, 20, -1, 0, 7)
.attr(StatusEffectAttr, StatusEffect.POISON)
.attr(StatStageChangeAttr, [ Stat.SPD ], -1),
Expand Down Expand Up @@ -10180,7 +10184,8 @@ export function initMoves() {
.unimplemented(),
new StatusMove(Moves.COACHING, Type.FIGHTING, -1, 10, -1, 0, 8)
.attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF ], 1)
.target(MoveTarget.NEAR_ALLY),
.target(MoveTarget.NEAR_ALLY)
.condition(failIfSingleBattle),
new AttackMove(Moves.FLIP_TURN, Type.WATER, MoveCategory.PHYSICAL, 60, 100, 20, -1, 0, 8)
.attr(ForceSwitchOutAttr, true),
new AttackMove(Moves.TRIPLE_AXEL, Type.ICE, MoveCategory.PHYSICAL, 20, 90, 10, -1, 0, 8)
Expand Down
18 changes: 10 additions & 8 deletions src/field/pokemon.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
};
if (this.shiny) {
const populateVariantColors = (isBackSprite: boolean = false): Promise<void> => {
return new Promise(resolve => {
return new Promise(async resolve => {
const battleSpritePath = this.getBattleSpriteAtlasPath(isBackSprite, ignoreOverride).replace("variant/", "").replace(/_[1-3]$/, "");
let config = variantData;
const useExpSprite = this.scene.experimentalSprites && this.scene.hasExpSprite(this.getBattleSpriteKey(isBackSprite, ignoreOverride));
Expand All @@ -451,7 +451,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
if (variantSet && variantSet[this.variant] === 1) {
const cacheKey = this.getBattleSpriteKey(isBackSprite);
if (!variantColorCache.hasOwnProperty(cacheKey)) {
this.populateVariantColorCache(cacheKey, useExpSprite, battleSpritePath);
await this.populateVariantColorCache(cacheKey, useExpSprite, battleSpritePath);
}
}
resolve();
Expand Down Expand Up @@ -483,10 +483,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
* @param battleSpritePath the filename of the sprite
* @param optionalParams any additional params to log
*/
fallbackVariantColor(cacheKey: string, attemptedSpritePath: string, useExpSprite: boolean, battleSpritePath: string, ...optionalParams: any[]) {
async fallbackVariantColor(cacheKey: string, attemptedSpritePath: string, useExpSprite: boolean, battleSpritePath: string, ...optionalParams: any[]) {
console.warn(`Could not load ${attemptedSpritePath}!`, ...optionalParams);
if (useExpSprite) {
this.populateVariantColorCache(cacheKey, false, battleSpritePath);
await this.populateVariantColorCache(cacheKey, false, battleSpritePath);
}
}

Expand All @@ -497,18 +497,20 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
* @param useExpSprite should the experimental sprite be used
* @param battleSpritePath the filename of the sprite
*/
populateVariantColorCache(cacheKey: string, useExpSprite: boolean, battleSpritePath: string) {
async populateVariantColorCache(cacheKey: string, useExpSprite: boolean, battleSpritePath: string) {
const spritePath = `./images/pokemon/variant/${useExpSprite ? "exp/" : ""}${battleSpritePath}.json`;
this.scene.cachedFetch(spritePath).then(res => {
return this.scene.cachedFetch(spritePath).then(res => {
// Prevent the JSON from processing if it failed to load
if (!res.ok) {
return this.fallbackVariantColor(cacheKey, res.url, useExpSprite, battleSpritePath, res.status, res.statusText);
}
return res.json();
}).catch(error => {
this.fallbackVariantColor(cacheKey, spritePath, useExpSprite, battleSpritePath, error);
return this.fallbackVariantColor(cacheKey, spritePath, useExpSprite, battleSpritePath, error);
}).then(c => {
variantColorCache[cacheKey] = c;
if (!isNullOrUndefined(c)) {
variantColorCache[cacheKey] = c;
}
});
}

Expand Down
19 changes: 6 additions & 13 deletions src/phases/move-phase.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,10 @@ export class MovePhase extends BattlePhase {
console.log(Moves[this.move.moveId]);

// Check if move is unusable (e.g. because it's out of PP due to a mid-turn Spite).
if (!this.canMove(true)) {
if (this.pokemon.isActive(true) && this.move.ppUsed >= this.move.getMovePp()) {
this.fail();
this.showMoveText();
this.showFailedText();
}

if (!this.canMove(true) && (this.pokemon.isActive(true) || this.move.ppUsed >= this.move.getMovePp())) {
this.fail();
this.showMoveText();
this.showFailedText();
return this.end();
}

Expand Down Expand Up @@ -378,16 +375,12 @@ export class MovePhase extends BattlePhase {
} else {
this.pokemon.pushMoveHistory({ move: this.move.moveId, targets: this.targets, result: MoveResult.FAIL, virtual: this.move.virtual });

let failedText: string | undefined;
const failureMessage = move.getFailedText(this.pokemon, targets[0], move, new BooleanHolder(false));

if (failureMessage) {
failedText = failureMessage;
this.showMoveText();
this.showFailedText(failureMessage);
}

this.showMoveText();
this.showFailedText(failedText);

// Remove the user from its semi-invulnerable state (if applicable)
this.pokemon.lapseTags(BattlerTagLapseType.MOVE_EFFECT);
}
Expand Down
87 changes: 31 additions & 56 deletions src/test/abilities/zen_mode.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
import { BattlerIndex } from "#app/battle";
import { Status } from "#app/data/status-effect";
import { DamagePhase } from "#app/phases/damage-phase";
import { SwitchSummonPhase } from "#app/phases/switch-summon-phase";
import { Mode } from "#app/ui/ui";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import { Stat } from "#enums/stat";
import { StatusEffect } from "#enums/status-effect";
import { SwitchType } from "#enums/switch-type";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
Expand All @@ -34,78 +28,60 @@ describe("Abilities - ZEN MODE", () => {
game = new GameManager(phaserGame);
game.override
.battleType("single")
.enemySpecies(Species.RATTATA)
.enemyAbility(Abilities.HYDRATION)
.disableCrits()
.enemySpecies(Species.MAGIKARP)
.enemyAbility(Abilities.BALL_FETCH)
.enemyLevel(5)
.ability(Abilities.ZEN_MODE)
.startingLevel(100)
.moveset(Moves.SPLASH)
.enemyMoveset(Moves.TACKLE);
.enemyMoveset(Moves.SEISMIC_TOSS);
});

it("shouldn't change form when taking damage if not dropping below 50% HP", async () => {
await game.classicMode.startBattle([ Species.DARMANITAN ]);
const player = game.scene.getPlayerPokemon()!;
player.stats[Stat.HP] = 100;
player.hp = 100;
expect(player.formIndex).toBe(baseForm);
const darmanitan = game.scene.getPlayerPokemon()!;
expect(darmanitan.formIndex).toBe(baseForm);

game.move.select(Moves.SPLASH);
await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
await game.phaseInterceptor.to("BerryPhase");
await game.toNextTurn();

expect(player.hp).toBeLessThan(100);
expect(player.formIndex).toBe(baseForm);
expect(darmanitan.getHpRatio()).toBeLessThan(1);
expect(darmanitan.getHpRatio()).toBeGreaterThan(0.5);
expect(darmanitan.formIndex).toBe(baseForm);
});

it("should change form when falling below 50% HP", async () => {
await game.classicMode.startBattle([ Species.DARMANITAN ]);

const player = game.scene.getPlayerPokemon()!;
player.stats[Stat.HP] = 1000;
player.hp = 100;
expect(player.formIndex).toBe(baseForm);
const darmanitan = game.scene.getPlayerPokemon()!;
darmanitan.hp = (darmanitan.getMaxHp() / 2) + 1;
expect(darmanitan.formIndex).toBe(baseForm);

game.move.select(Moves.SPLASH);
await game.toNextTurn();

await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
await game.phaseInterceptor.to("QuietFormChangePhase");
await game.phaseInterceptor.to("TurnInitPhase", false);

expect(player.hp).not.toBe(100);
expect(player.formIndex).toBe(zenForm);
expect(darmanitan.getHpRatio()).toBeLessThan(0.5);
expect(darmanitan.formIndex).toBe(zenForm);
});

it("should stay zen mode when fainted", async () => {
await game.classicMode.startBattle([ Species.DARMANITAN, Species.CHARIZARD ]);
const player = game.scene.getPlayerPokemon()!;
player.stats[Stat.HP] = 1000;
player.hp = 100;
expect(player.formIndex).toBe(baseForm);
const darmanitan = game.scene.getPlayerPokemon()!;
darmanitan.hp = (darmanitan.getMaxHp() / 2) + 1;
expect(darmanitan.formIndex).toBe(baseForm);

game.move.select(Moves.SPLASH);
await game.toNextTurn();

await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
await game.phaseInterceptor.to(DamagePhase, false);
const damagePhase = game.scene.getCurrentPhase() as DamagePhase;
damagePhase.updateAmount(80);
await game.phaseInterceptor.to("QuietFormChangePhase");

expect(player.hp).not.toBe(100);
expect(player.formIndex).toBe(zenForm);

await game.killPokemon(player);
expect(player.isFainted()).toBe(true);
expect(darmanitan.getHpRatio()).toBeLessThan(0.5);
expect(darmanitan.formIndex).toBe(zenForm);

await game.phaseInterceptor.to("TurnStartPhase");
game.onNextPrompt("SwitchPhase", Mode.PARTY, () => {
game.scene.unshiftPhase(new SwitchSummonPhase(game.scene, SwitchType.SWITCH, 0, 1, false));
game.scene.ui.setMode(Mode.MESSAGE);
});
game.onNextPrompt("SwitchPhase", Mode.MESSAGE, () => {
game.endPhase();
});
await game.phaseInterceptor.to("PostSummonPhase");
game.move.select(Moves.SPLASH);
await game.killPokemon(darmanitan);
game.doSelectPartyPokemon(1);
await game.toNextTurn();

expect(darmanitan.isFainted()).toBe(true);
expect(game.scene.getPlayerParty()[1].formIndex).toBe(zenForm);
});

Expand All @@ -117,7 +93,8 @@ describe("Abilities - ZEN MODE", () => {

await game.classicMode.startBattle([ Species.MAGIKARP, Species.DARMANITAN ]);

const darmanitan = game.scene.getPlayerParty().find((p) => p.species.speciesId === Species.DARMANITAN)!;
const darmanitan = game.scene.getPlayerParty()[1];
darmanitan.hp = 1;
expect(darmanitan.formIndex).toBe(zenForm);

darmanitan.hp = 0;
Expand All @@ -126,9 +103,7 @@ describe("Abilities - ZEN MODE", () => {

game.move.select(Moves.SPLASH);
await game.doKillOpponents();
await game.phaseInterceptor.to("TurnEndPhase");
game.doSelectModifier();
await game.phaseInterceptor.to("QuietFormChangePhase");
await game.toNextWave();

expect(darmanitan.formIndex).toBe(baseForm);
});
Expand Down

0 comments on commit 6ad2420

Please sign in to comment.