From 834255447d429282f15fbb49c3b4abbec7fdf22e Mon Sep 17 00:00:00 2001 From: Tempoanon <163687446+Tempo-anon@users.noreply.github.com> Date: Thu, 5 Sep 2024 00:02:45 -0400 Subject: [PATCH 01/83] Fix mbh not using user's nickname (#4033) --- src/modifier/modifier.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index 84d8a1385af..f3219c8bf73 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -2488,7 +2488,7 @@ export class TurnHeldItemTransferModifier extends HeldItemTransferModifier { } getTransferMessage(pokemon: Pokemon, targetPokemon: Pokemon, item: ModifierTypes.ModifierType): string { - return i18next.t("modifier:turnHeldItemTransferApply", { pokemonNameWithAffix: getPokemonNameWithAffix(targetPokemon), itemName: item.name, pokemonName: pokemon.name, typeName: this.type.name }); + return i18next.t("modifier:turnHeldItemTransferApply", { pokemonNameWithAffix: getPokemonNameWithAffix(targetPokemon), itemName: item.name, pokemonName: pokemon.getNameToRender(), typeName: this.type.name }); } getMaxHeldItemCount(pokemon: Pokemon): integer { From 31d3bec55ebce5d0d7c9f138ac643077a5ca2985 Mon Sep 17 00:00:00 2001 From: innerthunder <168692175+innerthunder@users.noreply.github.com> Date: Wed, 4 Sep 2024 21:54:51 -0700 Subject: [PATCH 02/83] [Test] Fix Rage Powder test failing randomly (#4038) * Fix random failure in Rage Powder test * Remove redundant override --- src/test/moves/rage_powder.test.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/moves/rage_powder.test.ts b/src/test/moves/rage_powder.test.ts index 3e9f422fda8..86bc48ef882 100644 --- a/src/test/moves/rage_powder.test.ts +++ b/src/test/moves/rage_powder.test.ts @@ -25,7 +25,6 @@ describe("Moves - Rage Powder", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override.battleType("double"); - game.override.starterSpecies(Species.AMOONGUSS); game.override.enemySpecies(Species.SNORLAX); game.override.startingLevel(100); game.override.enemyLevel(100); @@ -68,6 +67,10 @@ describe("Moves - Rage Powder", () => { game.move.select(Moves.QUICK_ATTACK, 0, BattlerIndex.ENEMY); game.move.select(Moves.QUICK_ATTACK, 1, BattlerIndex.ENEMY_2); + + await game.forceEnemyMove(Moves.RAGE_POWDER); + await game.forceEnemyMove(Moves.SPLASH); + await game.phaseInterceptor.to("BerryPhase", false); // If redirection was bypassed, both enemies should be damaged From 237aad2184320203646cff72f5f27859d4eb15a4 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Wed, 4 Sep 2024 22:29:02 -0700 Subject: [PATCH 03/83] [Misc] Clean up the `Battle` class a bit (#3995) * Use default values in the `Battle` class Turn a couple of comments into tsdoc comments Replace a `!!` with `?? false` * Replace `integer` with `number` --- src/battle.ts | 77 +++++++++++++++++++++------------------------------ 1 file changed, 32 insertions(+), 45 deletions(-) diff --git a/src/battle.ts b/src/battle.ts index f9afbf09604..0f1245a4397 100644 --- a/src/battle.ts +++ b/src/battle.ts @@ -6,7 +6,7 @@ import Trainer, { TrainerVariant } from "./field/trainer"; import { GameMode } from "./game-mode"; import { MoneyMultiplierModifier, PokemonHeldItemModifier } from "./modifier/modifier"; import { PokeballType } from "./data/pokeball"; -import {trainerConfigs} from "#app/data/trainer-config"; +import { trainerConfigs } from "#app/data/trainer-config"; import { ArenaTagType } from "#enums/arena-tag-type"; import { BattleSpec } from "#enums/battle-spec"; import { Moves } from "#enums/moves"; @@ -31,7 +31,7 @@ export enum BattlerIndex { export interface TurnCommand { command: Command; - cursor?: integer; + cursor?: number; move?: QueuedMove; targets?: BattlerIndex[]; skip?: boolean; @@ -39,38 +39,40 @@ export interface TurnCommand { } interface TurnCommands { - [key: integer]: TurnCommand | null + [key: number]: TurnCommand | null } export default class Battle { protected gameMode: GameMode; - public waveIndex: integer; + public waveIndex: number; public battleType: BattleType; public battleSpec: BattleSpec; public trainer: Trainer | null; - public enemyLevels: integer[] | undefined; - public enemyParty: EnemyPokemon[]; - public seenEnemyPartyMemberIds: Set; + public enemyLevels: number[] | undefined; + public enemyParty: EnemyPokemon[] = []; + public seenEnemyPartyMemberIds: Set = new Set(); public double: boolean; - public started: boolean; - public enemySwitchCounter: integer; - public turn: integer; + public started: boolean = false; + public enemySwitchCounter: number = 0; + public turn: number = 0; public turnCommands: TurnCommands; - public playerParticipantIds: Set; - public battleScore: integer; - public postBattleLoot: PokemonHeldItemModifier[]; - public escapeAttempts: integer; + public playerParticipantIds: Set = new Set(); + public battleScore: number = 0; + public postBattleLoot: PokemonHeldItemModifier[] = []; + public escapeAttempts: number = 0; public lastMove: Moves; - public battleSeed: string; - private battleSeedState: string | null; - public moneyScattered: number; - public lastUsedPokeball: PokeballType | null; - public playerFaints: number; // The amount of times pokemon on the players side have fainted - public enemyFaints: number; // The amount of times pokemon on the enemies side have fainted + public battleSeed: string = Utils.randomString(16, true); + private battleSeedState: string | null = null; + public moneyScattered: number = 0; + public lastUsedPokeball: PokeballType | null = null; + /** The number of times a Pokemon on the player's side has fainted this battle */ + public playerFaints: number = 0; + /** The number of times a Pokemon on the enemy's side has fainted this battle */ + public enemyFaints: number = 0; - private rngCounter: integer = 0; + private rngCounter: number = 0; - constructor(gameMode: GameMode, waveIndex: integer, battleType: BattleType, trainer?: Trainer, double?: boolean) { + constructor(gameMode: GameMode, waveIndex: number, battleType: BattleType, trainer?: Trainer, double?: boolean) { this.gameMode = gameMode; this.waveIndex = waveIndex; this.battleType = battleType; @@ -79,22 +81,7 @@ export default class Battle { this.enemyLevels = battleType !== BattleType.TRAINER ? new Array(double ? 2 : 1).fill(null).map(() => this.getLevelForWave()) : trainer?.getPartyLevels(this.waveIndex); - this.enemyParty = []; - this.seenEnemyPartyMemberIds = new Set(); - this.double = !!double; - this.enemySwitchCounter = 0; - this.turn = 0; - this.playerParticipantIds = new Set(); - this.battleScore = 0; - this.postBattleLoot = []; - this.escapeAttempts = 0; - this.started = false; - this.battleSeed = Utils.randomString(16, true); - this.battleSeedState = null; - this.moneyScattered = 0; - this.lastUsedPokeball = null; - this.playerFaints = 0; - this.enemyFaints = 0; + this.double = double ?? false; } private initBattleSpec(): void { @@ -105,7 +92,7 @@ export default class Battle { this.battleSpec = spec; } - private getLevelForWave(): integer { + private getLevelForWave(): number { const levelWaveIndex = this.gameMode.getWaveForDifficulty(this.waveIndex); const baseLevel = 1 + levelWaveIndex / 2 + Math.pow(levelWaveIndex / 25, 2); const bossMultiplier = 1.2; @@ -138,7 +125,7 @@ export default class Battle { return rand / value; } - getBattlerCount(): integer { + getBattlerCount(): number { return this.double ? 2 : 1; } @@ -367,7 +354,7 @@ export default class Battle { return null; } - randSeedInt(scene: BattleScene, range: integer, min: integer = 0): integer { + randSeedInt(scene: BattleScene, range: number, min: number = 0): number { if (range <= 1) { return min; } @@ -392,7 +379,7 @@ export default class Battle { } export class FixedBattle extends Battle { - constructor(scene: BattleScene, waveIndex: integer, config: FixedBattleConfig) { + constructor(scene: BattleScene, waveIndex: number, config: FixedBattleConfig) { super(scene.gameMode, waveIndex, config.battleType, config.battleType === BattleType.TRAINER ? config.getTrainer(scene) : undefined, config.double); if (config.getEnemyParty) { this.enemyParty = config.getEnemyParty(scene); @@ -408,7 +395,7 @@ export class FixedBattleConfig { public double: boolean; public getTrainer: GetTrainerFunc; public getEnemyParty: GetEnemyPartyFunc; - public seedOffsetWaveIndex: integer; + public seedOffsetWaveIndex: number; setBattleType(battleType: BattleType): FixedBattleConfig { this.battleType = battleType; @@ -430,7 +417,7 @@ export class FixedBattleConfig { return this; } - setSeedOffsetWave(seedOffsetWaveIndex: integer): FixedBattleConfig { + setSeedOffsetWave(seedOffsetWaveIndex: number): FixedBattleConfig { this.seedOffsetWaveIndex = seedOffsetWaveIndex; return this; } @@ -476,7 +463,7 @@ function getRandomTrainerFunc(trainerPool: (TrainerType | TrainerType[])[], rand } export interface FixedBattleConfigs { - [key: integer]: FixedBattleConfig + [key: number]: FixedBattleConfig } /** * Youngster/Lass on 5 From 61ab52c2954859824315f7dbe7591fe0ae4a2b62 Mon Sep 17 00:00:00 2001 From: Opaque02 <66582645+Opaque02@users.noreply.github.com> Date: Thu, 5 Sep 2024 15:29:39 +1000 Subject: [PATCH 04/83] [Balance] Changed escape calculation (#3973) * Changed escape calculation as per Mega * Adding tests * Updates some tests * Updated all tests for bosses * Removed console log lines * Added some clarifying comments * Fixed docs * comment add * comment add * Convert comments into tsdoc comments Convert `integer`/`IntegerHolder` to `number`/`NumberHolder` Clean up tests a bit --------- Co-authored-by: damocleas Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> --- src/phases/attempt-run-phase.ts | 69 +++++- src/test/escape-calculations.test.ts | 303 +++++++++++++++++++++++++++ src/test/utils/phaseInterceptor.ts | 2 + 3 files changed, 363 insertions(+), 11 deletions(-) create mode 100644 src/test/escape-calculations.test.ts diff --git a/src/phases/attempt-run-phase.ts b/src/phases/attempt-run-phase.ts index 817801985d2..9cf86fed592 100644 --- a/src/phases/attempt-run-phase.ts +++ b/src/phases/attempt-run-phase.ts @@ -1,31 +1,34 @@ -import BattleScene from "#app/battle-scene.js"; -import { applyAbAttrs, RunSuccessAbAttr } from "#app/data/ability.js"; -import { Stat } from "#app/enums/stat.js"; -import { StatusEffect } from "#app/enums/status-effect.js"; -import Pokemon from "#app/field/pokemon.js"; +import BattleScene from "#app/battle-scene"; +import { applyAbAttrs, RunSuccessAbAttr } from "#app/data/ability"; +import { Stat } from "#app/enums/stat"; +import { StatusEffect } from "#app/enums/status-effect"; +import Pokemon, { PlayerPokemon, EnemyPokemon } from "#app/field/pokemon"; import i18next from "i18next"; -import * as Utils from "#app/utils.js"; +import * as Utils from "#app/utils"; import { BattleEndPhase } from "./battle-end-phase"; import { NewBattlePhase } from "./new-battle-phase"; import { PokemonPhase } from "./pokemon-phase"; export class AttemptRunPhase extends PokemonPhase { - constructor(scene: BattleScene, fieldIndex: integer) { + constructor(scene: BattleScene, fieldIndex: number) { super(scene, fieldIndex); } start() { super.start(); - const playerPokemon = this.getPokemon(); + const playerField = this.scene.getPlayerField(); const enemyField = this.scene.getEnemyField(); - const enemySpeed = enemyField.reduce((total: integer, enemyPokemon: Pokemon) => total + enemyPokemon.getStat(Stat.SPD), 0) / enemyField.length; + const playerPokemon = this.getPokemon(); + + const escapeChance = new Utils.NumberHolder(0); + + this.attemptRunAway(playerField, enemyField, escapeChance); - const escapeChance = new Utils.IntegerHolder((((playerPokemon.getStat(Stat.SPD) * 128) / enemySpeed) + (30 * this.scene.currentBattle.escapeAttempts++)) % 256); applyAbAttrs(RunSuccessAbAttr, playerPokemon, null, false, escapeChance); - if (playerPokemon.randSeedInt(256) < escapeChance.value) { + if (Utils.randSeedInt(100) < escapeChance.value) { this.scene.playSound("se/flee"); this.scene.queueMessage(i18next.t("battle:runAwaySuccess"), null, true, 500); @@ -53,4 +56,48 @@ export class AttemptRunPhase extends PokemonPhase { this.end(); } + + attemptRunAway(playerField: PlayerPokemon[], enemyField: EnemyPokemon[], escapeChance: Utils.NumberHolder) { + /** Sum of the speed of all enemy pokemon on the field */ + const enemySpeed = enemyField.reduce((total: number, enemyPokemon: Pokemon) => total + enemyPokemon.getStat(Stat.SPD), 0); + /** Sum of the speed of all player pokemon on the field */ + const playerSpeed = playerField.reduce((total: number, playerPokemon: Pokemon) => total + playerPokemon.getStat(Stat.SPD), 0); + + /* The way the escape chance works is by looking at the difference between your speed and the enemy field's average speed as a ratio. The higher this ratio, the higher your chance of success. + * However, there is a cap for the ratio of your speed vs enemy speed which beyond that point, you won't gain any advantage. It also looks at how many times you've tried to escape. + * Again, the more times you've tried to escape, the higher your odds of escaping. Bosses and non-bosses are calculated differently - bosses are harder to escape from vs non-bosses + * Finally, there's a minimum and maximum escape chance as well so that escapes aren't guaranteed, yet they are never 0 either. + * The percentage chance to escape from a pokemon for both bosses and non bosses is linear and based on the minimum and maximum chances, and the speed ratio cap. + * + * At the time of writing, these conditions should be met: + * - The minimum escape chance should be 5% for bosses and non bosses + * - Bosses should have a maximum escape chance of 25%, whereas non-bosses should be 95% + * - The bonus per previous escape attempt should be 2% for bosses and 10% for non-bosses + * - The speed ratio cap should be 6x for bosses and 4x for non-bosses + * - The "default" escape chance when your speed equals the enemy speed should be 8.33% for bosses and 27.5% for non-bosses + * + * From the above, we can calculate the below values + */ + + let isBoss = false; + for (let e = 0; e < enemyField.length; e++) { + isBoss = isBoss || enemyField[e].isBoss(); // this line checks if any of the enemy pokemon on the field are bosses; if so, the calculation for escaping is different + } + + /** The ratio between the speed of your active pokemon and the speed of the enemy field */ + const speedRatio = playerSpeed / enemySpeed; + /** The max ratio before escape chance stops increasing. Increased if there is a boss on the field */ + const speedCap = isBoss ? 6 : 4; + /** Minimum percent chance to escape */ + const minChance = 5; + /** Maximum percent chance to escape. Decreased if a boss is on the field */ + const maxChance = isBoss ? 25 : 95; + /** How much each escape attempt increases the chance of the next attempt. Decreased if a boss is on the field */ + const escapeBonus = isBoss ? 2 : 10; + /** Slope of the escape chance curve */ + const escapeSlope = (maxChance - minChance) / speedCap; + + // This will calculate the escape chance given all of the above and clamp it to the range of [`minChance`, `maxChance`] + escapeChance.value = Phaser.Math.Clamp(Math.round((escapeSlope * speedRatio) + minChance + (escapeBonus * this.scene.currentBattle.escapeAttempts++)), minChance, maxChance); + } } diff --git a/src/test/escape-calculations.test.ts b/src/test/escape-calculations.test.ts new file mode 100644 index 00000000000..ecf22fc74aa --- /dev/null +++ b/src/test/escape-calculations.test.ts @@ -0,0 +1,303 @@ +import { AttemptRunPhase } from "#app/phases/attempt-run-phase"; +import { CommandPhase } from "#app/phases/command-phase"; +import { Command } from "#app/ui/command-ui-handler"; +import * as Utils from "#app/utils"; +import { Abilities } from "#enums/abilities"; +import { Species } from "#enums/species"; +import GameManager from "#test/utils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Escape chance calculations", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .battleType("single") + .enemySpecies(Species.BULBASAUR) + .enemyAbility(Abilities.INSOMNIA) + .ability(Abilities.INSOMNIA); + }); + + it("single non-boss opponent", async () => { + await game.classicMode.startBattle([Species.BULBASAUR]); + + const playerPokemon = game.scene.getPlayerField(); + const enemyField = game.scene.getEnemyField(); + const enemySpeed = 100; + // set enemyPokemon's speed to 100 + vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemySpeed]); + + const commandPhase = game.scene.getCurrentPhase() as CommandPhase; + commandPhase.handleCommand(Command.RUN, 0); + + await game.phaseInterceptor.to(AttemptRunPhase, false); + const phase = game.scene.getCurrentPhase() as AttemptRunPhase; + const escapePercentage = new Utils.NumberHolder(0); + + // this sets up an object for multiple attempts. The pokemonSpeedRatio is your speed divided by the enemy speed, the escapeAttempts are the number of escape attempts and the expectedEscapeChance is the chance it should be escaping + const escapeChances: { pokemonSpeedRatio: number, escapeAttempts: number, expectedEscapeChance: number }[] = [ + { pokemonSpeedRatio: 0.01, escapeAttempts: 0, expectedEscapeChance: 5 }, + { pokemonSpeedRatio: 0.1, escapeAttempts: 0, expectedEscapeChance: 7 }, + { pokemonSpeedRatio: 0.25, escapeAttempts: 0, expectedEscapeChance: 11 }, + { pokemonSpeedRatio: 0.5, escapeAttempts: 0, expectedEscapeChance: 16 }, + { pokemonSpeedRatio: 0.8, escapeAttempts: 0, expectedEscapeChance: 23 }, + { pokemonSpeedRatio: 1, escapeAttempts: 0, expectedEscapeChance: 28 }, + { pokemonSpeedRatio: 1.2, escapeAttempts: 0, expectedEscapeChance: 32 }, + { pokemonSpeedRatio: 1.5, escapeAttempts: 0, expectedEscapeChance: 39 }, + { pokemonSpeedRatio: 3, escapeAttempts: 0, expectedEscapeChance: 73 }, + { pokemonSpeedRatio: 3.8, escapeAttempts: 0, expectedEscapeChance: 91 }, + { pokemonSpeedRatio: 4, escapeAttempts: 0, expectedEscapeChance: 95 }, + { pokemonSpeedRatio: 4.2, escapeAttempts: 0, expectedEscapeChance: 95 }, + { pokemonSpeedRatio: 10, escapeAttempts: 0, expectedEscapeChance: 95 }, + + // retries section + { pokemonSpeedRatio: 0.4, escapeAttempts: 1, expectedEscapeChance: 24 }, + { pokemonSpeedRatio: 1.6, escapeAttempts: 2, expectedEscapeChance: 61 }, + { pokemonSpeedRatio: 3.7, escapeAttempts: 5, expectedEscapeChance: 95 }, + { pokemonSpeedRatio: 0.2, escapeAttempts: 2, expectedEscapeChance: 30 }, + { pokemonSpeedRatio: 1, escapeAttempts: 3, expectedEscapeChance: 58 }, + { pokemonSpeedRatio: 2.9, escapeAttempts: 0, expectedEscapeChance: 70 }, + { pokemonSpeedRatio: 0.01, escapeAttempts: 7, expectedEscapeChance: 75 }, + { pokemonSpeedRatio: 16.2, escapeAttempts: 4, expectedEscapeChance: 95 }, + { pokemonSpeedRatio: 2, escapeAttempts: 3, expectedEscapeChance: 80 }, + ]; + + for (let i = 0; i < escapeChances.length; i++) { + // sets the number of escape attempts to the required amount + game.scene.currentBattle.escapeAttempts = escapeChances[i].escapeAttempts; + // set playerPokemon's speed to a multiple of the enemySpeed + vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, escapeChances[i].pokemonSpeedRatio * enemySpeed]); + phase.attemptRunAway(playerPokemon, enemyField, escapePercentage); + expect(escapePercentage.value).toBe(escapeChances[i].expectedEscapeChance); + } + }, 20000); + + it("double non-boss opponent", async () => { + game.override.battleType("double"); + await game.classicMode.startBattle([Species.BULBASAUR, Species.ABOMASNOW]); + + const playerPokemon = game.scene.getPlayerField(); + const enemyField = game.scene.getEnemyField(); + const enemyASpeed = 70; + const enemyBSpeed = 30; + // gets the sum of the speed of the two pokemon + const totalEnemySpeed = enemyASpeed + enemyBSpeed; + // this is used to find the ratio of the player's first pokemon + const playerASpeedPercentage = 0.4; + // set enemyAPokemon's speed to 70 + vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemyASpeed]); + // set enemyBPokemon's speed to 30 + vi.spyOn(enemyField[1], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemyBSpeed]); + + const commandPhase = game.scene.getCurrentPhase() as CommandPhase; + commandPhase.handleCommand(Command.RUN, 0); + + await game.phaseInterceptor.to(AttemptRunPhase, false); + const phase = game.scene.getCurrentPhase() as AttemptRunPhase; + const escapePercentage = new Utils.NumberHolder(0); + + // this sets up an object for multiple attempts. The pokemonSpeedRatio is your speed divided by the enemy speed, the escapeAttempts are the number of escape attempts and the expectedEscapeChance is the chance it should be escaping + const escapeChances: { pokemonSpeedRatio: number, escapeAttempts: number, expectedEscapeChance: number }[] = [ + { pokemonSpeedRatio: 0.3, escapeAttempts: 0, expectedEscapeChance: 12 }, + { pokemonSpeedRatio: 0.7, escapeAttempts: 0, expectedEscapeChance: 21 }, + { pokemonSpeedRatio: 1.5, escapeAttempts: 0, expectedEscapeChance: 39 }, + { pokemonSpeedRatio: 3, escapeAttempts: 0, expectedEscapeChance: 73 }, + { pokemonSpeedRatio: 9, escapeAttempts: 0, expectedEscapeChance: 95 }, + { pokemonSpeedRatio: 0.01, escapeAttempts: 0, expectedEscapeChance: 5 }, + { pokemonSpeedRatio: 1, escapeAttempts: 0, expectedEscapeChance: 28 }, + { pokemonSpeedRatio: 4.3, escapeAttempts: 0, expectedEscapeChance: 95 }, + { pokemonSpeedRatio: 2.7, escapeAttempts: 0, expectedEscapeChance: 66 }, + { pokemonSpeedRatio: 2.1, escapeAttempts: 0, expectedEscapeChance: 52 }, + { pokemonSpeedRatio: 1.8, escapeAttempts: 0, expectedEscapeChance: 46 }, + { pokemonSpeedRatio: 6, escapeAttempts: 0, expectedEscapeChance: 95 }, + + // retries section + { pokemonSpeedRatio: 0.9, escapeAttempts: 1, expectedEscapeChance: 35 }, + { pokemonSpeedRatio: 3.6, escapeAttempts: 2, expectedEscapeChance: 95 }, + { pokemonSpeedRatio: 0.03, escapeAttempts: 7, expectedEscapeChance: 76 }, + { pokemonSpeedRatio: 0.02, escapeAttempts: 7, expectedEscapeChance: 75 }, + { pokemonSpeedRatio: 1, escapeAttempts: 5, expectedEscapeChance: 78 }, + { pokemonSpeedRatio: 0.7, escapeAttempts: 3, expectedEscapeChance: 51 }, + { pokemonSpeedRatio: 2.4, escapeAttempts: 9, expectedEscapeChance: 95 }, + { pokemonSpeedRatio: 1.8, escapeAttempts: 7, expectedEscapeChance: 95 }, + { pokemonSpeedRatio: 2, escapeAttempts: 10, expectedEscapeChance: 95 }, + + ]; + + for (let i = 0; i < escapeChances.length; i++) { + // sets the number of escape attempts to the required amount + game.scene.currentBattle.escapeAttempts = escapeChances[i].escapeAttempts; + // set the first playerPokemon's speed to a multiple of the enemySpeed + vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, Math.floor(escapeChances[i].pokemonSpeedRatio * totalEnemySpeed * playerASpeedPercentage)]); + // set the second playerPokemon's speed to the remaining value of speed + vi.spyOn(playerPokemon[1], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, escapeChances[i].pokemonSpeedRatio * totalEnemySpeed - playerPokemon[0].stats[5]]); + phase.attemptRunAway(playerPokemon, enemyField, escapePercentage); + // checks to make sure the escape values are the same + expect(escapePercentage.value).toBe(escapeChances[i].expectedEscapeChance); + // checks to make sure the sum of the player's speed for all pokemon is equal to the appropriate ratio of the total enemy speed + expect(playerPokemon[0].stats[5] + playerPokemon[1].stats[5]).toBe(escapeChances[i].pokemonSpeedRatio * totalEnemySpeed); + } + }, 20000); + + it("single boss opponent", async () => { + game.override.startingWave(10); + await game.classicMode.startBattle([Species.BULBASAUR]); + + const playerPokemon = game.scene.getPlayerField()!; + const enemyField = game.scene.getEnemyField()!; + const enemySpeed = 100; + // set enemyPokemon's speed to 100 + vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemySpeed]); + + const commandPhase = game.scene.getCurrentPhase() as CommandPhase; + commandPhase.handleCommand(Command.RUN, 0); + + await game.phaseInterceptor.to(AttemptRunPhase, false); + const phase = game.scene.getCurrentPhase() as AttemptRunPhase; + const escapePercentage = new Utils.NumberHolder(0); + + // this sets up an object for multiple attempts. The pokemonSpeedRatio is your speed divided by the enemy speed, the escapeAttempts are the number of escape attempts and the expectedEscapeChance is the chance it should be escaping + const escapeChances: { pokemonSpeedRatio: number, escapeAttempts: number, expectedEscapeChance: number }[] = [ + { pokemonSpeedRatio: 0.01, escapeAttempts: 0, expectedEscapeChance: 5 }, + { pokemonSpeedRatio: 0.1, escapeAttempts: 0, expectedEscapeChance: 5 }, + { pokemonSpeedRatio: 0.25, escapeAttempts: 0, expectedEscapeChance: 6 }, + { pokemonSpeedRatio: 0.5, escapeAttempts: 0, expectedEscapeChance: 7 }, + { pokemonSpeedRatio: 0.8, escapeAttempts: 0, expectedEscapeChance: 8 }, + { pokemonSpeedRatio: 1, escapeAttempts: 0, expectedEscapeChance: 8 }, + { pokemonSpeedRatio: 1.2, escapeAttempts: 0, expectedEscapeChance: 9 }, + { pokemonSpeedRatio: 1.5, escapeAttempts: 0, expectedEscapeChance: 10 }, + { pokemonSpeedRatio: 3, escapeAttempts: 0, expectedEscapeChance: 15 }, + { pokemonSpeedRatio: 3.8, escapeAttempts: 0, expectedEscapeChance: 18 }, + { pokemonSpeedRatio: 4, escapeAttempts: 0, expectedEscapeChance: 18 }, + { pokemonSpeedRatio: 4.2, escapeAttempts: 0, expectedEscapeChance: 19 }, + { pokemonSpeedRatio: 4.7, escapeAttempts: 0, expectedEscapeChance: 21 }, + { pokemonSpeedRatio: 5, escapeAttempts: 0, expectedEscapeChance: 22 }, + { pokemonSpeedRatio: 5.9, escapeAttempts: 0, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 6, escapeAttempts: 0, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 6.7, escapeAttempts: 0, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 10, escapeAttempts: 0, expectedEscapeChance: 25 }, + + // retries section + { pokemonSpeedRatio: 0.4, escapeAttempts: 1, expectedEscapeChance: 8 }, + { pokemonSpeedRatio: 1.6, escapeAttempts: 2, expectedEscapeChance: 14 }, + { pokemonSpeedRatio: 3.7, escapeAttempts: 5, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 0.2, escapeAttempts: 2, expectedEscapeChance: 10 }, + { pokemonSpeedRatio: 1, escapeAttempts: 3, expectedEscapeChance: 14 }, + { pokemonSpeedRatio: 2.9, escapeAttempts: 0, expectedEscapeChance: 15 }, + { pokemonSpeedRatio: 0.01, escapeAttempts: 7, expectedEscapeChance: 19 }, + { pokemonSpeedRatio: 16.2, escapeAttempts: 4, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 2, escapeAttempts: 3, expectedEscapeChance: 18 }, + { pokemonSpeedRatio: 4.5, escapeAttempts: 1, expectedEscapeChance: 22 }, + { pokemonSpeedRatio: 6.8, escapeAttempts: 6, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 5.2, escapeAttempts: 8, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 4.7, escapeAttempts: 10, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 5.1, escapeAttempts: 1, expectedEscapeChance: 24 }, + { pokemonSpeedRatio: 6, escapeAttempts: 0, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 5.9, escapeAttempts: 2, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 6.1, escapeAttempts: 3, expectedEscapeChance: 25 }, + + ]; + + for (let i = 0; i < escapeChances.length; i++) { + // sets the number of escape attempts to the required amount + game.scene.currentBattle.escapeAttempts = escapeChances[i].escapeAttempts; + // set playerPokemon's speed to a multiple of the enemySpeed + vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, escapeChances[i].pokemonSpeedRatio * enemySpeed]); + phase.attemptRunAway(playerPokemon, enemyField, escapePercentage); + expect(escapePercentage.value).toBe(escapeChances[i].expectedEscapeChance); + } + }, 20000); + + it("double boss opponent", async () => { + game.override.battleType("double"); + game.override.startingWave(10); + await game.classicMode.startBattle([Species.BULBASAUR, Species.ABOMASNOW]); + + const playerPokemon = game.scene.getPlayerField(); + const enemyField = game.scene.getEnemyField(); + const enemyASpeed = 70; + const enemyBSpeed = 30; + // gets the sum of the speed of the two pokemon + const totalEnemySpeed = enemyASpeed + enemyBSpeed; + // this is used to find the ratio of the player's first pokemon + const playerASpeedPercentage = 0.8; + // set enemyAPokemon's speed to 70 + vi.spyOn(enemyField[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemyASpeed]); + // set enemyBPokemon's speed to 30 + vi.spyOn(enemyField[1], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, enemyBSpeed]); + + const commandPhase = game.scene.getCurrentPhase() as CommandPhase; + commandPhase.handleCommand(Command.RUN, 0); + + await game.phaseInterceptor.to(AttemptRunPhase, false); + const phase = game.scene.getCurrentPhase() as AttemptRunPhase; + const escapePercentage = new Utils.NumberHolder(0); + + // this sets up an object for multiple attempts. The pokemonSpeedRatio is your speed divided by the enemy speed, the escapeAttempts are the number of escape attempts and the expectedEscapeChance is the chance it should be escaping + const escapeChances: { pokemonSpeedRatio: number, escapeAttempts: number, expectedEscapeChance: number }[] = [ + { pokemonSpeedRatio: 0.3, escapeAttempts: 0, expectedEscapeChance: 6 }, + { pokemonSpeedRatio: 0.7, escapeAttempts: 0, expectedEscapeChance: 7 }, + { pokemonSpeedRatio: 1.5, escapeAttempts: 0, expectedEscapeChance: 10 }, + { pokemonSpeedRatio: 3, escapeAttempts: 0, expectedEscapeChance: 15 }, + { pokemonSpeedRatio: 9, escapeAttempts: 0, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 0.01, escapeAttempts: 0, expectedEscapeChance: 5 }, + { pokemonSpeedRatio: 1, escapeAttempts: 0, expectedEscapeChance: 8 }, + { pokemonSpeedRatio: 4.3, escapeAttempts: 0, expectedEscapeChance: 19 }, + { pokemonSpeedRatio: 2.7, escapeAttempts: 0, expectedEscapeChance: 14 }, + { pokemonSpeedRatio: 2.1, escapeAttempts: 0, expectedEscapeChance: 12 }, + { pokemonSpeedRatio: 1.8, escapeAttempts: 0, expectedEscapeChance: 11 }, + { pokemonSpeedRatio: 6, escapeAttempts: 0, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 4, escapeAttempts: 0, expectedEscapeChance: 18 }, + { pokemonSpeedRatio: 5.7, escapeAttempts: 0, expectedEscapeChance: 24 }, + { pokemonSpeedRatio: 5, escapeAttempts: 0, expectedEscapeChance: 22 }, + { pokemonSpeedRatio: 6.1, escapeAttempts: 0, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 6.8, escapeAttempts: 0, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 10, escapeAttempts: 0, expectedEscapeChance: 25 }, + + // retries section + { pokemonSpeedRatio: 0.9, escapeAttempts: 1, expectedEscapeChance: 10 }, + { pokemonSpeedRatio: 3.6, escapeAttempts: 2, expectedEscapeChance: 21 }, + { pokemonSpeedRatio: 0.03, escapeAttempts: 7, expectedEscapeChance: 19 }, + { pokemonSpeedRatio: 0.02, escapeAttempts: 7, expectedEscapeChance: 19 }, + { pokemonSpeedRatio: 1, escapeAttempts: 5, expectedEscapeChance: 18 }, + { pokemonSpeedRatio: 0.7, escapeAttempts: 3, expectedEscapeChance: 13 }, + { pokemonSpeedRatio: 2.4, escapeAttempts: 9, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 1.8, escapeAttempts: 7, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 2, escapeAttempts: 10, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 3, escapeAttempts: 1, expectedEscapeChance: 17 }, + { pokemonSpeedRatio: 4.5, escapeAttempts: 3, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 3.7, escapeAttempts: 1, expectedEscapeChance: 19 }, + { pokemonSpeedRatio: 6.5, escapeAttempts: 1, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 12, escapeAttempts: 4, expectedEscapeChance: 25 }, + { pokemonSpeedRatio: 5.2, escapeAttempts: 2, expectedEscapeChance: 25 }, + + ]; + + for (let i = 0; i < escapeChances.length; i++) { + // sets the number of escape attempts to the required amount + game.scene.currentBattle.escapeAttempts = escapeChances[i].escapeAttempts; + // set the first playerPokemon's speed to a multiple of the enemySpeed + vi.spyOn(playerPokemon[0], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, Math.floor(escapeChances[i].pokemonSpeedRatio * totalEnemySpeed * playerASpeedPercentage)]); + // set the second playerPokemon's speed to the remaining value of speed + vi.spyOn(playerPokemon[1], "stats", "get").mockReturnValue([20, 20, 20, 20, 20, escapeChances[i].pokemonSpeedRatio * totalEnemySpeed - playerPokemon[0].stats[5]]); + phase.attemptRunAway(playerPokemon, enemyField, escapePercentage); + // checks to make sure the escape values are the same + expect(escapePercentage.value).toBe(escapeChances[i].expectedEscapeChance); + // checks to make sure the sum of the player's speed for all pokemon is equal to the appropriate ratio of the total enemy speed + expect(playerPokemon[0].stats[5] + playerPokemon[1].stats[5]).toBe(escapeChances[i].pokemonSpeedRatio * totalEnemySpeed); + } + }, 20000); +}); diff --git a/src/test/utils/phaseInterceptor.ts b/src/test/utils/phaseInterceptor.ts index 1141d0bf0d9..2eb5324a2aa 100644 --- a/src/test/utils/phaseInterceptor.ts +++ b/src/test/utils/phaseInterceptor.ts @@ -1,5 +1,6 @@ import { Phase } from "#app/phase"; import ErrorInterceptor from "#app/test/utils/errorInterceptor"; +import { AttemptRunPhase } from "#app/phases/attempt-run-phase"; import { BattleEndPhase } from "#app/phases/battle-end-phase"; import { BerryPhase } from "#app/phases/berry-phase"; import { CheckSwitchPhase } from "#app/phases/check-switch-phase"; @@ -100,6 +101,7 @@ export default class PhaseInterceptor { [EvolutionPhase, this.startPhase], [EndEvolutionPhase, this.startPhase], [LevelCapPhase, this.startPhase], + [AttemptRunPhase, this.startPhase], ]; private endBySetMode = [ From 1434a3edafc36f5e9ba6991cdc8079e0843efca5 Mon Sep 17 00:00:00 2001 From: innerthunder <168692175+innerthunder@users.noreply.github.com> Date: Wed, 4 Sep 2024 22:31:32 -0700 Subject: [PATCH 05/83] Fix random failure in Parental Bond tests (#4036) Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- src/test/abilities/parental_bond.test.ts | 333 ++++++++--------------- 1 file changed, 113 insertions(+), 220 deletions(-) diff --git a/src/test/abilities/parental_bond.test.ts b/src/test/abilities/parental_bond.test.ts index e3c6c8ec5bb..81a30524a5e 100644 --- a/src/test/abilities/parental_bond.test.ts +++ b/src/test/abilities/parental_bond.test.ts @@ -2,12 +2,6 @@ import { Stat } from "#enums/stat"; import { StatusEffect } from "#app/data/status-effect"; import { Type } from "#app/data/type"; import { BattlerTagType } from "#app/enums/battler-tag-type"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { CommandPhase } from "#app/phases/command-phase"; -import { DamagePhase } from "#app/phases/damage-phase"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { toDmgValue } from "#app/utils"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; @@ -15,7 +9,7 @@ import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; const TIMEOUT = 20 * 1000; @@ -39,36 +33,31 @@ describe("Abilities - Parental Bond", () => { game.override.disableCrits(); game.override.ability(Abilities.PARENTAL_BOND); game.override.enemySpecies(Species.SNORLAX); - game.override.enemyAbility(Abilities.INSOMNIA); + game.override.enemyAbility(Abilities.FUR_COAT); game.override.enemyMoveset(SPLASH_ONLY); game.override.startingLevel(100); game.override.enemyLevel(100); }); - test( - "ability should add second strike to attack move", + it( + "should add second strike to attack move", async () => { game.override.moveset([Moves.TACKLE]); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); let enemyStartingHp = enemyPokemon.hp; game.move.select(Moves.TACKLE); - await game.phaseInterceptor.to(MoveEffectPhase, false); - - await game.phaseInterceptor.to(DamagePhase); + await game.phaseInterceptor.to("DamagePhase"); const firstStrikeDamage = enemyStartingHp - enemyPokemon.hp; enemyStartingHp = enemyPokemon.hp; - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); const secondStrikeDamage = enemyStartingHp - enemyPokemon.hp; @@ -77,556 +66,460 @@ describe("Abilities - Parental Bond", () => { }, TIMEOUT ); - test( - "ability should apply secondary effects to both strikes", + it( + "should apply secondary effects to both strikes", async () => { game.override.moveset([Moves.POWER_UP_PUNCH]); game.override.enemySpecies(Species.AMOONGUSS); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); game.move.select(Moves.POWER_UP_PUNCH); - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); expect(leadPokemon.turnData.hitCount).toBe(2); expect(leadPokemon.getStatStage(Stat.ATK)).toBe(2); }, TIMEOUT ); - test( - "ability should not apply to Status moves", + it( + "should not apply to Status moves", async () => { game.override.moveset([Moves.BABY_DOLL_EYES]); - await game.startBattle([Species.CHARIZARD]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); + await game.classicMode.startBattle([Species.MAGIKARP]); const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); game.move.select(Moves.BABY_DOLL_EYES); - await game.phaseInterceptor.to(BerryPhase, false); + + await game.phaseInterceptor.to("BerryPhase", false); expect(enemyPokemon.getStatStage(Stat.ATK)).toBe(-1); }, TIMEOUT ); - test( - "ability should not apply to multi-hit moves", + it( + "should not apply to multi-hit moves", async () => { game.override.moveset([Moves.DOUBLE_HIT]); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); game.move.select(Moves.DOUBLE_HIT); await game.move.forceHit(); - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); expect(leadPokemon.turnData.hitCount).toBe(2); }, TIMEOUT ); - test( - "ability should not apply to self-sacrifice moves", + it( + "should not apply to self-sacrifice moves", async () => { game.override.moveset([Moves.SELF_DESTRUCT]); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); game.move.select(Moves.SELF_DESTRUCT); - await game.phaseInterceptor.to(DamagePhase, false); + await game.phaseInterceptor.to("DamagePhase", false); expect(leadPokemon.turnData.hitCount).toBe(1); }, TIMEOUT ); - test( - "ability should not apply to Rollout", + it( + "should not apply to Rollout", async () => { game.override.moveset([Moves.ROLLOUT]); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); game.move.select(Moves.ROLLOUT); await game.move.forceHit(); - await game.phaseInterceptor.to(DamagePhase, false); + await game.phaseInterceptor.to("DamagePhase", false); expect(leadPokemon.turnData.hitCount).toBe(1); }, TIMEOUT ); - test( - "ability should not apply multiplier to fixed-damage moves", + it( + "should not apply multiplier to fixed-damage moves", async () => { game.override.moveset([Moves.DRAGON_RAGE]); - await game.startBattle([Species.CHARIZARD]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); + await game.classicMode.startBattle([Species.MAGIKARP]); const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); - - const enemyStartingHp = enemyPokemon.hp; game.move.select(Moves.DRAGON_RAGE); - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); - expect(enemyPokemon.hp).toBe(enemyStartingHp - 80); + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp() - 80); }, TIMEOUT ); - test( - "ability should not apply multiplier to counter moves", + it( + "should not apply multiplier to counter moves", async () => { game.override.moveset([Moves.COUNTER]); - game.override.enemyMoveset([Moves.TACKLE, Moves.TACKLE, Moves.TACKLE, Moves.TACKLE]); + game.override.enemyMoveset(Array(4).fill(Moves.TACKLE)); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.SHUCKLE]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); - - const playerStartingHp = leadPokemon.hp; - const enemyStartingHp = enemyPokemon.hp; game.move.select(Moves.COUNTER); - await game.phaseInterceptor.to(DamagePhase); + await game.phaseInterceptor.to("DamagePhase"); - const playerDamage = playerStartingHp - leadPokemon.hp; + const playerDamage = leadPokemon.getMaxHp() - leadPokemon.hp; - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); - expect(enemyPokemon.hp).toBe(enemyStartingHp - 4 * playerDamage); + expect(enemyPokemon.hp).toBe(enemyPokemon.getMaxHp() - 4 * playerDamage); }, TIMEOUT ); - test( - "ability should not apply to multi-target moves", + it( + "should not apply to multi-target moves", async () => { game.override.battleType("double"); game.override.moveset([Moves.EARTHQUAKE]); + game.override.passiveAbility(Abilities.LEVITATE); - await game.startBattle([Species.CHARIZARD, Species.PIDGEOT]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); const playerPokemon = game.scene.getPlayerField(); - expect(playerPokemon.length).toBe(2); - playerPokemon.forEach(p => expect(p).not.toBe(undefined)); - - const enemyPokemon = game.scene.getEnemyField(); - expect(enemyPokemon.length).toBe(2); - enemyPokemon.forEach(p => expect(p).not.toBe(undefined)); game.move.select(Moves.EARTHQUAKE); - await game.phaseInterceptor.to(CommandPhase); - game.move.select(Moves.EARTHQUAKE, 1); - await game.phaseInterceptor.to(BerryPhase, false); + + await game.phaseInterceptor.to("BerryPhase", false); playerPokemon.forEach(p => expect(p.turnData.hitCount).toBe(1)); }, TIMEOUT ); - test( - "ability should apply to multi-target moves when hitting only one target", + it( + "should apply to multi-target moves when hitting only one target", async () => { game.override.moveset([Moves.EARTHQUAKE]); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); game.move.select(Moves.EARTHQUAKE); - await game.phaseInterceptor.to(DamagePhase, false); + await game.phaseInterceptor.to("DamagePhase", false); expect(leadPokemon.turnData.hitCount).toBe(2); }, TIMEOUT ); - test( - "ability should only trigger post-target move effects once", + it( + "should only trigger post-target move effects once", async () => { game.override.moveset([Moves.MIND_BLOWN]); - await game.startBattle([Species.PIDGEOT]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); game.move.select(Moves.MIND_BLOWN); - await game.phaseInterceptor.to(DamagePhase, false); + await game.phaseInterceptor.to("DamagePhase", false); expect(leadPokemon.turnData.hitCount).toBe(2); // This test will time out if the user faints - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); - expect(leadPokemon.hp).toBe(toDmgValue(leadPokemon.getMaxHp() / 2)); + expect(leadPokemon.hp).toBe(Math.ceil(leadPokemon.getMaxHp() / 2)); }, TIMEOUT ); - test( - "Burn Up only removes type after second strike with this ability", + it( + "Burn Up only removes type after the second strike", async () => { game.override.moveset([Moves.BURN_UP]); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.CHARIZARD]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); game.move.select(Moves.BURN_UP); - await game.phaseInterceptor.to(DamagePhase); + await game.phaseInterceptor.to("MoveEffectPhase"); expect(leadPokemon.turnData.hitCount).toBe(2); expect(enemyPokemon.hp).toBeGreaterThan(0); expect(leadPokemon.isOfType(Type.FIRE)).toBe(true); - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); expect(leadPokemon.isOfType(Type.FIRE)).toBe(false); }, TIMEOUT ); - test( + it( "Moves boosted by this ability and Multi-Lens should strike 4 times", async () => { game.override.moveset([Moves.TACKLE]); game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); game.move.select(Moves.TACKLE); - await game.phaseInterceptor.to(DamagePhase); + await game.phaseInterceptor.to("DamagePhase"); expect(leadPokemon.turnData.hitCount).toBe(4); }, TIMEOUT ); - test( + it( "Super Fang boosted by this ability and Multi-Lens should strike twice", async () => { game.override.moveset([Moves.SUPER_FANG]); game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); - - const enemyStartingHp = enemyPokemon.hp; game.move.select(Moves.SUPER_FANG); await game.move.forceHit(); - await game.phaseInterceptor.to(DamagePhase); + await game.phaseInterceptor.to("DamagePhase"); expect(leadPokemon.turnData.hitCount).toBe(2); - await game.phaseInterceptor.to(MoveEndPhase, false); + await game.phaseInterceptor.to("MoveEndPhase", false); - expect(enemyPokemon.hp).toBe(Math.ceil(enemyStartingHp * 0.25)); + expect(enemyPokemon.hp).toBe(Math.ceil(enemyPokemon.getMaxHp() * 0.25)); }, TIMEOUT ); - test( + it( "Seismic Toss boosted by this ability and Multi-Lens should strike twice", async () => { game.override.moveset([Moves.SEISMIC_TOSS]); game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); const enemyStartingHp = enemyPokemon.hp; game.move.select(Moves.SEISMIC_TOSS); await game.move.forceHit(); - await game.phaseInterceptor.to(DamagePhase); + await game.phaseInterceptor.to("DamagePhase"); expect(leadPokemon.turnData.hitCount).toBe(2); - await game.phaseInterceptor.to(MoveEndPhase, false); + await game.phaseInterceptor.to("MoveEndPhase", false); expect(enemyPokemon.hp).toBe(enemyStartingHp - 200); }, TIMEOUT ); - test( + it( "Hyper Beam boosted by this ability should strike twice, then recharge", async () => { game.override.moveset([Moves.HYPER_BEAM]); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); game.move.select(Moves.HYPER_BEAM); await game.move.forceHit(); - await game.phaseInterceptor.to(DamagePhase); + await game.phaseInterceptor.to("DamagePhase"); expect(leadPokemon.turnData.hitCount).toBe(2); expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeUndefined(); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); expect(leadPokemon.getTag(BattlerTagType.RECHARGING)).toBeDefined(); }, TIMEOUT ); - /** TODO: Fix TRAPPED tag lapsing incorrectly, then run this test */ - test( + it( "Anchor Shot boosted by this ability should only trap the target after the second hit", async () => { game.override.moveset([Moves.ANCHOR_SHOT]); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); game.move.select(Moves.ANCHOR_SHOT); await game.move.forceHit(); - await game.phaseInterceptor.to(DamagePhase); + await game.phaseInterceptor.to("DamagePhase"); expect(leadPokemon.turnData.hitCount).toBe(2); - expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); // Passes + expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeUndefined(); - await game.phaseInterceptor.to(MoveEndPhase); - expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined(); // Passes + await game.phaseInterceptor.to("MoveEndPhase"); + expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined(); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); - expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined(); // Fails :( + expect(enemyPokemon.getTag(BattlerTagType.TRAPPED)).toBeDefined(); }, TIMEOUT ); - test( + it( "Smack Down boosted by this ability should only ground the target after the second hit", async () => { game.override.moveset([Moves.SMACK_DOWN]); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); game.move.select(Moves.SMACK_DOWN); await game.move.forceHit(); - await game.phaseInterceptor.to(DamagePhase); + await game.phaseInterceptor.to("DamagePhase"); expect(leadPokemon.turnData.hitCount).toBe(2); expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeUndefined(); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); expect(enemyPokemon.getTag(BattlerTagType.IGNORE_FLYING)).toBeDefined(); }, TIMEOUT ); - test( + it( "U-turn boosted by this ability should strike twice before forcing a switch", async () => { game.override.moveset([Moves.U_TURN]); - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.MAGIKARP, Species.BLASTOISE]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); game.move.select(Moves.U_TURN); await game.move.forceHit(); - await game.phaseInterceptor.to(MoveEffectPhase); + await game.phaseInterceptor.to("MoveEffectPhase"); expect(leadPokemon.turnData.hitCount).toBe(2); // This will cause this test to time out if the switch was forced on the first hit. - await game.phaseInterceptor.to(MoveEffectPhase, false); + await game.phaseInterceptor.to("MoveEffectPhase", false); }, TIMEOUT ); - test( + it( "Wake-Up Slap boosted by this ability should only wake up the target after the second hit", async () => { game.override.moveset([Moves.WAKE_UP_SLAP]).enemyStatusEffect(StatusEffect.SLEEP); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); game.move.select(Moves.WAKE_UP_SLAP); await game.move.forceHit(); - await game.phaseInterceptor.to(DamagePhase); + await game.phaseInterceptor.to("DamagePhase"); expect(leadPokemon.turnData.hitCount).toBe(2); expect(enemyPokemon.status?.effect).toBe(StatusEffect.SLEEP); - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); expect(enemyPokemon.status?.effect).toBeUndefined(); }, TIMEOUT ); - test( - "ability should not cause user to hit into King's Shield more than once", + it( + "should not cause user to hit into King's Shield more than once", async () => { game.override.moveset([Moves.TACKLE]); - game.override.enemyMoveset([Moves.KINGS_SHIELD, Moves.KINGS_SHIELD, Moves.KINGS_SHIELD, Moves.KINGS_SHIELD]); + game.override.enemyMoveset(Array(4).fill(Moves.KINGS_SHIELD)); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.MAGIKARP]); const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); - - const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); game.move.select(Moves.TACKLE); - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); expect(leadPokemon.getStatStage(Stat.ATK)).toBe(-1); }, TIMEOUT ); - test( - "ability should not cause user to hit into Storm Drain more than once", + it( + "should not cause user to hit into Storm Drain more than once", async () => { game.override.moveset([Moves.WATER_GUN]); game.override.enemyAbility(Abilities.STORM_DRAIN); - await game.startBattle([Species.CHARIZARD]); - - const leadPokemon = game.scene.getPlayerPokemon()!; - expect(leadPokemon).not.toBe(undefined); + await game.classicMode.startBattle([Species.MAGIKARP]); const enemyPokemon = game.scene.getEnemyPokemon()!; - expect(enemyPokemon).not.toBe(undefined); game.move.select(Moves.WATER_GUN); - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); expect(enemyPokemon.getStatStage(Stat.SPATK)).toBe(1); }, TIMEOUT ); - test( - "ability should not apply to multi-target moves with Multi-Lens", + it( + "should not apply to multi-target moves with Multi-Lens", async () => { game.override.battleType("double"); game.override.moveset([Moves.EARTHQUAKE, Moves.SPLASH]); + game.override.passiveAbility(Abilities.LEVITATE); game.override.startingHeldItems([{ name: "MULTI_LENS", count: 1 }]); - await game.startBattle([Species.CHARIZARD, Species.PIDGEOT]); - - const playerPokemon = game.scene.getPlayerField(); - expect(playerPokemon.length).toBe(2); - playerPokemon.forEach(p => expect(p).not.toBe(undefined)); + await game.classicMode.startBattle([Species.MAGIKARP, Species.FEEBAS]); const enemyPokemon = game.scene.getEnemyField(); - expect(enemyPokemon.length).toBe(2); - enemyPokemon.forEach(p => expect(p).not.toBe(undefined)); const enemyStartingHp = enemyPokemon.map(p => p.hp); game.move.select(Moves.EARTHQUAKE); - await game.phaseInterceptor.to(CommandPhase); - game.move.select(Moves.SPLASH, 1); - await game.phaseInterceptor.to(MoveEffectPhase, false); - - await game.phaseInterceptor.to(DamagePhase); + await game.phaseInterceptor.to("DamagePhase"); const enemyFirstHitDamage = enemyStartingHp.map((hp, i) => hp - enemyPokemon[i].hp); - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); enemyPokemon.forEach((p, i) => expect(enemyStartingHp[i] - p.hp).toBe(2 * enemyFirstHitDamage[i])); - }, TIMEOUT ); }); From 13f38dce8d53d4a8d176c9de9b0e345ecb4cac49 Mon Sep 17 00:00:00 2001 From: Zach Day Date: Thu, 5 Sep 2024 04:44:22 -0400 Subject: [PATCH 06/83] [Move] Use BattlerTag for move-disabling effects (#2051) * Use BattlerTag for move-disabling effects * Fix RUN command causing freeze * Improve documentation * Clean up and document PokemonMove.isUsable * Fix isMoveDisabled missing return * Tags define the message shown when disabling interrupts a move * Fix -1 duration on Disable effect * Add tests for Disable * En loc and fix message functions * Fix Disable test * Fix broken imports * Fix test * All disable tests passing * Localize remaining strings * Move cancellation logic out of lapse; use use TURN_END for lapse type * Prevent disabling STRUGGLE * Inline struggle check function * Restore RechargingTag docs * Move cancellation logic back to tag Wanted to increase similarity to the existing code base to avoid that stupid hyper beam error but it's still happening here * Fix hyper beam test * Remove erroneous shit * Fill movesets with SPLASH for disable test * More robust condition for disable checking * Remove DisabledTag lapse * Simplify DisablingBattlerTag lapse * Cancel disable-interrupted moves instead of failing them * Avoid disabling virtual moves * Consistent access modifiers across Disable tags * Add abstract function for message when player tries to select the disabled move * Fix syntax mistake * Always disable last-used non-virtual move * Overhaul tests + add tests * Implement loadTag for DisabledTag * Update translations * Update translations * Reimplement phase changes * fix battlertag strings * Fix disable test not running * Update name of base class * Rename "disabling" to "restriction" * Fix sneaky string fuckup * Fix test failure * fix merge problems * fix merge problems * Update tests * rerun RNG test * Properly mock stats in test * Document everything in battlertag * More docs + typo fix * Update tests --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> --- src/data/ability.ts | 13 +--- src/data/battler-tags.ts | 123 +++++++++++++++++++++++++++++ src/data/move.ts | 70 +---------------- src/enums/battler-tag-type.ts | 1 + src/field/pokemon.ts | 53 +++++++++++-- src/locales/en/battle.json | 1 + src/locales/en/battler-tags.json | 6 +- src/phases/command-phase.ts | 5 +- src/phases/move-phase.ts | 9 +-- src/phases/turn-end-phase.ts | 8 -- src/system/pokemon-data.ts | 2 - src/test/moves/disable.test.ts | 129 +++++++++++++++++++++++++++++++ 12 files changed, 315 insertions(+), 105 deletions(-) mode change 100644 => 100755 src/data/ability.ts create mode 100644 src/test/moves/disable.test.ts diff --git a/src/data/ability.ts b/src/data/ability.ts old mode 100644 new mode 100755 index 925a7efb79b..fde39ebb152 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -1085,7 +1085,7 @@ export class PostDefendMoveDisableAbAttr extends PostDefendAbAttr { } applyPostDefend(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean { - if (!attacker.summonData.disabledMove) { + if (attacker.getTag(BattlerTagType.DISABLED) === null) { if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon) && (this.chance === -1 || pokemon.randSeedInt(100) < this.chance) && !attacker.isMax()) { if (simulated) { return true; @@ -1093,21 +1093,12 @@ export class PostDefendMoveDisableAbAttr extends PostDefendAbAttr { this.attacker = attacker; this.move = move; - - attacker.summonData.disabledMove = move.id; - attacker.summonData.disabledTurns = 4; + this.attacker.addTag(BattlerTagType.DISABLED, 4, 0, pokemon.id); return true; } } return false; } - - getTriggerMessage(pokemon: Pokemon, abilityName: string, ...args: any[]): string { - return i18next.t("abilityTriggers:postDefendMoveDisable", { - pokemonNameWithAffix: getPokemonNameWithAffix(this.attacker), - moveName: this.move.name, - }); - } } export class PostStatStageChangeStatStageChangeAbAttr extends PostStatStageChangeAbAttr { diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index 66bcc7b9c3c..ef91dda7b63 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -98,6 +98,127 @@ export interface TerrainBattlerTag { terrainTypes: TerrainType[]; } +/** + * Base class for tags that restrict the usage of moves. This effect is generally referred to as "disabling" a move + * in-game. This is not to be confused with {@linkcode Moves.DISABLE}. + * + * Descendants can override {@linkcode isMoveRestricted} to restrict moves that + * match a condition. A restricted move gets cancelled before it is used. Players and enemies should not be allowed + * to select restricted moves. + */ +export abstract class MoveRestrictionBattlerTag extends BattlerTag { + constructor(tagType: BattlerTagType, turnCount: integer, sourceMove?: Moves, sourceId?: integer) { + super(tagType, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], turnCount, sourceMove, sourceId); + } + + /** @override */ + override lapse(pokemon: Pokemon, lapseType: BattlerTagLapseType): boolean { + if (lapseType === BattlerTagLapseType.PRE_MOVE) { + // Cancel the affected pokemon's selected move + const phase = pokemon.scene.getCurrentPhase() as MovePhase; + const move = phase.move; + + if (this.isMoveRestricted(move.moveId)) { + pokemon.scene.queueMessage(this.interruptedText(pokemon, move.moveId)); + phase.cancel(); + } + + return true; + } + + return super.lapse(pokemon, lapseType); + } + + /** + * Gets whether this tag is restricting a move. + * + * @param {Moves} move {@linkcode Moves} ID to check restriction for. + * @returns {boolean} `true` if the move is restricted by this tag, otherwise `false`. + */ + abstract isMoveRestricted(move: Moves): boolean; + + /** + * Gets the text to display when the player attempts to select a move that is restricted by this tag. + * + * @param {Pokemon} pokemon {@linkcode Pokemon} for which the player is attempting to select the restricted move + * @param {Moves} move {@linkcode Moves} ID of the move that is having its selection denied + * @returns {string} text to display when the player attempts to select the restricted move + */ + abstract selectionDeniedText(pokemon: Pokemon, move: Moves): string; + + /** + * Gets the text to display when a move's execution is prevented as a result of the restriction. + * Because restriction effects also prevent selection of the move, this situation can only arise if a + * pokemon first selects a move, then gets outsped by a pokemon using a move that restricts the selected move. + * + * @param {Pokemon} pokemon {@linkcode Pokemon} attempting to use the restricted move + * @param {Moves} move {@linkcode Moves} ID of the move being interrupted + * @returns {string} text to display when the move is interrupted + */ + abstract interruptedText(pokemon: Pokemon, move: Moves): string; +} + +/** + * Tag representing the "disabling" effect performed by {@linkcode Moves.DISABLE} and {@linkcode Abilities.CURSED_BODY}. + * When the tag is added, the last-used move of the tag holder is set as the disabled move. + */ +export class DisabledTag extends MoveRestrictionBattlerTag { + /** The move being disabled. Gets set when {@linkcode onAdd} is called for this tag. */ + private moveId: Moves = Moves.NONE; + + constructor(sourceId: number) { + super(BattlerTagType.DISABLED, 4, Moves.DISABLE, sourceId); + } + + /** @override */ + override isMoveRestricted(move: Moves): boolean { + return move === this.moveId; + } + + /** + * @override + * + * Ensures that move history exists on `pokemon` and has a valid move. If so, sets the {@link moveId} and shows a message. + * Otherwise the move ID will not get assigned and this tag will get removed next turn. + */ + override onAdd(pokemon: Pokemon): void { + super.onAdd(pokemon); + + const move = pokemon.getLastXMoves() + .find(m => m.move !== Moves.NONE && m.move !== Moves.STRUGGLE && !m.virtual); + if (move === undefined) { + return; + } + + this.moveId = move.move; + + pokemon.scene.queueMessage(i18next.t("battlerTags:disabledOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[this.moveId].name })); + } + + /** @override */ + override onRemove(pokemon: Pokemon): void { + super.onRemove(pokemon); + + pokemon.scene.queueMessage(i18next.t("battlerTags:disabledLapse", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[this.moveId].name })); + } + + /** @override */ + override selectionDeniedText(pokemon: Pokemon, move: Moves): string { + return i18next.t("battle:moveDisabled", { moveName: allMoves[move].name }); + } + + /** @override */ + override interruptedText(pokemon: Pokemon, move: Moves): string { + return i18next.t("battle:disableInterruptedMove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name }); + } + + /** @override */ + override loadTag(source: BattlerTag | any): void { + super.loadTag(source); + this.moveId = source.moveId; + } +} + /** * BattlerTag that represents the "recharge" effects of moves like Hyper Beam. */ @@ -1995,6 +2116,8 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source return new StockpilingTag(sourceMove); case BattlerTagType.OCTOLOCK: return new OctolockTag(sourceId); + case BattlerTagType.DISABLED: + return new DisabledTag(sourceId); case BattlerTagType.IGNORE_GHOST: return new ExposedTag(tagType, sourceMove, Type.GHOST, [Type.NORMAL, Type.FIGHTING]); case BattlerTagType.IGNORE_DARK: diff --git a/src/data/move.ts b/src/data/move.ts index ddf043c554d..a591f12df90 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -4332,72 +4332,6 @@ export class TypelessAttr extends MoveAttr { } */ export class BypassRedirectAttr extends MoveAttr { } -export class DisableMoveAttr extends MoveEffectAttr { - constructor() { - super(false); - } - - apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { - if (!super.apply(user, target, move, args)) { - return false; - } - - const moveQueue = target.getLastXMoves(); - let turnMove: TurnMove | undefined; - while (moveQueue.length) { - turnMove = moveQueue.shift(); - if (turnMove?.virtual) { - continue; - } - - const moveIndex = target.getMoveset().findIndex(m => m?.moveId === turnMove?.move); - if (moveIndex === -1) { - return false; - } - - const disabledMove = target.getMoveset()[moveIndex]; - target.summonData.disabledMove = disabledMove?.moveId!; // TODO: is this bang correct? - target.summonData.disabledTurns = 4; - - user.scene.queueMessage(i18next.t("abilityTriggers:postDefendMoveDisable", { pokemonNameWithAffix: getPokemonNameWithAffix(target), moveName: disabledMove?.getName()})); - - return true; - } - - return false; - } - - getCondition(): MoveConditionFunc { - return (user, target, move): boolean => { // TODO: Not sure what to do here - if (target.summonData.disabledMove || target.isMax()) { - return false; - } - - const moveQueue = target.getLastXMoves(); - let turnMove: TurnMove | undefined; - while (moveQueue.length) { - turnMove = moveQueue.shift(); - if (turnMove?.virtual) { - continue; - } - - const move = target.getMoveset().find(m => m?.moveId === turnMove?.move); - if (!move) { - continue; - } - - return true; - } - - return false; - }; - } - - getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { - return -5; - } -} - export class FrenzyAttr extends MoveEffectAttr { constructor() { super(true, MoveEffectTrigger.HIT, false, true); @@ -4488,6 +4422,7 @@ export class AddBattlerTagAttr extends MoveEffectAttr { case BattlerTagType.INFATUATED: case BattlerTagType.NIGHTMARE: case BattlerTagType.DROWSY: + case BattlerTagType.DISABLED: return -5; case BattlerTagType.SEEDED: case BattlerTagType.SALT_CURED: @@ -6673,7 +6608,8 @@ export function initMoves() { new AttackMove(Moves.SONIC_BOOM, Type.NORMAL, MoveCategory.SPECIAL, -1, 90, 20, -1, 0, 1) .attr(FixedDamageAttr, 20), new StatusMove(Moves.DISABLE, Type.NORMAL, 100, 20, -1, 0, 1) - .attr(DisableMoveAttr) + .attr(AddBattlerTagAttr, BattlerTagType.DISABLED, false, true) + .condition((user, target, move) => target.getMoveHistory().reverse().find(m => m.move !== Moves.NONE && m.move !== Moves.STRUGGLE && !m.virtual) !== undefined) .condition(failOnMaxCondition), new AttackMove(Moves.ACID, Type.POISON, MoveCategory.SPECIAL, 40, 100, 30, 10, 0, 1) .attr(StatStageChangeAttr, [ Stat.SPDEF ], -1) diff --git a/src/enums/battler-tag-type.ts b/src/enums/battler-tag-type.ts index 20ceb1b331f..a2bcf9e4c0e 100644 --- a/src/enums/battler-tag-type.ts +++ b/src/enums/battler-tag-type.ts @@ -64,6 +64,7 @@ export enum BattlerTagType { STOCKPILING = "STOCKPILING", RECEIVE_DOUBLE_DAMAGE = "RECEIVE_DOUBLE_DAMAGE", ALWAYS_GET_HIT = "ALWAYS_GET_HIT", + DISABLED = "DISABLED", IGNORE_GHOST = "IGNORE_GHOST", IGNORE_DARK = "IGNORE_DARK", GULP_MISSILE_ARROKUDA = "GULP_MISSILE_ARROKUDA", diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index e0a9a4a86ce..269d0b1dba5 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -17,7 +17,7 @@ import { initMoveAnim, loadMoveAnimAssets } from "../data/battle-anims"; import { Status, StatusEffect, getRandomStatus } from "../data/status-effect"; import { pokemonEvolutions, pokemonPrevolutions, SpeciesFormEvolution, SpeciesEvolutionCondition, FusionSpeciesFormEvolution } from "../data/pokemon-evolutions"; import { reverseCompatibleTms, tmSpecies, tmPoolTiers } from "../data/tms"; -import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HighestStatBoostTag, TypeImmuneTag, getBattlerTag, SemiInvulnerableTag, TypeBoostTag, ExposedTag, DragonCheerTag, CritBoostTag, TrappedTag } from "../data/battler-tags"; +import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HighestStatBoostTag, TypeImmuneTag, getBattlerTag, SemiInvulnerableTag, TypeBoostTag, MoveRestrictionBattlerTag, ExposedTag, DragonCheerTag, CritBoostTag, TrappedTag } from "../data/battler-tags"; import { WeatherType } from "../data/weather"; import { ArenaTagSide, NoCritTag, WeakenMoveScreenTag } from "../data/arena-tag"; import { Ability, AbAttr, StatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, IgnoreOpponentStatStagesAbAttr, MoveImmunityAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyStatMultiplierAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr, IgnoreTypeStatusEffectImmunityAbAttr, ConditionalCritAbAttr, applyFieldStatMultiplierAbAttrs, FieldMultiplyStatAbAttr, AddSecondStrikeAbAttr, UserFieldStatusEffectImmunityAbAttr, UserFieldBattlerTagImmunityAbAttr, BattlerTagImmunityAbAttr, MoveTypeChangeAbAttr, FullHpResistTypeAbAttr, applyCheckTrappedAbAttrs, CheckTrappedAbAttr } from "../data/ability"; @@ -2670,6 +2670,33 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.updateInfo(); } + /** + * Gets whether the given move is currently disabled for this Pokemon. + * + * @param {Moves} moveId {@linkcode Moves} ID of the move to check + * @returns {boolean} `true` if the move is disabled for this Pokemon, otherwise `false` + * + * @see {@linkcode MoveRestrictionBattlerTag} + */ + isMoveRestricted(moveId: Moves): boolean { + return this.getRestrictingTag(moveId) !== null; + } + + /** + * Gets the {@link MoveRestrictionBattlerTag} that is restricting a move, if it exists. + * + * @param {Moves} moveId {@linkcode Moves} ID of the move to check + * @returns {MoveRestrictionBattlerTag | null} the first tag on this Pokemon that restricts the move, or `null` if the move is not restricted. + */ + getRestrictingTag(moveId: Moves): MoveRestrictionBattlerTag | null { + for (const tag of this.findTags(t => t instanceof MoveRestrictionBattlerTag)) { + if ((tag as MoveRestrictionBattlerTag).isMoveRestricted(moveId)) { + return tag as MoveRestrictionBattlerTag; + } + } + return null; + } + getMoveHistory(): TurnMove[] { return this.battleSummonData.moveHistory; } @@ -4458,8 +4485,6 @@ export interface AttackMoveResult { export class PokemonSummonData { public statStages: number[] = [ 0, 0, 0, 0, 0, 0, 0 ]; public moveQueue: QueuedMove[] = []; - public disabledMove: Moves = Moves.NONE; - public disabledTurns: number = 0; public tags: BattlerTag[] = []; public abilitySuppressed: boolean = false; public abilitiesApplied: Abilities[] = []; @@ -4540,7 +4565,7 @@ export type DamageResult = HitResult.EFFECTIVE | HitResult.SUPER_EFFECTIVE | Hit * It links to {@linkcode Move} class via the move ID. * Compared to {@linkcode Move}, this class also tracks if a move has received. * PP Ups, amount of PP used, and things like that. - * @see {@linkcode isUsable} - checks if move is disabled, out of PP, or not implemented. + * @see {@linkcode isUsable} - checks if move is restricted, out of PP, or not implemented. * @see {@linkcode getMove} - returns {@linkcode Move} object by looking it up via ID. * @see {@linkcode usePp} - removes a point of PP from the move. * @see {@linkcode getMovePp} - returns amount of PP a move currently has. @@ -4560,11 +4585,25 @@ export class PokemonMove { this.virtual = !!virtual; } - isUsable(pokemon: Pokemon, ignorePp?: boolean): boolean { - if (this.moveId && pokemon.summonData?.disabledMove === this.moveId) { + /** + * Checks whether the move can be selected or performed by a Pokemon, without consideration for the move's targets. + * The move is unusable if it is out of PP, restricted by an effect, or unimplemented. + * + * @param {Pokemon} pokemon {@linkcode Pokemon} that would be using this move + * @param {boolean} ignorePp If `true`, skips the PP check + * @param {boolean} ignoreRestrictionTags If `true`, skips the check for move restriction tags (see {@link MoveRestrictionBattlerTag}) + * @returns `true` if the move can be selected and used by the Pokemon, otherwise `false`. + */ + isUsable(pokemon: Pokemon, ignorePp?: boolean, ignoreRestrictionTags?: boolean): boolean { + if (this.moveId && !ignoreRestrictionTags && pokemon.isMoveRestricted(this.moveId)) { return false; } - return (ignorePp || this.ppUsed < this.getMovePp() || this.getMove().pp === -1) && !this.getMove().name.endsWith(" (N)"); + + if (this.getMove().name.endsWith(" (N)")) { + return false; + } + + return (ignorePp || this.ppUsed < this.getMovePp() || this.getMove().pp === -1); } getMove(): Move { diff --git a/src/locales/en/battle.json b/src/locales/en/battle.json index 918fb38b520..120ac749acb 100644 --- a/src/locales/en/battle.json +++ b/src/locales/en/battle.json @@ -44,6 +44,7 @@ "moveNotImplemented": "{{moveName}} is not yet implemented and cannot be selected.", "moveNoPP": "There's no PP left for\nthis move!", "moveDisabled": "{{moveName}} is disabled!", + "disableInterruptedMove": "{{pokemonNameWithAffix}}'s {{moveName}}\nis disabled!", "noPokeballForce": "An unseen force\nprevents using Poké Balls.", "noPokeballTrainer": "You can't catch\nanother trainer's Pokémon!", "noPokeballMulti": "You can only throw a Poké Ball\nwhen there is one Pokémon remaining!", diff --git a/src/locales/en/battler-tags.json b/src/locales/en/battler-tags.json index 94ea3b14958..222aee4087c 100644 --- a/src/locales/en/battler-tags.json +++ b/src/locales/en/battler-tags.json @@ -67,5 +67,7 @@ "saltCuredLapse": "{{pokemonNameWithAffix}} is hurt by {{moveName}}!", "cursedOnAdd": "{{pokemonNameWithAffix}} cut its own HP and put a curse on the {{pokemonName}}!", "cursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!", - "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!" -} \ No newline at end of file + "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!", + "disabledOnAdd": "{{pokemonNameWithAffix}}'s {{moveName}}\nwas disabled!", + "disabledLapse": "{{pokemonNameWithAffix}}'s {{moveName}}\nis no longer disabled." +} diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts index 9681a6eeee8..47d212aa598 100644 --- a/src/phases/command-phase.ts +++ b/src/phases/command-phase.ts @@ -107,8 +107,9 @@ export class CommandPhase extends FieldPhase { // Decides between a Disabled, Not Implemented, or No PP translation message const errorMessage = - playerPokemon.summonData.disabledMove === move.moveId ? "battle:moveDisabled" : - move.getName().endsWith(" (N)") ? "battle:moveNotImplemented" : "battle:moveNoPP"; + playerPokemon.isMoveRestricted(move.moveId) + ? playerPokemon.getRestrictingTag(move.moveId)!.selectionDeniedText(playerPokemon, move.moveId) + : move.getName().endsWith(" (N)") ? "battle:moveNotImplemented" : "battle:moveNoPP"; const moveName = move.getName().replace(" (N)", ""); // Trims off the indicator this.scene.ui.showText(i18next.t(errorMessage, { moveName: moveName }), null, () => { diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts index e2893d587a7..0ccf19a462f 100644 --- a/src/phases/move-phase.ts +++ b/src/phases/move-phase.ts @@ -44,8 +44,8 @@ export class MovePhase extends BattlePhase { this.cancelled = false; } - canMove(): boolean { - return this.pokemon.isActive(true) && this.move.isUsable(this.pokemon, this.ignorePp) && !!this.targets.length; + canMove(ignoreDisableTags?: boolean): boolean { + return this.pokemon.isActive(true) && this.move.isUsable(this.pokemon, this.ignorePp, ignoreDisableTags) && !!this.targets.length; } /**Signifies the current move should fail but still use PP */ @@ -63,10 +63,7 @@ export class MovePhase extends BattlePhase { console.log(Moves[this.move.moveId]); - if (!this.canMove()) { - if (this.move.moveId && this.pokemon.summonData?.disabledMove === this.move.moveId) { - this.scene.queueMessage(i18next.t("battle:moveDisabled", { moveName: this.move.getName() })); - } + if (!this.canMove(true)) { if (this.pokemon.isActive(true) && this.move.ppUsed >= this.move.getMovePp()) { // if the move PP was reduced from Spite or otherwise, the move fails this.fail(); this.showMoveText(); diff --git a/src/phases/turn-end-phase.ts b/src/phases/turn-end-phase.ts index 9f4de46b0fa..c8bd3398bb5 100644 --- a/src/phases/turn-end-phase.ts +++ b/src/phases/turn-end-phase.ts @@ -1,9 +1,7 @@ import BattleScene from "#app/battle-scene.js"; import { applyPostTurnAbAttrs, PostTurnAbAttr } from "#app/data/ability.js"; import { BattlerTagLapseType } from "#app/data/battler-tags.js"; -import { allMoves } from "#app/data/move.js"; import { TerrainType } from "#app/data/terrain.js"; -import { Moves } from "#app/enums/moves.js"; import { WeatherType } from "#app/enums/weather-type.js"; import { TurnEndEvent } from "#app/events/battle-scene.js"; import Pokemon from "#app/field/pokemon.js"; @@ -11,7 +9,6 @@ import { getPokemonNameWithAffix } from "#app/messages.js"; import { TurnHealModifier, EnemyTurnHealModifier, EnemyStatusEffectHealChanceModifier, TurnStatusEffectModifier, TurnHeldItemTransferModifier } from "#app/modifier/modifier.js"; import i18next from "i18next"; import { FieldPhase } from "./field-phase"; -import { MessagePhase } from "./message-phase"; import { PokemonHealPhase } from "./pokemon-heal-phase"; export class TurnEndPhase extends FieldPhase { @@ -28,11 +25,6 @@ export class TurnEndPhase extends FieldPhase { const handlePokemon = (pokemon: Pokemon) => { pokemon.lapseTags(BattlerTagLapseType.TURN_END); - if (pokemon.summonData.disabledMove && !--pokemon.summonData.disabledTurns) { - this.scene.pushPhase(new MessagePhase(this.scene, i18next.t("battle:notDisabled", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: allMoves[pokemon.summonData.disabledMove].name }))); - pokemon.summonData.disabledMove = Moves.NONE; - } - this.scene.applyModifiers(TurnHealModifier, pokemon.isPlayer(), pokemon); if (this.scene.arena.terrain?.terrainType === TerrainType.GRASSY && pokemon.isGrounded()) { diff --git a/src/system/pokemon-data.ts b/src/system/pokemon-data.ts index 9a743ceb1d2..1fafcbf8acc 100644 --- a/src/system/pokemon-data.ts +++ b/src/system/pokemon-data.ts @@ -127,8 +127,6 @@ export default class PokemonData { this.summonData.stats = source.summonData.stats; this.summonData.statStages = source.summonData.statStages; this.summonData.moveQueue = source.summonData.moveQueue; - this.summonData.disabledMove = source.summonData.disabledMove; - this.summonData.disabledTurns = source.summonData.disabledTurns; this.summonData.abilitySuppressed = source.summonData.abilitySuppressed; this.summonData.abilitiesApplied = source.summonData.abilitiesApplied; diff --git a/src/test/moves/disable.test.ts b/src/test/moves/disable.test.ts new file mode 100644 index 00000000000..3d207035ce3 --- /dev/null +++ b/src/test/moves/disable.test.ts @@ -0,0 +1,129 @@ +import { BattlerIndex } from "#app/battle"; +import { MoveResult } from "#app/field/pokemon"; +import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/utils/gameManager"; +import { SPLASH_ONLY } from "#test/utils/testUtils"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Moves - Disable", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(async () => { + game = new GameManager(phaserGame); + game.override + .battleType("single") + .ability(Abilities.BALL_FETCH) + .enemyAbility(Abilities.BALL_FETCH) + .moveset([Moves.DISABLE, Moves.SPLASH]) + .enemyMoveset(SPLASH_ONLY) + .starterSpecies(Species.PIKACHU) + .enemySpecies(Species.SHUCKLE); + }); + + it("restricts moves", async () => { + await game.classicMode.startBattle(); + + const enemyMon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.DISABLE); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextTurn(); + + expect(enemyMon.getMoveHistory()).toHaveLength(1); + expect(enemyMon.isMoveRestricted(Moves.SPLASH)).toBe(true); + }); + + it("fails if enemy has no move history", async() => { + await game.classicMode.startBattle(); + + const playerMon = game.scene.getPlayerPokemon()!; + const enemyMon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.DISABLE); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.toNextTurn(); + + expect(playerMon.getMoveHistory()[0]).toMatchObject({ move: Moves.DISABLE, result: MoveResult.FAIL }); + expect(enemyMon.isMoveRestricted(Moves.SPLASH)).toBe(false); + }, 20000); + + it("causes STRUGGLE if all usable moves are disabled", async() => { + await game.classicMode.startBattle(); + + const enemyMon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.DISABLE); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextTurn(); + + game.move.select(Moves.SPLASH); + await game.toNextTurn(); + + const enemyHistory = enemyMon.getMoveHistory(); + expect(enemyHistory).toHaveLength(2); + expect(enemyHistory[0].move).toBe(Moves.SPLASH); + expect(enemyHistory[1].move).toBe(Moves.STRUGGLE); + }, 20000); + + it("cannot disable STRUGGLE", async() => { + game.override.enemyMoveset(Array(4).fill(Moves.STRUGGLE)); + await game.classicMode.startBattle(); + + const playerMon = game.scene.getPlayerPokemon()!; + const enemyMon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.DISABLE); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextTurn(); + + expect(playerMon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + expect(enemyMon.getLastXMoves()[0].move).toBe(Moves.STRUGGLE); + expect(enemyMon.isMoveRestricted(Moves.STRUGGLE)).toBe(false); + }, 20000); + + it("interrupts target's move when target moves after", async() => { + await game.classicMode.startBattle(); + + const enemyMon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.SPLASH); + await game.toNextTurn(); + + // Both mons just used Splash last turn; now have player use Disable. + game.move.select(Moves.DISABLE); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.toNextTurn(); + + const enemyHistory = enemyMon.getMoveHistory(); + expect(enemyHistory).toHaveLength(2); + expect(enemyHistory[0]).toMatchObject({ move: Moves.SPLASH, result: MoveResult.SUCCESS }); + expect(enemyHistory[1].result).toBe(MoveResult.FAIL); + }, 20000); + + it("disables NATURE POWER, not the move invoked by it", async() => { + game.override.enemyMoveset(Array(4).fill(Moves.NATURE_POWER)); + await game.classicMode.startBattle(); + + const enemyMon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.DISABLE); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.toNextTurn(); + + expect(enemyMon.isMoveRestricted(Moves.NATURE_POWER)).toBe(true); + expect(enemyMon.isMoveRestricted(enemyMon.getLastXMoves(2)[1].move)).toBe(false); + }, 20000); +}); From 1968680104cfa9874e425f614e9e83a2a635feab Mon Sep 17 00:00:00 2001 From: Leo Kim <47556641+KimJeongSun@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:52:48 +0900 Subject: [PATCH 07/83] [Enhancement] add font size option per language on registration UI (#3849) * add language setting for register form ui * remove button fontsize option * fix tests * remove deprecated comments * update request changes * update requested changes from es * update requested changes from walker * Update src/locales/es/menu.json Co-authored-by: Asdar --------- Co-authored-by: Asdar --- src/locales/es/menu.json | 4 ++-- src/ui/registration-form-ui-handler.ts | 30 +++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/locales/es/menu.json b/src/locales/es/menu.json index bd2479a02df..3f2caafac21 100644 --- a/src/locales/es/menu.json +++ b/src/locales/es/menu.json @@ -14,14 +14,14 @@ "register": "Registrarse", "emptyUsername": "El usuario no puede estar vacío", "invalidLoginUsername": "El usuario no es válido", - "invalidRegisterUsername": "El usuario solo puede contener letras, números y guiones bajos", + "invalidRegisterUsername": "El usuario solo puede contener letras, números y guiones bajos.", "invalidLoginPassword": "La contraseña no es válida", "invalidRegisterPassword": "La contraseña debe tener 6 o más caracteres.", "usernameAlreadyUsed": "El usuario ya está en uso", "accountNonExistent": "El usuario no existe", "unmatchingPassword": "La contraseña no coincide", "passwordNotMatchingConfirmPassword": "Las contraseñas deben coincidir", - "confirmPassword": "Confirmar Contra.", + "confirmPassword": "Confirmar contraseña", "registrationAgeWarning": "Al registrarte, confirmas tener 13 o más años de edad.", "backToLogin": "Volver al Login", "failedToLoadSaveData": "No se han podido cargar los datos guardados. Por favor, recarga la página.\nSi el fallo continúa, por favor comprueba #announcements en nuestro Discord.", diff --git a/src/ui/registration-form-ui-handler.ts b/src/ui/registration-form-ui-handler.ts index 733aab79b05..0c4b54ac723 100644 --- a/src/ui/registration-form-ui-handler.ts +++ b/src/ui/registration-form-ui-handler.ts @@ -5,6 +5,20 @@ import { Mode } from "./ui"; import { TextStyle, addTextObject } from "./text"; import i18next from "i18next"; + +interface LanguageSetting { + inputFieldFontSize?: string, + warningMessageFontSize?: string, + errorMessageFontSize?: string, +} + +const languageSettings: { [key: string]: LanguageSetting } = { + "es":{ + inputFieldFontSize: "50px", + errorMessageFontSize: "40px", + } +}; + export default class RegistrationFormUiHandler extends FormModalUiHandler { getModalTitle(config?: ModalConfig): string { return i18next.t("menu:register"); @@ -50,7 +64,17 @@ export default class RegistrationFormUiHandler extends FormModalUiHandler { setup(): void { super.setup(); - const label = addTextObject(this.scene, 10, 87, i18next.t("menu:registrationAgeWarning"), TextStyle.TOOLTIP_CONTENT, { fontSize: "42px" }); + this.modalContainer.list.forEach((child: Phaser.GameObjects.GameObject) => { + if (child instanceof Phaser.GameObjects.Text && child !== this.titleText) { + const inputFieldFontSize = languageSettings[i18next.resolvedLanguage!]?.inputFieldFontSize; + if (inputFieldFontSize) { + child.setFontSize(inputFieldFontSize); + } + } + }); + + const warningMessageFontSize = languageSettings[i18next.resolvedLanguage!]?.warningMessageFontSize ?? "42px"; + const label = addTextObject(this.scene, 10, 87, i18next.t("menu:registrationAgeWarning"), TextStyle.TOOLTIP_CONTENT, { fontSize: warningMessageFontSize}); this.modalContainer.add(label); } @@ -68,6 +92,10 @@ export default class RegistrationFormUiHandler extends FormModalUiHandler { const onFail = error => { this.scene.ui.setMode(Mode.REGISTRATION_FORM, Object.assign(config, { errorMessage: error?.trim() })); this.scene.ui.playError(); + const errorMessageFontSize = languageSettings[i18next.resolvedLanguage!]?.errorMessageFontSize; + if (errorMessageFontSize) { + this.errorMessage.setFontSize(errorMessageFontSize); + } }; if (!this.inputs[0].text) { return onFail(i18next.t("menu:emptyUsername")); From 41bb12d0c06734c667918023c28f0caddd14738b Mon Sep 17 00:00:00 2001 From: "Dmitriy K." Date: Thu, 5 Sep 2024 06:08:00 -0400 Subject: [PATCH 08/83] skip pre-commit on merge and rebase, add pre-push (#1607) --- lefthook.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lefthook.yml b/lefthook.yml index 01ffebc69c7..662d3b5617b 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -2,6 +2,15 @@ pre-commit: parallel: true commands: eslint: - glob: '*.{js,jsx,ts,tsx}' + glob: "*.{js,jsx,ts,tsx}" run: npx eslint --fix {staged_files} - stage_fixed: true \ No newline at end of file + stage_fixed: true + skip: + - merge + - rebase + +pre-push: + commands: + eslint: + glob: "*.{js,ts,jsx,tsx}" + run: npx eslint --fix {push_files} \ No newline at end of file From c902369eed57b357924701f9d33f39ffe3a1a4b0 Mon Sep 17 00:00:00 2001 From: Lugiad Date: Thu, 5 Sep 2024 14:39:10 +0200 Subject: [PATCH 09/83] [Localization] Restoring "Safeguard" entries in arena-flyout.json of all locales where it existed (#4026) * Update arena-flyout.json * Update arena-flyout.json * Update arena-flyout.json * Update arena-flyout.json * Update arena-flyout.json * Update arena-flyout.json * Update arena-flyout.json * Update arena-flyout.json --- src/locales/de/arena-flyout.json | 5 +++-- src/locales/es/arena-flyout.json | 3 ++- src/locales/fr/arena-flyout.json | 5 +++-- src/locales/it/arena-flyout.json | 5 +++-- src/locales/ko/arena-flyout.json | 5 +++-- src/locales/pt_BR/arena-flyout.json | 3 ++- src/locales/zh_CN/arena-flyout.json | 5 +++-- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/locales/de/arena-flyout.json b/src/locales/de/arena-flyout.json index 30d3e7febb3..a1f2254c642 100644 --- a/src/locales/de/arena-flyout.json +++ b/src/locales/de/arena-flyout.json @@ -36,5 +36,6 @@ "matBlock": "Tatami-Schild", "craftyShield": "Trickschutz", "tailwind": "Rückenwind", - "happyHour": "Goldene Zeiten" -} \ No newline at end of file + "happyHour": "Goldene Zeiten", + "safeguard": "Bodyguard" +} diff --git a/src/locales/es/arena-flyout.json b/src/locales/es/arena-flyout.json index e3ec1dc6d4a..64c9a489d73 100644 --- a/src/locales/es/arena-flyout.json +++ b/src/locales/es/arena-flyout.json @@ -36,5 +36,6 @@ "matBlock": "Escudo Tatami", "craftyShield": "Truco Defensa", "tailwind": "Viento Afín", - "happyHour": "Paga Extra" + "happyHour": "Paga Extra", + "safeguard": "Velo Sagrado" } diff --git a/src/locales/fr/arena-flyout.json b/src/locales/fr/arena-flyout.json index ce78643862e..e90de13b20a 100644 --- a/src/locales/fr/arena-flyout.json +++ b/src/locales/fr/arena-flyout.json @@ -36,5 +36,6 @@ "matBlock": "Tatamigaeshi", "craftyShield": "Vigilance", "tailwind": "Vent Arrière", - "happyHour": "Étrennes" -} \ No newline at end of file + "happyHour": "Étrennes", + "safeguard": "Rune Protect" +} diff --git a/src/locales/it/arena-flyout.json b/src/locales/it/arena-flyout.json index ac6dd4225cc..31c2a4c0015 100644 --- a/src/locales/it/arena-flyout.json +++ b/src/locales/it/arena-flyout.json @@ -36,5 +36,6 @@ "matBlock": "Ribaltappeto", "craftyShield": "Truccodifesa", "tailwind": "Ventoincoda", - "happyHour": "Cuccagna" -} \ No newline at end of file + "happyHour": "Cuccagna", + "safeguard": "Salvaguardia" +} diff --git a/src/locales/ko/arena-flyout.json b/src/locales/ko/arena-flyout.json index bfd24776cdc..e4b271691a5 100644 --- a/src/locales/ko/arena-flyout.json +++ b/src/locales/ko/arena-flyout.json @@ -36,5 +36,6 @@ "matBlock": "마룻바닥세워막기", "craftyShield": "트릭가드", "tailwind": "순풍", - "happyHour": "해피타임" -} \ No newline at end of file + "happyHour": "해피타임", + "safeguard": "신비의부적" +} diff --git a/src/locales/pt_BR/arena-flyout.json b/src/locales/pt_BR/arena-flyout.json index e221fa6c0a5..a4be2727b27 100644 --- a/src/locales/pt_BR/arena-flyout.json +++ b/src/locales/pt_BR/arena-flyout.json @@ -36,5 +36,6 @@ "matBlock": "Mat Block", "craftyShield": "Crafty Shield", "tailwind": "Tailwind", - "happyHour": "Happy Hour" + "happyHour": "Happy Hour", + "safeguard": "Safeguard" } diff --git a/src/locales/zh_CN/arena-flyout.json b/src/locales/zh_CN/arena-flyout.json index 7ddc304f404..fbce213c4aa 100644 --- a/src/locales/zh_CN/arena-flyout.json +++ b/src/locales/zh_CN/arena-flyout.json @@ -36,5 +36,6 @@ "matBlock": "掀榻榻米", "craftyShield": "戏法防守", "tailwind": "顺风", - "happyHour": "快乐时光" -} \ No newline at end of file + "happyHour": "快乐时光", + "safeguard": "神秘守护" +} From 01eb05469a559670de1c4bf5804ddcd58f2fd0ad Mon Sep 17 00:00:00 2001 From: Opaque02 <66582645+Opaque02@users.noreply.github.com> Date: Fri, 6 Sep 2024 00:00:19 +1000 Subject: [PATCH 10/83] [QoL] Username finder (#4040) * Added the ability to potentially get username from login screen * Accidentally made dev login enforced :) * Updated image --- public/images/ui/legacy/settings_icon.png | Bin 0 -> 261 bytes public/images/ui/settings_icon.png | Bin 0 -> 261 bytes src/loading-scene.ts | 1 + src/ui/login-form-ui-handler.ts | 99 ++++++++++++++++++---- 4 files changed, 83 insertions(+), 17 deletions(-) create mode 100644 public/images/ui/legacy/settings_icon.png create mode 100644 public/images/ui/settings_icon.png diff --git a/public/images/ui/legacy/settings_icon.png b/public/images/ui/legacy/settings_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..21680cce7fcdc15309a67cc2465c6e5ee921cd56 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^;vmey3?#3AQJDm!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h2Ka=yM#aRKnOgvPWpUylqnJyA{DS}gXSjZf7pRtjv%n*=n1O-sFbFdq z&tH)OQtIjA7@`q8x8G6dfC3NG+W++>lUrB3?3rE^5Mi=5d79fPJ0b5i2{Rw1tSB!m z3NO07uGwDm_Y=JXp$790MX=uY-Mle>j`Jgt-2z5oiPL@^w*Q>}UwC;Gh1;^xF5?nCq9p#v3_#E=aWDeFnGH9xvXk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h2Ka=yM#aRKnOgvPWpUylqnJyA{DS}gXSjZf7pRtjv%n*=n1O-sFbFdq z&tH)OQtIjA7@`q8x8G6dfC3NG+W++>lUrB3?3rE^5Mi=5d79fPJ0b5i2{Rw1tSB!m z3NO07uGwDm_Y=JXp$790MX=uY-Mle>j`Jgt-2z5oiPL@^w*Q>}UwC;Gh1;^xF5?nCq9p#v3_#E=aWDeFnGH9xvX { - const redirectUri = encodeURIComponent(`${import.meta.env.VITE_SERVER_URL}/auth/google/callback`); - const googleId = import.meta.env.VITE_GOOGLE_CLIENT_ID; - const googleUrl = `https://accounts.google.com/o/oauth2/auth?client_id=${googleId}&redirect_uri=${redirectUri}&response_type=code&scope=openid`; - window.open(googleUrl, "_self"); - }); this.googleImage = googleImage; const discordImage = this.scene.add.image(20, 0, "discord"); @@ -46,12 +46,7 @@ export default class LoginFormUiHandler extends FormModalUiHandler { discordImage.setScale(0.07); discordImage.setInteractive(); discordImage.setName("discord-icon"); - discordImage.on("pointerdown", () => { - const redirectUri = encodeURIComponent(`${import.meta.env.VITE_SERVER_URL}/auth/discord/callback`); - const discordId = import.meta.env.VITE_DISCORD_CLIENT_ID; - const discordUrl = `https://discord.com/api/oauth2/authorize?client_id=${discordId}&redirect_uri=${redirectUri}&response_type=code&scope=identify&prompt=none`; - window.open(discordUrl, "_self"); - }); + this.discordImage = discordImage; this.externalPartyContainer.add(this.googleImage); @@ -60,6 +55,17 @@ export default class LoginFormUiHandler extends FormModalUiHandler { this.externalPartyContainer.add(this.googleImage); this.externalPartyContainer.add(this.discordImage); this.externalPartyContainer.setVisible(false); + + const usernameInfoImage = this.scene.add.image(20, 0, "settings_icon"); + usernameInfoImage.setOrigin(0, 0); + usernameInfoImage.setScale(0.5); + usernameInfoImage.setInteractive(); + usernameInfoImage.setName("username-info-icon"); + this.usernameInfoImage = usernameInfoImage; + + this.infoContainer.add(this.usernameInfoImage); + this.getUi().add(this.infoContainer); + this.infoContainer.setVisible(false); } getModalTitle(config?: ModalConfig): string { @@ -104,9 +110,8 @@ export default class LoginFormUiHandler extends FormModalUiHandler { show(args: any[]): boolean { if (super.show(args)) { - this.processExternalProvider(); - const config = args[0] as ModalConfig; + this.processExternalProvider(config); const originalLoginAction = this.submitAction; this.submitAction = (_) => { // Prevent overlapping overrides on action modification @@ -146,22 +151,73 @@ export default class LoginFormUiHandler extends FormModalUiHandler { clear() { super.clear(); this.externalPartyContainer.setVisible(false); + this.infoContainer.setVisible(false); this.discordImage.off("pointerdown"); this.googleImage.off("pointerdown"); + this.usernameInfoImage.off("pointerdown"); } - processExternalProvider() : void { + processExternalProvider(config: ModalConfig) : void { this.externalPartyTitle.setText(i18next.t("menu:orUse") ?? ""); this.externalPartyTitle.setX(20+this.externalPartyTitle.text.length); this.externalPartyTitle.setVisible(true); this.externalPartyContainer.setPositionRelative(this.modalContainer, 175, 0); this.externalPartyContainer.setVisible(true); - this.externalPartyBg.setSize(this.externalPartyTitle.text.length+50, this.modalBg.height); + this.externalPartyBg.setSize(this.externalPartyTitle.text.length + 50, this.modalBg.height); this.getUi().moveTo(this.externalPartyContainer, this.getUi().length - 1); this.googleImage.setPosition(this.externalPartyBg.width/3.1, this.externalPartyBg.height-60); this.discordImage.setPosition(this.externalPartyBg.width/3.1, this.externalPartyBg.height-40); + this.infoContainer.setPosition(5, -76); + this.infoContainer.setVisible(true); + this.getUi().moveTo(this.infoContainer, this.getUi().length - 1); + this.usernameInfoImage.setPositionRelative(this.infoContainer, 0, 0); + + this.discordImage.on("pointerdown", () => { + const redirectUri = encodeURIComponent(`${import.meta.env.VITE_SERVER_URL}/auth/discord/callback`); + const discordId = import.meta.env.VITE_DISCORD_CLIENT_ID; + const discordUrl = `https://discord.com/api/oauth2/authorize?client_id=${discordId}&redirect_uri=${redirectUri}&response_type=code&scope=identify&prompt=none`; + window.open(discordUrl, "_self"); + }); + + this.googleImage.on("pointerdown", () => { + const redirectUri = encodeURIComponent(`${import.meta.env.VITE_SERVER_URL}/auth/google/callback`); + const googleId = import.meta.env.VITE_GOOGLE_CLIENT_ID; + const googleUrl = `https://accounts.google.com/o/oauth2/auth?client_id=${googleId}&redirect_uri=${redirectUri}&response_type=code&scope=openid`; + window.open(googleUrl, "_self"); + }); + + const onFail = error => { + this.scene.ui.setMode(Mode.LOADING, { buttonActions: [] }); + this.scene.ui.setModeForceTransition(Mode.LOGIN_FORM, Object.assign(config, { errorMessage: error?.trim() })); + this.scene.ui.playError(); + }; + + this.usernameInfoImage.on("pointerdown", () => { + const localStorageKeys = Object.keys(localStorage); // this gets the keys for localStorage + const keyToFind = "data_"; + const dataKeys = localStorageKeys.filter(ls => ls.indexOf(keyToFind) >= 0); + if (dataKeys.length > 0 && dataKeys.length <= 2) { + const options: OptionSelectItem[] = []; + for (let i = 0; i < dataKeys.length; i++) { + options.push({ + label: dataKeys[i].replace(keyToFind, ""), + handler: () => { + this.scene.ui.revertMode(); + return true; + } + }); + } + this.scene.ui.setOverlayMode(Mode.OPTION_SELECT, { + options: options, + delay: 1000 + }); + } else { + return onFail("You have too many save files to use this"); + } + }); + this.externalPartyContainer.setAlpha(0); this.scene.tweens.add({ targets: this.externalPartyContainer, @@ -170,5 +226,14 @@ export default class LoginFormUiHandler extends FormModalUiHandler { y: "-=24", alpha: 1 }); + + this.infoContainer.setAlpha(0); + this.scene.tweens.add({ + targets: this.infoContainer, + duration: Utils.fixedInt(1000), + ease: "Sine.easeInOut", + y: "-=24", + alpha: 1 + }); } } From e2e5b2c34941a455388f1410db544e684baa393a Mon Sep 17 00:00:00 2001 From: Chapybara-jp Date: Thu, 5 Sep 2024 19:49:28 +0200 Subject: [PATCH 11/83] [Localisation] [JA] Translated remaining JA text files (#3999) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Localisation] [JA] Begun translation on arena-flyout.json * Added english names to bgm-name.json * Translated common.json * Added English dialogue-double-battle.json To make translation easier * Added English dialogue-final-boss.json * Added english dialogue-misc.json * Added English dialogue.json * Translated fight-ui-handler.json * Update filter-bar.json Changed 飴 to アメ for consistency with its spelling in Pokemon GO * Update game-stats-ui-handler.json changed 孵化 to ふか * Update growth.json Added kanji * Update menu-ui-handler.json changed 孵化 to ふか * Update modifier-type.json Changed name of IV Scanner to match with other files, the rest of the item descriptions need to be changed to Kanji as well. * Update modifier.json * Changed move-trigger.json Added kanji and new moves. * Update party-ui-handler.json Added kanji * Update pokemon-info-container.json Changed to Kanji * Translated pokemon-summary.json The metFragment formatting is taken from BW * Update run-history.json Corrected some misinterpretations. Added correct original line of "Welcome to Hall of Fame!" * Added english splash-messages.json * Update move-trigger.json * Update move-trigger.json * Update move-trigger.json * Update arena-flyout.json * Update move-trigger.json * Translated arena-flyout.json * Update weather.json * Update save-slot-select-ui-handler.json changed wave to ラウンド * Update game-stats-ui-handler.json * Update challenges.json * Update achv.json Corrected some mistakes, misspelling * Added some translations dialogue.json Youngster translation done Female rival dialogue done, needs check * Update dialogue.json * Update dialogue.json * Update dialogue.json * Update dialogue.json * Update dialogue.json --- src/locales/ja/achv.json | 14 +- src/locales/ja/arena-flyout.json | 44 +- src/locales/ja/bgm-name.json | 151 +- src/locales/ja/challenges.json | 2 +- src/locales/ja/common.json | 9 +- src/locales/ja/dialogue-double-battle.json | 85 +- src/locales/ja/dialogue-final-boss.json | 11 +- src/locales/ja/dialogue-misc.json | 7 +- src/locales/ja/dialogue.json | 2828 ++++++++++++++++- src/locales/ja/fight-ui-handler.json | 10 +- src/locales/ja/filter-bar.json | 4 +- src/locales/ja/game-stats-ui-handler.json | 12 +- src/locales/ja/growth.json | 14 +- src/locales/ja/menu-ui-handler.json | 4 +- src/locales/ja/modifier-type.json | 2 +- src/locales/ja/modifier.json | 10 +- src/locales/ja/move-trigger.json | 111 +- src/locales/ja/party-ui-handler.json | 12 +- src/locales/ja/pokemon-info-container.json | 12 +- src/locales/ja/pokemon-summary.json | 45 +- src/locales/ja/run-history.json | 10 +- .../ja/save-slot-select-ui-handler.json | 4 +- src/locales/ja/splash-messages.json | 37 +- src/locales/ja/weather.json | 16 +- 24 files changed, 3329 insertions(+), 125 deletions(-) diff --git a/src/locales/ja/achv.json b/src/locales/ja/achv.json index 182da0aed2e..fd5e4b9e6c4 100644 --- a/src/locales/ja/achv.json +++ b/src/locales/ja/achv.json @@ -37,7 +37,7 @@ "name_female": "ワンパンウーマン" }, "HealAchv": { - "description": "一つの　技や　特性や　持っているアイテムで\n{{healAmount}}{{HP}}を　一気に　回復する" + "description": "一つの　技や　特性や　持たせたアイテムで\n{{HP}}{{healAmount}}を　一気に　回復する" }, "250_HEAL": { "name": "回復発見者" @@ -52,7 +52,7 @@ "name": "ジョーイさん" }, "LevelAchv": { - "description": "一つの　ポケモンを　Lv{{level}}まで　レベルアップする" + "description": "一つの　ポケモンを　Lv.{{level}}まで　上げる" }, "LV_100": { "name": "まだまだだよ" @@ -82,7 +82,7 @@ "name": "マスターリーグチャンピオン" }, "TRANSFER_MAX_STAT_STAGE": { - "name": "同力", + "name": "連係プレー", "description": "少なくとも　一つの　能力を　最大まで　あげて\n他の　手持ちポケモンに　バトンタッチする" }, "MAX_FRIENDSHIP": { @@ -94,7 +94,7 @@ "description": "一つの　手持ちポケモンを　メガシンカさせる" }, "GIGANTAMAX": { - "name": "太―くて　堪らない", + "name": "太ーくて堪らない", "description": "一つの　手持ちポケモンを　キョダイマックスさせる" }, "TERASTALLIZE": { @@ -106,7 +106,7 @@ "description": "一つの　手持ちポケモンを　ステラ・テラスタルさせる" }, "SPLICE": { - "name": "インフィニット・フュジョン", + "name": "インフィニット・フュージョン", "description": "遺伝子のくさびで　二つの　ポケモンを　吸収合体させる" }, "MINI_BLACK_HOLE": { @@ -205,7 +205,7 @@ "description": "{{type}}タイプの　単一タイプチャレンジを　クリアする" }, "MONO_NORMAL": { - "name": "凡人" + "name": "超凡人" }, "MONO_FIGHTING": { "name": "八千以上だ!!" @@ -223,7 +223,7 @@ "name": "タケシの挑戦状" }, "MONO_BUG": { - "name": "チョウチョウせん者" + "name": "チョウチョウ戦者" }, "MONO_GHOST": { "name": "貞子ちゃん" diff --git a/src/locales/ja/arena-flyout.json b/src/locales/ja/arena-flyout.json index 9e26dfeeb6e..fa29b4567c5 100644 --- a/src/locales/ja/arena-flyout.json +++ b/src/locales/ja/arena-flyout.json @@ -1 +1,43 @@ -{} \ No newline at end of file +{ + "activeBattleEffects": "場の効果", + "player": "味方", + "neutral": "場の全員", + "enemy": "相手", + + "sunny": "晴れ", + "rain": "雨", + "sandstorm": "砂あらし", + "hail": "あられ", + "snow": "雪", + "fog": "きり", + "heavyRain": "強い雨", + "harshSun": "大日照り", + "strongWinds": "乱気流", + + "misty": "ミストフィールド", + "electric": "エレキフィールド", + "grassy": "グラスフィールド", + "psychic": "サイコフィールド", + + "mudSport": "どろあそび", + "waterSport": "みずあそび", + "spikes": "まきびし", + "toxicSpikes": "どくびし", + "mist": "しろいきり", + "futureSight": "みらいよち", + "doomDesire": "はめつのねがい", + "wish": "ねがいごと", + "stealthRock": "ステルスロック", + "stickyWeb": "ねばねばネット", + "trickRoom": "トリックルーム", + "gravity": "じゅうりょく", + "reflect": "リフレクター", + "lightScreen": "ひかりのかべ", + "auroraVeil": "オーロラベール", + "quickGuard": "ファストガード", + "wideGuard": "ワイドガード", + "matBlock": "たたみがえし", + "craftyShield": "トリックガード", + "tailwind": "おいかぜ", + "happyHour": "ハッピータイム" +} diff --git a/src/locales/ja/bgm-name.json b/src/locales/ja/bgm-name.json index 9e26dfeeb6e..8838942c8a6 100644 --- a/src/locales/ja/bgm-name.json +++ b/src/locales/ja/bgm-name.json @@ -1 +1,150 @@ -{} \ No newline at end of file +{ + "music": "Music: ", + "missing_entries": "{{name}}", + "battle_kanto_champion": "B2W2 Kanto Champion Battle", + "battle_johto_champion": "B2W2 Johto Champion Battle", + "battle_hoenn_champion_g5": "B2W2 Hoenn Champion Battle", + "battle_hoenn_champion_g6": "ORAS Hoenn Champion Battle", + "battle_sinnoh_champion": "B2W2 Sinnoh Champion Battle", + "battle_champion_alder": "BW Unova Champion Battle", + "battle_champion_iris": "B2W2 Unova Champion Battle", + "battle_kalos_champion": "XY Kalos Champion Battle", + "battle_alola_champion": "USUM Alola Champion Battle", + "battle_galar_champion": "SWSH Galar Champion Battle", + "battle_champion_geeta": "SV Champion Geeta Battle", + "battle_champion_nemona": "SV Champion Nemona Battle", + "battle_champion_kieran": "SV Champion Kieran Battle", + "battle_hoenn_elite": "ORAS Elite Four Battle", + "battle_unova_elite": "BW Elite Four Battle", + "battle_kalos_elite": "XY Elite Four Battle", + "battle_alola_elite": "SM Elite Four Battle", + "battle_galar_elite": "SWSH League Tournament Battle", + "battle_paldea_elite": "SV Elite Four Battle", + "battle_bb_elite": "SV BB League Elite Four Battle", + "battle_final_encounter": "PMD RTDX Rayquaza's Domain", + "battle_final": "BW Ghetsis Battle", + "battle_kanto_gym": "B2W2 Kanto Gym Battle", + "battle_johto_gym": "B2W2 Johto Gym Battle", + "battle_hoenn_gym": "B2W2 Hoenn Gym Battle", + "battle_sinnoh_gym": "B2W2 Sinnoh Gym Battle", + "battle_unova_gym": "BW Unova Gym Battle", + "battle_kalos_gym": "XY Kalos Gym Battle", + "battle_galar_gym": "SWSH Galar Gym Battle", + "battle_paldea_gym": "SV Paldea Gym Battle", + "battle_legendary_kanto": "XY Kanto Legendary Battle", + "battle_legendary_raikou": "HGSS Raikou Battle", + "battle_legendary_entei": "HGSS Entei Battle", + "battle_legendary_suicune": "HGSS Suicune Battle", + "battle_legendary_lugia": "HGSS Lugia Battle", + "battle_legendary_ho_oh": "HGSS Ho-oh Battle", + "battle_legendary_regis_g5": "B2W2 Legendary Titan Battle", + "battle_legendary_regis_g6": "ORAS Legendary Titan Battle", + "battle_legendary_gro_kyo": "ORAS Groudon & Kyogre Battle", + "battle_legendary_rayquaza": "ORAS Rayquaza Battle", + "battle_legendary_deoxys": "ORAS Deoxys Battle", + "battle_legendary_lake_trio": "ORAS Lake Guardians Battle", + "battle_legendary_sinnoh": "ORAS Sinnoh Legendary Battle", + "battle_legendary_dia_pal": "ORAS Dialga & Palkia Battle", + "battle_legendary_origin_forme": "LA Origin Dialga & Palkia Battle", + "battle_legendary_giratina": "ORAS Giratina Battle", + "battle_legendary_arceus": "HGSS Arceus Battle", + "battle_legendary_unova": "BW Unova Legendary Battle", + "battle_legendary_kyurem": "BW Kyurem Battle", + "battle_legendary_res_zek": "BW Reshiram & Zekrom Battle", + "battle_legendary_xern_yvel": "XY Xerneas & Yveltal Battle", + "battle_legendary_tapu": "SM Tapu Battle", + "battle_legendary_sol_lun": "SM Solgaleo & Lunala Battle", + "battle_legendary_ub": "SM Ultra Beast Battle", + "battle_legendary_dusk_dawn": "USUM Dusk Mane & Dawn Wings Necrozma Battle", + "battle_legendary_ultra_nec": "USUM Ultra Necrozma Battle", + "battle_legendary_zac_zam": "SWSH Zacian & Zamazenta Battle", + "battle_legendary_glas_spec": "SWSH Glastrier & Spectrier Battle", + "battle_legendary_calyrex": "SWSH Calyrex Battle", + "battle_legendary_riders": "SWSH Ice & Shadow Rider Calyrex Battle", + "battle_legendary_birds_galar": "SWSH Galarian Legendary Birds Battle", + "battle_legendary_ruinous": "SV Treasures of Ruin Battle", + "battle_legendary_kor_mir": "SV Depths of Area Zero Battle", + "battle_legendary_loyal_three": "SV Loyal Three Battle", + "battle_legendary_ogerpon": "SV Ogerpon Battle", + "battle_legendary_terapagos": "SV Terapagos Battle", + "battle_legendary_pecharunt": "SV Pecharunt Battle", + "battle_rival": "BW Rival Battle", + "battle_rival_2": "BW N Battle", + "battle_rival_3": "BW Final N Battle", + "battle_trainer": "BW Trainer Battle", + "battle_wild": "BW Wild Battle", + "battle_wild_strong": "BW Strong Wild Battle", + "end_summit": "PMD RTDX Sky Tower Summit", + "battle_rocket_grunt": "HGSS Team Rocket Battle", + "battle_aqua_magma_grunt": "ORAS Team Aqua & Magma Battle", + "battle_galactic_grunt": "BDSP Team Galactic Battle", + "battle_plasma_grunt": "BW Team Plasma Battle", + "battle_flare_grunt": "XY Team Flare Battle", + "battle_aether_grunt": "SM Aether Foundation Battle", + "battle_skull_grunt": "SM Team Skull Battle", + "battle_macro_grunt": "SWSH Trainer Battle", + "battle_galactic_admin": "BDSP Team Galactic Admin Battle", + "battle_skull_admin": "SM Team Skull Admin Battle", + "battle_oleana": "SWSH Oleana Battle", + "battle_rocket_boss": "USUM Giovanni Battle", + "battle_aqua_magma_boss": "ORAS Archie & Maxie Battle", + "battle_galactic_boss": "BDSP Cyrus Battle", + "battle_plasma_boss": "B2W2 Ghetsis Battle", + "battle_flare_boss": "XY Lysandre Battle", + "battle_aether_boss": "SM Lusamine Battle", + "battle_skull_boss": "SM Guzma Battle", + "battle_macro_boss": "SWSH Rose Battle", + + "abyss": "PMD EoS Dark Crater", + "badlands": "PMD EoS Barren Valley", + "beach": "PMD EoS Drenched Bluff", + "cave": "PMD EoS Sky Peak Cave", + "construction_site": "PMD EoS Boulder Quarry", + "desert": "PMD EoS Northern Desert", + "dojo": "PMD EoS Marowak Dojo", + "end": "PMD RTDX Sky Tower", + "factory": "PMD EoS Concealed Ruins", + "fairy_cave": "PMD EoS Star Cave", + "forest": "PMD EoS Dusk Forest", + "grass": "PMD EoS Apple Woods", + "graveyard": "PMD EoS Mystifying Forest", + "ice_cave": "PMD EoS Vast Ice Mountain", + "island": "PMD EoS Craggy Coast", + "jungle": "Lmz - Jungle", + "laboratory": "Firel - Laboratory", + "lake": "PMD EoS Crystal Cave", + "meadow": "PMD EoS Sky Peak Forest", + "metropolis": "Firel - Metropolis", + "mountain": "PMD EoS Mt. Horn", + "plains": "PMD EoS Sky Peak Prairie", + "power_plant": "PMD EoS Far Amp Plains", + "ruins": "PMD EoS Deep Sealed Ruin", + "sea": "Andr06 - Marine Mystique", + "seabed": "Firel - Seabed", + "slum": "Andr06 - Sneaky Snom", + "snowy_forest": "PMD EoS Sky Peak Snowfield", + "space": "Firel - Aether", + "swamp": "PMD EoS Surrounded Sea", + "tall_grass": "PMD EoS Foggy Forest", + "temple": "PMD EoS Aegis Cave", + "town": "PMD EoS Random Dungeon Theme 3", + "volcano": "PMD EoS Steam Cave", + "wasteland": "PMD EoS Hidden Highland", + "encounter_ace_trainer": "BW Trainers' Eyes Meet (Ace Trainer)", + "encounter_backpacker": "BW Trainers' Eyes Meet (Backpacker)", + "encounter_clerk": "BW Trainers' Eyes Meet (Clerk)", + "encounter_cyclist": "BW Trainers' Eyes Meet (Cyclist)", + "encounter_lass": "BW Trainers' Eyes Meet (Lass)", + "encounter_parasol_lady": "BW Trainers' Eyes Meet (Parasol Lady)", + "encounter_pokefan": "BW Trainers' Eyes Meet (Poke Fan)", + "encounter_psychic": "BW Trainers' Eyes Meet (Psychic)", + "encounter_rich": "BW Trainers' Eyes Meet (Gentleman)", + "encounter_rival": "BW Cheren", + "encounter_roughneck": "BW Trainers' Eyes Meet (Roughneck)", + "encounter_scientist": "BW Trainers' Eyes Meet (Scientist)", + "encounter_twins": "BW Trainers' Eyes Meet (Twins)", + "encounter_youngster": "BW Trainers' Eyes Meet (Youngster)", + "heal": "BW Pokémon Heal", + "menu": "PMD EoS Welcome to the World of Pokémon!", + "title": "PMD EoS Top Menu Theme" +} diff --git a/src/locales/ja/challenges.json b/src/locales/ja/challenges.json index 99c6e978d49..d137df14086 100644 --- a/src/locales/ja/challenges.json +++ b/src/locales/ja/challenges.json @@ -1,5 +1,5 @@ { - "title": "チャレンジを 設定", + "title": "チャレンジの設定", "illegalEvolution": "{{pokemon}}は　このチャレンジで\n対象外の　ポケモンに　なってしまった！", "singleGeneration": { "name": "単一世代", diff --git a/src/locales/ja/common.json b/src/locales/ja/common.json index 9e26dfeeb6e..d10e3e42c70 100644 --- a/src/locales/ja/common.json +++ b/src/locales/ja/common.json @@ -1 +1,8 @@ -{} \ No newline at end of file +{ + "start": "スタート", + "luckIndicator": "運：", + "shinyOnHover": "色違い", + "commonShiny": "ふつう", + "rareShiny": "レア", + "epicShiny": "超レア" +} diff --git a/src/locales/ja/dialogue-double-battle.json b/src/locales/ja/dialogue-double-battle.json index 9e26dfeeb6e..b2632f3b990 100644 --- a/src/locales/ja/dialogue-double-battle.json +++ b/src/locales/ja/dialogue-double-battle.json @@ -1 +1,84 @@ -{} \ No newline at end of file +{ + "blue_red_double": { + "encounter": { + "1": "Blue: Hey Red, let's show them what we're made of!\n$Red: ...\n$Blue: This is Pallet Town Power!" + }, + "victory": { + "1": "Blue: That was a great battle!\n$Red: ..." + } + }, + "red_blue_double": { + "encounter": { + "1": "Red: ...!\n$Blue: He never talks much.\n$Blue: But dont let that fool you! He is a champ after all!" + }, + "victory": { + "1": "Red: ...!\n$Blue: Next time we will beat you!" + } + }, + "tate_liza_double": { + "encounter": { + "1": "Tate: Are you surprised?\n$Liza: We are two gym leaders at once!\n$Tate: We are twins!\n$Liza: We dont need to talk to understand each other!\n$Tate: Twice the power...\n$Liza: Can you handle it?" + }, + "victory": { + "1": "Tate: What? Our combination was perfect!\n$Liza: Looks like we need to train more..." + } + }, + "liza_tate_double": { + "encounter": { + "1": "Liza: Hihihi... Are you surprised?\n$Tate: Yes, we are really two gym leaders at once!\n$Liza: This is my twin brother Tate!\n$Tate: And this is my twin sister Liza!\n$Liza: Don't you think we are a perfect combination?" + }, + "victory": { + "1": "Liza: Are we...\n$Tate: ...not as strong as we thought?" + } + }, + "wallace_steven_double": { + "encounter": { + "1": "Steven: Wallace, let's show them the power of the champions!\n$Wallace: We will show you the power of Hoenn!\n$Steven: Let's go!" + }, + "victory": { + "1": "Steven: That was a great battle!\n$Wallace: We will win next time!" + } + }, + "steven_wallace_double": { + "encounter": { + "1": "Steven: Do you have any rare Pokémon?\n$Wallace: Steven... We are here for a battle, not to show off our Pokémon.\n$Steven: Oh... I see... Let's go then!" + }, + "victory": { + "1": "Steven: Now that we are done with the battle, let's show off our Pokémon!\n$Wallace: Steven..." + } + }, + "alder_iris_double": { + "encounter": { + "1": "Alder: We are the strongest trainers in Unova!\n$Iris: Fights against strong trainers are the best!" + }, + "victory": { + "1": "Alder: Wow! You are super strong!\n$Iris: We will win next time!" + } + }, + "iris_alder_double": { + "encounter": { + "1": "Iris: Welcome Challenger! I am THE Unova Champion!\n$Alder: Iris, aren't you a bit too excited?", + "1_female": "Iris: Welcome Challenger! I am THE Unova Champion!\n$Alder: Iris, aren't you a bit too excited?" + }, + "victory": { + "1": "Iris: A loss like this is not easy to take...\n$Alder: But we will only get stronger with every loss!" + } + }, + "piers_marnie_double": { + "encounter": { + "1": "Marnie: Brother, let's show them the power of Spikemuth!\n$Piers: We bring darkness!" + }, + "victory": { + "1": "Marnie: You brought light to our darkness!\n$Piers: Its too bright..." + } + }, + "marnie_piers_double": { + "encounter": { + "1": "Piers: Ready for a concert?\n$Marnie: Brother... They are here to fight, not to sing...", + "1_female": "Piers: Ready for a concert?\n$Marnie: Brother... They are here to fight, not to sing..." + }, + "victory": { + "1": "Piers: Now that was a great concert!\n$Marnie: Brother..." + } + } +} diff --git a/src/locales/ja/dialogue-final-boss.json b/src/locales/ja/dialogue-final-boss.json index 9e26dfeeb6e..f20d0f013d1 100644 --- a/src/locales/ja/dialogue-final-boss.json +++ b/src/locales/ja/dialogue-final-boss.json @@ -1 +1,10 @@ -{} \ No newline at end of file +{ + "encounter": "It appears the time has finally come once again.\nYou know why you have come here, do you not?\n$You were drawn here, because you have been here before.\nCountless times.\n$Though, perhaps it can be counted.\nTo be precise, this is in fact your {{cycleCount}} cycle.\n$Each cycle your mind reverts to its former state.\nEven so, somehow, remnants of your former selves remain.\n$Until now you have yet to succeed, but I sense a different presence in you this time.\n\n$You are the only one here, though it is as if there is… another.\n$Will you finally prove a formidable challenge to me?\nThe challenge I have longed after for millennia?\n$We begin.", + "encounter_female": "It appears the time has finally come once again.\nYou know why you have come here, do you not?\n$You were drawn here, because you have been here before.\nCountless times.\n$Though, perhaps it can be counted.\nTo be precise, this is in fact your {{cycleCount}} cycle.\n$Each cycle your mind reverts to its former state.\nEven so, somehow, remnants of your former selves remain.\n$Until now you have yet to succeed, but I sense a different presence in you this time.\n\n$You are the only one here, though it is as if there is… another.\n$Will you finally prove a formidable challenge to me?\nThe challenge I have longed after for millennia?\n$We begin.", + "firstStageWin": "I see. The presence I felt was indeed real.\nIt appears I no longer need to hold back.\n$Do not disappoint me.", + "secondStageWin": "…Magnificent.", + "key_ordinal_one": "st", + "key_ordinal_two": "nd", + "key_ordinal_few": "rd", + "key_ordinal_other": "th" +} diff --git a/src/locales/ja/dialogue-misc.json b/src/locales/ja/dialogue-misc.json index 9e26dfeeb6e..2f333b5f383 100644 --- a/src/locales/ja/dialogue-misc.json +++ b/src/locales/ja/dialogue-misc.json @@ -1 +1,6 @@ -{} \ No newline at end of file +{ + "ending": "@c{shock}You're back?@d{32} Does that mean…@d{96} you won?!\n@c{smile_ehalf}I should have known you had it in you.\n$@c{smile_eclosed}Of course… I always had that feeling.\n@c{smile}It's over now, right? You ended the loop.\n$@c{smile_ehalf}You fulfilled your dream too, didn't you?\nYou didn't lose even once.\n$I'll be the only one to remember what you did.\n@c{angry_mopen}I'll try not to forget!\n$@c{smile_wave_wink}Just kidding!@d{64} @c{smile}I'd never forget.@d{32}\nYour legend will live on in our hearts.\n$@c{smile_wave}Anyway,@d{64} it's getting late…@d{96} I think?\nIt's hard to tell in this place.\n$Let's go home. @c{smile_wave_wink}Maybe tomorrow, we can have another battle, for old time's sake?", + "ending_female": "@c{smile}Oh? You won?@d{96} @c{smile_eclosed}I guess I should've known.\nBut, you're back now.\n$@c{smile}It's over.@d{64} You ended the loop.\n$@c{serious_smile_fists}You fulfilled your dream too, didn't you?\nYou didn't lose even once.\n$@c{neutral}I'm the only one who'll remember what you did.@d{96}\nI guess that's okay, isn't it?\n$@c{serious_smile_fists}Your legend will always live on in our hearts.\n$@c{smile_eclosed}Anyway, I've had about enough of this place, haven't you? Let's head home.\n$@c{serious_smile_fists}Maybe when we get back, we can have another battle?\nIf you're up to it.", + "ending_endless": "Congratulations on reaching the current end!\nMore content is coming soon.", + "ending_name": "Devs" +} diff --git a/src/locales/ja/dialogue.json b/src/locales/ja/dialogue.json index 9e26dfeeb6e..6130ade1cb4 100644 --- a/src/locales/ja/dialogue.json +++ b/src/locales/ja/dialogue.json @@ -1 +1,2827 @@ -{} \ No newline at end of file +{ + "youngster": { + "encounter": { + "1": "よっ　勝負する？", + "2": "あっ　君も　駆け出し　トレーナーだね？", + "2_female": "あっ　きみも　駆け出し　トレーナーだね？", + "3": "あっ 初めてみる 人！　勝負だ！", + "4": "さっき　負けて　悔しいから　ポケモン　探してるんだよ。\nでも 君 弱そうだな……　よしっ！　勝負　しようぜ！", + "4_female": "さっき　負けて　悔しいから　ポケモン　探してるんだよ。\nでも 君 弱そうだな……　よしっ！　勝負　しようぜ！", + "5": "お久しぶりかな？　初めましてかな？\n覚えてないけど　ヨロシクね！", + "6": "よーし　行くぞー！", + "7": "よっしゃ　行っくぜー！\n僕の　パワー　見せてやる！", + "8": "へへへ……　見せて あげるね！\n僕の ポケモンの すごさを！", + "9": "挨拶 なんて よかよか！　いつでも かかってきんしゃい！", + "9_female": "挨拶 なんて よかよか！　いつでも かかってきんしゃい！", + "10": "小僧　　だからって　油断してると\n君　泣いちゃう　かもしれないよー.", + "11": "大事に　育てた　ポケモンだぞー！\n絶対　倒しちゃ　ダメなんだぞ！", + "12": "よく来たな！\nこっから　先は　一筋縄じゃ　いかないぞ！", + "12_female": "よく来たな！\nこっから　先は　一筋縄じゃ　いかないぞ！", + "13": "勝負は　続くよ！　いつまでも！\n終わりなき　世界へ　ようこそ！", + "13_female": "勝負は　続くよ！\nいつまでも！　終わりなき　世界へ　ようこそ！" + }, + "victory": { + "1": "スゴッ！　君　強いんだ！", + "1_femal1e": "スゴッ！　君　強いんだ！", + "2": "敵わなかったね？", + "3": "僕　大きくなったら　絶対　君を　倒すよ！", + "4": "ゲッ　戦えるポケモン　もう　いない…", + "5": "トホ……　トホホーイ……\nまた　負けちゃったよ……", + "5_female": "トホ……　トホホーイ……\nまた　負けちゃったよ……", + "6": "うわー！　負けたー！！", + "7": "すごいな　君の　パワーは！\nビックリで　ドッキリだよ！", + "8": "そんな……　どうして……\n僕の　ポケモンは　サイキョー　なのに……", + "9": "また　バトルして　くれよな！\n次は　負けないからな！", + "10": "も～！ 僕は　小僧だけ　だよ！\nそんな全力で　戦っちゃ　ひどいぞ！", + "11": "君の　ポケモンの　方が　すごい！\n僕のと　交換しておくれよ！", + "12": "さっきは　勢いで　言ったけど\n一筋縄って　どんな縄？", + "13": "あはは　さすが！　さすがだね！\nもう　君も　この世界の　住人だ！" + } + }, + "lass": { + "encounter": { + "1": "Let's have a battle, shall we?", + "2": "You look like a new trainer. Let's have a battle!", + "2_female": "You look like a new trainer. Let's have a battle!", + "3": "I don't recognize you. How about a battle?", + "4": "Let's have a fun Pokémon battle!", + "5": "I'll show you the ropes of how to really use Pokémon!", + "6": "A serious battle starts from a serious beginning! Are you sure you're ready?", + "6_female": "A serious battle starts from a serious beginning! Are you sure you're ready?", + "7": "You're only young once. And you only get one shot at a given battle. Soon, you'll be nothing but a memory.", + "8": "You'd better go easy on me, OK? Though I'll be seriously fighting!", + "9": "School is boring. I've got nothing to do. Yawn. I'm only battling to kill the time." + }, + "victory": { + "1": "That was impressive! I've got a lot to learn.", + "2": "I didn't think you'd beat me that bad…", + "2_female": "I didn't think you'd beat me that bad…", + "3": "I hope we get to have a rematch some day.", + "4": "That was pretty amazingly fun! You've totally exhausted me…", + "5": "You actually taught me a lesson! You're pretty amazing!", + "6": "Seriously, I lost. That is, like, seriously depressing, but you were seriously cool.", + "6_female": "Seriously, I lost. That is, like, seriously depressing, but you were seriously cool.", + "7": "I don't need memories like this. Deleting memory…", + "8": "Hey! I told you to go easy on me! Still, you're pretty cool when you're serious.", + "8_female": "Hey! I told you to go easy on me! Still, you're pretty cool when you're serious.", + "9": "I'm actually getting tired of battling… There's gotta be something new to do…" + } + }, + "breeder": { + "encounter": { + "1": "Obedient Pokémon, selfish Pokémon… Pokémon have unique characteristics.", + "2": "Even though my upbringing and behavior are poor, I've raised my Pokémon well.", + "3": "Hmm, do you discipline your Pokémon? Pampering them too much is no good." + }, + "victory": { + "1": "It is important to nurture and train each Pokémon's characteristics.", + "2": "Unlike my diabolical self, these are some good Pokémon.", + "3": "Too much praise can spoil both Pokémon and people." + }, + "defeat": { + "1": "You should not get angry at your Pokémon, even if you lose a battle.", + "2": "Right? Pretty good Pokémon, huh? I'm suited to raising things.", + "3": "No matter how much you love your Pokémon, you still have to discipline them when they misbehave." + } + }, + "breeder_female": { + "encounter": { + "1": "Pokémon never betray you. They return all the love you give them.", + "2": "Shall I give you a tip for training good Pokémon?", + "3": "I have raised these very special Pokémon using a special method." + }, + "victory": { + "1": "Ugh… It wasn't supposed to be like this. Did I administer the wrong blend?", + "2": "How could that happen to my Pokémon… What are you feeding your Pokémon?", + "3": "If I lose, that tells you I was just killing time. It doesn't damage my ego at all." + }, + "defeat": { + "1": "This proves my Pokémon have accepted my love.", + "2": "The real trick behind training good Pokémon is catching good Pokémon.", + "3": "Pokémon will be strong or weak depending on how you raise them." + } + }, + "fisherman": { + "encounter": { + "1": "Aack! You made me lose a bite!\nWhat are you going to do about it?", + "2": "Go away! You're scaring the Pokémon!", + "3": "Let's see if you can reel in a victory!" + }, + "victory": { + "1": "Just forget about it.", + "2": "Next time, I'll be reelin' in the triumph!", + "3": "Guess I underestimated the currents this time." + } + }, + "fisherman_female": { + "encounter": { + "1": "Woah! I've hooked a big one!", + "2": "Line's in, ready to reel in success!", + "3": "Ready to make waves!" + }, + "victory": { + "1": "I'll be back with a stronger hook.", + "2": "I'll reel in victory next time.", + "3": "I'm just sharpening my hooks for the comeback!" + } + }, + "swimmer": { + "encounter": { + "1": "Time to dive in!", + "2": "Let's ride the waves of victory!", + "3": "Ready to make a splash!" + }, + "victory": { + "1": "Drenched in defeat!", + "2": "A wave of defeat!", + "3": "Back to shore, I guess." + } + }, + "backpacker": { + "encounter": { + "1": "Pack up, game on!", + "2": "Let's see if you can keep pace!", + "3": "Gear up, challenger!", + "4": "I've spent 20 years trying to find myself… But where am I?" + }, + "victory": { + "1": "Tripped up this time!", + "2": "Oh, I think I'm lost.", + "3": "Dead end!", + "4": "Wait up a second! Hey! Don't you know who I am?" + } + }, + "ace_trainer": { + "encounter": { + "1": "You seem quite confident.", + "1_female": "You seem quite confident.", + "2": "Your Pokémon… Show them to me…", + "3": "Because I'm an Ace Trainer, people think I'm strong.", + "4": "Are you aware of what it takes to be an Ace Trainer?" + }, + "victory": { + "1": "Yes… You have good Pokémon…", + "2": "What?! But I'm a battling genius!", + "3": "Of course, you are the main character!", + "3_female": "Of course, you are the main character!", + "4": "OK! OK! You could be an Ace Trainer!", + "4_female": "OK! OK! You could be an Ace Trainer!" + }, + "defeat": { + "1": "I am devoting my body and soul to Pokémon battles!", + "2": "All within my expectations… Nothing to be surprised about…", + "3": "I thought I'd grow up to be a frail person who looked like they would break if you squeezed them too hard.", + "4": "Of course I'm strong and don't lose. It's important that I win gracefully." + } + }, + "parasol_lady": { + "encounter": { + "1": "Time to grace the battlefield with elegance and poise!" + }, + "victory": { + "1": "My elegance remains unbroken!" + } + }, + "twins": { + "encounter": { + "1": "Get ready, because when we team up, it's double the trouble!", + "2": "Two hearts, one strategy – let's see if you can keep up with our twin power!", + "3": "Hope you're ready for double trouble, because we're about to bring the heat!", + "3_female": "Hope you're ready for double trouble, because we're about to bring the heat!" + }, + "victory": { + "1": "We may have lost this round, but our bond remains unbreakable!", + "2": "Our twin spirit won't be dimmed for long.", + "3": "We'll come back stronger as a dynamic duo!" + }, + "defeat": { + "1": "Twin power reigns supreme!", + "2": "Two hearts, one triumph!", + "3": "Double the smiles, double the victory dance!" + } + }, + "cyclist": { + "encounter": { + "1": "Get ready to eat my dust!", + "2": "Gear up, challenger! I'm about to leave you in the dust!", + "3": "Pedal to the metal, let's see if you can keep pace!" + }, + "victory": { + "1": "Spokes may be still, but determination pedals on.", + "2": "Outpaced!", + "3": "The road to victory has many twists and turns yet to explore." + } + }, + "black_belt": { + "encounter": { + "1": "I praise your courage in challenging me! For I am the one with the strongest kick!", + "2": "Oh, I see. Would you like to be cut to pieces? Or do you prefer the role of punching bag?", + "2_female": "Oh, I see. Would you like to be cut to pieces? Or do you prefer the role of punching bag?" + }, + "victory": { + "1": "Oh. The Pokémon did the fighting. My strong kick didn't help a bit.", + "2": "Hmmm… If I was going to lose anyway, I was hoping to get totally messed up in the process." + } + }, + "battle_girl": { + "encounter": { + "1": "You don't have to try to impress me. You can lose against me." + }, + "victory": { + "1": "It's hard to say good-bye, but we are running out of time…" + } + }, + "hiker": { + "encounter": { + "1": "My middle-age spread has given me as much gravitas as the mountains I hike!", + "2": "I inherited this big-boned body from my parents… I'm like a living mountain range…" + }, + "victory": { + "1": "At least I cannot lose when it comes to BMI!", + "2": "It's not enough… It's never enough. My bad cholesterol isn't high enough…" + } + }, + "ranger": { + "encounter": { + "1": "When I am surrounded by nature, most other things cease to matter.", + "2": "When I'm living without nature in my life, sometimes I'll suddenly feel an anxiety attack coming on." + }, + "victory": { + "1": "It doesn't matter to the vastness of nature whether I win or lose…", + "2": "Something like this is pretty trivial compared to the stifling feelings of city life." + }, + "defeat": { + "1": "I won the battle. But victory is nothing compared to the vastness of nature…", + "2": "I'm sure how you feel is not so bad if you compare it to my anxiety attacks…" + } + }, + "scientist": { + "encounter": { + "1": "My research will lead this world to peace and joy." + }, + "victory": { + "1": "I am a genius… I am not supposed to lose against someone like you…" + } + }, + "school_kid": { + "encounter": { + "1": "…Heehee. I'm confident in my calculations and analysis.", + "2": "I'm gaining as much experience as I can because I want to be a Gym Leader someday." + }, + "victory": { + "1": "Ohhhh… Calculation and analysis are perhaps no match for chance…", + "2": "Even difficult, trying experiences have their purpose, I suppose." + } + }, + "artist": { + "encounter": { + "1": "I used to be popular, but now I am all washed up." + }, + "victory": { + "1": "As times change, values also change. I realized that too late." + } + }, + "guitarist": { + "encounter": { + "1": "Get ready to feel the rhythm of defeat as I strum my way to victory!" + }, + "victory": { + "1": "Silenced for now, but my melody of resilience will play on." + } + }, + "worker": { + "encounter": { + "1": "It bothers me that people always misunderstand me. I'm a lot more pure than everyone thinks." + }, + "victory": { + "1": "I really don't want my skin to burn, so I want to stay in the shade while I work." + } + }, + "worker_female": { + "encounter": { + "1": "It bothers me that people always misunderstand me.\n$I'm a lot more pure than everyone thinks." + }, + "victory": { + "1": "I really don't want my skin to burn, so I want to stay in the shade while I work." + }, + "defeat": { + "1": "My body and mind aren't necessarily always in sync." + } + }, + "worker_double": { + "encounter": { + "1": "I'll show you we can break you. We've been training in the field!" + }, + "victory": { + "1": "How strange… How could this be… I shouldn't have been outmuscled." + } + }, + "hex_maniac": { + "encounter": { + "1": "I normally only ever listen to classical music, but if I lose, I think I shall try a bit of new age!", + "2": "I grow stronger with each tear I cry." + }, + "victory": { + "1": "Is this the dawning of the age of Aquarius?", + "2": "Now I can get even stronger. I grow with every grudge." + }, + "defeat": { + "1": "New age simply refers to twentieth century classical composers, right?", + "2": "Don't get hung up on sadness or frustration. You can use your grudges to motivate yourself.", + "2_female": "Don't get hung up on sadness or frustration. You can use your grudges to motivate yourself." + } + }, + "psychic": { + "encounter": { + "1": "Hi! Focus!" + }, + "victory": { + "1": "Eeeeek!" + } + }, + "officer": { + "encounter": { + "1": "Brace yourself, because justice is about to be served!", + "2": "Ready to uphold the law and serve justice on the battlefield!" + }, + "victory": { + "1": "The weight of justice feels heavier than ever…", + "2": "The shadows of defeat linger in the precinct." + } + }, + "beauty": { + "encounter": { + "1": "My last ever battle… That's the way I'd like us to view this match…" + }, + "victory": { + "1": "It's been fun… Let's have another last battle again someday…" + } + }, + "baker": { + "encounter": { + "1": "Hope you're ready to taste defeat!", + "1_female": "Hope you're ready to taste defeat!" + }, + "victory": { + "1": "I'll bake a comeback." + } + }, + "biker": { + "encounter": { + "1": "Time to rev up and leave you in the dust!" + }, + "victory": { + "1": "I'll tune up for the next race." + } + }, + "firebreather": { + "encounter": { + "1": "My flames shall devour you!", + "2": "My soul is on fire. I'll show you how hot it burns!", + "3": "Step right up and take a look!" + }, + "victory": { + "1": "I burned down to ashes...", + "2": "Yow! That's hot!", + "3": "Ow! I scorched the tip of my nose!" + } + }, + "sailor": { + "encounter": { + "1": "Matey, you're walking the plank if you lose!", + "2": "Come on then! My sailor's pride is at stake!", + "3": "Ahoy there! Are you seasick?", + "3_female": "Ahoy there! Are you seasick?" + }, + "victory": { + "1": "Argh! Beaten by a kid!", + "2": "Your spirit sank me!", + "3": "I think it's me that's seasick..." + } + }, + "archer": { + "encounter": { + "1": "Before you go any further, let's see how you fare against us, Team Rocket!", + "2": "I have received reports that your skills are not insignificant. Let's see if they are true.", + "3": "I am Archer, an Admin of Team Rocket. And I do not go easy on enemies of our organization." + }, + "victory": { + "1": "What a blunder!", + "2": "With my current skills, I was not up to the task after all.", + "3": "F-forgive me, Giovanni... For me to be defeated by a mere trainer..." + } + }, + "ariana": { + "encounter": { + "1": "Hold it right there! We can't someone on the loose.\n$It's harmful to Team Rocket's pride, you see.", + "2": "I don't know or care if what I'm doing is right or wrong...\n$I just put my faith in Giovanni and do as I am told", + "3": "Your trip ends here. I'm going to take you down!" + }, + "victory": { + "1": "Tch, you really are strong. It's too bad.\n$If you were to join Team Rocket, you could become an Executive.", + "1_female": "Tch, you really are strong. It's too bad.\n$If you were to join Team Rocket, you could become an Executive.", + "2": "I... I'm shattered...", + "3": "Aaaieeeee! This can't be happening! I fought hard, but I still lost…" + } + }, + "proton": { + "encounter": { + "1": "What do you want? If you interrupt our work, don't expect any mercy!", + "2": "What do we have here? I am often labeled as the scariest and cruelest guy in Team Rocket…\n$I strongly urge you not to interfere with our business!", + "3": "I am Proton, an Admin of Team Rocket. I am here to put an end to your meddling!" + }, + "victory": { + "1": "The fortress came down!", + "2": "You may have won this time… But all you did was make Team Rocket's wrath grow…", + "3": "I am defeated… But I will not forget this!" + } + }, + "petrel": { + "encounter": { + "1": "Muhahaha, we've been waiting for you. Me? You don't know who I am? It is me, Giovanni.\n$The majestic Giovanni himself! Wahahaha! …Huh? I don't sound anything like Giovanni?\n$I don't even look like Giovanni? How come? I've worked so hard to mimic him!", + "2": "I am Petrel, an Admin of Team Rocket. I will not allow you to interfere with our plans!", + "3": "Rocket Executive Petrel will deal with this intruder!" + }, + "victory": { + "1": "OK, OK. I'll tell you where he is.", + "2": "I… I couldn't do a thing… Giovanni, please forgive me…", + "3": "No, I can't let this affect me. I have to inform the others…" + } + }, + "tabitha": { + "encounter": { + "1": "Hehehe! So you've come all the way here! But you're too late!", + "2": "Hehehe... Got here already, did you? We underestimated you! But this is it! \n$I'm a cut above the Grunts you've seen so far. I'm not stalling for time.\n$I'm going to pulverize you!", + "3": "I'm going to give you a little taste of pain! Resign yourself to it!" + }, + "victory": { + "1": "Hehehe! You might have beaten me, but you don't stand a chance against the boss!\n$If you get lost now, you won't have to face a sound whipping!", + "2": "Hehehe... So, I lost, too...", + "3": "Ahya! How could this be? For an Admin like me to lose to some random trainer...", + "3_female": "Ahya! How could this be? For an Admin like me to lose to some random trainer..." + } + }, + "courtney": { + "encounter": { + "1": "Don't. Get. In. My. Way.", + "2": "You... ...I want to...analyze. Ahahaha", + "3": "... Well then...Deleting..." + }, + "victory": { + "1": "Hah hah... Uhn...hah hah...", + "2": "As anticipated. Unanticipated. You. Target lock...completed.\n$Commencing...experiment. You. Forever. Aha... ♪", + "3": "That's unanticipated. ...I knew it. You...are interesting! ...Haha. ♪" + } + }, + "shelly": { + "encounter": { + "1": "Ahahahaha! You're going to meddle in Team Aqua's affairs?\n$You're either absolutely fearless, simply ignorant, or both!\n$You're so cute, you're disgusting! I'll put you down", + "2": "What's this? Who's this spoiled brat?", + "3": "Cool your jets. Be patient. I'll crush you shortly.", + "3_female": "Cool your jets. Be patient. I'll crush you shortly." + }, + "victory": { + "1": "Ahahahaha! We got meddled with unexpectedly! We're out of options.\n$We'll have to pull out. But this isn't the last you'll see of Team Aqua!\n$We have other plans! Don't you forget it!", + "2": "Ahhh?! Did I go too easy on you?!", + "3": "Uh. Are you telling me you've upped your game even more during the fight?\n$You're a brat with a bright future… My Pokémon and I don't have any strength left to fight…\n$Go on… Go and be destroyed by Archie.", + "3_female": "Uh. Are you telling me you've upped your game even more during the fight?\n$You're a brat with a bright future… My Pokémon and I don't have any strength left to fight…\n$Go on… Go and be destroyed by Archie." + } + }, + "matt": { + "encounter": { + "1": "All right then, until the boss has time for you, I'll be your opponent!", + "2": "Hooah! Full on! I'm burning up! Well! Welll! Wellllll! Let's battle it out until we've got nothing left!", + "3": "Hoo hah! I'm gonna smash you up!" + }, + "victory": { + "1": "Muwuhahaha! That battle was fun even though I lost!", + "2": "I can feel it! I can feel it, all right! The strength coming offa you!\n$More! I still want more! But looks like we're outta time...", + "3": "Oho! That's a loss I can be proud of!", + "3_female": "Oho! That's a loss I can be proud of!" + } + }, + "mars": { + "encounter": { + "1": "I'm Mars, one of Team Galactic's top Commanders.", + "2": "Team Galactic's vision for the future is unwavering. Opposition will be crushed without mercy!", + "3": "Feeling nervous? You should be!", + "3_female": "Feeling nervous? You should be!" + }, + "victory": { + "1": "This can't be happening! How did I lose?!", + "2": "You have some skill, I'll give you that.", + "3": "Defeated... This was a costly mistake." + } + }, + "jupiter": { + "encounter": { + "1": "Jupiter, Commander of Team Galactic, at your service.", + "2": "Resistance is futile. Team Galactic will prevail!", + "3": "You're trembling... scared already?" + }, + "victory": { + "1": "No way... I lost?!", + "2": "Impressive, you've got guts!", + "3": "Losing like this... How embarrassing." + } + }, + "saturn": { + "encounter": { + "1": "I am Saturn, Commander of Team Galactic.", + "2": "Our mission is absolute. Any hindrance will be obliterated!", + "3": "Is that fear I see in your eyes?" + }, + "victory": { + "1": "Impossible... Defeated by you?!", + "2": "You have proven yourself a worthy adversary.", + "3": "Bestowed in defeat... This is unacceptable." + } + }, + "zinzolin": { + "encounter": { + "1": "You could become a threat to Team Plasma, so we will eliminate you here and now!", + "1_female": "You could become a threat to Team Plasma, so we will eliminate you here and now!", + "2": "You don't have the sense to know when to quit, it seems. It's an act of mercy on my part to bring an end to this now!", + "3": "You're an impressive Trainer to have made it this far. But it ends here.", + "3_female": "You're an impressive Trainer to have made it this far. But it ends here." + }, + "victory": { + "1": "Ghetsis... I have failed you...", + "2": "It's bitter cold. I'm shivering. I'm suffering. Yet, we will stand victorious.", + "3": "Hmph. You're a smarter Trainer than I expected, but not smart enough.", + "3_female": "Hmph. You're a smarter Trainer than I expected, but not smart enough." + } + }, + "rood": { + "encounter": { + "1": "You are a threat to Team Plasma. We cannot let you walk away from here and now!", + "1_female": "You are a threat to Team Plasma. We cannot let you walk away from here and now!", + "2": "It seems you don't know when to give up. I'll make sure no one interferes with our plans!", + "3": "You are a remarkable Trainer to have made it this far. But this is where it ends.", + "3_female": "You are a remarkable Trainer to have made it this far. But this is where it ends." + }, + "victory": { + "1": "Ghetsis... I have failed my mission...", + "2": "The cold is piercing. I'm shivering. I'm suffering. Yet, we will stand triumphant.", + "3": "Hm. You are a talented Trainer, but unfortunately not talented enough." + } + }, + "xerosic": { + "encounter": { + "1": "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!", + "1_female": "Ah ha ha! It would be my pleasure. Come on, little Trainer! Let's see what you've got!", + "2": "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.", + "2_female": "Hmm... You're more powerful than you look. I wonder how much energy there is inside you.", + "3": "I've been waiting for you! I need to do a little research on you! Come, let us begin!" + }, + "victory": { + "1": "Ah, you're quite strong. Oh yes—very strong, indeed.", + "2": "Ding-ding-ding! You did it! To the victor go the spoils!", + "2_female": "Ding-ding-ding! You did it! To the victor go the spoils!", + "3": "Wonderful! Amazing! You have tremendous skill and bravery!" + } + }, + "bryony": { + "encounter": { + "1": "I am Bryony, and it would be my pleasure to battle you. Show me what you've got.", + "2": "Impressive... You're more powerful than you appear. Let's see the true extent of your energy.", + "2_female": "Impressive... You're more powerful than you appear. Let's see the true extent of your energy.", + "3": "I've anticipated your arrival. It's time for a little test. Shall we begin?" + }, + "victory": { + "1": "You're quite strong. Oh yes—very strong, indeed.", + "2": "Ding-ding-ding! You've done well. Victory is yours.", + "3": "Wonderful! Remarkable! Your skill and bravery are commendable." + } + }, + "rocket_grunt": { + "encounter": { + "1": "Prepare for trouble!", + "2": "We're pulling a big job here! Get lost, kid!", + "2_female": "We're pulling a big job here! Get lost, kid!", + "3": "Hand over your Pokémon, or face the wrath of Team Rocket!", + "4": "You're about to experience the true terror of Team Rocket!", + "5": "Hey, kid! Me am a Team Rocket member kind of guy!", + "5_female": "Hey, kid! Me am a Team Rocket member kind of guy!" + }, + "victory": { + "1": "Team Rocket blasting off again!", + "2": "Oh no! I dropped the Lift Key!", + "3": "I blew it!", + "4": "My associates won't stand for this!", + "5": "You say what? Team Rocket bye-bye a go-go? Broken it is says you?" + } + }, + "magma_grunt": { + "encounter": { + "1": "If you get in the way of Team Magma, don’t expect any mercy!", + "2": "You'd better not interfere with our plans! We're making the world a better place!", + "3": "You're in the way! Team Magma has no time for kids like you!", + "4": "I hope you brought marshmallows because things are about to heat up!", + "5": "We're going to use the power of a volcano! It's gonna be... explosive! Get it? Heh heh!" + }, + "victory": { + "1": "Huh? I lost?!", + "2": "I can't believe I lost! I even skipped lunch for this", + "3": "No way! You're just a kid!", + "3_female": "No way! You're just a kid!", + "4": "Urrrgh... I should've ducked into our hideout right away...", + "5": "You beat me... Do you think the boss will dock my pay for this?" + } + }, + "aqua_grunt": { + "encounter": { + "1": "No one who crosses Team Aqua gets any mercy, not even kids!", + "2": "Grrr... You've got some nerve meddling with Team Aqua!", + "3": "You're about to get soaked! And not just from my water Pokémon!", + "4": "We, Team Aqua, exist for the good of all!", + "5": "Prepare to be washed away by the tides of my... uh, Pokémon! Yeah, my Pokémon!" + }, + "victory": { + "1": "You're kidding me!", + "2": "Arrgh, I didn't count on being meddled with by some meddling kid!", + "3": "I lost?! Guess I'll have to swim back to the hideout now...", + "4": "Oh, man, what a disaster... The boss is going to be furious...", + "5": "You beat me... Do you think the boss will make me walk the plank for this?" + } + }, + "galactic_grunt": { + "encounter": { + "1": "Don't mess with Team Galactic!", + "2": "Witness the power of our technology and the future we envision!", + "3": "In the name of Team Galactic, I'll eliminate anyone who stands in our way!", + "4": "Get ready to lose!", + "5": "Hope you're ready for a cosmic beatdown!", + "5_female": "Hope you're ready for a cosmic beatdown!" + }, + "victory": { + "1": "Shut down...", + "2": "This setback means nothing in the grand scheme.", + "3": "Our plans are bigger than this defeat.", + "4": "How?!", + "5": "Note to self: practice Pokémon battling, ASAP." + } + }, + "plasma_grunt": { + "encounter": { + "1": "We won't tolerate people who have different ideas!", + "2": "If I win against you, release your Pokémon!", + "3": "If you get in the way of Team Plasma, I'll take care of you!", + "4": "Team Plasma will liberate Pokémon from selfish humans like you!", + "5": "Our hairstyles are out of this world... but our battling skills? You'll find out soon enough." + }, + "victory": { + "1": "Plasmaaaaaaaaa!", + "2": "How could I lose...", + "3": "...What a weak Pokémon, I'll just have to go steal some better ones!", + "4": "Great plans are always interrupted.", + "5": "This is bad... Badbadbadbadbadbadbad! Bad for Team Plasma! Or Plasbad, for short!" + } + }, + "flare_grunt": { + "encounter": { + "1": "Your Pokémon are no match for the elegance of Team Flare.", + "2": "Hope you brought your sunglasses, because things are about to get bright!", + "2_female": "Hope you brought your sunglasses, because things are about to get bright!", + "3": "Team Flare will cleanse the world of imperfection!", + "4": "Prepare to face the brilliance of Team Flare!", + "5": "Fashion is most important to us!" + }, + "victory": { + "1": "The future doesn't look bright for me.", + "2": "Perhaps there's more to battling than I thought. Back to the drawing board.", + "3": "Gahh?! I lost?!", + "4": "Even in defeat, Team Flare's elegance shines through.", + "5": "You may have beaten me, but when I lose, I go out in style!" + } + }, + "aether_grunt": { + "encounter": { + "1": "I'll fight you with all I have to wipe you out!", + "2": "I don't care if you're a kid or what. I'll send you flying if you threaten us!", + "2_female": "I don't care if you're a kid or what. I'll send you flying if you threaten us!", + "3": "I was told to turn away Trainers, whomever they might be!", + "4": "I'll show you the power of Aether Paradise!", + "5": "Now that you've learned of the darkness at the heart of Aether Paradise, we'll need you to conveniently disappear!" + }, + "victory": { + "1": "Hmph! You seem to have a lot of skill.", + "2": "What does this mean? What does this mean!", + "3": "Hey! You're so strong that there's no way I can turn you away!", + "4": "Hmm... It seems as though I may have lost.", + "5": "Here's an impression for you: Aiyee!" + } + }, + "faba": { + "encounter": { + "1": "I, Branch Chief Faba, shall show you the harshness of the real world!", + "2": "The man who is called Aether Paradise's last line of defense is to battle a mere child?", + "2_female": "The man who is called Aether Paradise's last line of defense is to battle a mere child?", + "3": "I, Faba, am the Aether Branch Chief. The only one in the world, I'm irreplaceable." + }, + "victory": { + "1": "Aiyee!", + "2": "H-h-how can this be?! How could this child...", + "2_female": "H-h-how can this be?! How could this child...", + "3": "This is why... This is why I can't bring myself to like children." + } + }, + "skull_grunt": { + "encounter": { + "1": "We're not bad-we're just hard!", + "2": "You want some? That's how we say hello! Nice knowing you, punks!", + "2_female": "You want some? That's how we say hello! Nice knowing you, punks!", + "3": "We're just a bunch of guys and gals with a great interest in other people's Pokémon!", + "4": "Why you trying to act hard when we're already hard as bones out here, homie?", + "4_female": "Why you trying to act hard when we're already hard as bones out here, homie?", + "5": "Team Skull represent! We can't pay the rent! Had a lot of fun, but our youth was misspent!", + "5_female": "Team Skull represent! We can't pay the rent! Had a lot of fun, but our youth was misspent!" + }, + "victory": { + "1": "Huh? Is it over already?", + "2": "Time for us to break out, yo! Gotta tell y'all peace out, yo!", + "3": "We don't need your wack Pokémon anyway!", + "4": "Wha-?! This kid's way too strong-no bones about it!", + "5": "So, what? I'm lower than a Pokémon?! I already got self-esteem issues, man." + } + }, + "plumeria": { + "encounter": { + "1": " ...Hmph. You don't look like anything special to me.", + "1_female": " ...Hmph. You don't look like anything special to me.", + "2": "It takes these dumb Grunts way too long to deal with you kids...", + "3": "Mess with anyone in Team Skull, and I'll show you how serious I can get." + }, + "victory": { + "1": "Hmmph! You're pretty strong. I'll give you that.", + "1_female": "Hmmph! You're pretty strong. I'll give you that.", + "2": "Hmmph. Guess you are pretty tough. Now I understand why my Grunts waste so much time battling kids.", + "3": "Hmmph! I guess I just have to hold that loss." + } + }, + "macro_grunt": { + "encounter": { + "1": "It looks like this is the end of the line for you!", + "2": "You are a trainer aren't you? I'm afraid that doesn't give you the right to interfere in our work.", + "2_female": "You are a trainer aren't you? I'm afraid that doesn't give you the right to interfere in our work.", + "3": "I'm from Macro Cosmos Insurance! Do you have a life insurance policy?" + }, + "victory": { + "1": "I have little choice but to respectfully retreat.", + "2": "Having to give up my pocket money... Losing means I'm back in the red...", + "3": "Nobody can beat Macro Cosmos when it comes to our dedication to our work!" + } + }, + "oleana": { + "encounter": { + "1": "I won't let anyone interfere with Mr. Rose's plan!", + "2": "So, you got through all of the special staff that I had ordered to stop you. I would expect nothing less.", + "3": "For the chairman! I won't lose!" + }, + "victory": { + "1": "*sigh* I wasn't able to win... Oleana...you really are a hopeless woman.", + "2": "Arghhh! This is inexcusable... What was I thinking... Any trainer who's made it this far would be no pushover..", + "2_female": "Arghhh! This is inexcusable... What was I thinking... Any trainer who's made it this far would be no pushover..", + "3": "*sigh* I am one tired Oleana..." + } + }, + "rocket_boss_giovanni_1": { + "encounter": { + "1": "So! I must say, I am impressed you got here!" + }, + "victory": { + "1": "WHAT! This cannot be!" + }, + "defeat": { + "1": "Mark my words. Not being able to measure your own strength shows that you are still a child.", + "1_female": "Mark my words. Not being able to measure your own strength shows that you are still a child." + } + }, + "rocket_boss_giovanni_2": { + "encounter": { + "1": "My old associates need me... Are you going to get in my way?" + }, + "victory": { + "1": "How is this possible...? The precious dream of Team Rocket has become little more than an illusion..." + }, + "defeat": { + "1": "Team Rocket will be reborn again, and I will rule the world!" + } + }, + "magma_boss_maxie_1": { + "encounter": { + "1": "I will bury you by my own hand. I hope you appreciate this honor!" + }, + "victory": { + "1": "Ugh! You are... quite capable...\nI fell behind, but only by an inch..." + }, + "defeat": { + "1": "Team Magma will prevail!" + } + }, + "magma_boss_maxie_2": { + "encounter": { + "1": "You are the final obstacle remaining between me and my goals.\n$Brace yourself for my ultimate attack! Fuhahaha!" + }, + "victory": { + "1": "This... This is not.. Ngh..." + }, + "defeat": { + "1": "And now... I will transform this planet to a land ideal for humanity." + } + }, + "aqua_boss_archie_1": { + "encounter": { + "1": "I'm the leader of Team Aqua, so I'm afraid it's the rope's end for you." + }, + "victory": { + "1": "Let's meet again somewhere. I'll be sure to remember that face." + }, + "defeat": { + "1": "Brilliant! My team won't hold back now!" + } + }, + "aqua_boss_archie_2": { + "encounter": { + "1": "I've been waiting so long for this day to come.\nThis is the true power of my team!" + }, + "victory": { + "1": "Like I figured..." + }, + "defeat": { + "1": "I'll return everything in this world to its original, pure state!!" + } + }, + "galactic_boss_cyrus_1": { + "encounter": { + "1": "You were compelled to come here by such vacuous sentimentality.\n$I will make you regret paying heed to your heart!", + "1_female": "You were compelled to come here by such vacuous sentimentality.\n$I will make you regret paying heed to your heart!" + }, + "victory": { + "1": "Interesting. And quite curious." + }, + "defeat": { + "1": "I will create my new world..." + } + }, + "galactic_boss_cyrus_2": { + "encounter": { + "1": "So we meet again. It seems our fates have become intertwined.\n$But here and now, I will finally break that bond!" + }, + "victory": { + "1": "How? How? HOW?!" + }, + "defeat": { + "1": "Farewell." + } + }, + "plasma_boss_ghetsis_1": { + "encounter": { + "1": "I won't allow anyone to stop me! No matter who does what!" + }, + "victory": { + "1": "How can this be? I'm the creator of Team Plasma! I'm perfect!" + }, + "defeat": { + "1": "I am the perfect ruler of a perfect new world! Mwa ha ha!" + } + }, + "plasma_boss_ghetsis_2": { + "encounter": { + "1": "Come now! I want to see your face at the moment you lose all hope!" + }, + "victory": { + "1": "My calculations... No! My careful schemes! The world should be mine!" + }, + "defeat": { + "1": "Kyurem! Use Absofusion!" + } + }, + "flare_boss_lysandre_1": { + "encounter": { + "1": "Do you want to stop me? Show me in battle." + }, + "victory": { + "1": "You are here to stop me. But I ask you to wait. " + }, + "defeat": { + "1": "Pokemon...Shall no longer exist." + } + }, + "flare_boss_lysandre_2": { + "encounter": { + "1": "The future you want, or the future I want... Let us see which one is more deserving, shall we?" + }, + "victory": { + "1": "Whaugh!" + }, + "defeat": { + "1": "Fools with no vision will continue to befoul this beautiful world." + } + }, + "aether_boss_lusamine_1": { + "encounter": { + "1": "You're going to startle my sweet beast! It looks like I'll need to silence you first." + }, + "victory": { + "1": "How... how can you be so awful!" + }, + "defeat": { + "1": "Hmph..." + } + }, + "aether_boss_lusamine_2": { + "encounter": { + "1": "Why must you continue to pester me?! I am sick of you. Sick through and through!\n$Enough with this useless talk.. with Nihilego's power I will show you how wrong you were to come here!" + }, + "victory": { + "1": "Aaauuuggghhhhhhhhh!!!" + }, + "defeat": { + "1": "All that I want is my precious beast! I don't care about any of the rest of you!" + } + }, + "skull_boss_guzma_1": { + "encounter": { + "1": "The hated boss who beats you down and beats you down and never lets up...\n$Yeah. Big bad Guzma is here!" + }, + "victory": { + "1": "Tch. I'm gonna beat you down one of these days!" + }, + "defeat": { + "1": "And you came all the way out here just for that, huh?" + } + }, + "skull_boss_guzma_2": { + "encounter": { + "1": "Doesn't matter who I'm up against, I'm gonna beat them down!\n$That's what big bad Guzma is all about!" + }, + "victory": { + "1": "Guzma!!! What is wrong with you?!" + }, + "defeat": { + "1": "Y'all are stupid!" + } + }, + "macro_boss_rose_1": { + "encounter": { + "1": "I must provide limitless energy to ensure everlasting prosperity for everyone...\n$It is my purpose, my duty, my destiny!" + }, + "victory": { + "1": "You still don't understand, trainer...\n$We... No, I am going to change the course of history!" + }, + "defeat": { + "1": "You still don't understand a thing!" + } + }, + "macro_boss_rose_2": { + "encounter": { + "1": "I'm committed to solving the energy problem in the Galar region—and, of course, around the world.\n$My experience and accomplishments that made Macro Cosmos a success are proof my methods work.\n$I don't intend to change my mind, even if I lose." + }, + "victory": { + "1": "I'd forgotten how great Pokémon battles are! It's been so long since I battled...\n$That sure was satisfying, I accept defeat for this battle." + }, + "defeat": { + "1": "I suppose it must seem that I am doing something terrible. I don't expect you to understand.\n$But I must provide the Galar region with limitless energy to ensure everlasting prosperity." + } + }, + "brock": { + "encounter": { + "1": "My expertise on Rock-type Pokémon will take you down! Come on!", + "2": "My rock-hard willpower will overwhelm you!", + "3": "Allow me to show you the true strength of my Pokémon!" + }, + "victory": { + "1": "Your Pokémon's strength have overcome my rock-hard defenses!", + "2": "The world is huge! I'm glad to have had a chance to battle you.", + "3": "Perhaps I should go back to pursuing my dream as a Pokémon Breeder…" + }, + "defeat": { + "1": "The best offense is a good defense!\nThat's my way of doing things!", + "2": "Come study rocks with me next time to better learn how to fight them!", + "3": "Hah, all my traveling around the regions is paying off!" + } + }, + "misty": { + "encounter": { + "1": "My policy is an all out offensive with Water-type Pokémon!", + "1_female": "My policy is an all out offensive with Water-type Pokémon!", + "2": "Hiya, I'll show you the strength of my aquatic Pokémon!", + "3": "My dream was to go on a journey and battle powerful trainers…\nWill you be a sufficient challenge?" + }, + "victory": { + "1": "You really are strong… I'll admit that you are skilled…", + "2": "Grrr… You know you just got lucky, right?!", + "3": "Wow, you're too much! I can't believe you beat me!" + }, + "defeat": { + "1": "Was the mighty Misty too much for you?", + "2": "I hope you saw my Pokémon's elegant swimming techniques!", + "3": "Your Pokémon were no match for my pride and joys!" + } + }, + "lt_surge": { + "encounter": { + "1": "My Electric Pokémon saved me during the war! I'll show you how!", + "1_female": "My Electric Pokémon saved me during the war! I'll show you how!", + "2": "Ten-hut! I'll shock you into surrender!", + "3": "I'll zap you just like I do to all my enemies in battle!" + }, + "victory": { + "1": "Whoa! Your team's the real deal, kid!", + "2": "Aaargh, you're strong! Even my electric tricks lost against you.", + "2_female": "Aaargh, you're strong! Even my electric tricks lost against you.", + "3": "That was an absolutely shocking loss!" + }, + "defeat": { + "1": "Oh yeah! When it comes to Electric-type Pokémon, I'm number one in the world!", + "2": "Hahaha! That was an electrifying battle, kid!", + "3": "A Pokémon battle is war, and I have showed you first-hand combat!" + } + }, + "erika": { + "encounter": { + "1": "Ah, the weather is lovely here…\nOh, a battle? Very well then.", + "2": "My Pokémon battling skills rival that of my flower arranging skills.", + "3": "Oh, I hope the pleasant aroma of my Pokémon doesn't put me to sleep again…", + "4": "Seeing flowers in a garden is so soothing." + }, + "victory": { + "1": "Oh! I concede defeat.", + "2": "That match was most delightful.", + "3": "Ah, it appears it is my loss…", + "4": "Oh, my goodness." + }, + "defeat": { + "1": "I was afraid I would doze off…", + "2": "Oh my, it seems my Grass Pokémon overwhelmed you.", + "2_female": "Oh my, it seems my Grass Pokémon overwhelmed you.", + "3": "That battle was such a soothing experience.", + "4": "Oh… Is that all?" + } + }, + "janine": { + "encounter": { + "1": "I am mastering the art of poisonous attacks.\nI shall spar with you today!", + "2": "Father trusts that I can hold my own.\nI will prove him right!", + "3": "My ninja techniques are only second to my Father's!\nCan you keep up?" + }, + "victory": { + "1": "Even now, I still need training… I understand.", + "2": "Your battle technique has outmatched mine.", + "3": "I'm going to really apply myself and improve my skills." + }, + "defeat": { + "1": "Fufufu… the poison has sapped all your strength to battle.", + "2": "Ha! You didn't stand a chance against my superior ninja skills!", + "3": "Father's faith in me has proven to not be misplaced." + } + }, + "sabrina": { + "encounter": { + "1": "Through my psychic ability, I had a vision of your arrival!", + "2": "I dislike fighting, but if you wish, I will show you my powers!", + "3": "I can sense great ambition in you. I shall see if it not unfounded." + }, + "victory": { + "1": "Your power… It far exceeds what I foresaw…", + "2": "I failed to accurately predict your power.", + "3": "Even with my immense psychic powers, I cannot sense another as strong as you." + }, + "defeat": { + "1": "This victory… It is exactly as I foresaw in my visions!", + "2": "Perhaps it was another I sensed a great desire in…", + "3": "Hone your abilities before recklessly charging into battle.\nYou never know what the future may hold if you do…" + } + }, + "blaine": { + "encounter": { + "1": "Hah! Hope you brought a Burn Heal!", + "2": "My fiery Pokémon will incinerate all challengers!", + "3": "Get ready to play with fire!" + }, + "victory": { + "1": "I have burned down to nothing! Not even ashes remain!", + "2": "Didn't I stoke the flames high enough?", + "3": "I'm all burned out… But this makes my motivation to improve burn even hotter!" + }, + "defeat": { + "1": "My raging inferno cannot be quelled!", + "2": "My Pokémon have been powered up with the heat from this victory!", + "3": "Hah! My passion burns brighter than yours!" + } + }, + "giovanni": { + "encounter": { + "1": "I, the leader of Team Rocket, will make you feel a world of pain!", + "2": "My training here will be vital before I am to face my old associates again.", + "3": "I do not think you are prepared for the level of failure you are about to experience!", + "3_female": "I do not think you are prepared for the level of failure you are about to experience!" + }, + "victory": { + "1": "WHAT! Me, lose?! There is nothing I wish to say to you!", + "2": "Hmph… You could never understand what I hope to achieve.", + "3": "This defeat is merely delaying the inevitable.\nI will rise Team Rocket from the ashes in due time." + }, + "defeat": { + "1": "Not being able to measure your own strength shows that you are still but a child.", + "2": "Do not try to interfere with me again.", + "3": "I hope you understand how foolish challenging me was." + } + }, + "roxanne": { + "encounter": { + "1": "Would you kindly demonstrate how you battle?", + "2": "You can learn many things by battling many trainers.", + "3": "Oh, you caught me strategizing.\nWould you like to battle?" + }, + "victory": { + "1": "Oh, I appear to have lost.\nI understand.", + "2": "It seems that I still have so much more to learn when it comes to battle.", + "3": "I'll take what I learned here today to heart." + }, + "defeat": { + "1": "I have learned many things from our battle.\nI hope you have too.", + "2": "I look forward to battling you again.\nI hope you'll use what you've learned here.", + "3": "I won due to everything I have learned." + } + }, + "brawly": { + "encounter": { + "1": "Oh man, a challenger!\nLet's see what you can do!", + "1_female": "Oh man, a challenger!\nLet's see what you can do!", + "2": "You seem like a big splash.\nLet's battle!", + "3": "Time to create a storm!\nLet's go!" + }, + "victory": { + "1": "Oh woah, you've washed me out!", + "2": "You surfed my wave and crashed me down!", + "3": "I feel like I'm lost in Granite Cave!" + }, + "defeat": { + "1": "Haha, I surfed the big wave!\nChallenge me again sometime.", + "2": "Surf with me again some time!", + "3": "Just like the tides come in and out, I hope you return to challenge me again." + } + }, + "wattson": { + "encounter": { + "1": "Time to get shocked!\nWahahahaha!", + "2": "I'll make sparks fly!\nWahahahaha!", + "3": "I hope you brought Paralyz Heal!\nWahahahaha!" + }, + "victory": { + "1": "Seems like I'm out of charge!\nWahahahaha!", + "2": "You've completely grounded me!\nWahahahaha!", + "3": "Thanks for the thrill!\nWahahahaha!" + }, + "defeat": { + "1": "Recharge your batteries and challenge me again sometime!\nWahahahaha!", + "1_female": "Recharge your batteries and challenge me again sometime!\nWahahahaha!", + "2": "I hope you found our battle electrifying!\nWahahahaha!", + "3": "Aren't you shocked I won?\nWahahahaha!" + } + }, + "flannery": { + "encounter": { + "1": "Nice to meet you! Wait, no…\nI will crush you!", + "2": "I've only been a leader for a little while, but I'll smoke you!", + "3": "It's time to demonstrate the moves my grandfather has taught me! Let's battle!" + }, + "victory": { + "1": "You remind me of my grandfather…\nNo wonder I lost.", + "2": "Am I trying too hard?\nI should relax, can't get too heated.", + "3": "Losing isn't going to smother me out.\nTime to reignite training!" + }, + "defeat": { + "1": "I hope I've made my grandfather proud…\nLet's battle again some time.", + "2": "I…I can't believe I won!\nDoing things my way worked!", + "3": "Let's exchange burning hot moves again soon!" + } + }, + "norman": { + "encounter": { + "1": "I'm surprised you managed to get here.\nLet's battle.", + "2": "I'll do everything in my power as a Gym Leader to win.\nLet's go!", + "3": "You better give this your all.\nIt's time to battle!" + }, + "victory": { + "1": "I lost to you…?\nRules are rules, though.", + "2": "Was moving from Olivine a mistake…?", + "3": "I can't believe it.\nThat was a great match." + }, + "defeat": { + "1": "We both tried our best.\nI hope we can battle again soon.", + "2": "You should try challenging my kid instead.\nYou might learn something!", + "3": "Thank you for the excellent battle.\nBetter luck next time." + } + }, + "winona": { + "encounter": { + "1": "I've been soaring the skies looking for prey…\nAnd you're my target!", + "2": "No matter how our battle is, my Flying Pokémon and I will triumph with grace. Let's battle!", + "3": "I hope you aren't scared of heights.\nLet's ascend!" + }, + "victory": { + "1": "You're the first Trainer I've seen with more grace than I.\nExcellently played.", + "1_female": "You're the first Trainer I've seen with more grace than I.\nExcellently played.", + "2": "Oh, my Flying Pokémon have plummeted!\nVery well.", + "3": "Though I may have fallen, my Pokémon will continue to fly!" + }, + "defeat": { + "1": "My Flying Pokémon and I will forever dance elegantly!", + "2": "I hope you enjoyed our show.\nOur graceful dance is finished.", + "3": "Won't you come see our elegant choreography again?" + } + }, + "tate": { + "encounter": { + "1": "Hehehe…\nWere you surprised to see me without my sister?", + "1_female": "Hehehe…\nWere you surprised to see me without my sister?", + "2": "I can see what you're thinking…\nYou want to battle!", + "3": "How can you defeat someone…\nWho knows your every move?" + }, + "victory": { + "1": "It can't be helped…\nI miss Liza…", + "2": "Your bond with your Pokémon was stronger than mine.", + "3": "If I were with Liza, we would have won.\nWe can finish each other's thoughts!" + }, + "defeat": { + "1": "My Pokémon and I are superior!", + "2": "If you can't even defeat me, you'll never be able to defeat Liza either.", + "3": "It's all thanks to my strict training with Liza.\nI can make myself one with Pokémon." + } + }, + "liza": { + "encounter": { + "1": "Fufufu…\nWere you surprised to see me without my brother?", + "1_female": "Fufufu…\nWere you surprised to see me without my brother?", + "2": "I can determine what you desire…\nYou want to battle, don't you?", + "3": "How can you defeat someone…\nWho's one with their Pokémon?" + }, + "victory": { + "1": "It can't be helped…\nI miss Tate…", + "2": "Your bond with your Pokémon…\nIt's stronger than mine.", + "3": "If I were with Tate, we would have won.\nWe can finish each other's sentences!" + }, + "defeat": { + "1": "My Pokémon and I are victorious.", + "2": "If you can't even defeat me, you'll never be able to defeat Tate either.", + "3": "It's all thanks to my strict training with Tate.\nI can synchronize myself with my Pokémon." + } + }, + "juan": { + "encounter": { + "1": "Now's not the time to act coy.\nLet's battle!", + "2": "Ahahaha, You'll be witness to my artistry with Water Pokémon!", + "3": "A typhoon approaches!\nWill you be able to test me?", + "4": "Please, you shall bear witness to our artistry.\nA grand illusion of water sculpted by my Pokémon and myself!" + }, + "victory": { + "1": "You may be a genius who can take on Wallace!", + "2": "I focused on elegance while you trained.\nIt's only natural that you defeated me.", + "3": "Ahahaha!\nVery well, You have won this time.", + "4": "From you, I sense the brilliant shine of skill that will overcome all." + }, + "defeat": { + "1": "My Pokémon and I have sculpted an illusion of Water and come out victorious.", + "2": "Ahahaha, I have won, and you have lost.", + "3": "Shall I loan you my outfit? It may help you battle!\nAhahaha, I jest!", + "4": "I'm the winner! Which is to say, you lost." + } + }, + "crasher_wake": { + "encounter": { + "1": "Crash! Crash! Watch out!\nCrasher Wake…is…heeere!", + "2": "Crash! Crash! Crasher Wake!", + "3": "I'm the tidal wave of power to wash you away!" + }, + "victory": { + "1": "That puts a grin on my face!\nGuhahaha! That was a blast!", + "2": "Hunwah! It's gone and ended!\nHow will I say this…\nI want more! I wanted to battle a lot more!", + "3": "WHAAAAT!?" + }, + "defeat": { + "1": "Yeeeeah! That's right!", + "2": "I won, but I want more! I wanted to battle a lot more!", + "3": "So long!" + } + }, + "falkner": { + "encounter": { + "1": "I'll show you the real power of the magnificent bird Pokémon!", + "2": "Winds, stay with me!", + "3": "Dad! I hope you're watching me battle from above!" + }, + "victory": { + "1": "I understand… I'll bow out gracefully.", + "2": "A defeat is a defeat. You are strong indeed.", + "3": "…Shoot! Yeah, I lost." + }, + "defeat": { + "1": "Dad! I won with your cherished bird Pokémon…", + "2": "Bird Pokémon are the best after all!", + "3": "Feels like I'm catching up to my dad!" + } + }, + "nessa": { + "encounter": { + "1": "No matter what kind of plan your refined mind may be plotting, my partner and I will be sure to sink it.", + "1_female": "No matter what kind of plan your refined mind may be plotting, my partner and I will be sure to sink it.", + "2": "I'm not here to chat. I'm here to win!", + "3": "This is a little gift from my Pokémon… I hope you can take it!", + "3_female": "This is a little gift from my Pokémon… I hope you can take it!" + }, + "victory": { + "1": "You and your Pokémon are just too much…", + "2": "How…? How can this be?!", + "3": "I was totally washed away!" + }, + "defeat": { + "1": "The raging wave crashes again!", + "2": "Time to ride the wave of victory!", + "3": "Ehehe!" + } + }, + "melony": { + "encounter": { + "1": "I'm not going to hold back!", + "2": "All righty, I suppose we should get started.", + "3": "I'll freeze you solid!" + }, + "victory": { + "1": "You… You're pretty good, huh?", + "1_female": "You… You're pretty good, huh?", + "2": "If you find Gordie around, be sure to give him a right trashing, would you?", + "3": "I think you took breaking the ice a little too literally…" + }, + "defeat": { + "1": "Now do you see how severe battles can be?", + "2": "Hee! Looks like I went and won again!", + "3": "Are you holding back?" + } + }, + "marlon": { + "encounter": { + "1": "You look strong! Shoots! Let's start!", + "2": "I'm strong like the ocean's wide. You're gonna get swept away, fo' sho'.", + "2_female": "I'm strong like the ocean's wide. You're gonna get swept away, fo' sho'.", + "3": "Oh ho, so I'm facing you! That's off the wall." + }, + "victory": { + "1": "You totally rocked that! You're raising some wicked Pokémon. You got this Trainer thing down!", + "1_female": "You totally rocked that! You're raising some wicked Pokémon. You got this Trainer thing down!", + "2": "You don't just look strong, you're strong fo' reals! Eh, I was swept away, too!", + "3": "You're strong as a gnarly wave!" + }, + "defeat": { + "1": "You're tough, but it's not enough to sway the sea, 'K!", + "2": "Hee! Looks like I went and won again!", + "3": "Sweet, sweet victory!" + } + }, + "shauntal": { + "encounter": { + "1": "Excuse me. You're a challenger, right?\nI'm the Elite Four's Ghost-type Pokémon user, Shauntal, and I shall be your opponent.", + "1_female": "Excuse me. You're a challenger, right?\nI'm the Elite Four's Ghost-type Pokémon user, Shauntal, and I shall be your opponent.", + "2": "I absolutely love writing about Trainers who come here and the Pokémon they train.\nCould I use you and your Pokémon as a subject?", + "3": "Every person who works with Pokémon has a story to tell.\nWhat story is about to be told?" + }, + "victory": { + "1": "Wow. I'm dumbstruck!", + "2": "S-sorry! First, I must apologize to my Pokémon…\n\nI'm really sorry you had a bad experience because of me!", + "3": "Even in light of that, I'm still one of the Elite Four!" + }, + "defeat": { + "1": "Eheh.", + "2": "That gave me excellent material for my next novel!", + "3": "And so, another tale ends…" + } + }, + "marshal": { + "encounter": { + "1": "My mentor, Alder, sees your potential as a Trainer and is taking an interest in you.\nIt is my intention to test you--to take you to the limits of your strength. Kiai!", + "1_female": "My mentor, Alder, sees your potential as a Trainer and is taking an interest in you.\nIt is my intention to test you--to take you to the limits of your strength. Kiai!", + "2": "Victory, decisive victory, is my intention! Challenger, here I come!", + "3": "In myself, I seek to develop the strength of a fighter and shatter any weakness in myself!\nPrevailing with the force of my convictions!" + }, + "victory": { + "1": "Whew! Well done!", + "2": "As your battles continue, aim for even greater heights!", + "3": "The strength shown by you and your Pokémon has deeply impressed me…" + }, + "defeat": { + "1": "Hmm.", + "2": "That was good battle.", + "3": "Haaah! Haaah! Haiyaaaah!" + } + }, + "cheren": { + "encounter": { + "1": "You remind me of an old friend. That makes me excited about this Pokémon battle!", + "2": "Pokémon battles have no meaning if you don't think why you battle.\n$Or better said, it makes battling together with Pokémon meaningless.", + "3": "My name's Cheren! I'm a Gym Leader and a teacher! Pleasure to meet you.", + "3_female": "My name's Cheren! I'm a Gym Leader and a teacher! Pleasure to meet you." + }, + "victory": { + "1": "Thank you! I saw what was missing in me.", + "2": "Thank you! I feel like I saw a little of the way toward my ideals.", + "3": "Hmm… This is problematic." + }, + "defeat": { + "1": "As a Gym Leader, I aim to be a wall for you to overcome.", + "2": "All right!", + "3": "I made it where I am because Pokémon were by my side.\nPerhaps we need to think about why Pokémon help us not in terms of Pokémon and Trainers but as a relationship between living beings." + } + }, + "chili": { + "encounter": { + "1": "Yeeeeooow! Time to play with FIRE!! I'm the strongest of us brothers!", + "1_female": "Yeeeeooow! Time to play with FIRE!! I'm the strongest of us brothers!", + "2": "Ta-da! The Fire-type scorcher Chili--that's me--will be your opponent!", + "2_female": "Ta-da! The Fire-type scorcher Chili--that's me--will be your opponent!", + "3": "I'm going to show you what me and my blazing Fire types can do!", + "3_female": "I'm going to show you what me and my blazing Fire types can do!" + }, + "victory": { + "1": "You got me. I am… burned… out…", + "1_female": "You got me. I am… burned… out…", + "2": "Whoa ho! You're on fire!", + "2_female": "Whoa ho! You're on fire!", + "3": "Augh! You got me!" + }, + "defeat": { + "1": "I'm on fire! Play with me, and you'll get burned!", + "1_female": "I'm on fire! Play with me, and you'll get burned!", + "2": "When you play with fire, you get burned!", + "3": "I mean, c'mon, your opponent was me! You didn't have a chance!", + "3_female": "I mean, c'mon, your opponent was me! You didn't have a chance!" + } + }, + "cilan": { + "encounter": { + "1": "Nothing personal... No hard feelings... Me and my Grass-type Pokémon will...\n$Um... We're gonna battle come what may.", + "1_female": "Nothing personal... No hard feelings... Me and my Grass-type Pokémon will...\n$Um... We're gonna battle come what may.", + "2": "So, um, if you're OK with me, I'll, um, put everything I've got into being, er, you know, your opponent.", + "2_female": "So, um, if you're OK with me, I'll, um, put everything I've got into being, er, you know, your opponent.", + "3": "OK… So, um, I'm Cilan, I like Grass-type Pokémon.", + "3_female": "OK… So, um, I'm Cilan, I like Grass-type Pokémon." + }, + "victory": { + "1": "Er… Is it over now?", + "1_female": "Er… Is it over now?", + "2": "…What a surprise. You are very strong, aren't you? \n$I guess my brothers wouldn't have been able to defeat you either…", + "2_female": "…What a surprise. You are very strong, aren't you? \n$I guess my brothers wouldn't have been able to defeat you either…", + "3": "…Huh. Looks like my timing was, um, off?" + }, + "defeat": { + "1": "Huh? Did I win?", + "1_female": "Huh? Did I win?", + "2": "I guess… \n$I suppose I won, because I've been competing with my brothers Chili and Cress, and we all were able to get tougher.", + "2_female": "I guess… \n$I suppose I won, because I've been competing with my brothers Chili and Cress, and we all were able to get tougher.", + "3": "It…it was quite a thrilling experience…", + "3_female": "It…it was quite a thrilling experience…" + } + }, + "roark": { + "encounter": { + "1": "I need to see your potential as a Trainer. And, I'll need to see the toughness of the Pokémon that battle with you!", + "1_female": "I need to see your potential as a Trainer. And, I'll need to see the toughness of the Pokémon that battle with you!", + "2": "Here goes! These are my rocking Pokémon, my pride and joy!", + "3": "Rock-type Pokémon are simply the best!", + "4": "Every day, I toughened up my Pokémon by digging up Fossils nonstop.\n$Could I show you how tough I made them in a battle?", + "4_female": "Every day, I toughened up my Pokémon by digging up Fossils nonstop.\n$Could I show you how tough I made them in a battle?" + }, + "victory": { + "1": "W-what? That can't be! My buffed-up Pokémon!", + "2": "…We lost control there. Next time I'd like to challenge you to a Fossil-digging race underground.", + "2_female": "…We lost control there. Next time I'd like to challenge you to a Fossil-digging race underground.", + "3": "With skill like yours, it's natural for you to win.", + "4": "Wh-what?! It can't be! Even that wasn't enough?" + }, + "defeat": { + "1": "See? I'm proud of my rocking battle style!", + "2": "Thanks! The battle gave me confidence that I may be able to beat my dad!", + "3": "See? These are my rocking Pokémon, my pride and joy!", + "4": "I knew I would win!" + } + }, + "morty": { + "encounter": { + "1": "With a little more, I could see a future in which I meet the legendary Pokémon.\n$You're going to help me reach that level!", + "2": "It's said that a rainbow-hued Pokémon will come down to appear before a truly powerful Trainer. \n$I believed that tale, so I have secretly trained here all my life. As a result, I can now see what others cannot. \n$I see a shadow of the person who will make the Pokémon appear. \n$I believe that person is me! You're going to help me reach that level!", + "3": "Whether you choose to believe or not, mystic power does exist.", + "4": "You can bear witness to the fruits of my training.", + "5": "You must make your soul one with that of Pokémon. Can you do this?", + "6": "Say, do you want to be part of my training?" + }, + "victory": { + "1": "I'm not good enough yet…", + "2": "I see… Your journey has taken you to far-away places and you have witnessed much more than I.\n$I envy you for that…", + "2_female": "I see… Your journey has taken you to far-away places and you have witnessed much more than I.\n$I envy you for that…", + "3": "How is this possible…", + "4": "I don't think our potentials are so different.\n$But you seem to have something more than that… So be it.", + "5": "Guess I need more training.", + "6": "That's a shame." + }, + "defeat": { + "1": "I moved… one step ahead again.", + "2": "Fufufu…", + "3": "Wh-what?! It can't be! Even that wasn't enough?", + "4": "I feel like I just smashed through a really stubborn boulder!", + "5": "Ahahahah!", + "6": "I knew I would win!" + } + }, + "crispin": { + "encounter": { + "1": "I wanna win, so that's exactly what I'll do!", + "2": "I battle because I wanna battle! And you know what? That's how it should be!" + }, + "victory": { + "1": "I wanted to win…but I lost!", + "2": "I lost…'cause I couldn't win!" + }, + "defeat": { + "1": "Hey, wait a sec. Did I just win? I think I just won! Talk about satisfying!", + "2": "Wooo! That was amazing!" + } + }, + "amarys": { + "encounter": { + "1": "I want to be the one to help a certain person. That being the case, I cannot afford to lose.\n$… Our battle starts now." + }, + "victory": { + "1": "I am… not enough, I see." + }, + "defeat": { + "1": "Victory belongs to me. Well fought." + } + }, + "lacey": { + "encounter": { + "1": "I'll be facing you with my usual party as a member of the Elite Four." + }, + "victory": { + "1": "That was a great battle!" + }, + "defeat": { + "1": "Let's give your Pokémon a nice round of applause for their efforts!" + } + }, + "drayton": { + "encounter": { + "1": "Man, I love chairs. Don't you love chairs? What lifesavers. \n$I don't get why everyone doesn't just sit all the time. Standing up's tiring work!" + }, + "victory": { + "1": "Guess I should've expected that!" + }, + "defeat": { + "1": "Heh heh! Don't mind me, just scooping up a W over here. I get it if you're upset, but don't go full Kieran on me, OK?", + "1_female": "Heh heh! Don't mind me, just scooping up a W over here. I get it if you're upset, but don't go full Kieran on me, OK?" + } + }, + "ramos": { + "encounter": { + "1": "Did yeh enjoy the garden playground I made with all these sturdy plants o' mine?\n$Their strength is a sign o' my strength as a gardener and a Gym Leader! Yeh sure yer up to facing all that?", + "1_female": "Did yeh enjoy the garden playground I made with all these sturdy plants o' mine?\n$Their strength is a sign o' my strength as a gardener and a Gym Leader! Yeh sure yer up to facing all that?" + }, + "victory": { + "1": "Yeh believe in yer Pokémon… And they believe in yeh, too… It was a fine battle, sprout." + }, + "defeat": { + "1": "Hohoho… Indeed. Frail little blades o' grass'll break through even concrete." + } + }, + "viola": { + "encounter": { + "1": "Whether it's the tears of frustration that follow a loss or the blossoming of joy that comes with victory…\n$They're both great subjects for my camera! Fantastic! This'll be just fantastic! \n$Now come at me!", + "2": "My lens is always focused on victory--I won't let anything ruin this shot!" + }, + "victory": { + "1": "You and your Pokémon have shown me a whole new depth of field! Fantastic! Just fantastic!", + "2": "The world you see through a lens, and the world you see with a Pokémon by your side…\n$The same world can look entirely different depending on your view." + }, + "defeat": { + "1": "The photo from the moment of my victory will be a real winner, all right!", + "2": "Yes! I took some great photos!" + } + }, + "candice": { + "encounter": { + "1": "You want to challenge Candice? Sure thing! I was waiting for someone tough! \n$But I should tell you, I'm tough because I know how to focus.", + "2": "Pokémon, fashion, romance… It's all about focus! \n$I'll show you just what I mean. Get ready to lose!" + }, + "victory": { + "1": "I must say, I'm warmed up to you! I might even admire you a little.", + "2": "Wow! You're great! You've earned my respect! \n$I think your focus and will bowled us over totally. ", + "2_female": "Wow! You're great! You've earned my respect! \n$I think your focus and will bowled us over totally. " + }, + "defeat": { + "1": "I sensed your will to win, but I don't lose!", + "2": "See? Candice's focus! My Pokémon's focus is great, too!" + } + }, + "gardenia": { + "encounter": { + "1": "You have a winning aura about you. So, anyway, this will be fun. Let's have our battle!" + }, + "victory": { + "1": "Amazing! You're very good, aren't you?", + "1_female": "Amazing! You're very good, aren't you?" + }, + "defeat": { + "1": "Yes! My Pokémon and I are perfectly good!" + } + }, + "aaron": { + "encounter": { + "1": "Ok! Let me take you on!" + }, + "victory": { + "1": "Battling is a deep and complex affair…" + }, + "defeat": { + "1": "Victory over an Elite Four member doesn't come easily." + } + }, + "cress": { + "encounter": { + "1": "That is correct! It shall be I and my esteemed Water types that you must face in battle!" + }, + "victory": { + "1": "Lose? Me? I don't believe this." + }, + "defeat": { + "1": "This is the appropriate result when I'm your opponent." + } + }, + "allister": { + "encounter": { + "1": "'M Allister.\nH-here… I go…" + }, + "victory": { + "1": "I nearly lost my mask from the shock… That was…\n$Wow. I can see your skill for what it is." + }, + "defeat": { + "1": "Th-that was ace!" + } + }, + "clay": { + "encounter": { + "1": "Harrumph! Kept me waitin', didn't ya, kid? All right, time to see what ya can do!", + "1_female": "Harrumph! Kept me waitin', didn't ya, kid? All right, time to see what ya can do!" + }, + "victory": { + "1": "Man oh man… It feels good to go all out and still be defeated!" + }, + "defeat": { + "1": "What's important is how ya react to losin'. \n$That's why folks who use losin' as fuel to get better are tough." + } + }, + "kofu": { + "encounter": { + "1": "I'mma serve you a full course o' Water-type Pokémon! Don't try to eat 'em, though!" + }, + "victory": { + "1": "Vaultin' Veluza! Yer a lively one, aren't ya! A little TOO lively, if I do say so myself!", + "1_female": "Vaultin' Veluza! Yer a lively one, aren't ya! A little TOO lively, if I do say so myself!" + }, + "defeat": { + "1": "You come back to see me again now, ya hear?" + } + }, + "tulip": { + "encounter": { + "1": "Allow me to put my skills to use to make your cute little Pokémon even more beautiful!" + }, + "victory": { + "1": "Your strength has a magic to it that cannot be washed away." + }, + "defeat": { + "1": "You know, in my line of work, people who lack talent in one area or the other often fade away quickly—never to be heard of again." + } + }, + "sidney": { + "encounter": { + "1": "I like that look you're giving me. I guess you'll give me a good match.\n$That's good! Looking real good! All right!\n$You and me, let's enjoy a battle that can only be staged here!" + }, + "victory": { + "1": "Well, how do you like that? I lost! Eh, it was fun, so it doesn't matter." + }, + "defeat": { + "1": "No hard feelings, alright?" + } + }, + "phoebe": { + "encounter": { + "1": "While I trained, I gained the ability to commune with Ghost-type Pokémon. \n$Yes, the bond I developed with Pokémon is extremely tight. \n$So, come on, just try and see if you can even inflict damage on my Pokémon!" + }, + "victory": { + "1": "Oh, darn. I've gone and lost." + }, + "defeat": { + "1": "I look forward to battling you again sometime!" + } + }, + "glacia": { + "encounter": { + "1": "All I have seen are challenges by weak Trainers and their Pokémon. \n$What about you? It would please me to no end if I could go all out against you!" + }, + "victory": { + "1": "You and your Pokémon… How hot your spirits burn!\n$The all-consuming heat overwhelms. \n$It's no surprise that my icy skills failed to harm you." + }, + "defeat": { + "1": "A fiercely passionate battle, indeed." + } + }, + "drake": { + "encounter": { + "1": "For us to battle with Pokémon as partners, do you know what it takes? Do you know what is needed? \n$If you don't, then you will never prevail over me!" + }, + "victory": { + "1": "Superb, it should be said." + }, + "defeat": { + "1": "I gave my all for that battle!" + } + }, + "wallace": { + "encounter": { + "1": "There's something about you… A difference in your demeanor. \n$I think I sense that in you. Now, show me. Show me the power you wield with your Pokémon. \n$And I, in turn, shall present you with a performance of illusions in water by me and my Pokémon!" + }, + "victory": { + "1": "Bravo. I realize now your authenticity and magnificence as a Pokémon Trainer. \n$I find much joy in having met you and your Pokémon. You have proven yourself worthy.", + "1_female": "Bravo. I realize now your authenticity and magnificence as a Pokémon Trainer. \n$I find much joy in having met you and your Pokémon. You have proven yourself worthy." + }, + "defeat": { + "1": "A grand illusion!" + } + }, + "lorelei": { + "encounter": { + "1": "No one can best me when it comes to icy Pokémon! Freezing moves are powerful!\n$Your Pokémon will be at my mercy when they are frozen solid! Hahaha! Are you ready?", + "1_female": "No one can best me when it comes to icy Pokémon! Freezing moves are powerful!\n$Your Pokémon will be at my mercy when they are frozen solid! Hahaha! Are you ready?" + }, + "victory": { + "1": "How dare you!" + }, + "defeat": { + "1": "There's nothing you can do once you're frozen.", + "1_female": "There's nothing you can do once you're frozen." + } + }, + "will": { + "encounter": { + "1": "I have trained all around the world, making my psychic Pokémon powerful.\n$I can only keep getting better! Losing is not an option!" + }, + "victory": { + "1": "I… I can't… believe it…" + }, + "defeat": { + "1": "That was close. I wonder what it is that you lack." + } + }, + "malva": { + "encounter": { + "1": "I feel like my heart might just burst into flames. \n$I'm burning up with my hatred for you, runt!", + "1_female": "I feel like my heart might just burst into flames. \n$I'm burning up with my hatred for you, runt!" + }, + "victory": { + "1": "What news… So a new challenger has defeated Malva!", + "1_female": "What news… So a new challenger has defeated Malva!" + }, + "defeat": { + "1": "I am delighted! Yes, delighted that I could squash you beneath my heel." + } + }, + "hala": { + "encounter": { + "1": "Old Hala is here to make you holler!" + }, + "victory": { + "1": "I could feel the power you gained on your journey." + }, + "defeat": { + "1": "Haha! What a delightful battle!" + } + }, + "molayne": { + "encounter": { + "1": "I gave the captain position to my cousin Sophocles, but I'm confident in my ability. \n$My strength is like that of a supernova!" + }, + "victory": { + "1": "I certainly found an interesting Trainer to face!", + "1_female": "I certainly found an interesting Trainer to face!" + }, + "defeat": { + "1": "Ahaha. What an interesting battle." + } + }, + "rika": { + "encounter": { + "1": "I'd say I'll go easy on you, but… I'd be lying! Think fast!" + }, + "victory": { + "1": "Not bad, kiddo.", + "1_female": "Not bad, kiddo." + }, + "defeat": { + "1": "Nahahaha! You really are something else, kiddo!", + "1_female": "Nahahaha! You really are something else, kiddo!" + } + }, + "bruno": { + "encounter": { + "1": "We will grind you down with our superior power! Hoo hah!" + }, + "victory": { + "1": "Why? How could I lose?" + }, + "defeat": { + "1": "You can challenge me all you like, but the results will never change!" + } + }, + "bugsy": { + "encounter": { + "1": "I'm Bugsy! I never lose when it comes to bug Pokémon!" + }, + "victory": { + "1": "Whoa, amazing! You're an expert on Pokémon!\nMy research isn't complete yet. OK, you win.", + "1_female": "Whoa, amazing! You're an expert on Pokémon!\nMy research isn't complete yet. OK, you win." + }, + "defeat": { + "1": "Thanks! Thanks to our battle, I was also able to make progress in my research!" + } + }, + "koga": { + "encounter": { + "1": "Fwahahahaha! Pokémon are not merely about brute force--you shall see soon enough!" + }, + "victory": { + "1": "Ah! You've proven your worth!" + }, + "defeat": { + "1": "Have you learned to fear the techniques of the ninja?" + } + }, + "bertha": { + "encounter": { + "1": "Well, would you show this old lady how much you've learned?" + }, + "victory": { + "1": "Well! Dear child, I must say, that was most impressive. \n$Your Pokémon believed in you and did their best to earn you the win. \n$Even though I've lost, I find myself with this silly grin!" + }, + "defeat": { + "1": "Hahahahah! Looks like this old lady won!" + } + }, + "lenora": { + "encounter": { + "1": "Well then, challenger, I'm going to research how you battle with the Pokémon you've so lovingly raised!", + "1_female": "Well then, challenger, I'm going to research how you battle with the Pokémon you've so lovingly raised!" + }, + "victory": { + "1": "My theory about you was correct. You're more than just talented… You're motivated! I salute you!", + "1_female": "My theory about you was correct. You're more than just talented… You're motivated! I salute you!" + }, + "defeat": { + "1": "Ah ha ha! If you lose, make sure to analyze why, and use that knowledge in your next battle!" + } + }, + "siebold": { + "encounter": { + "1": "As long as I am alive, I shall strive onward to seek the ultimate cuisine... and the strongest opponents in battle!" + }, + "victory": { + "1": "I shall store my memory of you and your Pokémon forever away within my heart." + }, + "defeat": { + "1": "Our Pokémon battle was like food for my soul. It shall keep me going. \n$That is how I will pay my respects to you for giving your all in battle!" + } + }, + "roxie": { + "encounter": { + "1": "Get ready! I'm gonna knock some sense outta ya!" + }, + "victory": { + "1": "Wild! Your reason's already more toxic than mine!" + }, + "defeat": { + "1": "Hey, c'mon! Get serious! You gotta put more out there!", + "1_female": "Hey, c'mon! Get serious! You gotta put more out there!" + } + }, + "olivia": { + "encounter": { + "1": "No introduction needed here. Time to battle me, Olivia!" + }, + "victory": { + "1": "Really lovely… Both you and your Pokémon…" + }, + "defeat": { + "1": "Mmm-hmm." + } + }, + "poppy": { + "encounter": { + "1": "Oooh! Do you wanna have a Pokémon battle with me?" + }, + "victory": { + "1": "Uagh?! Mmmuuuggghhh…" + }, + "defeat": { + "1": "Yaaay! I did it! I de-feet-ed you! You can come for… For… An avenge match? \n$Come for an avenge match anytime you want!" + } + }, + "agatha": { + "encounter": { + "1": "Pokémon are for battling! I'll show you how a real Trainer battles!" + }, + "victory": { + "1": "Oh my! You're something special, child!" + }, + "defeat": { + "1": "Bahaha. That's how a proper battle's done!" + } + }, + "flint": { + "encounter": { + "1": "Hope you're warmed up, cause here comes the Big Bang!", + "1_female": "Hope you're warmed up, cause here comes the Big Bang!" + }, + "victory": { + "1": "Incredible! Your moves are so hot, they make mine look lukewarm!" + }, + "defeat": { + "1": "Huh? Is that it? I think you need a bit more passion." + } + }, + "grimsley": { + "encounter": { + "1": "The winner takes everything, and there's nothing left for the loser." + }, + "victory": { + "1": "When one loses, they lose everything… The next thing I'll look for will be victory, too!" + }, + "defeat": { + "1": "If somebody wins, the person who fought against that person will lose." + } + }, + "caitlin": { + "encounter": { + "1": "It's me who appeared when the flower opened up. You who have been waiting…\n$You look like a Pokémon Trainer with refined strength and deepened kindness. \n$What I look for in my opponent is superb strength… \n$Please unleash your power to the fullest!", + "1_female": "It's me who appeared when the flower opened up. You who have been waiting…\n$You look like a Pokémon Trainer with refined strength and deepened kindness. \n$What I look for in my opponent is superb strength… \n$Please unleash your power to the fullest!" + }, + "victory": { + "1": "My Pokémon and I learned so much! I offer you my thanks." + }, + "defeat": { + "1": "I aspire to claim victory with elegance and grace." + } + }, + "diantha": { + "encounter": { + "1": "Battling against you and your Pokémon, all of you brimming with hope for the future… \n$Honestly, it just fills me up with energy I need to keep facing each new day! It does!" + }, + "victory": { + "1": "Witnessing the noble spirits of you and your Pokémon in battle has really touched my heart…" + }, + "defeat": { + "1": "Oh, fantastic! What did you think? My team was pretty cool, right?" + } + }, + "wikstrom": { + "encounter": { + "1": "Well met, young challenger! Verily am I the famed blade of hardened steel, Duke Wikstrom! \n$Let the battle begin! En garde!", + "1_female": "Well met, young challenger! Verily am I the famed blade of hardened steel, Duke Wikstrom! \n$Let the battle begin! En garde!" + }, + "victory": { + "1": "Glorious! The trust that you share with your honorable Pokémon surpasses even mine!", + "1_female": "Glorious! The trust that you share with your honorable Pokémon surpasses even mine!" + }, + "defeat": { + "1": "What manner of magic is this? My heart, it doth hammer ceaselessly in my breast! \n$Winning against such a worthy opponent doth give my soul wings--thus do I soar!", + "1_female": "What manner of magic is this? My heart, it doth hammer ceaselessly in my breast! \n$Winning against such a worthy opponent doth give my soul wings--thus do I soar!" + } + }, + "acerola": { + "encounter": { + "1": "Battling is just plain fun! Come on, I can take you!" + }, + "victory": { + "1": "I'm… I'm speechless! How did you do it?!" + }, + "defeat": { + "1": "Ehaha! What an amazing victory!" + } + }, + "larry_elite": { + "encounter": { + "1": "Hello there… It's me, Larry.\n$I serve as a member of the Elite Four too, yes… Unfortunately for me." + }, + "victory": { + "1": "Well, that took the wind from under our wings…" + }, + "defeat": { + "1": "It's time for a meeting with the boss." + } + }, + "lance": { + "encounter": { + "1": "I've been waiting for you. Allow me to test your skill.", + "2": "I thought that you would be able to get this far. Let's get this started." + }, + "victory": { + "1": "You got me. You are magnificent!", + "1_female": "You got me. You are magnificent!", + "2": "I never expected another trainer to beat me… I'm surprised.", + "2_female": "I never expected another trainer to beat me… I'm surprised." + }, + "defeat": { + "1": "That was close. Want to try again?", + "2": "It's not that you are weak. Don't let it bother you.", + "2_female": "It's not that you are weak. Don't let it bother you." + } + }, + "karen": { + "encounter": { + "1": "I am Karen. Would you care for a showdown with my Dark-type Pokémon?", + "2": "I am unlike those you've already met.", + "3": "You've assembled a charming team. Our battle should be a good one." + }, + "victory": { + "1": "No! I can't win. How did you become so strong?", + "2": "I will not stray from my chosen path.", + "3": "The Champion is looking forward to meeting you." + }, + "defeat": { + "1": "That's about what I expected.", + "2": "Well, that was relatively entertaining.", + "3": "Come visit me anytime." + } + }, + "milo": { + "encounter": { + "1": "Sure seems like you understand Pokémon real well. \n$This is gonna be a doozy of a battle! \n$I'll have to Dynamax my Pokémon if I want to win!" + }, + "victory": { + "1": "The power of Grass has wilted… What an incredible Challenger!", + "1_female": "The power of Grass has wilted… What an incredible Challenger!" + }, + "defeat": { + "1": "This'll really leave you in shock and awe." + } + }, + "lucian": { + "encounter": { + "1": "Just a moment, please. The book I'm reading has nearly reached its thrilling climax… \n$The hero has obtained a mystic sword and is about to face their final trial… Ah, never mind. \n$Since you've made it this far, I'll put that aside and battle you. \n$Let me see if you'll achieve as much glory as the hero of my book!" + }, + "victory": { + "1": "I see… It appears you've put me in checkmate." + }, + "defeat": { + "1": "I have a reputation to uphold." + } + }, + "drasna": { + "encounter": { + "1": "You must be a strong Trainer. Yes, quite strong indeed…\n$That's just wonderful news! Facing opponents like you and your team will make my Pokémon grow like weeds!", + "1_female": "You must be a strong Trainer. Yes, quite strong indeed…\n$That's just wonderful news! Facing opponents like you and your team will make my Pokémon grow like weeds!" + }, + "victory": { + "1": "Oh, dear me. That sure was a quick battle… I do hope you'll come back again sometime!" + }, + "defeat": { + "1": "How can this be?" + } + }, + "kahili": { + "encounter": { + "1": "So, here you are… Why don't we see who the winds favor today, you… Or me?" + }, + "victory": { + "1": "It's frustrating to me as a member of the Elite Four, but it seems your strength is the real deal." + }, + "defeat": { + "1": "That was an ace!" + } + }, + "hassel": { + "encounter": { + "1": "Prepare to learn firsthand how the fiery breath of ferocious battle feels!" + }, + "victory": { + "1": "Fortune smiled on me this time, but… \n$Judging from how the match went, who knows if I will be so lucky next time." + }, + "defeat": { + "1": "That was an ace!" + } + }, + "blue": { + "encounter": { + "1": "You must be pretty good to get this far.", + "1_female": "You must be pretty good to get this far." + }, + "victory": { + "1": "I've only lost to him and now to you… Him? Hee, hee…" + }, + "defeat": { + "1": "See? My power is what got me here." + } + }, + "piers": { + "encounter": { + "1": "Get ready for a mosh pit with me and my party! Spikemuth, it's time to rock!" + }, + "victory": { + "1": "Me an' my team gave it our best. Let's meet up again for a battle some time…" + }, + "defeat": { + "1": "My throat's ragged from shoutin'… But 'at was an excitin' battle!" + } + }, + "red": { + "encounter": { + "1": "…!" + }, + "victory": { + "1": "…?" + }, + "defeat": { + "1": "…!" + } + }, + "jasmine": { + "encounter": { + "1": "Oh… Your Pokémon are impressive. I think I will enjoy this." + }, + "victory": { + "1": "You are truly strong. I'll have to try much harder, too." + }, + "defeat": { + "1": "I never expected to win." + } + }, + "lance_champion": { + "encounter": { + "1": "I am still the Champion. I won't hold anything back." + }, + "victory": { + "1": "This is the emergence of a new Champion.", + "1_female": "This is the emergence of a new Champion." + }, + "defeat": { + "1": "I successfully defended my Championship." + } + }, + "steven": { + "encounter": { + "1": "Tell me… What have you seen on your journey with your Pokémon? \n$What have you felt, meeting so many other Trainers out there? \n$Traveling this rich land… Has it awoken something inside you? \n$I want you to come at me with all that you've learned. \n$My Pokémon and I will respond in turn with all that we know!" + }, + "victory": { + "1": "So I, the Champion, fall in defeat…" + }, + "defeat": { + "1": "That was time well spent! Thank you!" + } + }, + "cynthia": { + "encounter": { + "1": "I, Cynthia, accept your challenge! There won't be any letup from me!" + }, + "victory": { + "1": "No matter how fun the battle is, it will always end sometime…" + }, + "defeat": { + "1": "Even if you lose, never lose your love of Pokémon." + } + }, + "iris": { + "encounter": { + "1": "Know what? I really look forward to having serious battles with strong Trainers! \n$I mean, come on! The Trainers who make it here are Trainers who desire victory with every fiber of their being! \n$And they are battling alongside Pokémon that have been through countless difficult battles! \n$If I battle with people like that, not only will I get stronger, my Pokémon will, too! \n$And we'll get to know each other even better! OK! Brace yourself! \n$I'm Iris, the Pokémon League Champion, and I'm going to defeat you!" + }, + "victory": { + "1": "Aghhhh… I did my best, but we lost…" + }, + "defeat": { + "1": "Yay! We won!" + } + }, + "hau": { + "encounter": { + "1": "I wonder if a Trainer battles differently depending on whether they're from a warm region or a cold region.\n$Let's test it out!" + }, + "victory": { + "1": "That was awesome! I think I kinda understand your vibe a little better now!" + }, + "defeat": { + "1": "Ma-an, that was some kinda battle!" + } + }, + "geeta": { + "encounter": { + "1": "I decided to throw my hat in the ring once more. \n$Come now… Show me the fruits of your training." + }, + "victory": { + "1": "I eagerly await news of all your achievements!" + }, + "defeat": { + "1": "What's the matter? This isn't all, is it?" + } + }, + "nemona": { + "encounter": { + "1": "Yesss! I'm so psyched! Time for us to let loose!" + }, + "victory": { + "1": "Well, that stinks, but I still had fun! I'll getcha next time!" + }, + "defeat": { + "1": "Well, that was a great battle! Fruitful for sure." + } + }, + "leon": { + "encounter": { + "1": "We're gonna have an absolutely champion time!" + }, + "victory": { + "1": "My time as Champion is over… \n$But what a champion time it's been! \n$Thank you for the greatest battle I've ever had!" + }, + "defeat": { + "1": "An absolute champion time, that was!" + } + }, + "whitney": { + "encounter": { + "1": "Hey! Don't you think Pokémon are, like, super cute?" + }, + "victory": { + "1": "Waaah! Waaah! You're so mean!", + "1_female": "Waaah! Waaah! You're so mean!" + }, + "defeat": { + "1": "And that's that!" + } + }, + "chuck": { + "encounter": { + "1": "Hah! You want to challenge me? Are you brave or just ignorant?", + "1_female": "Hah! You want to challenge me? Are you brave or just ignorant?" + }, + "victory": { + "1": "You're strong! Would you please make me your apprentice?" + }, + "defeat": { + "1": "There. Do you realize how much more powerful I am than you?" + } + }, + "katy": { + "encounter": { + "1": "Don't let your guard down unless you would like to find yourself knocked off your feet!", + "1_female": "Don't let your guard down unless you would like to find yourself knocked off your feet!" + }, + "victory": { + "1": "All of my sweet little Pokémon dropped like flies!" + }, + "defeat": { + "1": "Eat up, my cute little Vivillon!" + } + }, + "pryce": { + "encounter": { + "1": "Youth alone does not ensure victory! Experience is what counts." + }, + "victory": { + "1": "Outstanding! That was perfect. Try not to forget what you feel now." + }, + "defeat": { + "1": "Just as I envisioned." + } + }, + "clair": { + "encounter": { + "1": "Do you know who I am? And you still dare to challenge me?" + }, + "victory": { + "1": "I wonder how far you can get with your skill level. This should be fascinating." + }, + "defeat": { + "1": "That's that." + } + }, + "maylene": { + "encounter": { + "1": "I've come to challenge you now, and I won't hold anything back. \n$Please prepare yourself for battle!", + "1_female": "I've come to challenge you now, and I won't hold anything back. \n$Please prepare yourself for battle!" + }, + "victory": { + "1": "I admit defeat…" + }, + "defeat": { + "1": "That was awesome." + } + }, + "fantina": { + "encounter": { + "1": "You shall challenge me, yes? But I shall win. \n$That is what the Gym Leader of Hearthome does, non?" + }, + "victory": { + "1": "You are so fantastically strong. I know why I have lost." + }, + "defeat": { + "1": "I am so, so, very happy!" + } + }, + "byron": { + "encounter": { + "1": "Trainer! You're young, just like my son, Roark. \n$With more young Trainers taking charge, the future of Pokémon is bright! \n$So, as a wall for young people, I'll take your challenge!", + "1_female": "Trainer! You're young, just like my son, Roark. \n$With more young Trainers taking charge, the future of Pokémon is bright! \n$So, as a wall for young people, I'll take your challenge!" + }, + "victory": { + "1": "Hmm! My sturdy Pokémon--defeated!" + }, + "defeat": { + "1": "Gwahahaha! How were my sturdy Pokémon?!" + } + }, + "olympia": { + "encounter": { + "1": "An ancient custom deciding one's destiny. The battle begins!" + }, + "victory": { + "1": "Create your own path. Let nothing get in your way. Your fate, your future." + }, + "defeat": { + "1": "Our path is clear now." + } + }, + "volkner": { + "encounter": { + "1": "Since you've come this far, you must be quite strong…\n$I hope you're the Trainer who'll make me remember how fun it is to battle!", + "1_female": "Since you've come this far, you must be quite strong…\n$I hope you're the Trainer who'll make me remember how fun it is to battle!" + }, + "victory": { + "1": "You've got me beat…\n$Your desire and the noble way your Pokémon battled for you… \n$I even felt thrilled during our match. That was a very good battle." + }, + "defeat": { + "1": "It was not shocking at all… \n$That is not what I wanted!" + } + }, + "burgh": { + "encounter": { + "1": "M'hm… If I win this battle, I feel like I can draw a picture unlike any before it. \n$OK! I can hear my battle muse loud and clear. Let's get straight to it!", + "2": "Of course, I'm really proud of all of my Pokémon! \n$Well now… Let's get right to it!" + }, + "victory": { + "1": "Is it over? Has my muse abandoned me?", + "2": "Hmm… It's over! You're incredible!" + }, + "defeat": { + "1": "Wow… It's beautiful somehow, isn't it…", + "2": "Sometimes I hear people say something was an ugly win. \n$I think if you're trying your best, any win is beautiful." + } + }, + "elesa": { + "encounter": { + "1": "C'est fini! When I'm certain of that, I feel an electric jolt run through my body! \n$I want to feel the sensation, so now my beloved Pokémon are going to make your head spin!" + }, + "victory": { + "1": "I meant to make your head spin, but you shocked me instead." + }, + "defeat": { + "1": "That was unsatisfying somehow… Will you give it your all next time?" + } + }, + "skyla": { + "encounter": { + "1": "It's finally time for a showdown! That means the Pokémon battle that decides who's at the top, right? \n$I love being on the summit! 'Cause you can see forever and ever from high places! \n$So, how about you and I have some fun?" + }, + "victory": { + "1": "Being your opponent in battle is a new source of strength to me. Thank you!" + }, + "defeat": { + "1": "Win or lose, you always gain something from a battle, right?" + } + }, + "brycen": { + "encounter": { + "1": "There is also strength in being with other people and Pokémon. \n$Receiving their support makes you stronger. I'll show you this power!" + }, + "victory": { + "1": "The wonderful combination of you and your Pokémon! What a beautiful friendship!" + }, + "defeat": { + "1": "Extreme conditions really test you and train you!" + } + }, + "drayden": { + "encounter": { + "1": "What I want to find is a young Trainer who can show me a bright future. \n$Let's battle with everything we have: your skill, my experience, and the love we've raised our Pokémon with!" + }, + "victory": { + "1": "This intense feeling that floods me after a defeat… I don't know how to describe it." + }, + "defeat": { + "1": "Harrumph! I know your ability is greater than that!" + } + }, + "grant": { + "encounter": { + "1": "There is only one thing I wish for. \n$That by surpassing one another, we find a way to even greater heights." + }, + "victory": { + "1": "You are a wall that I am unable to surmount!" + }, + "defeat": { + "1": "Do not give up. \n$That is all there really is to it. \n$The most important lessons in life are simple." + } + }, + "korrina": { + "encounter": { + "1": "Time for Lady Korrina's big appearance!" + }, + "victory": { + "1": "It's your very being that allows your Pokémon to evolve!" + }, + "defeat": { + "1": "What an explosive battle!" + } + }, + "clemont": { + "encounter": { + "1": "Oh! I'm glad that we got to meet!" + }, + "victory": { + "1": "Your passion for battle inspires me!" + }, + "defeat": { + "1": "Looks like my Trainer-Grow-Stronger Machine, Mach 2 is really working!" + } + }, + "valerie": { + "encounter": { + "1": "Oh, if it isn't a young Trainer… It is lovely to get to meet you like this. \n$Then I suppose you have earned yourself the right to a battle, as a reward for your efforts. \n$The elusive Fairy may appear frail as the breeze and delicate as a bloom, but it is strong.", + "1_female": "Oh, if it isn't a young Trainer… It is lovely to get to meet you like this. \n$Then I suppose you have earned yourself the right to a battle, as a reward for your efforts. \n$The elusive Fairy may appear frail as the breeze and delicate as a bloom, but it is strong." + }, + "victory": { + "1": "I hope that you will find things worth smiling about tomorrow…" + }, + "defeat": { + "1": "Oh goodness, what a pity…" + } + }, + "wulfric": { + "encounter": { + "1": "You know what? We all talk big about what you learn from battling and bonds and all that…\n$But really, I just do it 'cause it's fun. \n$Who cares about the grandstanding? Let's get to battling!" + }, + "victory": { + "1": "Outstanding! I'm tough as an iceberg, but you smashed me through and through!" + }, + "defeat": { + "1": "Tussle with me and this is what happens!" + } + }, + "kabu": { + "encounter": { + "1": "Every Trainer and Pokémon trains hard in pursuit of victory. \n$But that means your opponent is also working hard to win. \n$In the end, the match is decided by which side is able to unleash their true potential." + }, + "victory": { + "1": "I'm glad I could battle you today!" + }, + "defeat": { + "1": "That's a great way for me to feel my own growth!" + } + }, + "bea": { + "encounter": { + "1": "Do you have an unshakable spirit that won't be moved, no matter how you are attacked? \n$I think I'll just test that out, shall I?" + }, + "victory": { + "1": "I felt the fighting spirit of your Pokémon as you led them in battle." + }, + "defeat": { + "1": "That was the best sort of match anyone could ever hope for." + } + }, + "opal": { + "encounter": { + "1": "Let me have a look at how you and your partner Pokémon behave!" + }, + "victory": { + "1": "Your pink is still lacking, but you're an excellent Trainer with excellent Pokémon.", + "1_female": "Your pink is still lacking, but you're an excellent Trainer with excellent Pokémon." + }, + "defeat": { + "1": "Too bad for you, I guess." + } + }, + "bede": { + "encounter": { + "1": "I suppose I should prove beyond doubt just how pathetic you are and how strong I am.", + "1_female": "I suppose I should prove beyond doubt just how pathetic you are and how strong I am." + }, + "victory": { + "1": "I see… Well, that's fine. I wasn't really trying all that hard anyway." + }, + "defeat": { + "1": "Not a bad job, I suppose." + } + }, + "gordie": { + "encounter": { + "1": "So, let's get this over with." + }, + "victory": { + "1": "I just want to climb into a hole… Well, I guess it'd be more like falling from here." + }, + "defeat": { + "1": "Battle like you always do, victory will follow!" + } + }, + "marnie": { + "encounter": { + "1": "The truth is, when all's said and done… I really just wanna become Champion for myself! \n$So don't take it personal when I kick your butt!" + }, + "victory": { + "1": "OK, so I lost… But I got to see a lot of the good points of you and your Pokémon!" + }, + "defeat": { + "1": "Hope you enjoyed our battle tactics." + } + }, + "raihan": { + "encounter": { + "1": "I'm going to defeat the Champion, win the whole tournament, and prove to the world just how strong the great Raihan really is!" + }, + "victory": { + "1": "I look this good even when I lose. \n$It's a real curse. \n$Guess it's time for another selfie!" + }, + "defeat": { + "1": "Let's take a selfie to remember this." + } + }, + "brassius": { + "encounter": { + "1": "I assume you are ready? Let our collaborative work of art begin!", + "1_female": "I assume you are ready? Let our collaborative work of art begin!" + }, + "victory": { + "1": "Ahhh…vant-garde!" + }, + "defeat": { + "1": "I will begin on a new piece at once!" + } + }, + "iono": { + "encounter": { + "1": "How're ya feelin' about this battle?\n$...\n$Let's get this show on the road! How strong is our challenger? \n$I 'unno! Let's find out together!", + "1_female": "How're ya feelin' about this battle?\n$...\n$Let's get this show on the road! How strong is our challenger? \n$I 'unno! Let's find out together!" + }, + "victory": { + "1": "You're as flashy and bright as a 10,000,000-volt Thunderbolt, friendo!", + "1_female": "You're as flashy and bright as a 10,000,000-volt Thunderbolt, friendo!" + }, + "defeat": { + "1": "Your eyeballs are MINE!" + } + }, + "larry": { + "encounter": { + "1": "When all's said and done, simplicity is strongest." + }, + "victory": { + "1": "A serving of defeat, huh?" + }, + "defeat": { + "1": "I'll call it a day." + } + }, + "ryme": { + "encounter": { + "1": "Come on, baby! Rattle me down to the bone!" + }, + "victory": { + "1": "You're cool, my friend—you move my SOUL!", + "1_female": "You're cool, my friend—you move my SOUL!" + }, + "defeat": { + "1": "Later, baby!" + } + }, + "grusha": { + "encounter": { + "1": "All I need to do is make sure the power of my Pokémon chills you to the bone!" + }, + "victory": { + "1": "Your burning passion… I kinda like it, to be honest." + }, + "defeat": { + "1": "Things didn't heat up for you." + } + }, + "marnie_elite": { + "encounter": { + "1": "You've made it this far, huh? Let's see if you can handle my Pokémon!", + "2": "I'll give it my best shot, but don't think I'll go easy on you!" + }, + "victory": { + "1": "I can't believe I lost... But you deserved that win. Well done!", + "2": "Looks like I've still got a lot to learn. Great battle, though!" + }, + "defeat": { + "1": "You put up a good fight, but I've got the edge! Better luck next time!", + "2": "Seems like my training's paid off. Thanks for the battle!" + } + }, + "nessa_elite": { + "encounter": { + "1": "The tides are turning in my favor. Ready to get swept away?", + "1_female": "The tides are turning in my favor. Ready to get swept away?", + "2": "Let's make some waves with this battle! I hope you're prepared!", + "2_female": "Let's make some waves with this battle! I hope you're prepared!" + }, + "victory": { + "1": "You navigated those waters perfectly... Well done!", + "2": "Looks like my currents were no match for you. Great job!" + }, + "defeat": { + "1": "Water always finds a way. That was a refreshing battle!", + "2": "You fought well, but the ocean's power is unstoppable!" + } + }, + "bea_elite": { + "encounter": { + "1": "Prepare yourself! My fighting spirit burns bright!", + "2": "Let's see if you can keep up with my relentless pace!" + }, + "victory": { + "1": "Your strength... It's impressive. You truly deserve this win.", + "2": "I've never felt this intensity before. Amazing job!" + }, + "defeat": { + "1": "Another victory for my intense training regimen! Well done!", + "2": "You've got strength, but I trained harder. Great battle!" + } + }, + "allister_elite": { + "encounter": { + "1": "Shadows fall... Are you ready to face your fears?", + "1_female": "Shadows fall... Are you ready to face your fears?", + "2": "Let's see if you can handle the darkness that I command." + }, + "victory": { + "1": "You've dispelled the shadows... For now. Well done.", + "2": "Your light pierced through my darkness. Great job." + }, + "defeat": { + "1": "The shadows have spoken... Your strength isn't enough.", + "2": "Darkness triumphs... Maybe next time you'll see the light." + } + }, + "raihan_elite": { + "encounter": { + "1": "Storm's brewing! Let's see if you can weather this fight!", + "2": "Get ready to face the eye of the storm!" + }, + "victory": { + "1": "You've bested the storm... Incredible job!", + "2": "You rode the winds perfectly... Great battle!" + }, + "defeat": { + "1": "Another storm weathered, another victory claimed! Well fought!", + "2": "You got caught in my storm! Better luck next time!", + "2_female": "You got caught in my storm! Better luck next time!" + } + }, + "alder": { + "encounter": { + "1": "Prepare yourself for a match against the strongest Trainer in Unova!" + }, + "victory": { + "1": "Well done! You certainly are an unmatched talent." + }, + "defeat": { + "1": "A fresh wind blows through my heart...\n$What an extraordinary effort!" + } + }, + "kieran": { + "encounter": { + "1": "Through hard work, I become stronger and stronger!\n$I don't lose." + }, + "victory": { + "1": "I don't believe it...\n$What a fun and heart-pounding battle!" + }, + "defeat": { + "1": "Wowzers, what a battle!\n$Time for you to train even harder." + } + }, + "rival": { + "encounter": { + "1": "@c{smile}あっ、ここに　いたんだ！　旅に　出る前に　「じゃ　またね！」って　くらい　聞きたかったよ……$@c{smile_eclosed}やっぱり　夢を　追ってこうと　しているんだ？　信じられない　ほどね……$@c{serious_smile_fists}じゃあ、　ここまで　来たから　バトルしよっか？　覚悟してるかを　確かめたい　から！$@c{serious_mopen_fists}遠慮せずに　全力で　かかってこいぜ！" + }, + "victory": { + "1": "@c{shock}ウワッ、カンゼンに　ぶっ壊したぜ。\n初心者だとは　思えないほど……$@c{smile}たぶん　運が良っかった　だけが……\n最後まで　行ける素質が　あるかもな！$こっちの　アイテムを　あげよう、　博士に そう言いつけたから。　結構　スゴそうな　もんだ！$@c{serious_smile_fists}ここからも　ガンバレ！" + } + }, + "rival_female": { + "encounter": { + "1": "@c{smile_wave}あ、ついに 見つけた！ あちこち 探したのよ！ \n@c{angry_mopen}だーい親友に お別れを 言うまでも 忘れちゃった？$@c{smile_ehalf}大切な 夢を 追っていくのね？\n やっぱり、この日が 来たのね……$@c{smile}とにかく！ アタシを 忘れちゃったのを 許せる 条件は 一つ： \n@c{smile_wave_wink}アタシと バトルだ!$@c{angry_mopen}全力で かかってきなさい！\n冒険が 第一歩で 終わっちゃうと もったいない でしょう？" + }, + "victory": { + "1": "@c{shock}始まった　バッカリなのに　そんなに強い？！@d{96}\n@c{angry}完全に　チートだろう？\n$@c{smile_wave_wink}なんちゃって！@d{64} @c{smile_eclosed}正々堂々と　負けたよ。　冒険　上手く行ける　気がするね！\n$@c{smile}ところで、こっち！　博士からの　アイテムを　あげるわ。きっと　便利だと　思うよ！\n$@c{smile_wave}いつも通り　頑張ってね！　信じてるから！" + } + }, + "rival_2": { + "encounter": { + "1": "@c{smile}おや、なんと　グウゼン。\n@c{smile_eclosed}今までも　パーフェクトに　勝った　ようだな……\n$@c{serious_mopen_fists}なんか　忍び寄った　みたいだとは　分かるけど、　そんなことない…　ほとんどはな。\n$@c{serious_smile_fists}ぶっちゃけ言うと、　オレが　負けた時から　再戦したくて　ウズウズしてたぜ。\n$張り切って　特訓したから　今は　ちゃんと　勢い　見せるんだ。\n$@c{serious_mopen_fists}今回も　遠慮しな！\n行こうぜ！" + }, + "victory": { + "1": "@c{neutral_eclosed}あ。　自信過剰かも。\n$@c{smile}いいけどさ、　こうなるのを　見込んだから。\n@c{serious_mopen_fists}次回まで　もっと頑張らなくちゃ　ってことだよな！\n\n$@c{smile}きっと　助け　要らないんだが、　もう一つの　アイテムが　欲しいかと　思ったから　あげるぜ。\n\n$@c{serious_smile_fists}でも　これで　ラストだ！\n相手に　利点を　あげ続けると　行けないんだろう！" + } + }, + "rival_2_female": { + "encounter": { + "1": "@c{smile_wave}あっ、 こんなとこで 偶然だね！ まだ 倒れないようだ。@c{angry_mopen}フム、えらいえらい！\n$@c{angry_mopen}考えてるのは 分かる、 つきまとってるワケ じゃないから！@c{smile_eclosed}この辺に いただけよ。\n$@c{smile_ehalf}ここまで 頑張っていて 良かったけど、 時々 負けることも 大丈夫だと 知ってるよね？\n$@c{smile}みんなは 失敗から 学ぶ… いつまでも 成功し続ける よりもね。\n$@c{angry_mopen}とにかく！ 再戦の ために 大変 トレーニングしてたから 全・勢・力で 戦おう！" + }, + "victory": { + "1": "@c{neutral}…今回は　負ける　はずじゃなかった…\n$@c{smile}しょうがないね。　次回まで　もっともっと　トレーニングしなくちゃ　ってこと！\n$@c{smile_wave}そして！　もう二つの　アイテム、　どうぞ！\n@c{smile_wave_wink}「ありがと」なんて　必要ない！\n$@c{angry_mopen}でもね、　これで　最後！ 今から　サービス　一つも　あげないよ～" + }, + "defeat": { + "1": "時々　負けることも　いいんだよ…" + } + }, + "rival_3": { + "encounter": { + "1": "@c{smile}Hey, look who it is! It's been a while.\n@c{neutral}You're… still undefeated? Huh.\n$@c{neutral_eclosed}Things have been kind of… strange.\nIt's not the same back home without you.\n$@c{serious}I know it's selfish, but I need to get this off my chest.\n@c{neutral_eclosed}I think you're in over your head here.\n$@c{serious}Never losing once is just unrealistic.\nWe need to lose sometimes in order to grow.\n$@c{neutral_eclosed}You've had a great run but there's still so much ahead, and it only gets harder. @c{neutral}Are you prepared for that?\n$@c{serious_mopen_fists}If so, prove it to me." + }, + "victory": { + "1": "@c{angry_mhalf}This is ridiculous… I've hardly stopped training…\nHow are we still so far apart?" + } + }, + "rival_3_female": { + "encounter": { + "1": "@c{smile_wave}ヒサブリ~！　まだ　負けてないね。\n@c{angry}だんだん　イラッと来る。@c{smile_wave_wink}なんちゃって！\n$@c{smile_ehalf}でもよ、　本当に　ふるさとが　恋しくないの？　それとも…　アタシ…？\nずっと会いたいよ…　あの、みんなはね！\n$@c{smile_eclosed}夢を　叶ってるのを　応援してるけど、　実際は　やがて　負ける。\n$@c{smile}その時が　来たら　アタシは　いつも通り　そばにいるよ。\n@c{angry_mopen}さあ、　ここまで　頑張ってきた　アタシの　力を　見せさせて！" + }, + "victory": { + "1": "@c{shock}もう…　足りなかった…？\nこのままで　決して　帰らない　だろう……" + }, + "defeat": { + "1": "ベストを　尽くした。　じゃ、　帰りましょう。" + } + }, + "rival_4": { + "encounter": { + "1": "@c{neutral}Hey.\n$I won't mince words or pleasantries with you.\n@c{neutral_eclosed}I'm here to win, plain and simple.\n$@c{serious_mhalf_fists}I've learned to maximize my potential by putting all my time into training.\n$@c{smile}You get a lot of extra time when you cut out the unnecessary sleep and social interaction.\n$@c{serious_mopen_fists}None of that matters anymore, not until I win.\n$@c{neutral_eclosed}I've even reached the point where I don't lose anymore.\n@c{smile_eclosed}I suppose your philosophy wasn't so wrong after all.\n$@c{angry_mhalf}Losing is for the weak, and I'm not weak anymore.\n$@c{serious_mopen_fists}Prepare yourself." + }, + "victory": { + "1": "@c{neutral}What…@d{64} What are you?" + } + }, + "rival_4_female": { + "encounter": { + "1": "@c{neutral}アタシよ！　また　忘れちゃった…　のね？\n$@c{smile}こんな　遠くまで　来たのは　鼻が高いことだよ！　おめでと～\nしかし、　ここは　終着点だね。\n$@c{smile_eclosed}アタシの　中にある　全然　知らなかった　部分を　目覚めたよ。\n今は、　トレーニングしか　してないみたい。\n$@c{smile_ehalf}食べたり　寝たりも　しなくて　朝から晩まで　ポケモンを　育って、　毎日　昨日より　強くなってる。\n$@c{neutral}実は…　もう　自分　認識できない。\n$結局、　峠を越して　まるで　カミに　なった。\n今は　誰にも　アタシを　倒せないと　思う。\n$ねえ、分かる？　全ては　アンタの　お陰で。\n@c{smile_ehalf}お礼を言うか　アンタのこと嫌いか　どうしたらいいの　分からない。\n$@c{angry_mopen}覚悟しなさい。" + }, + "victory": { + "1": "@c{neutral}一体…@d{64} 何モノか…？" + }, + "defeat": { + "1": "$@c{smile}ここまで　頑張ってたのを　誇りに思ってね。" + } + }, + "rival_5": { + "encounter": { + "1": "@c{neutral}…" + }, + "victory": { + "1": "@c{neutral}…" + } + }, + "rival_5_female": { + "encounter": { + "1": "@c{neutral}…" + }, + "victory": { + "1": "@c{neutral}…" + }, + "defeat": { + "1": "$@c{smile_ehalf}…" + } + }, + "rival_6": { + "encounter": { + "1": "@c{smile_eclosed}We meet again.\n$@c{neutral}I've had some time to reflect on all this.\nThere's a reason this all seems so strange.\n$@c{neutral_eclosed}Your dream, my drive to beat you…\nIt's all a part of something greater.\n$@c{serious}This isn't about me, or about you… This is about the world, @c{serious_mhalf_fists}and it's my purpose to push you to your limits.\n$@c{neutral_eclosed}Whether I've fulfilled that purpose I can't say, but I've done everything in my power.\n$@c{neutral}This place we ended up in is terrifying… Yet somehow I feel unphased, like I've been here before.\n$@c{serious_mhalf_fists}You feel the same, don't you?\n$@c{serious}…and it's like something here is speaking to me.\nThis is all the world's known for a long time now.\n$Those times we cherished together that seem so recent are nothing but a distant memory.\n$@c{neutral_eclosed}Who can say whether they were ever even real in the first place.\n$@c{serious_mopen_fists}You need to keep pushing, because if you don't, it will never end. You're the only one who can do this.\n$@c{serious_smile_fists}I hardly know what any of this means, I just know that it's true.\n$@c{serious_mopen_fists}If you can't defeat me here and now, you won't stand a chance." + }, + "victory": { + "1": "@c{smile_eclosed}It looks like my work is done here.\n$I want you to promise me one thing.\n@c{smile}After you heal the world, please come home." + } + }, + "rival_6_female": { + "encounter": { + "1": "@c{smile_ehalf}また　アタシたちだけに　なった。\n$@c{smile_eclosed}ねえ、　頭の中に　グルグル　巡ることが　あってよ。\n$@c{smile_ehalf}アタシとアナタの　間に　起こしたことも,　この変な感情も……\n$@c{smile}アナタの夢、　アタシの野心…\n$アタシたちが　し続けることも　全ては…　より高い　目的が　あると思うよ。\n$@c{smile_eclosed}最果ての　限界まで　押すこと…　それは　アタシの　役割だと思う。\n$@c{smile_ehalf}今まで　役割を　上手く果たせたかは　分からないけど……　一生懸命　頑張った。\n$こんな奇妙な　恐ろしい場所で　なんか…　全てが　明らかに　見られるみたい。\n$昔から… これだけしかは　この世界こそ　そのもの。\n$@c{smile_eclosed}アタシたちが　大切にした　心にギュッと　抱いた思い出…　もう　思い出せない。\n$@c{smile_ehalf}本当は　全部　ウソだったの？　今は　遠い彼方に　あるみたい。\n$@c{angry_mopen}アナタは　最後まで　戦い続けなければ　決して　終わらない。　アナタしか　できないのよ。\n$@c{smile_ehalf}この全ての　意味、　全然　分からないけど…　真実だと　感じてる。\n$@c{neutral}今ここで　アタシを　倒せないと　最後に　勝ち目は　ナイ。" + }, + "victory": { + "1": "@c{smile_ehalf}役割…　果たせたと思う。\n$@c{smile_eclosed}ね、　約束して。　この世界を　癒やしたら…　お願い　無事に　帰って。\n$@c{smile_ehalf}……ありがとう。" + } + } +} diff --git a/src/locales/ja/fight-ui-handler.json b/src/locales/ja/fight-ui-handler.json index 2318cebd2d3..41ec140c2ca 100644 --- a/src/locales/ja/fight-ui-handler.json +++ b/src/locales/ja/fight-ui-handler.json @@ -1,7 +1,7 @@ { "pp": "PP", - "power": "いりょく", - "accuracy": "めいちゅう", - "abilityFlyInText": " {{pokemonName}}の {{passive}}{{abilityName}}", - "passive": "Passive " -} \ No newline at end of file + "power": "威力", + "accuracy": "命中", + "abilityFlyInText": " {{pokemonName}}の\n{{passive}}：{{abilityName}}", + "passive": "パッシブ " +} diff --git a/src/locales/ja/filter-bar.json b/src/locales/ja/filter-bar.json index c09705d9b50..891b7d87674 100644 --- a/src/locales/ja/filter-bar.json +++ b/src/locales/ja/filter-bar.json @@ -32,7 +32,7 @@ "noPokerus": "ポケルス - なし", "sortByNumber": "No.", "sortByCost": "ポイント", - "sortByCandies": "飴の数", + "sortByCandies": "アメの数", "sortByIVs": "個体値", "sortByName": "名前" -} \ No newline at end of file +} diff --git a/src/locales/ja/game-stats-ui-handler.json b/src/locales/ja/game-stats-ui-handler.json index 2fff802734a..25301aa4297 100644 --- a/src/locales/ja/game-stats-ui-handler.json +++ b/src/locales/ja/game-stats-ui-handler.json @@ -12,26 +12,26 @@ "dailyRunAttempts": "デイリーラン", "dailyRunWins": "デイリーラン勝利", "endlessRuns": "エンドレスラン", - "highestWaveEndless": "エンドレス最高波", + "highestWaveEndless": "エンドレス最高ラウンド", "highestMoney": "最大貯金", "highestDamage": "最大ダメージ", "highestHPHealed": "最大HP回復", "pokemonEncountered": "遭遇したポケモン", "pokemonDefeated": "倒したポケモン", "pokemonCaught": "捕まえたポケモン", - "eggsHatched": "孵化したタマゴ", + "eggsHatched": "ふかしたタマゴ", "subLegendsSeen": "見つけた順伝説ポケモン", "subLegendsCaught": "捕まえた準伝説ポケモン", - "subLegendsHatched": "孵化した準伝説ポケモン", + "subLegendsHatched": "ふかした準伝説ポケモン", "legendsSeen": "見つけた伝説ポケモン", "legendsCaught": "捕まえた伝説ポケモン", - "legendsHatched": "孵化した伝説ポケモン", + "legendsHatched": "ふかした伝説ポケモン", "mythicalsSeen": "見つけた幻ポケモン", "mythicalsCaught": "捕まえた幻ポケモン", - "mythicalsHatched": "孵化した幻ポケモン", + "mythicalsHatched": "ふかした幻ポケモン", "shiniesSeen": "見つけた色違いポケモン", "shiniesCaught": "捕まえた色違いポケモン", - "shiniesHatched": "孵化した色違いポケモン", + "shiniesHatched": "ふかした色違いポケモン", "pokemonFused": "吸収合体したポケモン", "trainersDefeated": "倒したトレーナー", "eggsPulled": "引いたタマゴ", diff --git a/src/locales/ja/growth.json b/src/locales/ja/growth.json index 3d23fa1f46d..e5c1317632f 100644 --- a/src/locales/ja/growth.json +++ b/src/locales/ja/growth.json @@ -1,8 +1,8 @@ { - "Erratic": "60まんタイプ", - "Fast": "80まんタイプ", - "Medium_Fast": "100まんタイプ", - "Medium_Slow": "105まんタイプ", - "Slow": "125まんタイプ", - "Fluctuating": "164まんタイプ" -} \ No newline at end of file + "Erratic": "60万タイプ", + "Fast": "80万タイプ", + "Medium_Fast": "100万タイプ", + "Medium_Slow": "105万タイプ", + "Slow": "125万タイプ", + "Fluctuating": "164万タイプ" +} diff --git a/src/locales/ja/menu-ui-handler.json b/src/locales/ja/menu-ui-handler.json index 1930c3999c6..851c8478e9d 100644 --- a/src/locales/ja/menu-ui-handler.json +++ b/src/locales/ja/menu-ui-handler.json @@ -24,6 +24,6 @@ "linkGoogle": "Google連携", "unlinkGoogle": "Google連携解除", "cancel": "キャンセル", - "losingProgressionWarning": "戦闘開始からの　データが　保存されません。\nよろしいですか？", - "noEggs": "現在は　タマゴを　孵化していません！" + "losingProgressionWarning": "戦闘開始からの　データが　セーブされません。\nよろしいですか？", + "noEggs": "現在は　タマゴを　ふかしていません！" } diff --git a/src/locales/ja/modifier-type.json b/src/locales/ja/modifier-type.json index f1fcc4d3005..e249e3c430f 100644 --- a/src/locales/ja/modifier-type.json +++ b/src/locales/ja/modifier-type.json @@ -353,7 +353,7 @@ "description": "やせいのポケモンがかくれとくせいをもつかくりつをおおきくふやす" }, "IV_SCANNER": { - "name": "こたいち たんちき", + "name": "こたいちスキャナー", "description": "やせいのポケモンのこたいちをスキャンできる。スタックごとに2つのこたいちがあきらかになる。もっともたかいこたいちがさいしょにひょうじされる" }, "DNA_SPLICERS": { diff --git a/src/locales/ja/modifier.json b/src/locales/ja/modifier.json index a42a849e232..c33bb9be151 100644 --- a/src/locales/ja/modifier.json +++ b/src/locales/ja/modifier.json @@ -1,12 +1,12 @@ { "surviveDamageApply": "{{pokemonNameWithAffix}}は\n{{typeName}}で　もちこたえた！", - "turnHealApply": "{{pokemonNameWithAffix}}は\n{{typeName}}で　少し　回復！", - "hitHealApply": "{{pokemonNameWithAffix}}は\n{{typeName}}で　少し　回復！", + "turnHealApply": "{{pokemonNameWithAffix}}は\n{{typeName}}で　少し　体力を　回復した！", + "hitHealApply": "{{pokemonNameWithAffix}}は\n{{typeName}}で　少し　体力を　回復した！", "pokemonInstantReviveApply": "{{pokemonNameWithAffix}}は\n{{typeName}}で　復活した！", "resetNegativeStatStageApply": "{{pokemonNameWithAffix}}は　{{typeName}}で\n下がった能力が　元に戻った！", "moneyInterestApply": "{{typeName}}から　{{moneyAmount}}円　取得した！", - "turnHeldItemTransferApply": "{{pokemonName}}の {{typeName}}が\n{{pokemonNameWithAffix}}の {{itemName}}を 吸い取った！", - "contactHeldItemTransferApply": "{{pokemonName}}の {{typeName}}が\n{{pokemonNameWithAffix}}の {{itemName}}を うばい取った！", + "turnHeldItemTransferApply": "{{pokemonName}}の {{typeName}}が\n{{pokemonNameWithAffix}}の {{itemName}}を　吸い取った！", + "contactHeldItemTransferApply": "{{pokemonName}}の {{typeName}}が\n{{pokemonNameWithAffix}}の {{itemName}}を　奪い取った！", "enemyTurnHealApply": "{{pokemonNameWithAffix}}は\n体力を　回復！", "bypassSpeedChanceApply": "{{pokemonName}}は　{{itemName}}で\n行動が　はやくなった！" -} \ No newline at end of file +} diff --git a/src/locales/ja/move-trigger.json b/src/locales/ja/move-trigger.json index 11a327c01d7..7449d8c6e4b 100644 --- a/src/locales/ja/move-trigger.json +++ b/src/locales/ja/move-trigger.json @@ -1,64 +1,69 @@ { - "hitWithRecoil": "{{pokemonName}}は\nはんどうによる　ダメージを　うけた！", - "cutHpPowerUpMove": "{{pokemonName}}は\nたいりょくを　けずって　パワーぜんかい！", - "absorbedElectricity": "{{pokemonName}}は\n　でんきを　きゅうしゅうした！", - "switchedStatChanges": "{{pokemonName}}は　あいてと　じぶんの\nのうりょくへんかを　いれかえた！", - "sharedGuard": "{{pokemonName}}は\nおたがいのガードを　シェアした！", - "sharedPower": "{{pokemonName}}は\nおたがいのパワーを　シェアした！", - "goingAllOutForAttack": "{{pokemonName}}は\nほんきを　だした！", - "regainedHealth": "{{pokemonName}}は\nたいりょくを　かいふくした！", - "keptGoingAndCrashed": "いきおいあまって　{{pokemonName}}は\nじめんに　ぶつかった！", - "fled": "{{pokemonName}}は　にげだした!", - "cannotBeSwitchedOut": "{{pokemonName}}を\nもどすことが　できない！", - "swappedAbilitiesWithTarget": "{{pokemonName}}は\nおたがいの　とくせいを　いれかえた！", - "coinsScatteredEverywhere": "こばんが　あたりに　ちらばった！", + "hitWithRecoil": "{{pokemonName}}は\n反動による　ダメージを　受けた！", + "cutHpPowerUpMove": "{{pokemonName}}は\n体力を　削って　技の　威力を　上がった！", + "absorbedElectricity": "{{pokemonName}}は\n　電気を　吸収した！", + "switchedStatChanges": "{{pokemonName}}は　相手と　自分の\n能力変化を　入れ替えた！", + "switchedTwoStatChanges": "{{pokemonName}}は　相手と　自分の {{firstStat}}と\n{{secondStat}}の　能力変化を　入れ替えた！", + "switchedStat": "{{pokemonName}}は　相手と　{{stat}}を　入れ替えた！", + "sharedGuard": "{{pokemonName}}は\nお互いのガードを　シェアした！", + "sharedPower": "{{pokemonName}}は\nお互いのパワーを　シェアした！", + "goingAllOutForAttack": "{{pokemonName}}は\n本気を　出した！", + "regainedHealth": "{{pokemonName}}は\n体力を　回復した！", + "keptGoingAndCrashed": "勢い余って　{{pokemonName}}は\n地面に　ぶつかった！", + "fled": "{{pokemonName}}は　逃げ出した!", + "cannotBeSwitchedOut": "{{pokemonName}}を\n戻すことが　できない！", + "swappedAbilitiesWithTarget": "{{pokemonName}}は\nお互いの　特性を　入れ替えた！", + "coinsScatteredEverywhere": "小判が　辺りに　散らばった！", "attackedByItem": "{{pokemonName}}に\n{{itemName}}が　おそいかかる！", - "whippedUpAWhirlwind": "{{pokemonName}}の　まわりで\nくうきが　うずをまく！", - "flewUpHigh": "{{pokemonName}}は\nそらたかく　とびあがった！", - "tookInSunlight": "{{pokemonName}}は\nひかりを きゅうしゅうした！", - "dugAHole": "{{pokemonName}}は\nじめんに　もぐった！", - "loweredItsHead": "{{pokemonName}}は\nくびを　ひっこめた！", - "isGlowing": "{{pokemonName}}を\nはげしいひかりが　つつむ！", - "bellChimed": "すずのおとが　ひびきわたった！", - "foresawAnAttack": "{{pokemonName}}は\nみらいに　こうげきを　よちした！", - "hidUnderwater": "{{pokemonName}}は\nすいちゅうに　みをひそめた！", - "soothingAromaWaftedThroughArea": "ここちよい　かおりが　ひろがった！", - "sprangUp": "{{pokemonName}}は\nたかく　とびはねた！", - "choseDoomDesireAsDestiny": "{{pokemonName}}は\nはめつのねがいを　みらいに　たくした！", - "vanishedInstantly": "{{pokemonName}}の　すがたが\nいっしゅんにして　きえた！", - "tookTargetIntoSky": "{{pokemonName}}は {{targetName}}を\nじょうくうに　つれさった！", - "becameCloakedInFreezingLight": "{{pokemonName}}は\nつめたいひかりに　つつまれた！", - "becameCloakedInFreezingAir": "{{pokemonName}}は\nこごえるくうきに　つつまれた！", - "isChargingPower": "{{pokemonName}}は\nパワーを　ためこんでいる！", - "burnedItselfOut": "{{pokemonName}}の　ほのうは\nもえつきた！", - "startedHeatingUpBeak": "{{pokemonName}}は\nクチバシを　かねつしはじめた！", + "whippedUpAWhirlwind": "{{pokemonName}}の　周りで\n空気が　渦を巻く！", + "flewUpHigh": "{{pokemonName}}は\n空高く　飛び上がった！", + "tookInSunlight": "{{pokemonName}}は\n光を 吸収した！", + "dugAHole": "{{pokemonName}}は\n地面に　潜った！", + "loweredItsHead": "{{pokemonName}}は\n首を　引っ込めた！", + "isGlowing": "{{pokemonName}}を\n激しい光が　包む！", + "bellChimed": "鈴の音が　響き渡った！", + "foresawAnAttack": "{{pokemonName}}は\n未来に　攻撃を　予知した！", + "isTighteningFocus": "{{pokemonName}}は\n集中力を　高めている！", + "hidUnderwater": "{{pokemonName}}は\n水中に　身を潜めた！", + "soothingAromaWaftedThroughArea": "心地よい　香りが　広がった！", + "sprangUp": "{{pokemonName}}は\n高く　飛び跳ねた！", + "choseDoomDesireAsDestiny": "{{pokemonName}}は\nはめつのねがいを　未来に　託した！", + "vanishedInstantly": "{{pokemonName}}の　姿が\n一瞬にして　消えた！", + "tookTargetIntoSky": "{{pokemonName}}は {{targetName}}を\n上空に　連れ去った！", + "becameCloakedInFreezingLight": "{{pokemonName}}は\n冷たい光に　包まれた！", + "becameCloakedInFreezingAir": "{{pokemonName}}は\n凍える空気に　包まれた！", + "isChargingPower": "{{pokemonName}}は\nパワーを　溜め込んでいる！", + "burnedItselfOut": "{{pokemonName}}の　炎は　燃え尽きた！", + "startedHeatingUpBeak": "{{pokemonName}}は\nクチバシを　加熱し始めた！", "setUpShellTrap": "{{pokemonName}}は\nトラップシェルを　仕掛けた！", - "isOverflowingWithSpacePower": "{{pokemonName}}に\nうちゅうの　ちからが　あふれだす！", - "usedUpAllElectricity": "{{pokemonName}}は\nでんきを　つかいきった！", - "stoleItem": "{{pokemonName}}は\n{{targetName}}の {{itemName}}を　ぬすんだ！", - "incineratedItem": "{{pokemonName}}は\n{{targetName}}の {{itemName}}を　もやした！", - "knockedOffItem": "{{pokemonName}}は\n{{targetName}}の {{itemName}}を　はたきおとした！", - "tookMoveAttack": "{{pokemonName}}は\n{{moveName}}の　こうげきを　うけた！", - "cutOwnHpAndMaximizedStat": "{{pokemonName}}は\nたいりょくを　けずって　{{statName}}ぜんかい！", - "copiedStatChanges": "{{pokemonName}}は　{{targetName}}の\nのうりょくへんかを　コピーした！", + "isOverflowingWithSpacePower": "{{pokemonName}}に\n宇宙の　力が　溢れ出す！", + "usedUpAllElectricity": "{{pokemonName}}は\n電気を　使い切った！", + "stoleItem": "{{pokemonName}}は\n{{targetName}}の {{itemName}}を　盗んだ！", + "incineratedItem": "{{pokemonName}}は\n{{targetName}}の {{itemName}}を　燃やした！", + "knockedOffItem": "{{pokemonName}}は\n{{targetName}}の {{itemName}}を　はたき落とした！", + "tookMoveAttack": "{{pokemonName}}は\n{{moveName}}の　攻撃を　受けた！", + "cutOwnHpAndMaximizedStat": "{{pokemonName}}は\n体力を　削って　{{statName}}全開！", + "copiedStatChanges": "{{pokemonName}}は　{{targetName}}の\n能力変化を　コピーした！", "magnitudeMessage": "マグニチュード{{magnitude}}！", - "tookAimAtTarget": "{{pokemonName}}は {{targetName}}に\nねらいを　さだめた！", + "tookAimAtTarget": "{{pokemonName}}は {{targetName}}に\n狙いを　定めた！", "transformedIntoType": "{{pokemonName}}は\n{{typeName}}タイプに　なった！", "copiedMove": "{{pokemonName}}は\n{{moveName}}を　コピーした！", "sketchedMove": "{{pokemonName}}は\n{{moveName}}を　スケッチした！", - "acquiredAbility": "{{pokemonName}}の　とくせいが\n{{abilityName}}に　なった！", + "acquiredAbility": "{{pokemonName}}の　特性が\n{{abilityName}}に　なった！", "copiedTargetAbility": "{{pokemonName}}は\n{{targetName}}の　{{abilityName}}を　コピーした！", - "transformedIntoTarget": "{{pokemonName}}は\n{{targetName}}に　へんしんした！", - "tryingToTakeFoeDown": "{{pokemonName}}は　あいてを\nみちづれに　しようとしている！", - "addType": "{{pokemonName}}に\n{{typeName}}タイプが　ついかされた！", - "cannotUseMove": "{{pokemonName}}は\n{{moveName}}を　つかえなかった！", - "healHp": "{{pokemonName}}の\nたいりょくが　かいふくした！", - "sacrificialFullRestore": "{{pokemonName}}の\nねがいごとが　かなった！", - "invertStats": "{{pokemonName}}の\nのうりょくへんかが　ぎゃくてんした！", - "resetStats": "{{pokemonName}}の\nのうりょくへんかが　もとにもどった！", - "faintCountdown": "{{pokemonName}}は\n{{turnCount}}ターンごに　ほろびてしまう！", + "transformedIntoTarget": "{{pokemonName}}は\n{{targetName}}に　変身した！", + "tryingToTakeFoeDown": "{{pokemonName}}は　相手を\nみちづれに　しようとしている！", + "addType": "{{pokemonName}}に\n{{typeName}}タイプが　追加された！", + "cannotUseMove": "{{pokemonName}}は\n{{moveName}}を　使えなかった！", + "healHp": "{{pokemonName}}の\n体力が　回復した！", + "sacrificialFullRestore": "{{pokemonName}}の\nいやしのねがいが　叶った！", + "invertStats": "{{pokemonName}}は\n能力変化が　ひっくり返った！", + "resetStats": "{{pokemonName}}の\n能力変化が　元に戻った！", + "statEliminated": "全ての　能力変化が　元に戻った！", + "faintCountdown": "{{pokemonName}}は\n{{turnCount}}ターン後に　滅びてしまう！", "copyType": "{{pokemonName}}は　{{targetPokemonName}}と\n同じタイプに　なった！", - "suppressAbilities": "{{pokemonName}}の　とくせいが　きかなくなった！", + "suppressAbilities": "{{pokemonName}}の　特性が　効かなくなった！", "revivalBlessing": "{{pokemonName}}は\n復活して　戦えるようになった！", - "swapArenaTags": "{{pokemonName}}は\nおたがいの　ばのこうかを　いれかえた！" + "swapArenaTags": "{{pokemonName}}は\nお互いの　場の　効果を　入れ替えた！", + "exposedMove": "{{pokemonName}}は {{targetPokemonName}}の\n正体を　見破った！" } diff --git a/src/locales/ja/party-ui-handler.json b/src/locales/ja/party-ui-handler.json index a3a88b2dd6e..b112653c544 100644 --- a/src/locales/ja/party-ui-handler.json +++ b/src/locales/ja/party-ui-handler.json @@ -1,8 +1,8 @@ { - "SEND_OUT": "いれかえる", - "SUMMARY": "つよさをみる", + "SEND_OUT": "入れ替える", + "SUMMARY": "強さを見る", "CANCEL": "やめる", - "RELEASE": "にがす", - "APPLY": "つかう", - "TEACH": "おしえる" -} \ No newline at end of file + "RELEASE": "逃がす", + "APPLY": "使う", + "TEACH": "教える" +} diff --git a/src/locales/ja/pokemon-info-container.json b/src/locales/ja/pokemon-info-container.json index 796ac706731..287eed23c74 100644 --- a/src/locales/ja/pokemon-info-container.json +++ b/src/locales/ja/pokemon-info-container.json @@ -1,7 +1,7 @@ { - "moveset": "わざ", - "gender": "せいべつ:", - "ability": "とくせい:", - "nature": "せいかく:", - "form": "すがた:" -} \ No newline at end of file + "moveset": "技", + "gender": "性別:", + "ability": "特性:", + "nature": "性格:", + "form": "姿:" +} diff --git a/src/locales/ja/pokemon-summary.json b/src/locales/ja/pokemon-summary.json index 9e26dfeeb6e..cf35befe6fd 100644 --- a/src/locales/ja/pokemon-summary.json +++ b/src/locales/ja/pokemon-summary.json @@ -1 +1,44 @@ -{} \ No newline at end of file +{ + "pokemonInfo": "ポケモン情報", + "status": "ステータス", + "powerAccuracyCategory": "威力\n命中\n分類", + "type": "タイプ", + "unknownTrainer": "？？？", + "ot": "親", + "nature": "性格", + "expPoints": "経験値", + "nextLv": "次のレベルまで", + "cancel": "キャンセル", + "memoString": "{{natureFragment}}な性格。\n{{metFragment}}", + "metFragment": { + "normal": "{{biome}}で\nLv.{{level}}の時に出会った。", + "apparently": "{{biome}}で\nLv.{{level}}の時に出会ったようだ。" + }, + "natureFragment": { + "Hardy": "{{nature}}", + "Lonely": "{{nature}}", + "Brave": "{{nature}}", + "Adamant": "{{nature}}", + "Naughty": "{{nature}}", + "Bold": "{{nature}}", + "Docile": "{{nature}}", + "Relaxed": "{{nature}}", + "Impish": "{{nature}}", + "Lax": "{{nature}}", + "Timid": "{{nature}}", + "Hasty": "{{nature}}", + "Serious": "{{nature}}", + "Jolly": "{{nature}}", + "Naive": "{{nature}}", + "Modest": "{{nature}}", + "Mild": "{{nature}}", + "Quiet": "{{nature}}", + "Bashful": "{{nature}}", + "Rash": "{{nature}}", + "Calm": "{{nature}}", + "Gentle": "{{nature}}", + "Sassy": "{{nature}}", + "Careful": "{{nature}}", + "Quirky": "{{nature}}" + } +} diff --git a/src/locales/ja/run-history.json b/src/locales/ja/run-history.json index 222f7de728d..3bf9de32c68 100644 --- a/src/locales/ja/run-history.json +++ b/src/locales/ja/run-history.json @@ -28,10 +28,10 @@ "SPDshortened": "速さ", "runInfo": "ラン情報", "money": "お金", - "runLength": "ラン最高ウェーブ", - "viewHeldItems": "手持ちアイテム", - "hallofFameText": "殿堂へようこそ！", - "hallofFameText_female": "殿堂へようこそ！", + "runLength": "時間", + "viewHeldItems": "持たせたアイテム", + "hallofFameText": "殿堂入り　おめでとう！", + "hallofFameText_female": "殿堂入り　おめでとう！", "viewHallOfFame": "殿堂登録を見る！", "viewEndingSplash": "クリア後のアートを見る！" -} \ No newline at end of file +} diff --git a/src/locales/ja/save-slot-select-ui-handler.json b/src/locales/ja/save-slot-select-ui-handler.json index a84e3aca23d..73250a08f4b 100644 --- a/src/locales/ja/save-slot-select-ui-handler.json +++ b/src/locales/ja/save-slot-select-ui-handler.json @@ -1,7 +1,7 @@ { "overwriteData": "選択した　スロットに　データを　上書きします？", "loading": "読込中…", - "wave": "波", + "wave": "ラウンド", "lv": "Lv", "empty": "なし" -} \ No newline at end of file +} diff --git a/src/locales/ja/splash-messages.json b/src/locales/ja/splash-messages.json index 9e26dfeeb6e..b7378e7a916 100644 --- a/src/locales/ja/splash-messages.json +++ b/src/locales/ja/splash-messages.json @@ -1 +1,36 @@ -{} \ No newline at end of file +{ + "battlesWon": "Battles Won!", + "joinTheDiscord": "Join the Discord!", + "infiniteLevels": "Infinite Levels!", + "everythingStacks": "Everything Stacks!", + "optionalSaveScumming": "Optional Save Scumming!", + "biomes": "35 Biomes!", + "openSource": "Open Source!", + "playWithSpeed": "Play with 5x Speed!", + "liveBugTesting": "Live Bug Testing!", + "heavyInfluence": "Heavy RoR2 Influence!", + "pokemonRiskAndPokemonRain": "Pokémon Risk and Pokémon Rain!", + "nowWithMoreSalt": "Now with 33% More Salt!", + "infiniteFusionAtHome": "Infinite Fusion at Home!", + "brokenEggMoves": "Broken Egg Moves!", + "magnificent": "Magnificent!", + "mubstitute": "Mubstitute!", + "thatsCrazy": "That's Crazy!", + "oranceJuice": "Orance Juice!", + "questionableBalancing": "Questionable Balancing!", + "coolShaders": "Cool Shaders!", + "aiFree": "AI-Free!", + "suddenDifficultySpikes": "Sudden Difficulty Spikes!", + "basedOnAnUnfinishedFlashGame": "Based on an Unfinished Flash Game!", + "moreAddictiveThanIntended": "More Addictive than Intended!", + "mostlyConsistentSeeds": "Mostly Consistent Seeds!", + "achievementPointsDontDoAnything": "Achievement Points Don't Do Anything!", + "youDoNotStartAtLevel": "You Do Not Start at Level 2000!", + "dontTalkAboutTheManaphyEggIncident": "Don't Talk About the Manaphy Egg Incident!", + "alsoTryPokengine": "Also Try Pokéngine!", + "alsoTryEmeraldRogue": "Also Try Emerald Rogue!", + "alsoTryRadicalRed": "Also Try Radical Red!", + "eeveeExpo": "Eevee Expo!", + "ynoproject": "YNOproject!", + "breedersInSpace": "Breeders in space!" +} diff --git a/src/locales/ja/weather.json b/src/locales/ja/weather.json index 92728b81461..e2d3c6c4e32 100644 --- a/src/locales/ja/weather.json +++ b/src/locales/ja/weather.json @@ -16,17 +16,17 @@ "snowStartMessage": "雪が　降り始めた！", "snowLapseMessage": "雪が　降っている！", "snowClearMessage": "雪が　止んだ！", - "fogStartMessage": "足下に　霧(きり)が立ち込めた！", - "fogLapseMessage": "足下に　霧(きり)が　立ち込めている！", - "fogClearMessage": "足下の　霧(きり)が消え去った！", + "fogStartMessage": "足下に　霧が　立ち込めた！", + "fogLapseMessage": "足下に　霧が　立ち込めている！", + "fogClearMessage": "足下の　霧が　消え去った！", "heavyRainStartMessage": "強い雨が　降り始めた！", "heavyRainLapseMessage": "強い雨が　降っている！", "heavyRainClearMessage": "強い雨が　あがった！", "harshSunStartMessage": "日差しが　とても強くなった！", "harshSunLapseMessage": "日差しが　とても強い！", "harshSunClearMessage": "日差しが　元に戻った！", - "strongWindsStartMessage": "謎(なぞ)の　乱気流(らんきりゅう)が\nひこうポケモンを　護(まも)る！", - "strongWindsLapseMessage": "謎(なぞ)の　乱気流(らんきりゅう)の　勢(いきお)いは　止まらない！", - "strongWindsEffectMessage": "謎(なぞ)の　乱気流(らんきりゅう)が　攻撃(こうげき)を　弱(よわ)めた！", - "strongWindsClearMessage": "謎(なぞ)の　乱気流(らんきりゅう)が　おさまった！" -} \ No newline at end of file + "strongWindsStartMessage": "謎の　乱気流が\nひこうポケモンを　護る！", + "strongWindsLapseMessage": "謎の　乱気流の　勢いは　止まらない！", + "strongWindsEffectMessage": "謎の　乱気流が　攻撃を　弱めた！", + "strongWindsClearMessage": "謎の　乱気流が　おさまった！" +} From 6d312a29098faf5a7953f71830af90fc08306570 Mon Sep 17 00:00:00 2001 From: damocleas Date: Thu, 5 Sep 2024 14:50:28 -0400 Subject: [PATCH 12/83] Update egg.ts Same-Species Egg Shiny Rate (#4052) --- src/data/egg.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/egg.ts b/src/data/egg.ts index 9beb944de69..508263c9c8e 100644 --- a/src/data/egg.ts +++ b/src/data/egg.ts @@ -15,7 +15,7 @@ export const EGG_SEED = 1073741824; // Rates for specific random properties in 1/x const DEFAULT_SHINY_RATE = 128; const GACHA_SHINY_UP_SHINY_RATE = 64; -const SAME_SPECIES_EGG_SHINY_RATE = 24; +const SAME_SPECIES_EGG_SHINY_RATE = 12; const SAME_SPECIES_EGG_HA_RATE = 8; const MANAPHY_EGG_MANAPHY_RATE = 8; const GACHA_EGG_HA_RATE = 192; From 6e26db27b864b135303c08b23c88037b9b107f21 Mon Sep 17 00:00:00 2001 From: innerthunder <168692175+innerthunder@users.noreply.github.com> Date: Thu, 5 Sep 2024 12:07:04 -0700 Subject: [PATCH 13/83] Protection moves now fail when used last (#4045) --- src/data/move.ts | 42 ++++++++++++++------- src/test/moves/protect.test.ts | 41 ++++++++++++++++----- src/test/moves/quick_guard.test.ts | 59 ++++++++++++++++++------------ 3 files changed, 96 insertions(+), 46 deletions(-) diff --git a/src/data/move.ts b/src/data/move.ts index a591f12df90..bb85e62519b 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -6234,6 +6234,8 @@ const userSleptOrComatoseCondition: MoveConditionFunc = (user: Pokemon, target: const targetSleptOrComatoseCondition: MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => target.status?.effect === StatusEffect.SLEEP || target.hasAbility(Abilities.COMATOSE); +const failIfLastCondition: MoveConditionFunc = (user: Pokemon, target: Pokemon, move: Move) => user.scene.phaseQueue.find(phase => phase instanceof MovePhase) !== undefined; + export type MoveAttrFilter = (attr: MoveAttr) => boolean; function applyMoveAttrsInternal(attrFilter: MoveAttrFilter, user: Pokemon | null, target: Pokemon | null, move: Move, args: any[]): Promise { @@ -6972,7 +6974,8 @@ export function initMoves() { .attr(StatusEffectAttr, StatusEffect.FREEZE) .target(MoveTarget.ALL_NEAR_ENEMIES), new SelfStatusMove(Moves.PROTECT, Type.NORMAL, -1, 10, -1, 4, 2) - .attr(ProtectAttr), + .attr(ProtectAttr) + .condition(failIfLastCondition), new AttackMove(Moves.MACH_PUNCH, Type.FIGHTING, MoveCategory.PHYSICAL, 40, 100, 30, -1, 1, 2) .punchingMove(), new StatusMove(Moves.SCARY_FACE, Type.NORMAL, 100, 10, -1, 0, 2) @@ -7023,7 +7026,8 @@ export function initMoves() { .windMove() .target(MoveTarget.ALL_NEAR_ENEMIES), new SelfStatusMove(Moves.DETECT, Type.FIGHTING, -1, 5, -1, 4, 2) - .attr(ProtectAttr), + .attr(ProtectAttr) + .condition(failIfLastCondition), new AttackMove(Moves.BONE_RUSH, Type.GROUND, MoveCategory.PHYSICAL, 25, 90, 10, -1, 0, 2) .attr(MultiHitAttr) .makesContact(false), @@ -7041,7 +7045,8 @@ export function initMoves() { .attr(HitHealAttr) .triageMove(), new SelfStatusMove(Moves.ENDURE, Type.NORMAL, -1, 10, -1, 4, 2) - .attr(ProtectAttr, BattlerTagType.ENDURING), + .attr(ProtectAttr, BattlerTagType.ENDURING) + .condition(failIfLastCondition), new StatusMove(Moves.CHARM, Type.FAIRY, 100, 20, -1, 0, 2) .attr(StatStageChangeAttr, [ Stat.ATK ], -2), new AttackMove(Moves.ROLLOUT, Type.ROCK, MoveCategory.PHYSICAL, 30, 90, 20, -1, 0, 2) @@ -7788,7 +7793,8 @@ export function initMoves() { .attr(StatStageChangeAttr, [ Stat.ATK, Stat.ACC ], 1, true), new StatusMove(Moves.WIDE_GUARD, Type.ROCK, -1, 10, -1, 3, 5) .target(MoveTarget.USER_SIDE) - .attr(AddArenaTagAttr, ArenaTagType.WIDE_GUARD, 1, true, true), + .attr(AddArenaTagAttr, ArenaTagType.WIDE_GUARD, 1, true, true) + .condition(failIfLastCondition), new StatusMove(Moves.GUARD_SPLIT, Type.PSYCHIC, -1, 10, -1, 0, 5) .attr(AverageStatsAttr, [ Stat.DEF, Stat.SPDEF ], "moveTriggers:sharedGuard"), new StatusMove(Moves.POWER_SPLIT, Type.PSYCHIC, -1, 10, -1, 0, 5) @@ -7876,7 +7882,8 @@ export function initMoves() { .attr(PositiveStatStagePowerAttr), new StatusMove(Moves.QUICK_GUARD, Type.FIGHTING, -1, 15, -1, 3, 5) .target(MoveTarget.USER_SIDE) - .attr(AddArenaTagAttr, ArenaTagType.QUICK_GUARD, 1, true, true), + .attr(AddArenaTagAttr, ArenaTagType.QUICK_GUARD, 1, true, true) + .condition(failIfLastCondition), new SelfStatusMove(Moves.ALLY_SWITCH, Type.PSYCHIC, -1, 15, -1, 2, 5) .ignoresProtect() .unimplemented(), @@ -8047,7 +8054,8 @@ export function initMoves() { new StatusMove(Moves.MAT_BLOCK, Type.FIGHTING, -1, 10, -1, 0, 6) .target(MoveTarget.USER_SIDE) .attr(AddArenaTagAttr, ArenaTagType.MAT_BLOCK, 1, true, true) - .condition(new FirstMoveCondition()), + .condition(new FirstMoveCondition()) + .condition(failIfLastCondition), new AttackMove(Moves.BELCH, Type.POISON, MoveCategory.SPECIAL, 120, 90, 10, -1, 0, 6) .condition((user, target, move) => user.battleData.berriesEaten.length > 0), new StatusMove(Moves.ROTOTILLER, Type.GROUND, -1, 10, -1, 0, 6) @@ -8105,7 +8113,8 @@ export function initMoves() { .triageMove(), new StatusMove(Moves.CRAFTY_SHIELD, Type.FAIRY, -1, 10, -1, 3, 6) .target(MoveTarget.USER_SIDE) - .attr(AddArenaTagAttr, ArenaTagType.CRAFTY_SHIELD, 1, true, true), + .attr(AddArenaTagAttr, ArenaTagType.CRAFTY_SHIELD, 1, true, true) + .condition(failIfLastCondition), new StatusMove(Moves.FLOWER_SHIELD, Type.FAIRY, -1, 10, -1, 0, 6) .target(MoveTarget.ALL) .attr(StatStageChangeAttr, [ Stat.DEF ], 1, false, (user, target, move) => target.getTypes().includes(Type.GRASS) && !target.getTag(SemiInvulnerableTag)), @@ -8130,7 +8139,8 @@ export function initMoves() { .target(MoveTarget.BOTH_SIDES) .unimplemented(), new SelfStatusMove(Moves.KINGS_SHIELD, Type.STEEL, -1, 10, -1, 4, 6) - .attr(ProtectAttr, BattlerTagType.KINGS_SHIELD), + .attr(ProtectAttr, BattlerTagType.KINGS_SHIELD) + .condition(failIfLastCondition), new StatusMove(Moves.PLAY_NICE, Type.NORMAL, -1, 20, -1, 0, 6) .attr(StatStageChangeAttr, [ Stat.ATK ], -1), new StatusMove(Moves.CONFIDE, Type.NORMAL, -1, 20, -1, 0, 6) @@ -8153,7 +8163,8 @@ export function initMoves() { new AttackMove(Moves.MYSTICAL_FIRE, Type.FIRE, MoveCategory.SPECIAL, 75, 100, 10, 100, 0, 6) .attr(StatStageChangeAttr, [ Stat.SPATK ], -1), new SelfStatusMove(Moves.SPIKY_SHIELD, Type.GRASS, -1, 10, -1, 4, 6) - .attr(ProtectAttr, BattlerTagType.SPIKY_SHIELD), + .attr(ProtectAttr, BattlerTagType.SPIKY_SHIELD) + .condition(failIfLastCondition), new StatusMove(Moves.AROMATIC_MIST, Type.FAIRY, -1, 20, -1, 0, 6) .attr(StatStageChangeAttr, [ Stat.SPDEF ], 1) .target(MoveTarget.NEAR_ALLY), @@ -8349,7 +8360,8 @@ export function initMoves() { new AttackMove(Moves.FIRST_IMPRESSION, Type.BUG, MoveCategory.PHYSICAL, 90, 100, 10, -1, 2, 7) .condition(new FirstMoveCondition()), new SelfStatusMove(Moves.BANEFUL_BUNKER, Type.POISON, -1, 10, -1, 4, 7) - .attr(ProtectAttr, BattlerTagType.BANEFUL_BUNKER), + .attr(ProtectAttr, BattlerTagType.BANEFUL_BUNKER) + .condition(failIfLastCondition), new AttackMove(Moves.SPIRIT_SHACKLE, Type.GHOST, MoveCategory.PHYSICAL, 80, 100, 10, 100, 0, 7) .attr(AddBattlerTagAttr, BattlerTagType.TRAPPED, false, false, 1, 1, true) .makesContact(false), @@ -8592,6 +8604,7 @@ export function initMoves() { /* Unused */ new SelfStatusMove(Moves.MAX_GUARD, Type.NORMAL, -1, 10, -1, 4, 8) .attr(ProtectAttr) + .condition(failIfLastCondition) .ignoresVirtual(), /* End Unused */ new AttackMove(Moves.DYNAMAX_CANNON, Type.DRAGON, MoveCategory.SPECIAL, 100, 100, 5, -1, 0, 8) @@ -8770,7 +8783,8 @@ export function initMoves() { .target(MoveTarget.USER_AND_ALLIES) .ignoresProtect(), new SelfStatusMove(Moves.OBSTRUCT, Type.DARK, 100, 10, -1, 4, 8) - .attr(ProtectAttr, BattlerTagType.OBSTRUCT), + .attr(ProtectAttr, BattlerTagType.OBSTRUCT) + .condition(failIfLastCondition), new AttackMove(Moves.FALSE_SURRENDER, Type.DARK, MoveCategory.PHYSICAL, 80, -1, 10, -1, 0, 8), new AttackMove(Moves.METEOR_ASSAULT, Type.FIGHTING, MoveCategory.PHYSICAL, 150, 100, 5, -1, 0, 8) .attr(RechargeAttr) @@ -9061,7 +9075,8 @@ export function initMoves() { .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1, true, (user, target, move) => user.isTerastallized() && user.isOfType(Type.STELLAR)) .partial(), new SelfStatusMove(Moves.SILK_TRAP, Type.BUG, -1, 10, -1, 4, 9) - .attr(ProtectAttr, BattlerTagType.SILK_TRAP), + .attr(ProtectAttr, BattlerTagType.SILK_TRAP) + .condition(failIfLastCondition), new AttackMove(Moves.AXE_KICK, Type.FIGHTING, MoveCategory.PHYSICAL, 120, 90, 10, 30, 0, 9) .attr(MissEffectAttr, crashDamageFunc) .attr(NoEffectAttr, crashDamageFunc) @@ -9253,7 +9268,8 @@ export function initMoves() { .attr(PreMoveMessageAttr, doublePowerChanceMessageFunc) .attr(DoublePowerChanceAttr), new SelfStatusMove(Moves.BURNING_BULWARK, Type.FIRE, -1, 10, -1, 4, 9) - .attr(ProtectAttr, BattlerTagType.BURNING_BULWARK), + .attr(ProtectAttr, BattlerTagType.BURNING_BULWARK) + .condition(failIfLastCondition), new AttackMove(Moves.THUNDERCLAP, Type.ELECTRIC, MoveCategory.SPECIAL, 70, 100, 5, -1, 1, 9) .condition((user, target, move) => user.scene.currentBattle.turnCommands[target.getBattlerIndex()]?.command === Command.FIGHT && !target.turnData.acted && allMoves[user.scene.currentBattle.turnCommands[target.getBattlerIndex()]?.move?.move!].category !== MoveCategory.STATUS), // TODO: is this bang correct? new AttackMove(Moves.MIGHTY_CLEAVE, Type.ROCK, MoveCategory.PHYSICAL, 95, 100, 5, -1, 0, 9) diff --git a/src/test/moves/protect.test.ts b/src/test/moves/protect.test.ts index d792f586a37..83cd088aa47 100644 --- a/src/test/moves/protect.test.ts +++ b/src/test/moves/protect.test.ts @@ -7,7 +7,8 @@ import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; import { allMoves } from "#app/data/move"; import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag"; -import { BerryPhase } from "#app/phases/berry-phase"; +import { BattlerIndex } from "#app/battle"; +import { MoveResult } from "#app/field/pokemon"; const TIMEOUT = 20 * 1000; @@ -43,13 +44,13 @@ describe("Moves - Protect", () => { test( "should protect the user from attacks", async () => { - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.CHARIZARD]); const leadPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.PROTECT); - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); }, TIMEOUT @@ -61,13 +62,13 @@ describe("Moves - Protect", () => { game.override.enemyMoveset(Array(4).fill(Moves.CEASELESS_EDGE)); vi.spyOn(allMoves[Moves.CEASELESS_EDGE], "accuracy", "get").mockReturnValue(100); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.CHARIZARD]); const leadPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.PROTECT); - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); expect(game.scene.arena.getTagOnSide(ArenaTrapTag, ArenaTagSide.ENEMY)).toBeUndefined(); @@ -79,13 +80,13 @@ describe("Moves - Protect", () => { async () => { game.override.enemyMoveset(Array(4).fill(Moves.CHARM)); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.CHARIZARD]); const leadPokemon = game.scene.getPlayerPokemon()!; game.move.select(Moves.PROTECT); - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); expect(leadPokemon.getStatStage(Stat.ATK)).toBe(0); }, TIMEOUT @@ -96,18 +97,38 @@ describe("Moves - Protect", () => { async () => { game.override.enemyMoveset(Array(4).fill(Moves.TACHYON_CUTTER)); - await game.startBattle([Species.CHARIZARD]); + await game.classicMode.startBattle([Species.CHARIZARD]); const leadPokemon = game.scene.getPlayerPokemon()!; - const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.PROTECT); - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); expect(leadPokemon.hp).toBe(leadPokemon.getMaxHp()); expect(enemyPokemon.turnData.hitCount).toBe(1); }, TIMEOUT ); + + test( + "should fail if the user is the last to move in the turn", + async () => { + game.override.enemyMoveset(Array(4).fill(Moves.PROTECT)); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const leadPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.PROTECT); + + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); + expect(leadPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + }, TIMEOUT + ); }); diff --git a/src/test/moves/quick_guard.test.ts b/src/test/moves/quick_guard.test.ts index 25f98f8fa61..5f4af40eb71 100644 --- a/src/test/moves/quick_guard.test.ts +++ b/src/test/moves/quick_guard.test.ts @@ -5,8 +5,8 @@ import { Species } from "#enums/species"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; -import { BerryPhase } from "#app/phases/berry-phase"; -import { CommandPhase } from "#app/phases/command-phase"; +import { BattlerIndex } from "#app/battle"; +import { MoveResult } from "#app/field/pokemon"; const TIMEOUT = 20 * 1000; @@ -42,19 +42,16 @@ describe("Moves - Quick Guard", () => { test( "should protect the user and allies from priority moves", async () => { - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); - const leadPokemon = game.scene.getPlayerField(); + const playerPokemon = game.scene.getPlayerField(); game.move.select(Moves.QUICK_GUARD); - - await game.phaseInterceptor.to(CommandPhase); - game.move.select(Moves.SPLASH, 1); - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); - leadPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); + playerPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); }, TIMEOUT ); @@ -64,19 +61,16 @@ describe("Moves - Quick Guard", () => { game.override.enemyAbility(Abilities.PRANKSTER); game.override.enemyMoveset(Array(4).fill(Moves.GROWL)); - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); - const leadPokemon = game.scene.getPlayerField(); + const playerPokemon = game.scene.getPlayerField(); game.move.select(Moves.QUICK_GUARD); - - await game.phaseInterceptor.to(CommandPhase); - game.move.select(Moves.SPLASH, 1); - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); - leadPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0)); + playerPokemon.forEach(p => expect(p.getStatStage(Stat.ATK)).toBe(0)); }, TIMEOUT ); @@ -85,21 +79,40 @@ describe("Moves - Quick Guard", () => { async () => { game.override.enemyMoveset(Array(4).fill(Moves.WATER_SHURIKEN)); - await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); + await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); - const leadPokemon = game.scene.getPlayerField(); + const playerPokemon = game.scene.getPlayerField(); const enemyPokemon = game.scene.getEnemyField(); game.move.select(Moves.QUICK_GUARD); - - await game.phaseInterceptor.to(CommandPhase); - game.move.select(Moves.FOLLOW_ME, 1); - await game.phaseInterceptor.to(BerryPhase, false); + await game.phaseInterceptor.to("BerryPhase", false); - leadPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); + playerPokemon.forEach(p => expect(p.hp).toBe(p.getMaxHp())); enemyPokemon.forEach(p => expect(p.turnData.hitCount).toBe(1)); } ); + + test( + "should fail if the user is the last to move in the turn", + async () => { + game.override.battleType("single"); + game.override.enemyMoveset(Array(4).fill(Moves.QUICK_GUARD)); + + await game.classicMode.startBattle([Species.CHARIZARD]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.QUICK_GUARD); + + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + + await game.phaseInterceptor.to("BerryPhase", false); + + expect(enemyPokemon.getLastXMoves()[0].result).toBe(MoveResult.SUCCESS); + expect(playerPokemon.getLastXMoves()[0].result).toBe(MoveResult.FAIL); + }, TIMEOUT + ); }); From deac3141a1ea35c5a34c0b5353b290c82fc342d6 Mon Sep 17 00:00:00 2001 From: "Adrian T." <68144167+torranx@users.noreply.github.com> Date: Fri, 6 Sep 2024 04:05:09 +0800 Subject: [PATCH 14/83] remove partial from tera blast (#4044) --- src/data/move.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/data/move.ts b/src/data/move.ts index bb85e62519b..252c474864c 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -9072,8 +9072,7 @@ export function initMoves() { .attr(TeraBlastCategoryAttr) .attr(TeraBlastTypeAttr) .attr(TeraBlastPowerAttr) - .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1, true, (user, target, move) => user.isTerastallized() && user.isOfType(Type.STELLAR)) - .partial(), + .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], -1, true, (user, target, move) => user.isTerastallized() && user.isOfType(Type.STELLAR)), new SelfStatusMove(Moves.SILK_TRAP, Type.BUG, -1, 10, -1, 4, 9) .attr(ProtectAttr, BattlerTagType.SILK_TRAP) .condition(failIfLastCondition), From 57a3efd9e2e5106c5ebee015921982535cf08446 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Thu, 5 Sep 2024 16:51:05 -0700 Subject: [PATCH 15/83] [Bug] Fix off-by-one errors in some random number calls (#3665) * Fix off-by-one error in some random number calls * Fix mock RNG function used by tests Also remove unnecessary extra RNG mock from Glaive Rush test * Just some github UI manipulation don't mind me * Update Glaive Rush test * Remove unnecessary `Math.floor()` * Remove resolved comment * Add tsdocs to various functions * Remove `src/rng.md` file * Update tsdoc --- src/battle-scene.ts | 17 ++++- src/battle.ts | 6 ++ src/data/ability.ts | 2 +- src/data/battler-tags.ts | 2 +- src/data/move.ts | 2 +- src/field/pokemon.ts | 22 ++++++- src/phases/move-effect-phase.ts | 6 +- src/test/moves/glaive_rush.test.ts | 102 ++++++++++++++++------------- src/test/utils/gameManager.ts | 2 +- src/utils.ts | 8 ++- 10 files changed, 110 insertions(+), 59 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index d4c33663c14..9123a213f4c 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -855,7 +855,7 @@ export default class BattleScene extends SceneBase { overrideModifiers(this, false); overrideHeldItems(this, pokemon, false); if (boss && !dataSource) { - const secondaryIvs = Utils.getIvsFromId(Utils.randSeedInt(4294967295)); + const secondaryIvs = Utils.getIvsFromId(Utils.randSeedInt(4294967296)); for (let s = 0; s < pokemon.ivs.length; s++) { pokemon.ivs[s] = Math.round(Phaser.Math.Linear(Math.min(pokemon.ivs[s], secondaryIvs[s]), Math.max(pokemon.ivs[s], secondaryIvs[s]), 0.75)); @@ -961,6 +961,16 @@ export default class BattleScene extends SceneBase { this.offsetGym = this.gameMode.isClassic && this.getGeneratedOffsetGym(); } + /** + * Generates a random number using the current battle's seed + * + * This calls {@linkcode Battle.randSeedInt}(`scene`, {@linkcode range}, {@linkcode min}) in `src/battle.ts` + * which calls {@linkcode Utils.randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts` + * + * @param range How large of a range of random numbers to choose from. If {@linkcode range} <= 1, returns {@linkcode min} + * @param min The minimum integer to pick, default `0` + * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1) + */ randBattleSeedInt(range: integer, min: integer = 0): integer { return this.currentBattle?.randSeedInt(this, range, min); } @@ -1112,7 +1122,8 @@ export default class BattleScene extends SceneBase { doubleTrainer = false; } } - newTrainer = trainerData !== undefined ? trainerData.toTrainer(this) : new Trainer(this, trainerType, doubleTrainer ? TrainerVariant.DOUBLE : Utils.randSeedInt(2) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT); + const variant = doubleTrainer ? TrainerVariant.DOUBLE : (Utils.randSeedInt(2) ? TrainerVariant.FEMALE : TrainerVariant.DEFAULT); + newTrainer = trainerData !== undefined ? trainerData.toTrainer(this) : new Trainer(this, trainerType, variant); this.field.add(newTrainer); } } @@ -2620,7 +2631,7 @@ export default class BattleScene extends SceneBase { if (mods.length < 1) { return mods; } - const rand = Math.floor(Utils.randSeedInt(mods.length)); + const rand = Utils.randSeedInt(mods.length); return [mods[rand], ...shuffleModifiers(mods.filter((_, i) => i !== rand))]; }; modifiers = shuffleModifiers(modifiers); diff --git a/src/battle.ts b/src/battle.ts index 0f1245a4397..b80caa9e679 100644 --- a/src/battle.ts +++ b/src/battle.ts @@ -354,6 +354,12 @@ export default class Battle { return null; } + /** + * Generates a random number using the current battle's seed. Calls {@linkcode Utils.randSeedInt} + * @param range How large of a range of random numbers to choose from. If {@linkcode range} <= 1, returns {@linkcode min} + * @param min The minimum integer to pick, default `0` + * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1) + */ randSeedInt(scene: BattleScene, range: number, min: number = 0): number { if (range <= 1) { return min; diff --git a/src/data/ability.ts b/src/data/ability.ts index fde39ebb152..2407460b87d 100755 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -2642,7 +2642,7 @@ export class ConfusionOnStatusEffectAbAttr extends PostAttackAbAttr { if (simulated) { return defender.canAddTag(BattlerTagType.CONFUSED); } else { - return defender.addTag(BattlerTagType.CONFUSED, pokemon.randSeedInt(3, 2), move.id, defender.id); + return defender.addTag(BattlerTagType.CONFUSED, pokemon.randSeedIntRange(2, 5), move.id, defender.id); } } return false; diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index ef91dda7b63..ddb85600c18 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -486,7 +486,7 @@ export class ConfusedTag extends BattlerTag { if (pokemon.randSeedInt(3) === 0) { const atk = pokemon.getEffectiveStat(Stat.ATK); const def = pokemon.getEffectiveStat(Stat.DEF); - const damage = Utils.toDmgValue(((((2 * pokemon.level / 5 + 2) * 40 * atk / def) / 50) + 2) * (pokemon.randSeedInt(15, 85) / 100)); + const damage = Utils.toDmgValue(((((2 * pokemon.level / 5 + 2) * 40 * atk / def) / 50) + 2) * (pokemon.randSeedIntRange(85, 100) / 100)); pokemon.scene.queueMessage(i18next.t("battlerTags:confusedLapseHurtItself")); pokemon.damageAndUpdate(damage); pokemon.battleData.hitCount++; diff --git a/src/data/move.ts b/src/data/move.ts index 252c474864c..96b780a8330 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -4400,7 +4400,7 @@ export class AddBattlerTagAttr extends MoveEffectAttr { const moveChance = this.getMoveChance(user, target, move, this.selfTarget, true); if (moveChance < 0 || moveChance === 100 || user.randSeedInt(100) < moveChance) { - return (this.selfTarget ? user : target).addTag(this.tagType, user.randSeedInt(this.turnCountMax - this.turnCountMin, this.turnCountMin), move.id, user.id); + return (this.selfTarget ? user : target).addTag(this.tagType, user.randSeedIntRange(this.turnCountMin, this.turnCountMax), move.id, user.id); } return false; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 269d0b1dba5..f522d50f357 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1720,7 +1720,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { }; this.fusionSpecies = this.scene.randomSpecies(this.scene.currentBattle?.waveIndex || 0, this.level, false, filter, true); - this.fusionAbilityIndex = (this.fusionSpecies.abilityHidden && hasHiddenAbility ? this.fusionSpecies.ability2 ? 2 : 1 : this.fusionSpecies.ability2 ? randAbilityIndex : 0); + this.fusionAbilityIndex = (this.fusionSpecies.abilityHidden && hasHiddenAbility ? 2 : this.fusionSpecies.ability2 !== this.fusionSpecies.ability1 ? randAbilityIndex : 0); this.fusionShiny = this.shiny; this.fusionVariant = this.variant; @@ -2278,7 +2278,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (!isTypeImmune) { const levelMultiplier = (2 * source.level / 5 + 2); - const randomMultiplier = ((this.scene.randBattleSeedInt(16) + 85) / 100); + const randomMultiplier = (this.randSeedIntRange(85, 100) / 100); damage.value = Utils.toDmgValue((((levelMultiplier * power * sourceAtk.value / targetDef.value) / 50) + 2) * stabMultiplier.value * typeMultiplier @@ -3448,12 +3448,30 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { fusionCanvas.remove(); } + /** + * Generates a random number using the current battle's seed, or the global seed if `this.scene.currentBattle` is falsy + * + * This calls either {@linkcode BattleScene.randBattleSeedInt}({@linkcode range}, {@linkcode min}) in `src/battle-scene.ts` + * which calls {@linkcode Battle.randSeedInt}(`scene`, {@linkcode range}, {@linkcode min}) in `src/battle.ts` + * which calls {@linkcode Utils.randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts`, + * or it directly calls {@linkcode Utils.randSeedInt randSeedInt}({@linkcode range}, {@linkcode min}) in `src/utils.ts` if there is no current battle + * + * @param range How large of a range of random numbers to choose from. If {@linkcode range} <= 1, returns {@linkcode min} + * @param min The minimum integer to pick, default `0` + * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1) + */ randSeedInt(range: integer, min: integer = 0): integer { return this.scene.currentBattle ? this.scene.randBattleSeedInt(range, min) : Utils.randSeedInt(range, min); } + /** + * Generates a random number using the current battle's seed, or the global seed if `this.scene.currentBattle` is falsy + * @param min The minimum integer to generate + * @param max The maximum integer to generate + * @returns a random integer between {@linkcode min} and {@linkcode max} inclusive + */ randSeedIntRange(min: integer, max: integer): integer { return this.randSeedInt((max - min) + 1, min); } diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts index f100a763219..9b22c520e19 100644 --- a/src/phases/move-effect-phase.ts +++ b/src/phases/move-effect-phase.ts @@ -377,16 +377,16 @@ export class MoveEffectPhase extends PokemonPhase { return false; } - const moveAccuracy = this.move.getMove().calculateBattleAccuracy(user!, target); // TODO: is the bang correct here? + const moveAccuracy = this.move.getMove().calculateBattleAccuracy(user, target); if (moveAccuracy === -1) { return true; } const accuracyMultiplier = user.getAccuracyMultiplier(target, this.move.getMove()); - const rand = user.randSeedInt(100, 1); + const rand = user.randSeedInt(100); - return rand <= moveAccuracy * (accuracyMultiplier!); // TODO: is this bang correct? + return rand < (moveAccuracy * accuracyMultiplier); } /** Returns the {@linkcode Pokemon} using this phase's invoked move */ diff --git a/src/test/moves/glaive_rush.test.ts b/src/test/moves/glaive_rush.test.ts index 1eac3c32bb4..5867ef751b8 100644 --- a/src/test/moves/glaive_rush.test.ts +++ b/src/test/moves/glaive_rush.test.ts @@ -1,13 +1,12 @@ import { allMoves } from "#app/data/move"; import { Abilities } from "#app/enums/abilities"; -import { DamagePhase } from "#app/phases/damage-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { Moves } from "#enums/moves"; -import { Species } from "#enums/species"; +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; +const TIMEOUT = 20 * 1000; describe("Moves - Glaive Rush", () => { let phaserGame: Phaser.Game; @@ -25,131 +24,142 @@ describe("Moves - Glaive Rush", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.battleType("single"); - game.override.disableCrits(); - game.override.enemySpecies(Species.MAGIKARP); - game.override.enemyAbility(Abilities.BALL_FETCH); - game.override.enemyMoveset(Array(4).fill(Moves.GLAIVE_RUSH)); - game.override.starterSpecies(Species.KLINK); - game.override.ability(Abilities.UNNERVE); - game.override.passiveAbility(Abilities.FUR_COAT); - game.override.moveset([Moves.SHADOW_SNEAK, Moves.AVALANCHE, Moves.SPLASH, Moves.GLAIVE_RUSH]); + game.override + .battleType("single") + .disableCrits() + .enemySpecies(Species.MAGIKARP) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Array(4).fill(Moves.GLAIVE_RUSH)) + .starterSpecies(Species.KLINK) + .ability(Abilities.BALL_FETCH) + .moveset([Moves.SHADOW_SNEAK, Moves.AVALANCHE, Moves.SPLASH, Moves.GLAIVE_RUSH]); }); it("takes double damage from attacks", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); + const enemy = game.scene.getEnemyPokemon()!; enemy.hp = 1000; - vi.spyOn(game.scene, "randBattleSeedInt").mockReturnValue(0); game.move.select(Moves.SHADOW_SNEAK); - await game.phaseInterceptor.to(DamagePhase); + await game.phaseInterceptor.to("DamagePhase"); const damageDealt = 1000 - enemy.hp; - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); game.move.select(Moves.SHADOW_SNEAK); - await game.phaseInterceptor.to(DamagePhase); + await game.phaseInterceptor.to("DamagePhase"); expect(enemy.hp).toBeLessThanOrEqual(1001 - (damageDealt * 3)); - }, 5000); // TODO: revert back to 20s + }, TIMEOUT); it("always gets hit by attacks", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); + const enemy = game.scene.getEnemyPokemon()!; enemy.hp = 1000; allMoves[Moves.AVALANCHE].accuracy = 0; game.move.select(Moves.AVALANCHE); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); expect(enemy.hp).toBeLessThan(1000); - }, 20000); + }, TIMEOUT); it("interacts properly with multi-lens", async () => { - game.override.startingHeldItems([{ name: "MULTI_LENS", count: 2 }]); - game.override.enemyMoveset(Array(4).fill(Moves.AVALANCHE)); - await game.startBattle(); + game.override + .startingHeldItems([{ name: "MULTI_LENS", count: 2 }]) + .enemyMoveset(Array(4).fill(Moves.AVALANCHE)); + await game.classicMode.startBattle(); + const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; + enemy.hp = 1000; player.hp = 1000; allMoves[Moves.AVALANCHE].accuracy = 0; game.move.select(Moves.GLAIVE_RUSH); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); expect(player.hp).toBeLessThan(1000); player.hp = 1000; game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); expect(player.hp).toBe(1000); - }, 20000); + }, TIMEOUT); it("secondary effects only last until next move", async () => { game.override.enemyMoveset(Array(4).fill(Moves.SHADOW_SNEAK)); - await game.startBattle(); + await game.classicMode.startBattle(); + const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; + enemy.hp = 1000; player.hp = 1000; allMoves[Moves.SHADOW_SNEAK].accuracy = 0; game.move.select(Moves.GLAIVE_RUSH); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); expect(player.hp).toBe(1000); game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); const damagedHp = player.hp; expect(player.hp).toBeLessThan(1000); game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); expect(player.hp).toBe(damagedHp); - }, 20000); + }, TIMEOUT); it("secondary effects are removed upon switching", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.SHADOW_SNEAK)); - game.override.starterSpecies(0); - await game.startBattle([Species.KLINK, Species.FEEBAS]); + game.override + .enemyMoveset(Array(4).fill(Moves.SHADOW_SNEAK)) + .starterSpecies(0); + await game.classicMode.startBattle([Species.KLINK, Species.FEEBAS]); + const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; + enemy.hp = 1000; allMoves[Moves.SHADOW_SNEAK].accuracy = 0; game.move.select(Moves.GLAIVE_RUSH); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); expect(player.hp).toBe(player.getMaxHp()); game.doSwitchPokemon(1); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); game.doSwitchPokemon(1); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); expect(player.hp).toBe(player.getMaxHp()); - }, 20000); + }, TIMEOUT); it("secondary effects don't activate if move fails", async () => { game.override.moveset([Moves.SHADOW_SNEAK, Moves.PROTECT, Moves.SPLASH, Moves.GLAIVE_RUSH]); - await game.startBattle(); + await game.classicMode.startBattle(); + const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; + enemy.hp = 1000; player.hp = 1000; game.move.select(Moves.PROTECT); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); game.move.select(Moves.SHADOW_SNEAK); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); game.override.enemyMoveset(Array(4).fill(Moves.SPLASH)); const damagedHP1 = 1000 - enemy.hp; enemy.hp = 1000; game.move.select(Moves.SHADOW_SNEAK); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); const damagedHP2 = 1000 - enemy.hp; expect(damagedHP2).toBeGreaterThanOrEqual((damagedHP1 * 2) - 1); - }, 20000); + }, TIMEOUT); }); diff --git a/src/test/utils/gameManager.ts b/src/test/utils/gameManager.ts index f367fc70936..ade33aa1148 100644 --- a/src/test/utils/gameManager.ts +++ b/src/test/utils/gameManager.ts @@ -76,7 +76,7 @@ export default class GameManager { constructor(phaserGame: Phaser.Game, bypassLogin: boolean = true) { localStorage.clear(); ErrorInterceptor.getInstance().clear(); - BattleScene.prototype.randBattleSeedInt = (arg) => arg-1; + BattleScene.prototype.randBattleSeedInt = (range, min: number = 0) => min + range - 1; // This simulates a max roll this.gameWrapper = new GameWrapper(phaserGame, bypassLogin); this.scene = new BattleScene(); this.phaseInterceptor = new PhaseInterceptor(this.scene); diff --git a/src/utils.ts b/src/utils.ts index 173ea25b17c..fd5430d7276 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,5 +1,5 @@ -import i18next from "i18next"; import { MoneyFormat } from "#enums/money-format"; +import i18next from "i18next"; export const MissingTextureKey = "__MISSING"; @@ -82,6 +82,12 @@ export function randInt(range: integer, min: integer = 0): integer { return Math.floor(Math.random() * range) + min; } +/** + * Generates a random number using the global seed, or the current battle's seed if called via `Battle.randSeedInt` + * @param range How large of a range of random numbers to choose from. If {@linkcode range} <= 1, returns {@linkcode min} + * @param min The minimum integer to pick, default `0` + * @returns A random integer between {@linkcode min} and ({@linkcode min} + {@linkcode range} - 1) + */ export function randSeedInt(range: integer, min: integer = 0): integer { if (range <= 1) { return min; From 39f3572c1bda83a1f91911364a5f0ed240503d96 Mon Sep 17 00:00:00 2001 From: "Adrian T." <68144167+torranx@users.noreply.github.com> Date: Fri, 6 Sep 2024 07:51:47 +0800 Subject: [PATCH 16/83] [Test] Add Dragon Cheer tests (#4013) * add dragon cheer tests * Update src/test/moves/dragon_cheer.test.ts Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * update tests --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> --- src/test/moves/dragon_cheer.test.ts | 101 ++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 src/test/moves/dragon_cheer.test.ts diff --git a/src/test/moves/dragon_cheer.test.ts b/src/test/moves/dragon_cheer.test.ts new file mode 100644 index 00000000000..747d71bd000 --- /dev/null +++ b/src/test/moves/dragon_cheer.test.ts @@ -0,0 +1,101 @@ +import { BattlerIndex } from "#app/battle"; +import { Type } from "#app/data/type"; +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; +import { Abilities } from "#enums/abilities"; +import GameManager from "#test/utils/gameManager"; +import { SPLASH_ONLY } from "#test/utils/testUtils"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Moves - Dragon Cheer", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + const TIMEOUT = 20 * 1000; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .battleType("double") + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(SPLASH_ONLY) + .enemyLevel(20) + .moveset([Moves.DRAGON_CHEER, Moves.TACKLE, Moves.SPLASH]); + }); + + it("increases the user's allies' critical hit ratio by one stage", async () => { + await game.classicMode.startBattle([Species.DRAGONAIR, Species.MAGIKARP]); + + const enemy = game.scene.getEnemyField()[0]; + + vi.spyOn(enemy, "getCritStage"); + + game.move.select(Moves.DRAGON_CHEER, 0); + game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY); + + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + + // After Tackle + await game.phaseInterceptor.to("TurnEndPhase"); + expect(enemy.getCritStage).toHaveReturnedWith(1); // getCritStage is called on defender + }, TIMEOUT); + + it("increases the user's Dragon-type allies' critical hit ratio by two stages", async () => { + await game.classicMode.startBattle([Species.MAGIKARP, Species.DRAGONAIR]); + + const enemy = game.scene.getEnemyField()[0]; + + vi.spyOn(enemy, "getCritStage"); + + game.move.select(Moves.DRAGON_CHEER, 0); + game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY); + + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + + // After Tackle + await game.phaseInterceptor.to("TurnEndPhase"); + expect(enemy.getCritStage).toHaveReturnedWith(2); // getCritStage is called on defender + }, TIMEOUT); + + it("applies the effect based on the allies' type upon use of the move, and do not change if the allies' type changes later in battle", async () => { + await game.classicMode.startBattle([Species.DRAGONAIR, Species.MAGIKARP]); + + const magikarp = game.scene.getPlayerField()[1]; + const enemy = game.scene.getEnemyField()[0]; + + vi.spyOn(enemy, "getCritStage"); + + game.move.select(Moves.DRAGON_CHEER, 0); + game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY); + + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.PLAYER_2, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + + // After Tackle + await game.phaseInterceptor.to("TurnEndPhase"); + expect(enemy.getCritStage).toHaveReturnedWith(1); // getCritStage is called on defender + + await game.toNextTurn(); + + // Change Magikarp's type to Dragon + vi.spyOn(magikarp, "getTypes").mockReturnValue([Type.DRAGON]); + expect(magikarp.getTypes()).toEqual([Type.DRAGON]); + + game.move.select(Moves.SPLASH, 0); + game.move.select(Moves.TACKLE, 1, BattlerIndex.ENEMY); + + await game.setTurnOrder([BattlerIndex.PLAYER_2, BattlerIndex.PLAYER, BattlerIndex.ENEMY, BattlerIndex.ENEMY_2]); + + await game.phaseInterceptor.to("MoveEndPhase"); + expect(enemy.getCritStage).toHaveReturnedWith(1); // getCritStage is called on defender + }, TIMEOUT); +}); From f3bdaa12cadd7f1447acf08e84bab4603f74a0a2 Mon Sep 17 00:00:00 2001 From: flx-sta <50131232+flx-sta@users.noreply.github.com> Date: Thu, 5 Sep 2024 17:07:24 -0700 Subject: [PATCH 17/83] [Bug][Refactor] fix username-finder issues + code & visual improvements (#4055) * fix username-finder issues & refactor `login-form-ui-handler` - reduce redundancy - add hover effect for interactable game objects - add error handler for "No save files found!" - Make user finder errors support i18n * add `disableInteractive` to mockContainer --- src/locales/en/menu.json | 4 +- .../mocks/mocksContainer/mockContainer.ts | 1 + src/ui/login-form-ui-handler.ts | 121 +++++++++++------- src/ui/modal-ui-handler.ts | 56 +++++--- src/ui/ui-handler.ts | 9 ++ 5 files changed, 127 insertions(+), 64 deletions(-) diff --git a/src/locales/en/menu.json b/src/locales/en/menu.json index 97cfc0b019d..91888e9db31 100644 --- a/src/locales/en/menu.json +++ b/src/locales/en/menu.json @@ -51,5 +51,7 @@ "renamePokemon": "Rename Pokémon", "rename": "Rename", "nickname": "Nickname", - "errorServerDown": "Oops! There was an issue contacting the server.\n\nYou may leave this window open,\nthe game will automatically reconnect." + "errorServerDown": "Oops! There was an issue contacting the server.\n\nYou may leave this window open,\nthe game will automatically reconnect.", + "noSaves": "You don't have any save files on record!", + "tooManySaves": "You have too many save files on record!" } \ No newline at end of file diff --git a/src/test/utils/mocks/mocksContainer/mockContainer.ts b/src/test/utils/mocks/mocksContainer/mockContainer.ts index 5babd9e71b2..d2cdd852257 100644 --- a/src/test/utils/mocks/mocksContainer/mockContainer.ts +++ b/src/test/utils/mocks/mocksContainer/mockContainer.ts @@ -208,4 +208,5 @@ export default class MockContainer implements MockGameObject { return this.list; } + disableInteractive = vi.fn(); } diff --git a/src/ui/login-form-ui-handler.ts b/src/ui/login-form-ui-handler.ts index 87b7730e8df..631b2e50b02 100644 --- a/src/ui/login-form-ui-handler.ts +++ b/src/ui/login-form-ui-handler.ts @@ -8,7 +8,21 @@ import { addTextObject, TextStyle } from "./text"; import { addWindow } from "./ui-theme"; import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; +interface BuildInteractableImageOpts { + scale?: number; + x?: number; + y?: number; + origin?: { x: number; y: number }; +} + export default class LoginFormUiHandler extends FormModalUiHandler { + private readonly ERR_USERNAME: string = "invalid username"; + private readonly ERR_PASSWORD: string = "invalid password"; + private readonly ERR_ACCOUNT_EXIST: string = "account doesn't exist"; + private readonly ERR_PASSWORD_MATCH: string = "password doesn't match"; + private readonly ERR_NO_SAVES: string = "No save files found"; + private readonly ERR_TOO_MANY_SAVES: string = "Too many save files found"; + private googleImage: Phaser.GameObjects.Image; private discordImage: Phaser.GameObjects.Image; private usernameInfoImage: Phaser.GameObjects.Image; @@ -21,8 +35,23 @@ export default class LoginFormUiHandler extends FormModalUiHandler { } setup(): void { - super.setup(); + this.buildExternalPartyContainer(); + + this.infoContainer = this.scene.add.container(0, 0); + + this.usernameInfoImage = this.buildInteractableImage("settings_icon", "username-info-icon", { + x: 20, + scale: 0.5 + }); + + this.infoContainer.add(this.usernameInfoImage); + this.getUi().add(this.infoContainer); + this.infoContainer.setVisible(false); + this.infoContainer.disableInteractive(); + } + + private buildExternalPartyContainer() { this.externalPartyContainer = this.scene.add.container(0, 0); this.externalPartyContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.scene.game.canvas.width / 12, this.scene.game.canvas.height / 12), Phaser.Geom.Rectangle.Contains); this.externalPartyTitle = addTextObject(this.scene, 0, 4, "", TextStyle.SETTINGS_LABEL); @@ -31,23 +60,8 @@ export default class LoginFormUiHandler extends FormModalUiHandler { this.externalPartyContainer.add(this.externalPartyBg); this.externalPartyContainer.add(this.externalPartyTitle); - this.infoContainer = this.scene.add.container(0, 0); - this.infoContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.scene.game.canvas.width / 12, this.scene.game.canvas.height / 12), Phaser.Geom.Rectangle.Contains); - - const googleImage = this.scene.add.image(0, 0, "google"); - googleImage.setOrigin(0, 0); - googleImage.setScale(0.07); - googleImage.setInteractive(); - googleImage.setName("google-icon"); - this.googleImage = googleImage; - - const discordImage = this.scene.add.image(20, 0, "discord"); - discordImage.setOrigin(0, 0); - discordImage.setScale(0.07); - discordImage.setInteractive(); - discordImage.setName("discord-icon"); - - this.discordImage = discordImage; + this.googleImage = this.buildInteractableImage("google", "google-icon"); + this.discordImage = this.buildInteractableImage("discord", "discord-icon"); this.externalPartyContainer.add(this.googleImage); this.externalPartyContainer.add(this.discordImage); @@ -55,59 +69,52 @@ export default class LoginFormUiHandler extends FormModalUiHandler { this.externalPartyContainer.add(this.googleImage); this.externalPartyContainer.add(this.discordImage); this.externalPartyContainer.setVisible(false); - - const usernameInfoImage = this.scene.add.image(20, 0, "settings_icon"); - usernameInfoImage.setOrigin(0, 0); - usernameInfoImage.setScale(0.5); - usernameInfoImage.setInteractive(); - usernameInfoImage.setName("username-info-icon"); - this.usernameInfoImage = usernameInfoImage; - - this.infoContainer.add(this.usernameInfoImage); - this.getUi().add(this.infoContainer); - this.infoContainer.setVisible(false); } - getModalTitle(config?: ModalConfig): string { + override getModalTitle(_config?: ModalConfig): string { return i18next.t("menu:login"); } - getFields(config?: ModalConfig): string[] { + override getFields(_config?: ModalConfig): string[] { return [ i18next.t("menu:username"), i18next.t("menu:password") ]; } - getWidth(config?: ModalConfig): number { + override getWidth(_config?: ModalConfig): number { return 160; } - getMargin(config?: ModalConfig): [number, number, number, number] { + override getMargin(_config?: ModalConfig): [number, number, number, number] { return [ 0, 0, 48, 0 ]; } - getButtonLabels(config?: ModalConfig): string[] { + override getButtonLabels(_config?: ModalConfig): string[] { return [ i18next.t("menu:login"), i18next.t("menu:register")]; } - getReadableErrorMessage(error: string): string { + override getReadableErrorMessage(error: string): string { const colonIndex = error?.indexOf(":"); if (colonIndex > 0) { error = error.slice(0, colonIndex); } switch (error) { - case "invalid username": + case this.ERR_USERNAME: return i18next.t("menu:invalidLoginUsername"); - case "invalid password": + case this.ERR_PASSWORD: return i18next.t("menu:invalidLoginPassword"); - case "account doesn't exist": + case this.ERR_ACCOUNT_EXIST: return i18next.t("menu:accountNonExistent"); - case "password doesn't match": + case this.ERR_PASSWORD_MATCH: return i18next.t("menu:unmatchingPassword"); + case this.ERR_NO_SAVES: + return i18next.t("menu:noSaves"); + case this.ERR_TOO_MANY_SAVES: + return i18next.t("menu:tooManySaves"); } return super.getReadableErrorMessage(error); } - show(args: any[]): boolean { + override show(args: any[]): boolean { if (super.show(args)) { const config = args[0] as ModalConfig; @@ -148,17 +155,16 @@ export default class LoginFormUiHandler extends FormModalUiHandler { return false; } - clear() { + override clear() { super.clear(); this.externalPartyContainer.setVisible(false); this.infoContainer.setVisible(false); + this.setMouseCursorStyle("default"); //reset cursor - this.discordImage.off("pointerdown"); - this.googleImage.off("pointerdown"); - this.usernameInfoImage.off("pointerdown"); + [this.discordImage, this.googleImage, this.usernameInfoImage].forEach((img) => img.off("pointerdown")); } - processExternalProvider(config: ModalConfig) : void { + private processExternalProvider(config: ModalConfig) : void { this.externalPartyTitle.setText(i18next.t("menu:orUse") ?? ""); this.externalPartyTitle.setX(20+this.externalPartyTitle.text.length); this.externalPartyTitle.setVisible(true); @@ -205,6 +211,7 @@ export default class LoginFormUiHandler extends FormModalUiHandler { label: dataKeys[i].replace(keyToFind, ""), handler: () => { this.scene.ui.revertMode(); + this.infoContainer.disableInteractive(); return true; } }); @@ -213,8 +220,13 @@ export default class LoginFormUiHandler extends FormModalUiHandler { options: options, delay: 1000 }); + this.infoContainer.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.scene.game.canvas.width, this.scene.game.canvas.height), Phaser.Geom.Rectangle.Contains); } else { - return onFail("You have too many save files to use this"); + if (dataKeys.length > 2) { + return onFail(this.ERR_TOO_MANY_SAVES); + } else { + return onFail(this.ERR_NO_SAVES); + } } }); @@ -236,4 +248,21 @@ export default class LoginFormUiHandler extends FormModalUiHandler { alpha: 1 }); } + + private buildInteractableImage(texture: string, name: string, opts: BuildInteractableImageOpts = {}) { + const { + scale = 0.07, + x = 0, + y = 0, + origin = { x: 0, y: 0 } + } = opts; + const img = this.scene.add.image(x, y, texture); + img.setName(name); + img.setOrigin(origin.x, origin.y); + img.setScale(scale); + img.setInteractive(); + this.addInteractionHoverEffect(img); + + return img; + } } diff --git a/src/ui/modal-ui-handler.ts b/src/ui/modal-ui-handler.ts index cecdacc1eb9..5f586ec8db7 100644 --- a/src/ui/modal-ui-handler.ts +++ b/src/ui/modal-ui-handler.ts @@ -57,29 +57,35 @@ export abstract class ModalUiHandler extends UiHandler { const buttonLabels = this.getButtonLabels(); - const buttonTopMargin = this.getButtonTopMargin(); - for (const label of buttonLabels) { - const buttonLabel = addTextObject(this.scene, 0, 8, label, TextStyle.TOOLTIP_CONTENT); - buttonLabel.setOrigin(0.5, 0.5); - - const buttonBg = addWindow(this.scene, 0, 0, buttonLabel.getBounds().width + 8, 16, false, false, 0, 0, WindowVariant.THIN); - buttonBg.setOrigin(0.5, 0); - buttonBg.setInteractive(new Phaser.Geom.Rectangle(0, 0, buttonBg.width, buttonBg.height), Phaser.Geom.Rectangle.Contains); - - const buttonContainer = this.scene.add.container(0, buttonTopMargin); - - this.buttonBgs.push(buttonBg); - this.buttonContainers.push(buttonContainer); - - buttonContainer.add(buttonBg); - buttonContainer.add(buttonLabel); - this.modalContainer.add(buttonContainer); + this.addButton(label); } this.modalContainer.setVisible(false); } + private addButton(label: string) { + const buttonTopMargin = this.getButtonTopMargin(); + const buttonLabel = addTextObject(this.scene, 0, 8, label, TextStyle.TOOLTIP_CONTENT); + buttonLabel.setOrigin(0.5, 0.5); + + const buttonBg = addWindow(this.scene, 0, 0, buttonLabel.getBounds().width + 8, 16, false, false, 0, 0, WindowVariant.THIN); + buttonBg.setOrigin(0.5, 0); + buttonBg.setInteractive(new Phaser.Geom.Rectangle(0, 0, buttonBg.width, buttonBg.height), Phaser.Geom.Rectangle.Contains); + + const buttonContainer = this.scene.add.container(0, buttonTopMargin); + + this.buttonBgs.push(buttonBg); + this.buttonContainers.push(buttonContainer); + + buttonContainer.add(buttonBg); + buttonContainer.add(buttonLabel); + + this.addInteractionHoverEffect(buttonBg); + + this.modalContainer.add(buttonContainer); + } + show(args: any[]): boolean { if (args.length >= 1 && "buttonActions" in args[0]) { super.show(args); @@ -135,4 +141,20 @@ export abstract class ModalUiHandler extends UiHandler { this.buttonBgs.map(bg => bg.off("pointerdown")); } + + /** + * Adds a hover effect to a game object which changes the cursor to a `pointer` and tints it slighly + * @param gameObject the game object to add hover events/effects to + */ + protected addInteractionHoverEffect(gameObject: Phaser.GameObjects.Image | Phaser.GameObjects.NineSlice | Phaser.GameObjects.Sprite) { + gameObject.on("pointerover", () => { + this.setMouseCursorStyle("pointer"); + gameObject.setTint(0xbbbbbb); + }); + + gameObject.on("pointerout", () => { + this.setMouseCursorStyle("default"); + gameObject.clearTint(); + }); + } } diff --git a/src/ui/ui-handler.ts b/src/ui/ui-handler.ts index 94625efaa75..d9f0a876b71 100644 --- a/src/ui/ui-handler.ts +++ b/src/ui/ui-handler.ts @@ -52,6 +52,15 @@ export default abstract class UiHandler { return changed; } + /** + * Changes the style of the mouse cursor. + * @see {@link https://developer.mozilla.org/en-US/docs/Web/CSS/cursor} + * @param cursorStyle cursor style to apply + */ + protected setMouseCursorStyle(cursorStyle: "pointer" | "default") { + this.scene.input.manager.canvas.style.cursor = cursorStyle; + } + clear() { this.active = false; } From f1650d251594307e75170b8f0954b4e87bc3a5d4 Mon Sep 17 00:00:00 2001 From: chaosgrimmon <31082757+chaosgrimmon@users.noreply.github.com> Date: Thu, 5 Sep 2024 22:32:13 -0400 Subject: [PATCH 18/83] [Sprite] Fix Tangrowth Variants (#4059) * [Sprite] Front Tangrowth male variants * [Sprite] Front Tangrowth female variants * [Sprite] Back Tangrowth female variants * [Sprite] Back Tangrowth male epic palette * Delete public/images/pokemon/variant/465_2.png * Delete public/images/pokemon/variant/back/465_3.png * Delete public/images/pokemon/variant/465_3.png * Delete public/images/pokemon/variant/465_2.json * Delete public/images/pokemon/variant/465_3.json * Delete public/images/pokemon/variant/back/465_3.json * [Sprite] Update Tangrowth variants with females --- public/images/pokemon/variant/465.json | 22 + public/images/pokemon/variant/465_2.json | 4094 ----------------- public/images/pokemon/variant/465_2.png | Bin 38802 -> 0 bytes public/images/pokemon/variant/465_3.json | 4094 ----------------- public/images/pokemon/variant/465_3.png | Bin 43995 -> 0 bytes .../images/pokemon/variant/_masterlist.json | 16 +- public/images/pokemon/variant/back/465.json | 11 +- public/images/pokemon/variant/back/465_3.json | 4094 ----------------- public/images/pokemon/variant/back/465_3.png | Bin 34654 -> 0 bytes .../pokemon/variant/back/female/465.json | 21 + public/images/pokemon/variant/female/465.json | 22 + 11 files changed, 88 insertions(+), 12286 deletions(-) create mode 100644 public/images/pokemon/variant/465.json delete mode 100644 public/images/pokemon/variant/465_2.json delete mode 100644 public/images/pokemon/variant/465_2.png delete mode 100644 public/images/pokemon/variant/465_3.json delete mode 100644 public/images/pokemon/variant/465_3.png delete mode 100644 public/images/pokemon/variant/back/465_3.json delete mode 100644 public/images/pokemon/variant/back/465_3.png create mode 100644 public/images/pokemon/variant/back/female/465.json create mode 100644 public/images/pokemon/variant/female/465.json diff --git a/public/images/pokemon/variant/465.json b/public/images/pokemon/variant/465.json new file mode 100644 index 00000000000..a7ff2338057 --- /dev/null +++ b/public/images/pokemon/variant/465.json @@ -0,0 +1,22 @@ +{ + "1": { + "529cc5": "8153c7", + "d65a94": "5ad662", + "3a73ad": "6b3aad", + "bd216b": "21bd69", + "5a193a": "195a2a", + "193a63": "391963", + "295a84": "472984" + }, + "2": { + "529cc5": "ffedb6", + "d65a94": "e67d2f", + "3a73ad": "ebc582", + "bd216b": "b35131", + "31313a": "3d1519", + "5a193a": "752e2e", + "193a63": "705040", + "295a84": "ad875a", + "4a4a52": "57211a" + } +} \ No newline at end of file diff --git a/public/images/pokemon/variant/465_2.json b/public/images/pokemon/variant/465_2.json deleted file mode 100644 index 7c6d5ea081a..00000000000 --- a/public/images/pokemon/variant/465_2.json +++ /dev/null @@ -1,4094 +0,0 @@ -{ - "textures": [ - { - "image": "465_2.png", - "format": "RGBA8888", - "size": { - "w": 407, - "h": 407 - }, - "scale": 1, - "frames": [ - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0139.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0140.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0171.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0172.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0137.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0138.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0169.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0170.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0153.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0154.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0185.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0186.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0155.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0156.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0187.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0188.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0129.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0130.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0131.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0132.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0147.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0148.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0163.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0164.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0179.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0180.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0141.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0142.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0173.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0174.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0105.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 98, - "h": 65 - }, - "frame": { - "x": 64, - "y": 65, - "w": 98, - "h": 65 - } - }, - { - "filename": "0106.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 98, - "h": 65 - }, - "frame": { - "x": 64, - "y": 65, - "w": 98, - "h": 65 - } - }, - { - "filename": "0121.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 98, - "h": 65 - }, - "frame": { - "x": 64, - "y": 65, - "w": 98, - "h": 65 - } - }, - { - "filename": "0122.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 98, - "h": 65 - }, - "frame": { - "x": 64, - "y": 65, - "w": 98, - "h": 65 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0133.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0134.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0165.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0166.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0157.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0158.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0189.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0190.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0135.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0136.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0167.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0168.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0145.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0146.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0177.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0178.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0161.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0162.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0193.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0194.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0149.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0150.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0181.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0182.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0143.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0144.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0175.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0176.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0151.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0152.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0183.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0184.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 86, - "h": 66 - }, - "frame": { - "x": 0, - "y": 196, - "w": 86, - "h": 66 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 86, - "h": 66 - }, - "frame": { - "x": 0, - "y": 196, - "w": 86, - "h": 66 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 90, - "h": 66 - }, - "frame": { - "x": 86, - "y": 197, - "w": 90, - "h": 66 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 90, - "h": 66 - }, - "frame": { - "x": 86, - "y": 197, - "w": 90, - "h": 66 - } - }, - { - "filename": "0125.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 90, - "h": 66 - }, - "frame": { - "x": 86, - "y": 197, - "w": 90, - "h": 66 - } - }, - { - "filename": "0126.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 90, - "h": 66 - }, - "frame": { - "x": 86, - "y": 197, - "w": 90, - "h": 66 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 94, - "h": 66 - }, - "frame": { - "x": 176, - "y": 198, - "w": 94, - "h": 66 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 94, - "h": 66 - }, - "frame": { - "x": 176, - "y": 198, - "w": 94, - "h": 66 - } - }, - { - "filename": "0107.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 97, - "h": 66 - }, - "frame": { - "x": 270, - "y": 198, - "w": 97, - "h": 66 - } - }, - { - "filename": "0108.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 97, - "h": 66 - }, - "frame": { - "x": 270, - "y": 198, - "w": 97, - "h": 66 - } - }, - { - "filename": "0127.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 86, - "h": 66 - }, - "frame": { - "x": 0, - "y": 262, - "w": 86, - "h": 66 - } - }, - { - "filename": "0128.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 86, - "h": 66 - }, - "frame": { - "x": 0, - "y": 262, - "w": 86, - "h": 66 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0159.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0160.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0191.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0192.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0109.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 98, - "h": 66 - }, - "frame": { - "x": 156, - "y": 264, - "w": 98, - "h": 66 - } - }, - { - "filename": "0110.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 98, - "h": 66 - }, - "frame": { - "x": 156, - "y": 264, - "w": 98, - "h": 66 - } - }, - { - "filename": "0117.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 98, - "h": 66 - }, - "frame": { - "x": 156, - "y": 264, - "w": 98, - "h": 66 - } - }, - { - "filename": "0118.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 98, - "h": 66 - }, - "frame": { - "x": 156, - "y": 264, - "w": 98, - "h": 66 - } - }, - { - "filename": "0111.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 97, - "h": 66 - }, - "frame": { - "x": 254, - "y": 264, - "w": 97, - "h": 66 - } - }, - { - "filename": "0112.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 97, - "h": 66 - }, - "frame": { - "x": 254, - "y": 264, - "w": 97, - "h": 66 - } - }, - { - "filename": "0113.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 98, - "h": 66 - }, - "frame": { - "x": 0, - "y": 330, - "w": 98, - "h": 66 - } - }, - { - "filename": "0114.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 98, - "h": 66 - }, - "frame": { - "x": 0, - "y": 330, - "w": 98, - "h": 66 - } - }, - { - "filename": "0115.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 97, - "h": 66 - }, - "frame": { - "x": 98, - "y": 330, - "w": 97, - "h": 66 - } - }, - { - "filename": "0116.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 97, - "h": 66 - }, - "frame": { - "x": 98, - "y": 330, - "w": 97, - "h": 66 - } - }, - { - "filename": "0119.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 97, - "h": 66 - }, - "frame": { - "x": 195, - "y": 330, - "w": 97, - "h": 66 - } - }, - { - "filename": "0120.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 97, - "h": 66 - }, - "frame": { - "x": 195, - "y": 330, - "w": 97, - "h": 66 - } - }, - { - "filename": "0123.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 94, - "h": 66 - }, - "frame": { - "x": 292, - "y": 330, - "w": 94, - "h": 66 - } - }, - { - "filename": "0124.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 94, - "h": 66 - }, - "frame": { - "x": 292, - "y": 330, - "w": 94, - "h": 66 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:9fb6238f8e585be9be5e520abb59e23d:2204e0edc6a9e184240a16c4ee5faa7c:06d67de9e8d7f60fc986e0c00145d6b1$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/465_2.png b/public/images/pokemon/variant/465_2.png deleted file mode 100644 index db25e88ad987fbad282a87365e121b0f2755af87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 38802 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 acmjR-T^1VC^$#3i9C|uN+GUz{VgCiM=7Yij diff --git a/public/images/pokemon/variant/465_3.json b/public/images/pokemon/variant/465_3.json deleted file mode 100644 index c092ec585e7..00000000000 --- a/public/images/pokemon/variant/465_3.json +++ /dev/null @@ -1,4094 +0,0 @@ -{ - "textures": [ - { - "image": "465_3.png", - "format": "RGBA8888", - "size": { - "w": 407, - "h": 407 - }, - "scale": 1, - "frames": [ - { - "filename": "0009.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0010.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0041.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0042.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0073.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0074.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0139.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0140.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0171.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0172.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 3, - "w": 74, - "h": 64 - }, - "frame": { - "x": 0, - "y": 0, - "w": 74, - "h": 64 - } - }, - { - "filename": "0007.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0008.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0039.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0040.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0071.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0072.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0137.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0138.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0169.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0170.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 74, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0023.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0024.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0055.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0056.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0087.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0088.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0153.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0154.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0185.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0186.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 1, - "w": 83, - "h": 65 - }, - "frame": { - "x": 157, - "y": 0, - "w": 83, - "h": 65 - } - }, - { - "filename": "0025.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0026.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0057.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0058.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0089.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0090.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0155.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0156.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0187.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0188.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 12, - "y": 2, - "w": 74, - "h": 65 - }, - "frame": { - "x": 240, - "y": 0, - "w": 74, - "h": 65 - } - }, - { - "filename": "0001.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0002.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0017.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0018.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0033.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0034.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0049.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0050.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0065.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0066.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0081.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0082.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0097.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0098.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0129.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0130.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0131.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0132.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0147.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0148.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0163.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0164.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0179.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0180.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 83, - "h": 66 - }, - "frame": { - "x": 314, - "y": 0, - "w": 83, - "h": 66 - } - }, - { - "filename": "0011.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0012.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0043.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0044.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0075.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0076.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0141.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0142.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0173.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0174.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 0, - "y": 64, - "w": 64, - "h": 66 - } - }, - { - "filename": "0105.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 98, - "h": 65 - }, - "frame": { - "x": 64, - "y": 65, - "w": 98, - "h": 65 - } - }, - { - "filename": "0106.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 98, - "h": 65 - }, - "frame": { - "x": 64, - "y": 65, - "w": 98, - "h": 65 - } - }, - { - "filename": "0121.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 98, - "h": 65 - }, - "frame": { - "x": 64, - "y": 65, - "w": 98, - "h": 65 - } - }, - { - "filename": "0122.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 1, - "w": 98, - "h": 65 - }, - "frame": { - "x": 64, - "y": 65, - "w": 98, - "h": 65 - } - }, - { - "filename": "0003.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0004.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0035.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0036.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0067.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0068.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0133.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0134.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0165.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0166.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 162, - "y": 65, - "w": 88, - "h": 66 - } - }, - { - "filename": "0027.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0028.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0059.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0060.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0091.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0092.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0157.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0158.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0189.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0190.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 17, - "y": 1, - "w": 64, - "h": 66 - }, - "frame": { - "x": 250, - "y": 65, - "w": 64, - "h": 66 - } - }, - { - "filename": "0005.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0006.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0037.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0038.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0069.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0070.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0135.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0136.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0167.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0168.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 314, - "y": 66, - "w": 93, - "h": 66 - } - }, - { - "filename": "0015.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0016.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0047.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0048.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0079.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0080.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0145.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0146.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0177.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0178.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 0, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0031.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0032.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0063.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0064.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0095.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0096.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0161.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0162.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0193.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0194.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 11, - "y": 0, - "w": 76, - "h": 66 - }, - "frame": { - "x": 76, - "y": 130, - "w": 76, - "h": 66 - } - }, - { - "filename": "0019.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0020.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0051.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0052.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0083.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0084.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0149.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0150.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0181.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0182.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 88, - "h": 66 - }, - "frame": { - "x": 152, - "y": 131, - "w": 88, - "h": 66 - } - }, - { - "filename": "0013.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0014.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0045.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0046.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0077.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0078.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0143.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0144.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0175.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0176.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 240, - "y": 131, - "w": 70, - "h": 67 - } - }, - { - "filename": "0021.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0022.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0053.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0054.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0085.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0086.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0151.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0152.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0183.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0184.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 2, - "y": 0, - "w": 93, - "h": 66 - }, - "frame": { - "x": 310, - "y": 132, - "w": 93, - "h": 66 - } - }, - { - "filename": "0099.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 86, - "h": 66 - }, - "frame": { - "x": 0, - "y": 196, - "w": 86, - "h": 66 - } - }, - { - "filename": "0100.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 7, - "y": 0, - "w": 86, - "h": 66 - }, - "frame": { - "x": 0, - "y": 196, - "w": 86, - "h": 66 - } - }, - { - "filename": "0101.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 90, - "h": 66 - }, - "frame": { - "x": 86, - "y": 197, - "w": 90, - "h": 66 - } - }, - { - "filename": "0102.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 90, - "h": 66 - }, - "frame": { - "x": 86, - "y": 197, - "w": 90, - "h": 66 - } - }, - { - "filename": "0125.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 90, - "h": 66 - }, - "frame": { - "x": 86, - "y": 197, - "w": 90, - "h": 66 - } - }, - { - "filename": "0126.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 4, - "y": 0, - "w": 90, - "h": 66 - }, - "frame": { - "x": 86, - "y": 197, - "w": 90, - "h": 66 - } - }, - { - "filename": "0103.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 94, - "h": 66 - }, - "frame": { - "x": 176, - "y": 198, - "w": 94, - "h": 66 - } - }, - { - "filename": "0104.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 94, - "h": 66 - }, - "frame": { - "x": 176, - "y": 198, - "w": 94, - "h": 66 - } - }, - { - "filename": "0107.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 97, - "h": 66 - }, - "frame": { - "x": 270, - "y": 198, - "w": 97, - "h": 66 - } - }, - { - "filename": "0108.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 97, - "h": 66 - }, - "frame": { - "x": 270, - "y": 198, - "w": 97, - "h": 66 - } - }, - { - "filename": "0127.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 86, - "h": 66 - }, - "frame": { - "x": 0, - "y": 262, - "w": 86, - "h": 66 - } - }, - { - "filename": "0128.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 5, - "y": 0, - "w": 86, - "h": 66 - }, - "frame": { - "x": 0, - "y": 262, - "w": 86, - "h": 66 - } - }, - { - "filename": "0029.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0030.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0061.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0062.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0093.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0094.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0159.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0160.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0191.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0192.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 14, - "y": 0, - "w": 70, - "h": 67 - }, - "frame": { - "x": 86, - "y": 263, - "w": 70, - "h": 67 - } - }, - { - "filename": "0109.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 98, - "h": 66 - }, - "frame": { - "x": 156, - "y": 264, - "w": 98, - "h": 66 - } - }, - { - "filename": "0110.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 98, - "h": 66 - }, - "frame": { - "x": 156, - "y": 264, - "w": 98, - "h": 66 - } - }, - { - "filename": "0117.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 98, - "h": 66 - }, - "frame": { - "x": 156, - "y": 264, - "w": 98, - "h": 66 - } - }, - { - "filename": "0118.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 98, - "h": 66 - }, - "frame": { - "x": 156, - "y": 264, - "w": 98, - "h": 66 - } - }, - { - "filename": "0111.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 97, - "h": 66 - }, - "frame": { - "x": 254, - "y": 264, - "w": 97, - "h": 66 - } - }, - { - "filename": "0112.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 97, - "h": 66 - }, - "frame": { - "x": 254, - "y": 264, - "w": 97, - "h": 66 - } - }, - { - "filename": "0113.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 98, - "h": 66 - }, - "frame": { - "x": 0, - "y": 330, - "w": 98, - "h": 66 - } - }, - { - "filename": "0114.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 98, - "h": 66 - }, - "frame": { - "x": 0, - "y": 330, - "w": 98, - "h": 66 - } - }, - { - "filename": "0115.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 97, - "h": 66 - }, - "frame": { - "x": 98, - "y": 330, - "w": 97, - "h": 66 - } - }, - { - "filename": "0116.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 1, - "y": 0, - "w": 97, - "h": 66 - }, - "frame": { - "x": 98, - "y": 330, - "w": 97, - "h": 66 - } - }, - { - "filename": "0119.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 97, - "h": 66 - }, - "frame": { - "x": 195, - "y": 330, - "w": 97, - "h": 66 - } - }, - { - "filename": "0120.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 0, - "y": 0, - "w": 97, - "h": 66 - }, - "frame": { - "x": 195, - "y": 330, - "w": 97, - "h": 66 - } - }, - { - "filename": "0123.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 94, - "h": 66 - }, - "frame": { - "x": 292, - "y": 330, - "w": 94, - "h": 66 - } - }, - { - "filename": "0124.png", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 98, - "h": 67 - }, - "spriteSourceSize": { - "x": 3, - "y": 0, - "w": 94, - "h": 66 - }, - "frame": { - "x": 292, - "y": 330, - "w": 94, - "h": 66 - } - } - ] - } - ], - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:9fb6238f8e585be9be5e520abb59e23d:2204e0edc6a9e184240a16c4ee5faa7c:06d67de9e8d7f60fc986e0c00145d6b1$" - } -} \ No newline at end of file diff --git a/public/images/pokemon/variant/465_3.png b/public/images/pokemon/variant/465_3.png deleted file mode 100644 index fe8e764028b87c1e1e5cc7148976b299c5cb583d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43995 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%0AMb6O@Ayt6>35?%Qjt<+ z|Mx`APR9Q;Q3JMj!XO#H#XuSw zagmHtMMEIp&uv2P07D`vgVC~3++k$o{BW%g?Y1QigIpif*((DKedhZyo%z`r%Wq2@ zzz4m10|Y8D0+2{ln>m#90MsNuUk=V4fTr%q^DQ?btl#B#O5O>eYbr&QlBc{M6+!p& zBlSvA%>b%$M}{cZaP*mRg4D5579XFyI05JZ(T?Jl@i|%7@oRfaD@5TgmYe`S6SDNB zXUcQ&wbq@uITATpO8S*m z4R$XZH?tZw&`nW8q!{>yu}C!}1K{O0R8NrvP%H@tB+=D*W}IrmgU#W4JLv9%T2sam zgtZlivc4_3>4Lyj{G|f+88~yyF??sSDPOB?OV4ED@{e47<3ewOJFcC{INC?^Xmekbmm!1c|TAWv9pK~Vhb3*;dJ`Isg9c?nl> z_PfSs=$#7nQi^F$lO<4(wOX^k+>&Tx8#Xn^6Mwzc@p8f-i|R5z%P2QCXYCLFOprT& z9}VH^OdVIB;oJr26RYIk;*~@ryanEl5(o`(s|c}f`w)+GFEbzu=RN>pclA(RH^^qU zCk#x+X}ss1%Vn+a>q8n&cI2^s?Yud^&F|Dvv-|UrF{`sh{mfseePv`PXaVU{QcsT? zq&IF3o9q|O3;MB5^Ngnze)w9@hI|2TcOQ67S*eqw13Arac6edjzS+gMb@=w1Q^~4H zDs}QR4ouJe+mcP+gEjpS08x(M)!VmXSrw<0ih*>6J+51G77^!S@lzgk8dW>$MhEJe zIlZSpzf&;L9TBxLA3#yBT)TvCGCs6fd&1vvMK+1rD2fODna7o!J~!NDDxl?w+A(?- z4Q-fJ^96ImAP(16AQ1pa`8P0*yDb#D3(yy3)w#&FK~<;n`FmV~g@)b)-Cp$MTkNsL zGSfJAg{zN*j-(0dHsgC4SArjP)SgoN1i-v)WXxRZUQyv=KD0ON=u<-R*WvD?PonKe z*PETY$N3Mp#z)wi@a9L^*b#nd*~lPipy&!zRmqZDrvoJ244OR~4iKZb1FPb$*pnT+ znfb}%IXs)ikcsBM+9OinR319TQ87mAVYzp~9(+_PI z>^8Pjyj@-3vhqbR1$X-DmCa(#HSr><6^IoO_lJwb8X&lpLtIK6{3jeqDS_%ZOA$!o zG-W8E3H7T;OXg^?i~Q#j$|@j+232DoR$#9IggEG3hrN8Ll2ij+yOMBryRm$v@{gM& z-Xm7J_kXCRPUw+0CojfloBdVhz1D7((&uPWNz}FGJkIR(?JaFC#28ypE7B~xmCg%U ze%&N5+23$c6slv$*9iaezqB=iz5;tNFJeXnK^ih3Jld$LBCM;hc}0j4>*I&WG|8G% zP713!)*U_Ujlwd&(ld-BQhpdj8L&;Qp!NIM z=@rAwdjRYbh#G65CU|mzIiQKJGHFFO?omz?;ZjfOY2e`-8Ytx91*fh*ZnTGl#>WkR zB3e@A7Fz+4Rtk zU;Ftb-u@^_`_U6jW(d24u~klLe0InfF;C*4+OsdfD17%UVCeO_UOs*7VyeybyHIXf zuBc=2U2wRoZ@KH_YbBoai8Rp0S@`f%3$W1D8Ld}5aXm6G^u_SWr|H+wzPa|KKv|fQ zV*bJokyeSUhOh$tRpBWGVAC?M?HlEL9-@pv zSHQI2t0${wkp2TOEObZzrmlIaD|E%IzmgjAa-8xm(|4wfFH_t!%RF z5`{Y#JOZC^OQzU9Q~xF1hg>Or9X_(J(CSjc@+qAHb}arcoc~2D=L7T*gA6_9 zec?~|jjpT*!;@10$}zp3P&$n}g9Vm)8#3-^OSdJJw=1#Hr>p=}yh963A}jM1?`n4Oo5K&MtpjOef4y@HEm3igZzm;L6W&#t1R#?fAA zna@||AT4rduR06w!KOojLgk5^&>y7Y*?Ov)@b}xYNWX-EygX2G9sybH*bZH>mJQAb zQn$Vyj3Gzu3kkC!T?yZjRW4enm=n6CQqrxri#6jMD{*$W=;A!3Ni2Ier;}h-@+53_ zPS`d}3sb2d6<6zZbth$?^7JjuOJ?IK)PRu~rrDP8HYGF%%@y`f0$}k&cDnU_7q_F+ z3t6MSxx8P|slW?$-Kl3^Pxmcay`ubC9;j}mb54Y#W^yHKhW^UR39&}GSut)SySAWG|@L7Wfrmxyr?1AGbjWwK1BciFbwBKJZeN$uw~RbrKX9^5qQ~!?GJ}q7jCEd&`pbcl#}7g@mb5_L2{f4Wm|CI ztYcStLFqeQ_v?aagB6~Ugx%le0dY5@e7LD46cw~otS7~dtbJjbaq6v(dDIF6aV z^;dS~q7UPz5w@=zSPs?RHAj3YCrekFDA|5mk4S|jjC}`oCw9whIszWPPPw2y&FKZT z#?a)&I!7MxWHI?j!-saMDD%GFV=9`BxKC~E&8o2MbcXDMM;g<8jKB(KBQO5JIgiTcj z%@lqXXgX|Wp${{UQ$|NYsn_QO+)KFUxYHC%-f*HFHO@foqh~KMpju~Qc}BmmX%|yz zvAFE8OQ9>X@{4%$d@-+~fb~<5KG+DXGNKT{iptmh0;-XLywHylZ zFXHvfhCL(%O%W14=~}>3IAGl=|GcYEho`%%CqF=K`TQ0`Kz!m-7DClq0J26JrFh0> zO^s)UiRC33xMx(veEZGan~^w}Fnv~739;<}y4>^;GNx6awb)zY-m#;^ z^#$_qc*dsIm^qIAn5pyYq@dT6|I)Yog{C+Ut*#jBQvJ`bXsxQImoiL5&d4Z0&UP2)nN{y?(SJ=Dw|2Ze3A5~`xyb1lC_StU3Fp+<1~UOFB`Z|8v7& z>Qb^V?MR=-nG%?p6@SEx!LF=>aclMBqkoM5={~&X@7Tg4?;PQonRrk+bgQ?Dn+aT1 z?;AYm*=P2-a7ACJ6`rc}7UeU)GVZHEM)UDxH#BA23C$_~5zMOEwM4%UIz(4X7*A6H zUiE1Y4Y}~q3-r%g{+zq5whZk(hC$0Oq@Pz$;7-Y~THsSk>1xp#a;m`ygS_aeBbIAN zFTN{&_u0qf^0ltrykwdgWmA+j0C zB@5ePWZ|&b%~})${rEDMcX$q4O*IZ(`E5xU=gEX0{&NM-<#=8%;7eYQ*1h^b0siMU z^SQ|mmh#q&a?qn0gJPNkr*NzE2)DLQInFdzkNJH zn}6a#U@p}EFlu>xfi4=%FtrGhbqEO+SyTg>RhXKI_wg=oPuL>4-e<8vskMMLrVh)y zs4t(0r4*N+^;&y7WZ#D@5;sZr2cjMTps8khk^ylazqGwQi&jrU^Y+=N=^IAZxD3F~ zEH5>AI2T}%q!cvTFZVfl(&CFid^Y!T81XYO0H_J~oK&I24CR|~Fd3=w-U8}jEA$t@ zKt5m-!_{T!ZZE{$J^|Z!j_|bjG^4C;!C7V4IUG|hl9Z-SVXu{86tKb#ycDV}P%g;H z^%TvXzF?PH;SVxmx#Fp}L;kpZ&71nj zgq@xKBMDDDh4OA_^>WMhU|8v#PjY6@2dNWQnGB!l?Aq6vGjWk+_>aJ7rtBQyKj8u~ zS5`v zJn;K~P1BSLvJBJe%WF07-}wBgaDL)KLu2CZ`}9qfnR_yW)p2qXsk4miI&ABNTu^^X>|CqhW;bL*>?xGwjLRXE!V1janAOSG;-3J zQrmcI?~vCzn$OHGeHzttG0JGV6I?dCi0PqCT2p`VTPnS^nbHN%`&)NBXx_9{wB|tZ zvWM{D#d?ppScm-_`f8Fav6QL@5_z$r0sCZA^v+$i`X5v~G zcpKhMSx-EMj7rj&5=L0H-lK>?v5qss`j2AGd{jjJok51tNQVu#6AhEtSWxv^qnSN7 z^ZWp=LJ$bx7UF8q_9N~YL9f1T*zt(W8m9etzRA%e;?pj=oBk2|3k}zvS*-n+W7Tla z&0j+R%3|!gyYG_S1;$z*XA<3ejSe{XR?d&MruaHKNFJBgzBr87NQM#futGo-@le5+pH>5?XM z(!x@)2X-tiojS+T3hvO3hjV{VDz4@%Fq-Vbu)r+&=>1%KB;gt%hI90>Bk@%9F&C{A zo}1?6F&_1^YD|pv6KaE#{S&g={lF*i$$LJZ$YM})yp*AtvHby&nN&}RY8-Dt3`qU@ zFG>H=8df8jis!GZD-PU zQ)=smwIq$16$(N_M{n3JJvdgb+Ug{y=>At>ax)(Dx^e=`mL6mYfByhB^I7vLTH+eb z=R&bChf^Mvfy+K%S*4>s;`h2yAl+(Seo(v+Ec3I%;ncg60(P%MTbuf;R`JbnNjyV$4pcE^VP;;iM6CV?^zTnUB{c8>Z1^z1)6XhzX+G8^jNPYe4{9Fzp||Eh*#R`G*gGB|U;?&Rd)V-5GxfJLnaFMGYjODbxDk z2O9AFSr3%A=u#d$T3-o@DgDxYoFtP0xu!H8gfSQ}<$a z6c-+r=FcHsbAp$kZS@5|TW1uK#jv!VzN%l3YKCDM<^QTzjTBrmoqv8jvuW?!k8S{+J#H1ysH~JW z(PYkGfv1moZfKxT5Cr`F4^ETROOhirWG`4oMpd>URC$a9%r#pL1l2JgQMjr|RG&j9 zDM)b@$A{LC21owezpf*EKix`UeD_G0<xnZE7A*_dP^f?M=Mr74u z&1cS+$ITe`0-bj$MWStIaJ==(j+6XdS-aB`1BYF1N`te)h-Lmfq2-G?K0ncoDG`&C zY(&p+8|uW*?KRe>0z1~+3??2`ZF_qUsA_fh!5qYIaW8j^s=`4<7PvHoA+heXuH3i4w^`OhoKNamCfCUzD{eR1 zC4?L|>9`gkzv$*FutKi1uF+Y0UD|QYchX4~G&}jV72L^zL|A?SEcOFCIAa5E2m86g z?fmtCBb6XGqX;#AYoB8-@it4Wln;R=ME9VBsth_Xu^sqdlX3&T?OV< zs57KtqXyl z+JxSa2Nx$XoUZ$EPflJ%kV!>F+Mo zZA2Yvxw%&m_rqu|$PM-kH>Q*dXM?QGS^tH38galxBNiK`V1=n277JZBjv;74Ugn_B zfHaEM8!!L};{sv9s;l8YdbzavYkyzOvH}6gSKX*02hM{OU#k_Je>i)`XiugTsob zZ%fWJ2Q+A>eqG$QK+Co8jqM zW=PI-|Mu{{bG_v|g<-I#XD0i)%(v3n$=clh{#O>1%7#o3QU#g-EW{3Phqd58wSa3F z(2;5@9Jd8dz9+0@){&%RsQKo{Mg#h{cI~gmPk!+OJj_DU&AG{rBjp z%_JZA=w=|udbRSk?iphzQ28c36|+F+X3ab9S@GziODhFUQoLIPN3iS%@PvuEjya+ZI2?WF9r^ zDKCO!u_*GtC){=&ID)0bCJ0R0ZH*H9T*});Ua#v{rPw$jkaBWH*yM6}oc54V;)LqE zD*PlmkH9AE6WHVMV@O1USex!Cfgfx?CLq_PdRXBCMNk|!m$eRIT~;q=s=d5IH$M}; zewXd~1!JBmDJUrTq6|EG)Nxhzv;V>+gTOl+h+mSmWlD@ZE7G>_I;(%K%W?BGRf}oEl>?CiFiC%OTxKB0^||&cX&fS z-A?EdoK+3Bk^}%iW5u^6G4M@Gs9Kd9Fc=qhx#(y0*$S6K!Nz%YsnW~@iN|F@kbTl& zhR)BfN8tT4Q>l5fz-ZH2gwvJDU( zSet{>`MbU#?%XqS`2L*nim@NZwy(nqfq+u4CS~;vGn4vbZH#<1J`#6a=Pi`OMcJH{%y) z;GZ|^yy~G)dZ@|6AV6@}_=R@vx7}xc{7s#yf4uDVLvOKN<$<`32P)K3Buva+y)TO|_4gd!bvw__sO+!!BCo7WBCo8B>F`?gs*5`kWk>nM zpM<3CbE3?7xP0~u6MXBE3gr7A?ufqn3>w^pI_2Y_{3*7og+&`E5y>Wz_vJ5}fF0E^ z;~*{6eSo&YYxd|1{^|}B^FmLrfkU~b5BNKR|A}y?`(vT%-*p9LLw5px`twN&ce*b{ z?P5xOGyW&G4r8V9Sy(ae3+|+XKnw$2GHzX*=ce5 zE~|TM9=mz@^x|Gl^PUb{(|2o4<9)`uU}M{<{5~n|@!~f1A5c{lRM1cl^%^T*B9?<| zb`0$#8Xz3C8A?T{gAYwyNrV3my$PD3;u=UBaXOT2s*KL2Q5 zc#Q`mlvv#}P$VpPdf?^DS1H|JKAz)0Nyy{)1o-R;yVAI^ucN&$loHU9*e$-EB0epH zmUqpsyzH`we$Sf~j_3ZTr48c_fOmK|2dY&6^*=FfLyqRwh2rhwjnObIaN7|+AG-C? z_>ozlpfqc=0kz0g0?;UG3D_)MPAW!&0D)wZq`oUtI%JNREc=AH>;?WJH#ZQClJ=4^p~dhdaVyl41=5yke{rmzjG^V0ypKhb44yx zigqv%T1g5_gx1fQZz?XTq!mymbdrSO6^b64R@+@%RgpCjY^Y~*16B6vd%mibs1td% ztWcV^1)M-ycoSUEAmt3Co&uz7&_LKu-+(>h?{&so4&q(gR|<^LLki7WzCjrRDJT*; zez2_F1bToUM|%A-Ed{{Nw)KuF1Cvc_X;If`=U~2B;G|*TyWzXp`@?7Loam*YF63WR zWo2p1=Gvr_qVaGcnDP*K^nKs9Ud3U}T@!BwIpl0GsID`v7pLvfcWVPZf*EIG<&Wit ztbXz?E1#ETlg*2{^!SBKAg@~m?%c8huua%Hysdv*$^hrV{G?W|dcdgxz5|y;y|>&^ z8@?5>3y51Pv8rxedU@25U)EMZ8d{&dbjZ-JPLLRw3_n7B(o^*7%%Y+`ZU#DQqKNm| zxnwJ=zlY{&-oj2+x#8H#VK_$X06H1BROMJ>P8=jt-7iQ(`D` zd(J&b7dHy;S=6~}0*dD}BjnBibNdN-jct6DGbl|Tr0tcHqNH<_`+(Q_o?$3u`@`Bo ztVk&vY)J_V2^T94R(4M1-3(YhJMozlS(%WO=Py#X!*yRPN^aJ*Lm-`6ssLH&F0L}6 zvX2=H-u`lHFG*>GJv%_$0#)rmEfv&(hG-KG(=nW=D1p|Qa8}Umi#v~OJN4ch=R;QoDd;mstjQWIjsYz2t0~F1tCQQWDEi!GUdo5Rf@ zZzoq75lY+^c^b8HGEe@`eA7*E5uK)OnBafIgg*nCkXA0BW>aR?(sh`BE|B94R+F_5 zvTM4~hK|#0lhK=%^O5W}U&L0nA;g6FPG(v387YXQeO7qvIL`jmsc};8uL=}zO>Yqw zSEoJnF(sMcD0ML!Yey>{O)Q?9<~eLrf~m1UKF#|Bv#s35eDcg{hA5U6QC3cm7Pn+$5QM;jEg_;Ok^mPMG7FCGpcx{-MB|; zoSc1C+F#F*!y|Rc0}ZyLA!f4@zIalp_)HNyfI}1xK2uOaHmixmIe~xZx>ENBNcQV zyIr(TkRGN_bwci$HEnZhhrH4yo^lRGalUUQtTE1sKix9|iemP{-H8}~=4K`RZzr4wGy7U}y zPc;J^#lzUA*HGgg_F9b>*gr=#9=Me)KEUnAULd)D#4Zmko?#MYFS{B^k+DSYtJG$9 z>MzUmKK5S2R@AFwvGU|tmfEiU{HJrT+*8i?r>3$yeTmM|48s?sBHchrvBv^>xNfnu zzCn_0XACu-xBG#58HCuq8VB?V^=h^?j25wtfS(n9jmED8x~j3PkUEb)upz6Xr-)V6 z@U0WcA{{d#D<*5XTLUhz+it6uSK>AC>z*-Hd#EuKzM*>uW^u$MsYImPxP`c30C8%DDj9d}wh$de8>##CUJmc< zrtPHq$ecSLgHIQFpb5w;Edqj)-R|~dm4UGeX5H=Un9vxB^PR^dcpVfQL`r1&w<7p~)@T zD}f&lkaQjV&LYOo^K^}6ZT7Q3>_N#jWwotjhFo&89E>cCx*kYAQMzl$&cBY4zNo(| zl8Msj^g)PFYo=MRkF7kYzDBh`>}5c-HCJjagxk!x>Sme_hmAw%?}oR^;^@-(lOXYf zH-G{@y>YW`_HR-Vz}h$E)O1&wZ8YRcZm_pb*4`6~L7$47l%1wufvhd?(Rt;wKjyl; znpKw)%`1tSE-=$^3}NvKfJT2=aXn?493znoxMAAcK?NOz-p354ajT%KxVyxy>`jPP zi-CEs-S%J=P9eENB`FyCQ(UWfD*jdQ_!;CkwF|=VzdLk|rYDuNK9@+=Hd{j1oxXZS z^lum@>-acZUG1k|^bUix*{p~zla#tKEthD@B1De`DN}kB?Ii6_oYV~-2o(j+^g~xV z5o5v~4Mo;AlHRz5FrdHuJ*C2&|O};yeZPMV8WU1&(EiBWzqY0NTf48|9YQizD z)!JuevxK;&SLD89P(dV7V>Oqk<{Z zzgH^P(FbadRx+of>K|qNd-YpN{DyrZ_5FHRq$Yp1zbDTU&pvo%=(fSvG5tvcx8V@O zc>_O<;YUHv?XBXRQ}&rEdOQ(0HF>m0k&WiEchdU#TdAQyi<{Wz!j!FRYio{giOyku z0uxr%ApDyMbhI0f993(@nd7u4Ea8Ap_4{9X1M0+t!V8q-60x=niiH-Qh3wk+ig~4$ z9CB54%3q0z>pxBu+nW(P#}`onaO>*guf<=XCmDQ;{=xnsxWFEHFtSc~P|)Evlkshi z!VGbwZf8Uqdg3q0?CuB?za1AJ(SIP1!7p_Dq{hz)6xxzhU*HTBgwK zfq@=E9FZ)awo*~zHM(jyjkWaMv%swHe7(z(M~JI%ue~#QVr>_og9cj`T`CMB3?l)RoKuK6JQNt>i1HsnOy0(0>qEoeiLkKv=e-jD<`o%GTn!48$^N{y8bl}r?~BOA8oWAyH!r!i0PBFv>=j%dD2Aov zePqCJaEPz_z`>vYpz4hA|k(UMUvIKCvfu)qy1c{Be+-Gm3oOshpr281w;8y5R5`p&{yx%QJImYD#%~05`9$C5J8k7z&E70E z5vOLwZ{Bd{!ZpjyHWpV$MACQt{kAyLDe)L1PfQLA8|tHjH_x-nCP{1J)jvXw0EP?b zOr%#5H3!I=4Y`eA{z4>m8c8geQR~jM3kcu%BgD53P3h40z!v-j0xXyL)0nQTa|ZOa zblhRVYED?lPak@GW%@~>7#(_rK196yr@oo&Yi`fBbPXzyHi+k@=;N`Mjh>n@(_``K zYyZgHaoC{tx(!nB#`Vx8x-Rt>Bv1Vnbve=|jaU3G!_Av-VtkVgXj;kop=v6Ax5TcqC$x_72Iv+7+!yvAwFmR?1FFp|l z>u3y*6g&ibd_AjL>hRfo!UFfzgwN`9a9^$(oA<7$1O?%ZdBG=AH#uB~I=rsTi{jbd z`_rPGX|msf#41GIHFT}VH#yxM*kqz)KGC+M>VP8L zRPHfZFt#Xx(_b*V<~zj&Am%db(U*9#?ysI{wQxcJxN*Lredbrt#W(@<9se4%QYZ_5 z$=3$)?|a=X=Nq9vw2Kq!+8dnCBZ=tapc0K=ulZ30Zw-XT<-ffaOES$!@Co&ndthRD zb$=cBb+v0qx;xqOp3yvUOcWJ}EUaISX_I22z>}9t`Qli$Hpyo|Hr0t(VDjC)NExp)|96Z}ScEWj=Nah>^^5&&(o^ojhKb8b%gq0h-*UC>n; zag*hK^kgx}y2olSBUSS`t1ptf6vuw>e8#0|hf;7|Hi>TwbO0sElL zvqg6+sX+MgHK^yVN7lWo?d!ZxC6u6d9MGz&25qMhxAVPavvzH{K3-m4APtL2CfFB^l;>_l{5NJFXlPUdQ`H?vip@3O5bGI9o=u4ll&XlEr5;C zo)>6-05zby+7=v18(pzK&BhCvnxPUwp1BTWdcRB08GQHr9Sx`Z=nipnyk@t7t@LUa zebcqE-hoUY2oY_Dz12zQ{l(WYs=mogMZ*;ym9^EyzPmTxw_>=c74wPAc{OwFOBoE# zKeDT{h5Qxprm+c;-4O(~N`Ng01Ym<}FwX%Dm^6Z{S*Z6~0P7%>X8O9SWHEFbe9FH^ z;sH8QrFBoUzie>Q-@2yXg1$!dmcC|&JQG>~-o%E_TXa@cDlB#!37*>j=u#e|MTCoD zQ2xzPG6!x=?|);xvx+btOY@CpJVUl$#A*quQPi1oDL0q~Yo10A@n?w#rw(XIEQa~1 z|8V~MG$6}Xg5uB-KXK`$NgRPhB&hG#&O>5&jCxpoi0eB{J%^U=lZ3peuLPq(3g2Si zSJVme_RJRCn$lU5S(EWYwai*nSLt#b%3rFv|IA<)PCA4@V}|BE`Ne?)lci-)2fh1t zglw%bDU|g0vM@W`WILdgL@nZKpyl8ie9qQJ9!T+x_zg_mBtUhy2P*p0{>*aeDCgG& zXeQBe-dT2{As5Z&pLru2k25JNV-jYJJ1zvCe7!@=8Mi@eVW+rLM!(;``o@QUCee

ay$jD_TVVX|=S2?hq~pnNve&fVnxX3gLzg$t&H5MT`C@LQ0g>#_ zHo{BOZ8FzrMMtLJ=`Jaq!O9oUFB1OpBR5BL;%A?9dUP|Lw4asI`o5>ALRy~>pXT5K z)eZw?y66!V!~b~z6!6~WctPeTZ}(u_Ku;XPxF(~FWu13KTYffwQjuQ>l72p&J~Kz} zi=y3p?2&W--Nit(_$a`t=R`kmWoss>;d?{tIvk0svp@1&_I12|qt=mUiFSjI?$Gh@ zQQbkH#QO$3aPjgaf5PelXF~h4htLzaA1 zrQH{l9!}7n-u#lAp0NE>NEI(p%XRLBY%7=APrrW0i^*cCE#Bp1o()%!nQ}YLNdHFp zk-~kjcWGZgUCU>%aA>cBl_iWVJ10oa&oz-(C&m^f7nsdOQD-~JPR3{x^^+x_g6cwXdb`6*@6jFun=u z{P^BCpifg09jT)D#PSg>e=^F_bf#&{go$oVwOM)c#8Hjq`&U6MPlaA>YRAhXEk{Dy zxcEx>SIck{ux#-vZ6FAMYq-J3@AxkY)0)?8>6qsEh5HpbEP9f&3(}7jR4j(fH^`@J zl!3o#!t)T`sml5|lD4hSHO8*mPnUX2CE>=0uFG{nh_e&&Em_C3|}vSW(}r94NN;17~;Yjbu!uP*~{`l6~@A< zv6ARr4fRU5<0R7m7+!BEEjhE;p+r{{(IBgeoL1_4?dm1$QzcLh;KYe_p1Dp+b2v zl*vvX+8K8p4yz^WXbQAmgmv51S9PSFQ~Tkp7>qrFF&eH z3xi0pA?6CVC#OuwUR;fGQicf#$p zk2Z|%wfJV#&@d9AruFx-9r*Z#25s!l zW{da-`<4h;#AxbfHeC^Gh4HUrtsp@o53Ptju_Z27OU~>mU|84=LHIAgtu2We|78)Q zTkzpwDxDGeWaF3E%dMLiPAY+adTm)lAq@*+165zL0zEd48coks=RN{d?4(<8>jFY1 zCnYqs`h`<&Pa9=g;J#o%)GF5j=i^S?A^Zs493iwB?2$=Y$hyIb+8Ygdkv?3GYq#8q zgq##dqZjd*>FT#FE_s-*5VP7x4E^Kd*cDgY5>o)Fn(~oD&bHFU|QRKykY8`pH5Qv z5;c#feqKSnx@ujT(fNn(c}0^hu^7~s^x2J#Lb|QscC*HPO}!x7$!&YYOz^dh4)JY% zZ~DySUTImLq67C4Yh$YITN@f0gj}>(d}1E60h(v(jT8JouDqd~u<5)e8KtX->L&K|h=_my0WE~Bj+Mu| ze67J^vIG^+SsOAg?P@3NSKvL`L(cN2QYV0?SannCDPzZ?7TVlXGtHjRoujzrww*v} z>cC&&-V%JVw-1n__~{YlTv2JUS>;I^vy;)~Y(Ac;0!h8jdobnD4A`^~ zXaX27-b(+}eW?D*{+~r)$2!_@aIAC+g6k2UzZBrX;Si>Mo3d;K}N^@>Oqn>j1Y zX+9ikhs7!;1IP`UBm;K;-ri`^I78&IKcECiZVGP0voW_@Bubuw z;|MLxTC$$9r@8(QbXr>h#=AS{BEN0+>KycH5<59oI}v)!rV_PgRk*0jipLAbnX$UZ zq);L=aq}fEja76logR>}H{40*lIV1O#-=hmFn?I(n?NQkqKDP1PaHNLxms`GU=i$^ zF0h5-YA@~e8SbnG;tD#x$4mN{rI-ERBq`7LTR8j6ep2uA^vN52muLR7?m}`U`a(D* z0aFylJxMjwtPgL$^d9KEHzbe9z-UROgvCX$pgD~REuq9wNR#%?k8;VVw$=f1ikLz- zwVlv#OOIGfa@koXlGjJhxf=UGagD%1f13UrsQI#*^tsX4 z%rt`!UK0>RyBZsLA<@&=!S)+3gLeN;9?rf#?0NmGlwOb|e2fzpF62cw)=hnN%J|xH zQPQcMCq>R+Mx*xO9+=~7MT-(=YXV`PJY$Ghn#Gp9aVaXmJow{*{MyAV(`13)ao5^N zK*jEU{L{R1U;ne4UlyA&zfP_W3;!R@`x}wM(Gxa_!77cUd#z*`kFR|Hu=QfOXLy!W zG7|BMal@Y+XR#ZOvXD_r%0m1j4LS*|n2zHuY1Mi+q0-u#s_M!(oHdF=e-et^@Pe5G zIsxMAgPAP)4SKsVU)9jSKYSIbzq&fi*tmG15dx{ zF*C1g0G*?B`eoUMfeN**LZYHryT>}2+a7s?uradTOBxVYIAV=%5zN#ky^az1eLIhBpxsd< zUS2YD=gwBu`NB*;5^gfhBf<+Cgx})HumxE1`-d5o!uk*Qh?FVF4JIldu~wK%Hal0( zW+L)vW-)$~@I2Ia(59(+HCz>`TND!vEQ6~!goA&G^aJy|GNG+R zjV2Eghy%tOI)^l-GK$)=>JZ5;o>L^;%Kd2M>2JzPaL8E8q_k4qzoiYyqV z1Ft>JVdQZcFb(^a8I!DqPzj>_g3!WAivM2OhCIpV`lwRAE^;iqYe}NdrTi03t5tXH zG~(Ob8#-t}Kx-bpi?Jtap}F6)QU$U%-)}RY?t447US5!#UNp6cOrX%wveQaSb3vR;k+BCM?ELK zh=7@S$~mO+qBPyBOLJJz;B*%Gtqg&%HL=G%S$#Hye4ioR%4?iw^|EdE08Vu`zm1?? z)|$-2D9!lIKX0WtU${Bo`u?D*v}E^k^|7*my+^iyU6gW>-RhAtw;!sBF&~)Ef<+;*!$~C7Uq;3RG z%xv-T8;`rv1sE2-ZzDFZzGKqMx($iVb`MVztUxho@~j)=aQa{eK$C;F_CNAeZ4yZI z`aen|RhB)va^Gp(VvOe&ylO=*s8*s+X{zz*k@N9-p8HB0Y#E%=(Lc*UW|%IA#>d^b z#qyJLC|TdfWw__F_p~Bt4tSBNYGlmyMh+%U!FX_MWBwL5iqv6H)Zg72P@LW-BbCnJ z5VuIUp-%M=v7q`>qRwxE6l=N7JH!V*XjUr?x5eX^fmP-lRG7}E;@9yO`|27cG!aMiX{JfsMBJ^MyV^W_i&fv zNM<3)AisbEyiSkN>+bw{vkEj!6JIn81`y)rzNBRBp_K}(KDD=)=~MR!lGpw6jG_J( zLYXs#u?{uPC?cuEtALSMAord3b&(w^h2E*ShozyRX*&RUb44^5FbXRP8 z5`K9zHo(rB zFX2e=?SwoYD~TEme6F5@iCTPI@^HjJ=l=n4Zy0H$ETiKpT{6}Mc1Jp zhAFFDN*nmoY(<2cEx31W@|7us*!fbyBiHA2OlZJ3QeLOiI$8sJm&#aU%T_;|b6^SA zhjusn7C;ZMB)&emw(-3I|Gw*!%F*G!mzgjzC6=lbZ>A|w+R@`L3r(+7(IC@8KsQ{u zvswcjR{UbJeqjQCh&=X~y9SeH07{4=yw%zA&H}*7L6u21s&zhW58--S<&DB>e4)JfaSLZCP z)44rv@dI6Cu&1p07NB4Dm`(DebsB7>_`mNt;N>ts3ua8eaT{;?pn1*un9JgCl%T$1 zhovXD%`ixSqY6!{J|Et}ldZbp-|=dg13QTs)2LT<=^yScPn@2KQInJiH6}do)(;-I zGmQ^Ee#Uh9p1e}{hx~)`Pz9JMx?KeP1Ja<2z_e5G6F`2c+QrC0MH0Am8&O!ejnbTf zGwSQfE z=bu%Xym^)!rL3w=N;0%(m86ejxGCYPy|srz42CP9bObJ5=HZp`^tqyzc1w(#1&|B> zi)98M^!Cw+Rb5?qhkW7Zwcz!B+N!@GLHuY?o6BJT=2|#Mg+T>OYahSh$X!8N^`F9$v>^-B7GL@=quqtG z>}c3H2s?I@;7i+n%H;{ya&hSi-~`WapEdb!Y+<^WcXc~TFh23|YHbxoV+!Nzjm>*_b4wdxk5Lb? z9kTw_gT~Rdw%A5|E?+z}NtQv6jsEWrQd{LdWMwPWTn#qYO(uWjbL4}2&Yn{!L*`K; z?eAs39GaW#DUi>v+Uo9%PHSLy9z49th8s4GQg7$~qU0<_MT}F_ef6^&c3h*8$7=n6 zo@zuh8b+75t1_DP8hYt;;vu>1^AsV(aV(e`f}R;8U_1mUh(Cosjh^CvpQdEP$~9r5 zpuq|Mi4YZ(`ebJ$OYJ+gZYM)0K6y9%v;~U&G5|#6EZ(Yt;tl=yBaZ6wNPmq5wf)3^&yR|v~~*I>P_qN`A7<= zzkN%s9O6h$ort3ifqe5;xOR+NI1rpEB5n2eCx*syk~0;NANAc@o4M~ptlyAxl|lK{ zqrPG6^v9ZUhwm!#_BiNLZ!AxrK13${z3ixG7(^XELToA&<0A?*m7|Y4G-nXs0z^ru zsby9(li#f*1zyaXqA1g)TyO8@SFtZ*ViF?l`bhMOA%CbnPojY?KVRVc|qmWW7nd8~$+7L}?0T=cB?G4y<0_wa`GZf7KN|zBEYN|@wK=rcmJB?Qpdu0}I z;(gFus!ahkr(2b2?o#f;%s+sUk+RFuIC zAJxb2ghd+j{^j`es^@UscOmjx{``vLYpWR!;?i2REO{YW>t?CJt~@5)Ie^jd5X@IP z0yvm56>6t13(LT(O#e`ZPM+cZWfBr{ku{%_K}xQosLfCiOxj1}LO49v#}x11NL`Ci ze62uQuBRjEsE;+t#h+-rG&voaz1espq6A)aO7lv&)KiAPeK zP5QFw0ahuxDhEx>B*MhYp64ulu&&gST zG5prvBZ4ky^`!DWalD;;kYW%L60-o4ZOvG7?}jNg4Fbt}QuaDF5W~T86x#1g^UBl6 zuN$Kh4wsqSu>0te6A~I68cqsCp@9#PUZRPb@E&-chtcdqbj_ZHZApk$)kOo(COM=r zC)|c7HVEmOZ$L7<7(+bluxGSH!~=FzWQ+#*-=c1>@f8qE=t=YYN8q9kA^Sf$8D_Tr zn#82C-Uq;s?fWc+*RKA(%)WP@T^Bi_n85T=0wobifwF$9vuOYsE|^=ai~W1q%?XQG zU2hN(crrW|7Yc5!kmW!Wo;m8YBb->zjH$yO7Ku^*GhN--5QKgdYCeS+V!zn|EbFZa zNYv7q^EU+t-~7GolVK~2ET!agie!0ofgA+Z z_LlA#ECOh4jBgW>xofwGcXM&zsn;h|MMSVT!-e@1^T#bS6)}t|5I)=b3lkX3*c9wM z&;xw_aH0H}b|&Fx555x^#K1r~Iyi;-BpveU701TlLl@*2(=J+O_>d{l;~y`Ke5m0M zA1AG*uYb`=0Bd(VPB6y)L3EZ&oL*DVPpES1l7tPPJWZ)^;zD^4c zr>|F~v14f3D)mQekKUZFg$5^&+Ee~K$MSl(_Mw@4*f|U4n%Z@8P~*jz%cC>RZdu>H zdOvBh;CHy7`(+(CT>Pr5d4A>*vz?FSA-*lpRvQOMAkpQw1`4JR<#0;&Sxj80oTIgo zNdu475{;qtFvm84Xs>sRWsi8VcRaxB~cg3xPn@g>I0BC{*5#b zHUCdlar3bLCyn7{(@X)1pV15TbAtBauV>Her}%PtXzu2F9UWaArKNN^&_EcyY4O^9 ztnj@g*2FpN5$h}_nTH-vxHZj%Edt?cr9_Fdpq@vVH*Z>u-_uyxV%cfkNXjwUzdb#o z@hOGSUwCYn5$(or4*8I1E55n`vC*{#nI|~pbmCNbLbGmGH#dJmoJ!;==mRUS+BO^@rUDy(^C9e z%v|Hr2Xvl=1Gx<~NAS&jy=ndhX8*n!^MR6uAtx{9oQW6^f9-k{FHFL=Lit34c!ny7 zG5*)z%k+tfmFF#NtVatQhk4WPAzB?+`NdZs;%g2GUX+wSNuKTBt?vA6UIV94uZY^6 zbbd=<-%IZ@^q~lW`C~&Pj;gM&}dikwk zu7$+4puKnzBK}-@(QS=)%)ZuJU06(`GQIhj4S(%zq?S+0VTBNW0i)By+b(Sk7e{aL zMb~2ev&Oz&42zBA?ez&~)OfC;8b1Jy_s`=d6EycI7hg@&ia`{!+1F<7Y#ma74GgDD zgAu&bo|XFV^Omyn|A{H>j%Qoy8X7_tcWD~f>U*pG`6t7%S`aB_PkOlAyXNyzLL5bX zBz(!Yj2wshFcDzb<^o=S)(_@a$fbooX*hy>|X*zBA<} zMK{a#ZteBzibc-Piw8kt4+KVo`YV|CV$CjVQUm4-@s|8B>Dt?Tx}l+JcG0$dz_Et! z)?d8I++-gn0?gyjDZJs~kElf_ZQt9QD zkZ{tcQ`pL0lknKfXS&34b+NB6xoXIdq@R`+5fQy19;AtI=fwY=XeO2BT#gE!G$xHvbxLo_e>!Fb%eUwe~{Q%7XzH!|Wts^51P{Bou-IfYoW&-86>iLgl$KzcAhK$q&W`QDE!YR;YgL* z*%3Dbfw8z1o!lSGYx_bV(e&whOK6fV6HRv4BGXpq?OQh`?O44?tC17%BLT?C*xGXz z4J&PPr)_tcJ?yyo=8?bkriVGdbCay5Fm8I^j~G)PY(Cke9N%DM*L3EV^0IDF<(Nlc zhyPDfF`KFVezQGVJbHXXX>aBEjOQL!gXhg-z}1?uMJp*=58lc4F;whUo=u;J zny1?vS5-7!9L+dEYdphJYZ(z~LSx9kNoE!*9?!?sya-mAJ*wX#Gi#(& za}D1~ejDC-rwv-JA>YKZ3J_yq`aR}0vlfFjvVU_ebI7l*9g$b3i*&Vt>&0gL0~>2# z<^Ha1Mqjl{eh-x=<;aox^|Ic>0-5(*^$eq9J%f^8E;dz6nz5wwNhGP>fsGGuJq;R5 ziDxz)GcO_xjN~R1xTTezH{I@d{`dF24?}YzP`Wj24&7t}l&0|$u@Y`d9spN9{wsK- zz+Vr2g})}@^51f5QAsQPAx?|EQKQwx-WvHt*#erNU|??RU}Q8O48=>00~PvB&|1W* zIr<||^1SGK{xuwuA*zf7be=gED``)BGY&_@HY4vZ8dx6sv*&qvSLv?J8}@JXd3>`~ zu)Ac`u@ny1uk_obN(CK*VU+FwKJbf#WatMQ+_#TkA_tFt!gPFteZn%*n3UpE#eSMt zsUCgYH&5evc8ec3?LYjv^~|@`^&QU|^`VaghFzUz0^(-m_@hWCV{bFv(PBGQ|MKZK z&s+N<+3Ojp-6Z{Ifrm=YN8S8AL*DS0`O}7i%7}vR&LvMiV;OjKL>k{e6nMDUbK9eq zPUA4+BJ-aYCXS^A#GM_(yCak3&TY|r9=u3UTjx6RfS_i+ zu~KW3XOmHJ6rVBIH#(JCEmqPWIo@-maXTGpAKRS|i-(rd$iI6u+CAYxY;BFJ6wFwi zWL!jgL>-o9dhg3J6X2OYb7U*ZbmOr`G+l8Xx8DDXzYZBcvHZ3ZpoCqx;$19lek4GD zWmnf99m77+)v%$eAk{;~s7s8yFxr9Uc+&(UHBn^GX{%(z`4b1VJ(CeK&h6lxWQ9?4 z%(n$vl;1_Uo9fP}@*j*$4iUIRL0XP;q39hc5CT{idAYgvMttt)$XnCSlK!iv0 z`-PjPf0yQmcp^1rJA`dQJ006c0jtc}Tha0=eC?S076&lD-|#(j!ivv#UHh2X^2^1iJrEKUs1s znlo(hp+V+KA5m(anB99mj+t<7M@`a^{4n-So&{zlyBro7ukUXca9QxRYW%A!Z-V*ro6uY;$iik9KL%J}o%)0u?oOwUV>G*vX3!TJPybs@8IYD^$Q>E$IHVraHDPAYK%~@1sVd-Qwj8a_I@I8UpoUN ziec3$4MX<<6_`)v0bt2L5&WyPZ7(bYCWjqY%sdGLz~)@Vq4PzF=SrE{3MFFB3?~Z-qOJ|8l6koHOsD&3C z8^`SN$Vm+t{LzLmCzfW<_uviU0Red$`(Y4j3IJjj*TGj}0LlidA|zlDS{~Lfj=2_k z+rRUiLU~lXvxK~cn4#Z|9<--@1pZ7;{D8@7bcS}7Q)so<%_*Eyzy&%NpZeTf`xx|J z%EI!iHB0O%M$LD|SGc^nB`j}wB@!zY34!8MSP`1PlO5V(CKJAZ5xsacE~pZ zWS|V|03>ye5c-bRdt|*8q$8&7IVx@Q0!%O6xFa5gdDKfa-Ls|U354&4r=92<{Jp$P z7AwLUXq%%_6iHo~&Us-egc-gd+L#4V{ykjQby#4Y-BG|P7+NYv>P`)6eq|ibKFdz? z1K`rH>IKqR*c+Y-H5Dt-MhBa`5Yt)`5HO0E;{UmxjMCCQ)tEH@Cl~01oky=sMNFKEV`B2xQ@=dJ6cZ=00u76It_ay&;I>6 z$`bUzBHAl|h;0SlLvQgLfqkUp4xPz)Cy5*0jgVd-1jWxtkZvpSfx^JDAG9GOQ~acZ z!<&#yq3Gg>cI@)T;XOSTeqlk-O3kU@5F3YL#HUTn%2=Z>4tV9y_qxS-cc|}n5Es~+ z8`MAUS4noFcyV{|0MVs?4mLt#qWrDS^H*~M?DsZ1t2JuNI?8-+*pmprd=x`()SS0K z?1sNZa|*ev-lsVs1^Vd&5%cb734D#LP3yqEM~;H?XYHOTBK~UQCL(M>+8Q_GAA#xB zP@99TSqf1% z|0hJj|AeRuP!j+^?poob&!84QMPo>xGlufV#eXl8?O@n#T-?`Hz|Mjvwkhst(CY!N zwPT}wwmsDe8VRc`OZPACf^PCFyzK`|y+CB;9qfj~4O@gt$5GKc#n9m98kxPtMn z3TdC(VzH-Re*JofTps83{CxQb=co|!tnyJhS3F6P78M##GHaErJWxFmfzKEeK)jEC zZ6)3WJdiFU#U+S!i=7<;V()jqal+~Gs-)M&$gz2B9dS8AY~wm8?3MSyMA@`bCkQaL zKYoytsTLR7X%;Ige5dyZK+wkE`Bv||g1~lkbX3#OaDDxgh@Kd*5q%-g>bAe+-6=7& zC2VZ8*OOhx%jZ9AKxxvP|047mOePn#()g85D_6MQj&THBGK{)R~ejX@MNl0{po6WxA6_OrBN^8u_N5 z98kiG_l>5Scy&<6OO{b{Atcj>a+i^aU(*~{lDL^XBiQhK~puLyzcxb!TxPTvOXvyzup|aXRw25nZ2`5V{%!+>(Kr`f%4|1o41<# z9$n|9Oy2n9Gr{4`K6?Hn$aYNl3;<6R z0+To1{vbyIqe)=Xy)o+Dsqlp9i~os$blF>}M*-CsND?cXz+h*akdj<~9L+=TjnLz< z4gEGGAxcr>2(^832o&p)G|o9rIANwi`*eMuWJT69wN7FpDo04#+NzBDr@~Ro+|^|+ z?}MMzh0Jm%>Vow~dq`1OzSRR8E1{WIWW1j=Jt52_uxWUow7Rk|lG1{0l<8$cIg!cD zv>l(A+NF3e(5tv_9-}7txjA#fI$Znbdc3+M`@pm?qlDc^v&VFfI37IJTCl~>qLNTV z@d+Q`=auP=b#rPGTnBU5j9J#;kObhZ;T=CJ{hIE1kjWip9}i%4L$}5~ws!i#g8IJd z8Oi8{95=!>{@7QZGnXt**`+NGFP*#cvl7Bbz6ppx@gDk|rR7X9Uh0iouegN1q)dVg z>c>275>Eya>nwPVoZ3{@?OaG2f5CchwTN;qI{R?Nv`oyjU#`AgRh1W5JK3Y+y*l^5 zLcz&PM^}sL&m}3F^ea4w zfVm}5@?U}K<=6(kW;57@yEWX)zWDEgKfWb>J?qBuSK~~o!PF~I`ZIn z_V#n>CRzNU0?q!#O#ehjN^5BhfEo)R5nxV`P8pJ|`TiXB?V2YUym`Vr#{P2c|E4ab zDJ1fTe?sY1_6ap&Dr){YtY5^@3PjB!lSNz1oHYA1pyLz0l#2 zF}ha@VgLS2cf_eup3&z+7eE>NM6&`Np_ zLV~OzBmt5%NvHiC-}kLweQ$mLeN|#nK&87+pL5^Wyz7pN)s8<6&-9g{!`wI6BI6b zagxRpJ3lZrN5L|gs!O^-?NN=IZDzbmv$ZPu;mxUWNXRf{FU(>qpv=$=`q9^ePd)w# z1!-c!)j2lm_ASVY)`n)J6SD4KE%7jM=d-l2fXD0B^ubAb+iOp3Wyx8unCMt`#=^T$ zPn7L#sTD+vvkl>P5wtQe(iGEsW&h6N8QkEQ3v~IFYc%>KEaH{Bl2$&QmX-u&InX#f zMjGbXx>IC5!A1Oh3meM@P4*M7RhDY4Vo3vSbDEBL)X1zwu&_eLM!zExkh)^%H3if| zCJD-?HB`LzJzn_2Ap~@3(RG0dFsKA+Z65x={{q9i_N}`{1qPZEZ_An5?HS^F=T4m_G(jl)o55LmOcr}krH$ccN7ABa;{5lJ!b z?1*_sqiAS5yLU0XV}Kn##n6Q#ISnx;Nl6QXrFrEb2bXHKFfb3yaGsBEupuT;<5*Hs z0BUp9pcshnU|lTTRkf3K_G8_}5~lOA0W5-8Wu!mI^a$(0Vk}Cod{86B$H2P6V+B94ZV*49p2n(v93l<=-h7VH>himz}2c!!O zlen8iy~{__j8k0P$`j}RsO;M>E&m*-_U&izNyi*^Th>x%@ObUp zRLL6Yg0QD?j`fRZbC~{`KgmlsdWzrrh{ZUbPqO|DyZrUJE7SBEw*;e9$J`TZ{l*WZ zTbPeY%q)IGgXGZtH=i6HR;^z>%PsF!?cz3%RpR*TUhqhgIPS5<`E$0 zOk4~&8y^-FrY%*BWF^lwKR;jPKZF`fuARz-+!!p7NFfp4CVCf``<9GRpF&@R6U={E zW>-d>9AY50i$6NEuD?~W@Cw9v{t(?=2#wsy4nqFF+SpTLTRnFUVV5Wx>>4w#%El6y8DtJ;1L zROhLw3bJQ%+MceW#PK{yFm>Q*G!(HDIT_NH;gQ}{QdNU7^wu#vNeJkz6xG-);vWQ? z_#J&#NjP?BKwo z*_jMmq%CKE`XA*F9(a(l<~fh9;yL*R;>ob8>J9yl00=;HDFEP{j{=Y|Mld{{z1k)& zMgh9BhjNhQ)QVtHFr4YA{zkFT#fxxO-=*=Ls_qdO}_OyxcJ$s6H zg!{R7*yXP?7WoK<`#>=3G5;>O<4EFM`C+j`Jhp!KNe;z|GDYUj8Z)C$+SuHtN(;|Z=eA>~%Z4Pt=erogA zCC8L13~kxfRM*OJ1VkneK{Tf%kJ%heW@Q544qJ2?`Rw(cst&3BP!@P)wXRj9 z#e(-h3}I6J?vk_T?P+0|kM(!0Sw*cR@y=__;TKN_N4#R+r(36{m403FIlbxM%_15G z&T)kw$jw}%b-YDLQ%>AiQ7Rf>5NA z!JAj&1`goCRqoU0o#%ki&->ceTNkorB^bs9VmK5s8kf7uwy!Sp!_{b#2Iv3O?jL$_ zU)r{Gjrk6Zse2G1WACjTg_VxH@A==Hk)ZzE)4W!OtwS`?NsQ}Y?v8kvKNEL1KE_;P zbvahk{QcNh>FSHy!Y%*5TUQFNS(`-}B^7x(qyI>N{!8|cJN^bic5MnAw zACamUS@*`YSs=SUtI^nrWy!wjgjzXaEje=Z$dfNA=4k8ug}VdO=S#*jg7V@eTeO*& zg+;JrSvB0Dk$uNHP9(=lb9!2@5$2{Mr?B2LHp`v0FYry?fuLYquA*Y5CqU!eS`NAr zBhvrm!r^b$W*}$vZ&Z*z^>VW9;2UyxkpQG{){?_pvUh@mLN^p3JL8r%R!1f3->huB zvfsEpRw!*uHYmsFA}1-HK3qly+R~`SA8tI*Dm=bx+M~Z>@h>3%^wES{m8y=T+bd`b zQ3*K9u7)Fjh94;CzLyzZdH(Huah!9W@ps#2wW*Bun!#|hPxz6SY?*V2(V)XgP#ykJ zd)v90a1Xaan`;bImG5Yd5m5&@vr!Mz=(kkHzHMFw_Y1Y&?@iYXT-Q%P9nr?Vh0aaL zQQ&lLU0Z-Bnh&ITZBGb@R$5)(!^QPBfOBj4!E$1gk9e)Z!Oc24#BM{@F2(1G75~T8F7#20ojmv9#X_e~!VB8m;M%SN`H2mJSy8IH$jh!2d^}>8 z3YB=~oOoJSQy{^WALX~DKitv>Menc_q;{%EZhq(eCcgF|?s81h73Anzx}8G{V|`EyXy`?Yt`q4vE2nXdlk3Cd2w zt4pSWL5y#41qScUyZmM@ke%hr6ZEwo&mUOnaNnU5SbF%w_?I8B` z{7^!WB#y(Vx9Tu#tmZUz-cY%VVi{}T`O%U}Z82|^pWdTWTw#)H#_XuZ30{=IarX(^wzB2d3VfL4 zm&c>QWcPsC_W4*SP_pZ|%Ok*;>_YD4&~*^+kvf-=&btnnTq5QZK6rqkNVybppi^Vp zY_$40Ntq00zJfdiQ=T4GX%vtwYm-7kn6`m(xb5KR_Le^jVMy^is4gm?!f{CKw~cMV zYz|Nm!BaUeyH($ox$M?Ch~MT$BI=$^KCNM_ej9ZgKJoCqu=Y3g#L9~##m9W@srMHa z>+Zej2Ppu_e9@hcIc-la2Hes1DaMpG_^=%<_`eX7{~Envun}*@5A))$OE$Em626cO zD{(uDRya@pJJ-B3navzm{{VXtiW8HIf5 zDH$$h1Z44W&VbgCiILm(;moFDRPiB@&`^U#EYhGMBO8@ED&fkJ`w`OD1m^ZXC9axT zUH9ng?y9MY!=ce;?76oJ(ln(|sUkT5c0++YwzH7+mjl3v&7FBpIK=Z8P} zyFG1!PpE45NAg?UK<}5BxX5>yiww$-3MgTl45+5FYH8r-@xNCNhx>r25J3kA6uy7* zm@{vb{sq%f)#?AXz*Gdj{YAH^h+b~h=xw>Cq;J)1OF#F(y{r9wR(W;MJ6FZH*jl|9 zmr-DPw8S_+E;Nnr$6&iLFOPnsNQBKMZh9(X;L~!kQlw?zg?F4K-znJ}C`)B@WQP?& zNdwiHELl9dhL(uK_E0TSAfZn4_mnLWc=%je8YH_-<{as&J^j}e>Ja3QW)FBlu0Epu zJ7XWzdNx~Mep#1W(mHiqS&_b%GSHj)4ohlfX&p_ghqy1;545Y0bJ~mwZ!BzUfE|og z`oY=w;N=dkqxeLEKDrM1m+7i%csuTAm@Oh98y?k@kk7r;E35??ZJ{wWVU%I$eUrW!cnmvEz00ne%c2x&q*sWp*<6 zddxj~#gA-_`LA?Y1>!F2RhG(TZ@eP+p09<0T7dk~dvrPc{F}Vs2(3v2xS{Z}D(85H zgKhMPMqn~XE^4U4?En&gWes1K{Q8=0s7(#)o4zpg<{A*^T ztG=jx;=Le=zm1e=fT`#LnDlhL-!Jfo5h$5&h;l$*i35?p8l1xj5$&d3%Y9x8BM0QP ztwu@AICewKnD$Pul%e%nEcE!pXTUR5;+@ff_43Le_&lKKnq=HQF|D48!=zSY-RJt9 z%V3Zi`Qb#b1pgOggmR%bc*!X!1kypagW~244jV+5<%Hrd>%;%5)g5t9P}7_BZ<{)5 zpk^o;&tvT*=?3{X97t-+-VC%$ONcI_o4n0+tS-h(&>!ugJ&(_Xrqyy)r9CNiX-w{! znKTu<`i~~RR`mW5si#B5tt^S9-%J&oIG0g7pcVQY5Vfu!aep5s0`01uE$n-QRlv*` zn3!p~z=t8f^j~PA&(JO$^L~&&S;ooTD$OpR_$(pT+pF`NR+* z)s`qG0%8lDS#Apn-UiJ$X>gR|atmPMfWMG=2;kqS+u+|O8=I&m_}88-dJ)&9lHsK; za$IVPeY&lGy**iI=@qAuk&mX;|uag_aPcV`xx<;_o8b$6Kn-PBEE8Hgd_Qhx(OyU5oAoZ z&}SM`K6^uM2Ec;s)qeW@#wK(rZlm0mlkE8OG#@M99>Jd3^D5B8P)&Vd{4eqO&KjzB zt9W?4k^xoDJdCx@h#pKDz>Kjnzs)7Rs8UbUj3Ia%y@3>Ox)Fx*P(GVULiXfKbVsqP zf^mEL(eFT+9ZN1!-Ufm@T*QLEM+PO@0EOI<&gK-C_Zg$)OjlVH^7GNwk6wP0P>5!k z_HJc7->0!K^aluQWhK2z(D`;KvsbteP6*vOjG<&@E$~a` zmK#)DFgm`$=AnKcQ`4zVbW*>u}IUJV7ixPp;*e74t(}}Lt-!xfmc=t+5 z(hz9|>g6@MlMa=adHPC8sdbN#fv-z`QA!YYXEcB$i{r-a_wy@u-Ns7 z@qzkxpiTIZ+$2!gO%~zdvvk=5$~JHZHZWWM2iZx38A)oS=}$^P@50hX(>*;ER#%DY z)tN8JkF|*%y&AmcuSwfX=@sne#mP(bGskxfTWYw|Lv`G;wDdC{Hsof(yDYr-05>}DdpM&o^ zH>O}XR0laeJ}Dk?A8o@fe;^Wz0cR|(S^MsJTve+gA?Z#0$DgJqi@8mJ>pwRnE-P!G zI;4EiNJA_I(T_v`+r^+pyot|z@Op0^1{cS(ekS*VSGXDhk^eFX{UnEI4kw?%whdl* z#2!#~QnR#gM1+lEgK9vdH2;bS2G_5*oeVGZJwIsN?ls%d$^o=-RR?~^7|9OXai%7p zWPM%1Bz$Ig2IOTv6n`MNg3%2RFk!FecWcjpiv~mWj+6+E2^ov(KGEy|jB7swnncW~ z{vf+?r?4{x^o4oeTb-l95!LRJA(_Bg`%J%)@jcwzY?s31U1#Wu{jBjTu@26cM`NA- z+HXAW(l%suRF!UgKYwS>tBN2#f4=-gW-#)`%Z50Z|0$!A5prN?)^myxT31T@NCSD2 z`qlW$5YLDsq9w8a!oWK*$bQcj=~7@B^PBZo|JNJ0lXDtQj>fWAd-Fa8`EA0i!C6qw zcOe*IxQMig$T9)+wsnejsdDQ;OWms=RYpYOGckA7xcubRZood}8~HL5t*W`;R>xdK z9T{b4>a35J4$jj*c;JUF9b}KB0o5sH6R5}DkmK*NM@pa-&?SZe`mqPT#`DDrFQ-s9 zQ+q+Af#{1ueiew^Qsl;dGVa~bkV@$dBToAZ_&{re23>b^H|20#Kz>|}pQXsm;@(}a zGx`QyTfZ0)_)V4}FY}3tL6BNaOn+-pR)q`<<;?YlT%V8A?_k6OJLuf`L;lRX zEPs?MY1a5bjq7NGSoH7g6@BSHeO&7DLA6LSKULmuRm~FI4ApXlL}wLUNrwqC?g$$( z{%(|(NMDZIivdVi-(f$+&cR-O9dY2I2Kt6s{^&}*XJU0D_U~Hvg5YZ9t^HO}XZvdp zij1IL~oJRvW7QgGb6jk}uL^g=l{nW~oh?_dNunhed&_1BqH91mqo zL{gVhc7mOL6{^SAM#yS}oRr!iaJWE(mk=eAZX)Y9nC_I58s!>Yge0dSKV_S7DUNwW zBLLf+lPhSZ=clMUNUMUGo-x13w?DY-pD#}SE5g{){0&RjcVl>_{k5UkSS}kq)m^6= zoE{~`l0vMxAlc%LlyEERup)QF_=AQ(wpEVGJZJKSL6Fb^K0R67v?G-0{n8^i#N|7Q?deCV}yS@77vOl*k3Uf%2PXGh3E=|9L(kSpWILh56f> zLx-$R_1H~o$8(@dslz34=^38uN(BNEfWE}u{+tC{bcLnn2egT>3>taHE>|^metYq! z$~FH2ZE}NfK4^iOXu!h$1mLMxa=?F8xaAaQ8Tz_Wq;m)HFAR)X)3x8k#Z$h+b|A|C z5471xFT1Txe8AnB<*%sdFV0SxkLYQ)aKpC^3}?FV@1M171&5r1N=($(HTONym4^W2 z>F9@u`tZ&uWP`2p0bB>r=;llyXz&~LN8p{IiajzbcFPrnfL{XrWv_=3K7daPX{Ka< z(cea;>2l(+0g$77(_N{*@)IbGXxh4C<0!lBu0FYSwd?L!ZPiKkuJUWOPfJenI?(C# zheY9ZvG);fXdRM1HdaD=FvA|XWx5I$%V;9iJ)prmbmd!tY9nqvCJFd%GbOPf4Azk( z^`q?dCO=`|a{?pko+;|4-qo4H6l^nU&8v#JQHL|I(^u;$Yx2vbNgWZi{UIhK>yQeP zPNB<5Y!rLP_3M)65=;v(NCte_?F_?-Yb5wP$!K((08`(si`#Lg*Q)f%krJ$bq{vQ0y8yZzK(SgIR=NzG|gbDm-Q2Q zy^zqTHAB~7K#!lCmH_zr&3;9DUiaXc6vC*lANOB?d`J7HXgDZl^%HGD>2zcyoj71U zv-=7(ilXX<#=FWwm(P!1F1S2l@0cD=t2Xad*a=U&yJa!aS@t4!G+ae&!pM#?2Azc) zJ5omQyd-qxHQe`T*8$urIIb9kaG)V#)djhkC?DC?xrsbfZ;FvOOK)(Rpd^r4u_63O zZoj^jVUtPDY>X=MFL|IGGdRp@VwwAJhl!8eQe5Hy=HM#$+=IbqV~A4|%!deTUR8tY zj%n5)zFIcuqyRb=ocGYJ$lulj&I~IN=?;Il#xtQF4v^j$Qc?x_JA1R+)57E87iFqcUV@9|Tq`%28#GumnQ>=- zVI?)aiYJNU*)K9`B-E`GV3+_me-pmKu!*jRU|`TuzAOa9=4=r*+3mH%Az`;>8RgF| z&y#3FmyP@S=_awM1zi4oGVAczP#VMEpje8D9 zdQ{fLP5c$`ky(S*0Sya!Alia?Lz_v_{DxR_DIs#HauHv~OkQA^0_n6cT@D+?JYhP28QXX1MNvq4MmQ|C^q?nN;q1 zU+h@V=Q1dQeQxY-QCrn8ft1LLV3%e`U0wiqYuTXo9th2NX3BSP^eBl2F}cWI=Dq!$ zgPjfEF1-XFK)VBCbhkIc8vI?%rU+mA7M*6mqwbdQath*kWxp$)ED^S4di3qSAFq8u zVtsfu_#zs1xKfb6DHj_fnKF*8axFbiI8u@|CG&H;^+-b7sbE~q7M%P zqXEHFFJWhNMJ7>35aFI{jv>H6+`L6uFUK^ye@EF0oIPIFs-Lt5b`t7iW)%1ATb6n^IS#w6S&Fez(EkuwHWwMb~5m6 z3BYBqa7TU;$bi#mI1G>i30+G8--4T62gsf!jG5g~J`@<2q{Y3-CXXoc|5EsAHNMc& zxYLplcG@8aUvPw3P&z+u7{q%`7(-|T;IVQ6vc*z{5e+|SMO&DD+u;kM&Pp=KzcqBg zILcZLh3r(1Sh0opw-@ z@4ivPL~l;^CYYW>mTJyT8Fkzdf|s!&OR>l{Q^d+k$)Xq|f$kQvvdpOhczjGv`77P*F>t0Aq^!_4^YGBxxz+1u+D z7xO;v;LMd=!yijb)i!^PNGto%$jOD;-;a34T0nS2XPj*uTKx*?1Wyh=>t+<%!QZ8Q z0R;ngwY6H%6@LXCz#BkUFzW*O>$Lx73!hL(Bkq;RX_%{V@gjrPc_ACYf*L;D$`!UV zk*(E?d(s>7Lqq2sC)#7*9JkH8yEd}h$+sl8wzq4C$AGGA zp|Y6nLaFMlsyYO%f$D)F55V5CwZs1nx_dz6^B&gK96m?36)MZ+mjOoJlhj1Jn#{r2G0#5$eS0x)i!QkLi~D>&7+S0g2h7j`zez!R{m^|OlV-s z%Gtt=GS1%$+U+ltgWX8H%eqS9JQJ^FeHPv3Hyxjy9&Jm0PvX(4S!v zFquHwD+)1ZucdfJB*-R`oM$%5flD4y%$3rR+jdJ1L9OoW;Bn5BC(x)~G zDg{8occO(LE5cb)|3lyGpesvi7L+F;X4wXErt&>}BOh(Y{UifL5@%p~bO8N;U;2K_dkmCD>TNL<8$>iEi*jc3q*vXMjN|#|w9X^#|!J zUBfL=DJ-GGaugg9*K@V)hg-VF*){^3s*_c+s9{Old|g9ssCT4P z5c-q_wNLbLKI4HE9^vaJ3f9%?Xf_l5fbF;$4>c^68!Ct4LoX==5bbrLtuY{J{1&s) zVV~TaWA~jrF;mWT?P81Wch$OH$?=qLl9dzx0qJdn?DQ{FQ*GV{%g4T;L|ZFBLXb}s z_g41wJ0B7q3iyjX;x&9l6*Z*_CPNbNT;SrAK-h2uB>1T~?LWBfP~)Gl3&6AnHi8>` zn||k;wO9=fY@2s*fj)<(L;Z*@m%Zsl;^dD`_d8qwPAt7e5_L{?b6V}1o0L%di^J{+ zNt7>X1u@b~El%t>-E*RCKs8)fU{x34yOD00K)uWu7ElYZl}dN{&vG4PZISX6>=d2@ z>nopwCx5E{x1eHUQalwy#2Zj`K@xBiz{7b|12PywT;Amn76(ch7~pjNr=@P?tlQTb0418sqEz2Bxj=X-eJ9~7NRxLm#oEWm>v+#Vk|=dh9C zozfZVmN#pE>~-jhwOgorTwF5i>yq}Fk{7D%jEG~7HQY7@s2o$Z z`z6M){3PIg+_ksa!t3C{9HGXcuS-NSsG$q&Bw!Vn(~w^X%?P*_2iS*vbPWkU0xafF z;J3h;EN4mK<80AsEkj$WO`t7ECHk*HBR6+{cxFvuECh{_ge0ycsNb*Ku~u`Q6w8={ z#<+xAGDjD5`QixUCcVOfg9V$JX()*T9y%3#;_njh-9)G4MD1qKw63jVQD|e%u*3w^{qs^>+6>L;HaU>ur1V(iHuVW&oPM{finK?qV~aJVP95mHln_5EkDMK_MgO$!+Ue|9C_XBwQC@T7#^m>2z8+-9^9`oEmN0!G z>#WeY5P3PeJT;$3{SRuRE&aOWBE)-%@=$%)RYY6+iQ?Cb7asjg?ZC)xkPY9{brk>> zuW^V~f};)&AXG^?#W(2T+zQc8asYZ-PF@4)&C4qG#l}4+eCkf@SWnD2;K7$nOJ@g9 zrl`eZy+LajAGu>ybyaCYlHL+6p8!rZvUa}SQsYS32`e;VR4!fCl%xDxL%56k4t7U3 z7%()zr2%XR;-BTtjTplz{CXfq9WSE(?}Rtze-hr#Lp+ZAp3M!Xg7;JdnO7pOBbmjs zA7qvkuW!1>B-PAwQ=vyg!+qLGZ9dRIw1L5{{*eu|j`JJz@1@AWW}Zl-B|$fWy8wJU=7e?Hdlk=O|`kWc8oZSM(yT~*j8TzD{h^{uZ?s15|oC`m%-B&p5J2~1E zb0q6Nz0@jQnUMPMlR#2B<96AO%p?z;zgGI!>|-nF=5b#y57H6Kz}~Teh+#*o7lTvt zy`DAFs%nZwE^-V2!f1#n)uDd&Td7TTz=EPZw2~4T;^3Zxc8jnHDDc(EhlSq23K{8e zNOvZLKR%aNjW#WUSu{e5+WH}1zgliizk_bm-WI?|+fMZ|7y_r^aru{PmAMF$tJ6moWj<{?&lv@It7YVM=cBP~4H=phFKR%lXw!t^2O+w5CYbibvssESLE__r> z{%@z99HRR_PW#vYa@xb>-Nor?(cHRF7st@gwH3T%wC3gKT<*iE{8$EzjXN;kr#Aal zn~hpi+c2_F6|&KI#F;~1PX7+^lvzm9Wm%N-Lc9dn8=!8x4_%i`gDvv!?O#RYui-{W zSMqf`R}p!Rv%3|U^}*P6J(`*HZok3Zg@xpd@cVDVB4ho!UuEBS7^qo@WY-10{b>Gi zfH^-TL)l9g4>4W@oydr@nbY_c4n;y{EZt0B?y&aC#!NV89=SL1|2ikakX_k3ObLKB zB+@sT4g9*w9VPyEF?KffLbQNR;_&PNO8oHW3b-gJVU8*zr(cD!N!y2JaXoUKJE4^ysDuL@g4V>HS8zjN`}etmh$>LyjMRkF7^B^B9}j%@ z$BXF_xw@c9kfew5iq(U+XNs>`rbu4fA4-AgP0}N+kU>Ap$J8Ovd?X)201XGfG6) zm6@#r*0ttB?00aEbGIVJ<=oq9S=~oN10F7a)Sgfo6v_4J%zfM)3+vCOg*x_Q5qknNZAdc#5wgn@z2c?+~}F6B1tWQGmn8eB7;` zCqpYg?Bt`Zd><7z^{Mo4bbk7w^3%-Q7NUG>4--s!~ylZZ}EniXu+X5j9)O4vBVq)Iwj5*o#7}d7R_r z-L;nCtDo!jrK_n4`HQ_ydUgG5AoGF;GA~%Q=Ma8$VRS~v>>hLK%)aP07imq|RBX^p zD(X`uj?J!^TgZ&8Q*z_jQ{zc@;hYgY<&EcpX z1W7qHF4h_hh$VFS6p|2oJ>0^aC>Rq1dhd>%BMOH{=o-2))RhIu{MHaL$Q{4--vbW$ zwfWkMRk_T3{?&%`G@u_cte#j5 zA4TJ*3^A9P078LM4$ViU9xoa?hQ)kAj?G$)Ri+WWUjfF?B$~#Q{y2L^hVX7;eO&5innsD#0b@dk#1Fx7@CxQ(zgZ|#@1QtR|M;{bS zMOU|ThYr;MUcfD1;(f@x)YsxTyCP>z))g?5^+J;pco6rLEAXhQW9QD}dfu>Lr@UdO zxI8}P(3_g1j=9p}?XtS8FWX5AvGnrKhfx61Oxc9St2T3r0@0qbP?g_fMK_cb>W+OP z={~dIQ&ordWvMjmQqGfULB$z6YC!>z2)t-@6eRQK1_n^3r22!O zwU1i6i*2+{Gm%u+x{^B1AVMqmqE-5OY0FWEuS<4|>h4*8pSZ&7WL-5M;!92eZP2;C z@w7wvIg6m){Q;0KZvi8&%G?OO`B)1&o-mFJraQFULR(vn0&I*#B+j<~xnO)QQ;;WFu&2e&vdsJAsYS zkH%*8JU(@-=fJoaFl^G%(o~7Vug#WmVE%I(>i4btU1GtW0K@CE&gWV)U(PC+qmW|= zd#-KlU9b;x5%R`qxgV!%Ers6F^}z-M^4$K)TRrU?s$Y6tQKdzOJCVR7+GmJU!a&`i zHq~KTIzvB+RfWX4{eIM9y3T5zO`64nLwrtMez@z(bxUKSw>R<36RRtd(9)7Cl9}@(ZQV2rBBcup0hzr!*dgF->W)SijqcJreD#dBX&tPfuA@7~GJ!@*LNF?|8e6 z;Gtf?<=eC=QqgwlJBNKNqY!j@UseC1;NS}<9v7ZD9;{KR2+mcUI1w!YzrkU>NEg2x z?iI3W4j56%iAK$37a0?@yNdLd`t?>2?HOMV-HPZ%6M8e$rMj zFMQ?M67V#1=UfZMVi(H?|J-RpP0> za4{=%uwKsmBQV#(;INOjXFgtNr*=k!w|4f;(>*pMRRJ zsEFu^JJeq?Egid9S|B2=Bc@fKO?xLYxqPm?+ltzj<29Yp^1R^uq!PMZ3C4P8Az{%` z#9Uscw>N&l(gEV6B*t8>%T6kJ&}tQo+&_9 z{s98}+Mcn;alc>MRvY{({5*cg^?R7P4`A$>+9}p=`4unhz?6}tAp11mbPME<05Ey{ zb%_{y%KiNpxO&5$4FDbuPVI8beq4F#RhH}6&Z09J@KXj9+3jjHkZW`NxPl#^d^kDG z0-kn<8;em*)ZCVms| ze@O_A$x=QEv0^5g@8>4$zssl%54DL8*vnx8jtZ1H2!a-ei^ z{M~_vcl)dQUCfCGhEpFd3@GvTxSxn#6O!*lx>|FnazAFdlT~(I?lk>MpTlwCJI4MY zUEggYfjgK8@_TH}>M!&K9opylOoS}BL0izW|0dsPrfuPS8xkci1_Y-WTzy>%etw=% zZJ{K^Q#Wy}8@k%}Z0ZPppk&Xl9+jW{2(0a#bWefd%TcB2uy#^oLp{DSEJgN^U7;W1 zhG2C1r1EKPD)!KE7qK*+u-R(1tdL_2sHKHSD(ezJVU(@G~(hN_l{pI}IxSbGUwOdO?sn{m}%(dHYu5*sa0x zSZ$wZ9GlCXuH|lEqDH+=O07u z`dL%xgZqwUxO{jkH`{QfJoc@(uVM4)K}nmrlAVe$!kd)VPfeoP!!6uiBI`)`si;TZ z7IV%sX*A6e*j7l7kMMk(1nPL}6}S3v0^&Gg*)8nLyE(7Hx}%){^xes3M<~4s3vC_F z?!N=$&8_c|Z!5iUCv9!b+>p0(iLEF4cMyPh^I)iU;}cQgctn7UHRVxH=Wwc)cMaks z{9Ihn87YN!WTykM^In#I4SP~IgS^&dA@>uBd2Wxd&Vr9#%v+{W zrDdD`&bLQ5e9;!(jKAtpxM=2jv>18>;W<_gbSmtL#!wYT~7=`X>@Ob((ZQF-x z#UX!}-(F>kiBR|1&O4$`e?459tC>`nsd4YsX(5*=-ziqA04oVafbm{ z2|?>Qs$awc-Nqlb!oY+4HBpaI-wQemI>3_vUM0vc;1!0epg!&`{9NcYyau4HY1Ka5 zZ!ic|%-1*36-{mE@W~X!%pbmMgjDCgF6kc#gwoh9(nZ|U5TNoYK;IyH$<5Ta zU}FJd3E=T8=4x@~^9XGaf^B=zQ}Y@#EfoiB@h`|+y`5@FU+_JLGEE80sKzLpeFbBj?S|^@Fh`FtG68DIw&5Eo)=2Dc3NqWws+F#G|8ctkAt^%u{vx1h-CN z`dj6EdNxQWCP^4sv|`{VlJT;$v^#X!>C>7MP(!nfbb|ucaph@r!&EozX01JA((EKK z9{^ew_$M#S*X zchGmS_=Knogx)$a4ym?|D?9cTS@d&U)lRb@ zSzomIVEq9`cZEX2lNL@RiaMG(SU=zd>)#W$Ko?0vgi+_2wh?KfV5P%hVP~S5@O`g> zwhp#$=CR&fr-aDz-?P_PyK0pWPNn`+18_q7$R&l@c#Lp9e=NJ+g!Hk-jtyj zbr3PHS|Kg0tWf>C|DcT=UxTg`mok}r+H=;=AdepizJ}Q&_XRSpK-Q)OjbZ{B0}^I} zY$tI7FZ<|0m!(4u{=iq;-)GBGpoT-*lp#$lnCtS{DfB+GN1UV1&ypUB8$hczgoI#w zN ze*)AZ)(lddyYb~0lC=Uj=wb#HO*kYf!4;ZGgdXJ*PvU`K$1yb9!w^gtD6 zxe5WNV*_6JC&)7b%$INh{8g;RSc5?~ND;GdEOiZg&;%tO{vH1sWW#`H0h@V03pmw{ z3Vg+x!dI1+^Vj&@Wu)ObYGkFP6uKJwNtpDd(%s_yy|b@8|~3Ulu)6!;h4DVNm<&&y3h#HROxW1Eb0% zwrf610y#xNw*pc~8eDtaAWyzVMNt>1t`-jRvcbC#Yw|W7wcJ>xEWBAYh*<|@ZrU71 zhMmaZ;m7Lw>OB!(A=A>B%nEu%q~=gpm-0iFNF-A{Bh_m4{yk@(-T8cWXlsWtaTjt#@|MN+OJ!jiuO{UD^SkuSMUg61cJRb zH}}LiSNQiqZFN{z!Ax9HtUR&0z81psad#QW0qk5N3>>K-&kqA5&KdoEslC1_@g-$- z&TWsXHKmebG4NA-o_=^;Y@R@oH^v(aM2($wyYy~`8Yq^BY{QRpRVPlXaxVeM4kqXv zUkPRy8N%G`M@fxu5v#d|hT@v}H(mB7E5n0#ciQBS1S;9tCP zWy^Ws;*P{};xd$&d`%!i*Xzoc8f z>*vvvUKeiHX1JEy7z*VHJGJ2)UGNEKd_`@__OL0z#00u#I!pa&Bh(OL0IB!}xPrV- zP=6^I6-&N5)#V{Pkq2;So>wu=+RIocn9Z#0*@*{VCQ5SUa%BjJ@l6FlvjhWm>7>X6J0&TkF^t(D6-SHd5xkzyy622unfY+8r z?gL3_boN~RL?YVR^C9wRGPK~egn&KaxZ@>L=gNlKv@eL?&+VE5dJ12t_b&QQ0(P3* z$cZHM4r%31?eMWmQVuA9Kka-MJPfyY=)pI>Joxv#H?FvTAjf$6PBV>QbQTbWJ`$8n z9Nc(jV*KS$OrJqWnF#_m4Dw^dih!AbM81*<+T1^&#pKrjeYm)S?(=e{A)mY?sdg%m zueVa&2A|o$NGI=LD?e#TlxxxT2USMsQk@hwk~!T>OCZrA^J8jWF1iakb))`{LWg3y z?foscraU=Si@Khb`?@qf8ay|+s9RCX#rr0WCdn8y*8Y35bf%m(6G%%Gc?qVvM(&^= zaLNEU6Q?{Tx#ESYJ?6yqQARb*ara8Qp2A{hSPMp1b~@3bV=Kp9t~D-7ux`L6pRv_|DG2>hHdG} z`GEb`LT`ehUvDJvT0cSq09P{ZzdgUV%*&(fyrS!;Ne?=qe%iWaxod29oh%V!m-i8M zS8vrFCU3D_G;5~=Sl{wTbjs+sW zpQTc5Mb|LK=Sx-KMqlGN1DkW4bU`v_+3{-se<|mt!vr6|^2|s()sVFMU(A!7k-9OGBOEWbca4g`S&n zdFz1M0f-Sndl#oXst~5BE0vl?>ineQLC+ESW~D%#kMuqaN0+LoT!}IHT}YF}EJnW% z{06;kT>sz=0)6TLX4x6y0i`-SVvz0c-N7thZf|gIjtM(wXRQ6L`CvE2C1eL!g)=(M z?8!~}++7>=ushKzOd}$U2}E9#Ivmeizor27S*2SHK6D6elW6N*jDsh39Xwm=D)%ZT zIYF<`ikR5gbGnrH89!0gEG88Eat-*&Jc>|)el|m^Od4uGHTYlI+jXO;HqgE6k%Bd& zsagRgY*WK+cz1|RoPh3|+{6uS##9*@?&ke-in-{LcDz&0OKKvf0p~c2z1!9$Ca74m zi8{)#LhT9~;{O7sY79|`I{V-5wMc}{`m?1QQV60gq+U^}GHL+B1z%&`0+E@l+CO(C0o4T#58(tcKJ;+gAnZ;)gSJo8MMOPxeYD5c!8H5d83DcIwC-gkAi?pM=kNXqY(EH_^pUowAX5opf@j*>o%aB zI1rZ85=L59UD-F$b3W%wvCiu_K7-IP;=`(*8bZs%z#HOyni^E3qhBE+)YwtQXuvNa zeitUiXQDRXUKW8d6&9Et#YYM`X`xcewE&GgkP(h97AR&E%S3%i)NiUf^v4s5Wo9X? z3>*99v9C^(YFqx2WUUDLfeSEK+!9M@PRo&$luhjm+s|8Oai*y%jqgqPr-Q3qc zo=86)Pky;2IJ0J-UC4yXjL)rQ z`$VfG$W|Z=_8%a8prDHn>q1e!*ranBwbyJk z-$|oHHLPltZ}-rX=c?tu>n=2X^WK4(Bk^-vrET4ka==QEz^)idtdczDCCU8G@NzhX zHPfQ_89_~tn;1MXDDN74;r?P!^j}1P-8ylTZcWk;`n4DnfCYBr%s^(9d~3!XaMxSm zl@#z|+*~j!v(~Fq<5cCPF^RAhgyIv)^sF_cTIBR^{@jKmf|PL$GoN#v&hjf{2OQj9 zdQn%P$BxpyeWR%DU{nk6DZ7#kw{R1n(f~9_D1+91a-Dg0>}=|Ej+-28J58~tlPuv1 z@iD+TTDq%rfW2Eu1nkPf0;IPez9QaSrDQZirr?WvyKPItODS0dW(@w@=Riyowc1aS?oY=ZvIu)&wDt1A-@uuuUDM04~QQ)-P1Vzw1mMfve3EBBT}jXn&Z2}t$<#E*4&59&*5jiWqJ$!|$Q;-Q&6F(NT+-ti$0zBM6(QMmZluV4UfjgDA=FIb8ZO=a^46PP~OmnL|vVMdJXQE z!o6AQbVC7(C2qp3#)T6$=@Sv-L10vYSGI%mT0`E03=Ytn0a^lY=%AEx*&T3CdMk|b z_wWFtwCXjCq}JeSHw%DPmoqpLspslf2+K@;03W#f%D%7jj~;H#9ktoi9T=66x^ss0 zPVKbwJ^!!}g-jKH1c)g^4?ba(gs|~4<&^p{I5O$sX#Ib6Xo9hm-^)% z?tG{k-Aw!nktlye@a`%nnfVG1*2N;;Uc{3ZfYEp3KsLV8o^ox^Jp0q>5vi^|^;B!m z@%+Ge!uJ}{%kqFcZ-#7=)qRb$0+Cqu0xq=1z3Kdu zNYq>jWld-Q@&U1u`rqVy6=-2>2pP1xE-x1jOf~l8va%ASb;GGUe&6{#%&aHa{>ODz zW>z~SQLcSC6-5UB-M0zfS9Il3v6+JB3c#A<-Wj}4gC_%(?He~-e=S*3Lm0pN_qx1AgU!r;=p;*JLQ+-S1 ziS#1Qj35T2`G7@R&U6L)%g9-}O0+IetaFrh@LD8@{f|)hU9=OL3)Jxs9B0mqCJeul z$pXA%@nA8)jUhD%2K@1ISarn$mhHEs&OEDe0z^(P)bg@`>8JAnW-_VC)00#0J%x#A z%`~vv`INrd(HdEsAgV0toTsF1LdQuN z)dCvnx{1_5m640u;S*W7zI7#gD(vSlunE&Iz8e|_|HM&X-0o1lBm zZOb*-qVmvB3K4Mqq^ox#l_2_jnF0PDPVWHzo37vZyr4z04vxj%biy^l*Tw6RoMpk= z0D;rKAE;!Z=qQtAk(OU{x$G+;9#mQ8rN%u@3WB7YYgJY^i2hNjNr@3^^AuLwO}AsT zh{MFa$J%$LwwK0~;J+6f$-l@}q;43ndOJhTnqW^)@<%FaaHly-p@wgWasNThV0`{4 zdH|pwZtz;LT|^3{V`{LCWq~F}5#}|Q9(&Tmsn4(89$ZYIvwDc3g9Vr31>}QlrelV0 zH8aZD!!`FSYrI&gvkmwod#08nay9RZ7aX<*Cf{c*Mj7-Vr}Az_>^t@7IkFiDvghF; zOF$1Opbzh+{+@R-aXbcv3<+aDM;<9WrtkZ;yf`)0OAL446)bro2@+jYOz{ccwIgGW zAVJW%l1(6BilE-Ieo9vCOgXL*+Te!MZve|aQWY!CjH=x>KUa=4VG!$)tM!|oMmjBT zM{k!#)CfPBpDRmDp!MOywYf#uCZFI4R*#3;VW31#sw49ynYV{OWwJ}eJ?xsJL>rqf zpO`kI#d4A<@Mk!tQz+bWnfZCS=Ht)aIZ<7CBzq$NVzmW{ticEXTa^g=&!u`m6 zsrh}gyZ~%kyz~4U<(aAz8#hIkob!b3gvD zR@T1qBHMt&$!G<&W3<^NI%l*4cxHhFU}~)9f)>sWq6cyb2-!ffc=>Xxl0RV9SiVT1 z{#oVUs7QyFOcPch)^l=G%GC#FvDfT**CiHqeFR_R{6Hb$Xpdr#qPcKL{(;}sC^(cV z6J>{mAATY{+V@D2T7BEQI3O{=+Pd$>OLkt|C%jOg{sTP4In0MdbSXg8U%oR`y2ObgtbXWzPhzuZeOqLk6J#JH=tfk%q6yD^1Y9orj3*?ypUY0!4s>cbEEY;uXy=Ajen6d=) zSB4aP^%r<8U`D^kn7P(Y&SF-hZ{0R^%n)u!n5N}rr$`keTxj)uxNB&tVvBAgC<=&2 zsD|&&F4h3$lnh{Y4D|SGc+~sK-r?6#FJ?~Kb&pjZ%ujil=&5%Iv{@ad7aF$jzMyLN z6?_D(Be%n7nEDUhLYcp#q*BpnjX3~*Ij$pRJCm7f5%&p1Qsb?yMSW0LEjjF8QR-9D zWE;p0rb)x54)l5zrY;_tPWsAO(t%zk$pngo4 z4R#Vp#5=d`ocE}^8)meVq2&EnEN+H);?0Z=QKWZ9XN;HQPSpyg>jKMy zd`3>y>$c}SP7gr~)yqhi;zB21UJV|r>8c7&1jxA^_@{nA8Op%sH-Bb@>QBz@{r&HG z7m!dD6e$4E`>(n^zPRff9aW&<3|3gi6ASt&LhiSf%6A1(gIR>NQI@+i=`iw z{JLxU8QO(ObReO&gV11s+-`E|npgZsLo*S-9Go4Se8*(xgzZG-{zv<4gSKNbC)AY_ zE!Lc2QIDWmu{ z)&rg-sZDw_JIdjKQo|Lh(*|?|E1ktj`0sfhRaH}P=Zs19w@;#kGuGSx2czue$2u#Xm$PJ#Ij(|5PN2B)nf_r(7L2z z&+z*PJzzIo_BW#gfT?$@;It(Iixk|YS0`58IJK}$L}Q2;+kjK{vr*{~ZW3mk82x)5 z;se6y=Q9}OfC>~Nd&)+l&UJ^nui#Xs>hQA(>#79?r#ZWzzs8Czyt{N%izHq{3jI=o zM~t;!e&g`iaH9o6dsZ|YPP|)TTMn%8hkHZ@Yr~oj@;ddi!jzfM;2z<{c+F3!x38#J z$NQS*P$WcClgk1-^%WQFea>hlN&v!&=Zu-pF5PWLAOxbpaQ9_q@zDhTpcFj0UC852 zEWJH$u$z84ZS;z|C^Antl#%@)zs1$s9e)4Rww#tfs5_SYxKkS_GUSav7N9$Fp-Ih* zQ8^KfyLKwSqp_V7XA)Q-J733@^tR+2GpBh)@-v~@Td)m1UT*u*)NFszmR%FLQ

tL^cYM2l`)rl(QkR8s8JsUBN9 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

Ei*l&+?~})qL)ulQ?DBD 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 O!Yi?Zd5X?&{r?XwRU>l% literal 0 HcmV?d00001 diff --git a/public/images/events/egg-update_fr.png b/public/images/events/egg-update_fr.png new file mode 100644 index 0000000000000000000000000000000000000000..e0505fa96dd574a668a1e7bc5606829dde49d0db GIT binary patch literal 13387 zcma)j3p|u-_x3#q6(N;V4yE+A_nSjPa+

y(M<-c6N>>lVT`COqiK=(Sf3)LTD2y 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 O+njc8e(d1&>;C}+kLz>* literal 0 HcmV?d00001 diff --git a/public/images/events/egg-update_ja.png b/public/images/events/egg-update_ja.png new file mode 100644 index 0000000000000000000000000000000000000000..2259cbb4d9a9bd8dc3b26e76429f356922a58288 GIT binary patch literal 13612 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 literal 0 HcmV?d00001 diff --git a/public/images/events/egg-update_ko.png b/public/images/events/egg-update_ko.png new file mode 100644 index 0000000000000000000000000000000000000000..99dcc6624029946c861922311a805267c387d57d GIT binary patch literal 12565 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 literal 0 HcmV?d00001 diff --git a/public/images/events/egg-update_zh-CN.png b/public/images/events/egg-update_zh-CN.png new file mode 100644 index 0000000000000000000000000000000000000000..02d780fab89e1869730e7f52385da310f0390c4b GIT binary patch literal 51829 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 S(o>TF0000 !party[0].scene.gameMode.isDaily ? Math.max(1 - rerollCount, 0) : 0, 1), ].map(m => { m.setTier(ModifierTier.COMMON); return m; }), @@ -1615,7 +1616,7 @@ const modifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.BASE_STAT_BOOSTER, 3), new WeightedModifierType(modifierTypes.TERA_SHARD, 1), new WeightedModifierType(modifierTypes.DNA_SPLICERS, (party: Pokemon[]) => party[0].scene.gameMode.isSplicedOnly && party.filter(p => !p.fusionSpecies).length > 1 ? 4 : 0), - new WeightedModifierType(modifierTypes.VOUCHER, (party: Pokemon[], rerollCount: integer) => !party[0].scene.gameMode.isDaily ? Math.max(1 - rerollCount, 0) : 0, 1), + new WeightedModifierType(modifierTypes.VOUCHER, (party: Pokemon[], rerollCount: integer) => !party[0].scene.gameMode.isDaily ? Math.max(3 - rerollCount * 3, 0) : 0, 3), ].map(m => { m.setTier(ModifierTier.GREAT); return m; }), @@ -1696,7 +1697,7 @@ const modifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.RARE_FORM_CHANGE_ITEM, (party: Pokemon[]) => Math.min(Math.ceil(party[0].scene.currentBattle.waveIndex / 50), 4) * 6, 24), new WeightedModifierType(modifierTypes.MEGA_BRACELET, (party: Pokemon[]) => Math.min(Math.ceil(party[0].scene.currentBattle.waveIndex / 50), 4) * 9, 36), new WeightedModifierType(modifierTypes.DYNAMAX_BAND, (party: Pokemon[]) => Math.min(Math.ceil(party[0].scene.currentBattle.waveIndex / 50), 4) * 9, 36), - new WeightedModifierType(modifierTypes.VOUCHER_PLUS, (party: Pokemon[], rerollCount: integer) => !party[0].scene.gameMode.isDaily ? Math.max(3 - rerollCount * 1, 0) : 0, 3), + new WeightedModifierType(modifierTypes.VOUCHER_PLUS, (party: Pokemon[], rerollCount: integer) => !party[0].scene.gameMode.isDaily ? Math.max(9 - rerollCount * 3, 0) : 0, 9), ].map(m => { m.setTier(ModifierTier.ROGUE); return m; }), @@ -1705,7 +1706,7 @@ const modifierPool: ModifierPool = { new WeightedModifierType(modifierTypes.SHINY_CHARM, 14), new WeightedModifierType(modifierTypes.HEALING_CHARM, 18), new WeightedModifierType(modifierTypes.MULTI_LENS, 18), - new WeightedModifierType(modifierTypes.VOUCHER_PREMIUM, (party: Pokemon[], rerollCount: integer) => !party[0].scene.gameMode.isDaily && !party[0].scene.gameMode.isEndless && !party[0].scene.gameMode.isSplicedOnly ? Math.max(5 - rerollCount * 2, 0) : 0, 5), + new WeightedModifierType(modifierTypes.VOUCHER_PREMIUM, (party: Pokemon[], rerollCount: integer) => !party[0].scene.gameMode.isDaily && !party[0].scene.gameMode.isEndless && !party[0].scene.gameMode.isSplicedOnly ? Math.max(15 - rerollCount * 5, 0) : 0, 15), new WeightedModifierType(modifierTypes.DNA_SPLICERS, (party: Pokemon[]) => !party[0].scene.gameMode.isSplicedOnly && party.filter(p => !p.fusionSpecies).length > 1 ? 24 : 0, 24), new WeightedModifierType(modifierTypes.MINI_BLACK_HOLE, (party: Pokemon[]) => (!party[0].scene.gameMode.isFreshStartChallenge() && party[0].scene.gameData.unlocks[Unlockables.MINI_BLACK_HOLE]) ? 1 : 0, 1), ].map(m => { diff --git a/src/phases/trainer-victory-phase.ts b/src/phases/trainer-victory-phase.ts index a38874c9acd..7815244c35c 100644 --- a/src/phases/trainer-victory-phase.ts +++ b/src/phases/trainer-victory-phase.ts @@ -30,7 +30,7 @@ export class TrainerVictoryPhase extends BattlePhase { const trainerType = this.scene.currentBattle.trainer?.config.trainerType!; // TODO: is this bang correct? if (vouchers.hasOwnProperty(TrainerType[trainerType])) { if (!this.scene.validateVoucher(vouchers[TrainerType[trainerType]]) && this.scene.currentBattle.trainer?.config.isBoss) { - this.scene.unshiftPhase(new ModifierRewardPhase(this.scene, [modifierTypes.VOUCHER, modifierTypes.VOUCHER, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM][vouchers[TrainerType[trainerType]].voucherType])); + this.scene.unshiftPhase(new ModifierRewardPhase(this.scene, [modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM][vouchers[TrainerType[trainerType]].voucherType])); } } diff --git a/src/timed-event-manager.ts b/src/timed-event-manager.ts index 874bf6a8b46..9bfa3bdf54a 100644 --- a/src/timed-event-manager.ts +++ b/src/timed-event-manager.ts @@ -25,14 +25,14 @@ interface TimedEvent extends EventBanner { const timedEvents: TimedEvent[] = [ { - name: "September Update", + name: "Egg Skip Update", eventType: EventType.GENERIC, - startDate: new Date(Date.UTC(2024, 7, 28, 0)), - endDate: new Date(Date.UTC(2024, 8, 15, 0)), - bannerKey: "september-update", + startDate: new Date(Date.UTC(2024, 8, 8, 0)), + endDate: new Date(Date.UTC(2024, 8, 12, 0)), + bannerKey: "egg-update", xPosition: 19, - yPosition: 115, - scale: 0.30, + yPosition: 120, + scale: 0.21, availableLangs: ["en", "de", "it", "fr", "ja", "ko", "es", "pt-BR", "zh-CN"] } ]; @@ -94,9 +94,9 @@ export class TimedEventDisplay extends Phaser.GameObjects.Container { let key = this.event.bannerKey; if (lang && this.event.availableLangs && this.event.availableLangs.length > 0) { if (this.event.availableLangs.includes(lang)) { - key += "-"+lang; + key += "_"+lang; } else { - key += "-en"; + key += "_en"; } } console.log(this.event.bannerKey); From f73a830f7749b8289edc282e55dccd5305c772c8 Mon Sep 17 00:00:00 2001 From: DustinLin <39450497+DustinLin@users.noreply.github.com> Date: Sat, 7 Sep 2024 21:36:47 -0700 Subject: [PATCH 32/83] [DOCS] adding JSDocs to `arena.ts` (#3590) * adding some docs * Update src/field/pokemon.ts Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * seems like battleStats changed to statStages * Apply suggestions from code review editing doc text Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> * Update tsdocs, convert comment to tsdoc in `pokemon.ts` --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- src/field/arena.ts | 58 ++++++++++++++++++++++++++++++++++++++++---- src/field/pokemon.ts | 1 + 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/src/field/arena.ts b/src/field/arena.ts index e8defbd1a8e..5b167791769 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -60,7 +60,7 @@ export class Arena { this.scene.arenaBg.setTexture(`${biomeKey}_bg`); this.scene.arenaBgTransition.setTexture(`${biomeKey}_bg`); - // Redo this on initialise because during save/load the current wave isn't always + // Redo this on initialize because during save/load the current wave isn't always // set correctly during construction this.updatePoolsForTimeOfDay(); } @@ -289,7 +289,7 @@ export class Arena { /** * Sets weather to the override specified in overrides.ts - * @param weather new weather to set of type WeatherType + * @param weather new {@linkcode WeatherType} to set * @returns true to force trySetWeather to return true */ trySetWeatherOverride(weather: WeatherType): boolean { @@ -301,8 +301,8 @@ export class Arena { /** * Attempts to set a new weather to the battle - * @param weather new weather to set of type WeatherType - * @param hasPokemonSource is the new weather from a pokemon + * @param weather {@linkcode WeatherType} new {@linkcode WeatherType} to set + * @param hasPokemonSource boolean if the new weather is from a pokemon * @returns true if new weather set, false if no weather provided or attempting to set the same weather as currently in use */ trySetWeather(weather: WeatherType, hasPokemonSource: boolean): boolean { @@ -573,6 +573,12 @@ export class Arena { this.ignoreAbilities = ignoreAbilities; } + /** + * Applies each `ArenaTag` in this Arena, based on which side (self, enemy, or both) is passed in as a parameter + * @param tagType Either an {@linkcode ArenaTagType} string, or an actual {@linkcode ArenaTag} class to filter which ones to apply + * @param side {@linkcode ArenaTagSide} which side's arena tags to apply + * @param args array of parameters that the called upon tags may need + */ applyTagsForSide(tagType: ArenaTagType | Constructor, side: ArenaTagSide, ...args: unknown[]): void { let tags = typeof tagType === "string" ? this.tags.filter(t => t.tagType === tagType) @@ -583,11 +589,28 @@ export class Arena { tags.forEach(t => t.apply(this, args)); } + /** + * Applies the specified tag to both sides (ie: both user and trainer's tag that match the Tag specified) + * by calling {@linkcode applyTagsForSide()} + * @param tagType Either an {@linkcode ArenaTagType} string, or an actual {@linkcode ArenaTag} class to filter which ones to apply + * @param args array of parameters that the called upon tags may need + */ applyTags(tagType: ArenaTagType | Constructor, ...args: unknown[]): void { this.applyTagsForSide(tagType, ArenaTagSide.BOTH, ...args); } - addTag(tagType: ArenaTagType, turnCount: integer, sourceMove: Moves | undefined, sourceId: integer, side: ArenaTagSide = ArenaTagSide.BOTH, quiet: boolean = false, targetIndex?: BattlerIndex): boolean { + /** + * Adds a new tag to the arena + * @param tagType {@linkcode ArenaTagType} the tag being added + * @param turnCount How many turns the tag lasts + * @param sourceMove {@linkcode Moves} the move the tag came from, or `undefined` if not from a move + * @param sourceId The ID of the pokemon in play the tag came from (see {@linkcode BattleScene.getPokemonById}) + * @param side {@linkcode ArenaTagSide} which side(s) the tag applies to + * @param quiet If a message should be queued on screen to announce the tag being added + * @param targetIndex The {@linkcode BattlerIndex} of the target pokemon + * @returns `false` if there already exists a tag of this type in the Arena + */ + addTag(tagType: ArenaTagType, turnCount: number, sourceMove: Moves | undefined, sourceId: number, side: ArenaTagSide = ArenaTagSide.BOTH, quiet: boolean = false, targetIndex?: BattlerIndex): boolean { const existingTag = this.getTagOnSide(tagType, side); if (existingTag) { existingTag.onOverlap(this); @@ -600,6 +623,7 @@ export class Arena { return false; } + // creates a new tag object const newTag = getArenaTag(tagType, turnCount || 0, sourceMove, sourceId, targetIndex, side); if (newTag) { this.tags.push(newTag); @@ -613,6 +637,11 @@ export class Arena { return true; } + /** + * Attempts to get a tag from the Arena via {@linkcode getTagOnSide} that applies to both sides + * @param tagType The {@linkcode ArenaTagType} or {@linkcode ArenaTag} to get + * @returns either the {@linkcode ArenaTag}, or `undefined` if it isn't there + */ getTag(tagType: ArenaTagType | Constructor): ArenaTag | undefined { return this.getTagOnSide(tagType, ArenaTagSide.BOTH); } @@ -621,16 +650,35 @@ export class Arena { return !!this.getTag(tagType); } + /** + * Attempts to get a tag from the Arena from a specific side (the tag passed in has to either apply to both sides, or the specific side only) + * + * eg: `MIST` only applies to the user's side, while `MUD_SPORT` applies to both user and enemy side + * @param tagType The {@linkcode ArenaTagType} or {@linkcode ArenaTag} to get + * @param side The {@linkcode ArenaTagSide} to look at + * @returns either the {@linkcode ArenaTag}, or `undefined` if it isn't there + */ getTagOnSide(tagType: ArenaTagType | Constructor, side: ArenaTagSide): ArenaTag | undefined { return typeof(tagType) === "string" ? this.tags.find(t => t.tagType === tagType && (side === ArenaTagSide.BOTH || t.side === ArenaTagSide.BOTH || t.side === side)) : this.tags.find(t => t instanceof tagType && (side === ArenaTagSide.BOTH || t.side === ArenaTagSide.BOTH || t.side === side)); } + /** + * Uses {@linkcode findTagsOnSide} to filter (using the parameter function) for specific tags that apply to both sides + * @param tagPredicate a function mapping {@linkcode ArenaTag}s to `boolean`s + * @returns array of {@linkcode ArenaTag}s from which the Arena's tags return true and apply to both sides + */ findTags(tagPredicate: (t: ArenaTag) => boolean): ArenaTag[] { return this.findTagsOnSide(tagPredicate, ArenaTagSide.BOTH); } + /** + * Returns specific tags from the arena that pass the `tagPredicate` function passed in as a parameter, and apply to the given side + * @param tagPredicate a function mapping {@linkcode ArenaTag}s to `boolean`s + * @param side The {@linkcode ArenaTagSide} to look at + * @returns array of {@linkcode ArenaTag}s from which the Arena's tags return `true` and apply to the given side + */ findTagsOnSide(tagPredicate: (t: ArenaTag) => boolean, side: ArenaTagSide): ArenaTag[] { return this.tags.filter(t => tagPredicate(t) && (side === ArenaTagSide.BOTH || t.side === ArenaTagSide.BOTH || t.side === side)); } diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index f522d50f357..35a33907850 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -4501,6 +4501,7 @@ export interface AttackMoveResult { } export class PokemonSummonData { + /** [Atk, Def, SpAtk, SpDef, Spd, Acc, Eva] */ public statStages: number[] = [ 0, 0, 0, 0, 0, 0, 0 ]; public moveQueue: QueuedMove[] = []; public tags: BattlerTag[] = []; From 2fc3179bd90dfd8929ee1f1ff765f0075915d945 Mon Sep 17 00:00:00 2001 From: Leo Kim <47556641+KimJeongSun@users.noreply.github.com> Date: Sun, 8 Sep 2024 13:37:14 +0900 Subject: [PATCH 33/83] [Bug] Fix scrappy (+ some immunity move and ability) in inverse battle (#4067) * fix scrappy + etc. update inverse battle test code * update test code following request from swain --- src/field/pokemon.ts | 12 +- src/test/battle/inverse_battle.test.ts | 155 +++++++++++++++++++------ 2 files changed, 126 insertions(+), 41 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 35a33907850..863b0f41d2c 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1427,22 +1427,26 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } let multiplier = types.map(defType => { + const multiplier = new Utils.NumberHolder(getTypeDamageMultiplier(moveType, defType)); + applyChallenges(this.scene.gameMode, ChallengeType.TYPE_EFFECTIVENESS, multiplier); if (source) { const ignoreImmunity = new Utils.BooleanHolder(false); if (source.isActive(true) && source.hasAbilityWithAttr(IgnoreTypeImmunityAbAttr)) { applyAbAttrs(IgnoreTypeImmunityAbAttr, source, ignoreImmunity, simulated, moveType, defType); } if (ignoreImmunity.value) { - return 1; + if (multiplier.value === 0) { + return 1; + } } const exposedTags = this.findTags(tag => tag instanceof ExposedTag) as ExposedTag[]; if (exposedTags.some(t => t.ignoreImmunity(defType, moveType))) { - return 1; + if (multiplier.value === 0) { + return 1; + } } } - const multiplier = new Utils.NumberHolder(getTypeDamageMultiplier(moveType, defType)); - applyChallenges(this.scene.gameMode, ChallengeType.TYPE_EFFECTIVENESS, multiplier); return multiplier.value; }).reduce((acc, cur) => acc * cur, 1) as TypeDamageMultiplier; diff --git a/src/test/battle/inverse_battle.test.ts b/src/test/battle/inverse_battle.test.ts index be8b04155eb..2a561a09e5e 100644 --- a/src/test/battle/inverse_battle.test.ts +++ b/src/test/battle/inverse_battle.test.ts @@ -1,8 +1,5 @@ import { BattlerIndex } from "#app/battle"; -import { allMoves } from "#app/data/move"; import { Type } from "#app/data/type"; -import { MoveEndPhase } from "#app/phases/move-end-phase"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Abilities } from "#enums/abilities"; import { ArenaTagType } from "#enums/arena-tag-type"; import { Challenges } from "#enums/challenges"; @@ -11,7 +8,8 @@ import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; +import { SPLASH_ONLY } from "#test/utils/testUtils"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const TIMEOUT = 20 * 1000; @@ -39,43 +37,63 @@ describe("Inverse Battle", () => { .starterSpecies(Species.FEEBAS) .ability(Abilities.BALL_FETCH) .enemySpecies(Species.MAGIKARP) - .enemyAbility(Abilities.BALL_FETCH); + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(SPLASH_ONLY); }); - it("1. immune types are 2x effective - Thunderbolt against Ground Type", async () => { - game.override.enemySpecies(Species.SANDSHREW); + it("Immune types are 2x effective - Thunderbolt against Ground Type", async () => { + game.override + .moveset([Moves.THUNDERBOLT]) + .enemySpecies(Species.SANDSHREW); + await game.challengeMode.startBattle(); - const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; + vi.spyOn(enemy, "getMoveEffectiveness"); - expect(enemy.getMoveEffectiveness(player, allMoves[Moves.THUNDERBOLT])).toBe(2); + game.move.select(Moves.THUNDERBOLT); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("MoveEffectPhase"); + + expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2); }, TIMEOUT); - it("2. 2x effective types are 0.5x effective - Thunderbolt against Flying Type", async () => { - game.override.enemySpecies(Species.PIDGEY); + it("2x effective types are 0.5x effective - Thunderbolt against Flying Type", async () => { + game.override + .moveset([Moves.THUNDERBOLT]) + .enemySpecies(Species.PIDGEY); await game.challengeMode.startBattle(); - const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; + vi.spyOn(enemy, "getMoveEffectiveness"); - expect(enemy.getMoveEffectiveness(player, allMoves[Moves.THUNDERBOLT])).toBe(0.5); + game.move.select(Moves.THUNDERBOLT); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("MoveEffectPhase"); + + expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(0.5); }, TIMEOUT); - it("3. 0.5x effective types are 2x effective - Thunderbolt against Electric Type", async () => { - game.override.enemySpecies(Species.CHIKORITA); + it("0.5x effective types are 2x effective - Thunderbolt against Electric Type", async () => { + game.override + .moveset([Moves.THUNDERBOLT]) + .enemySpecies(Species.CHIKORITA); await game.challengeMode.startBattle(); - const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; + vi.spyOn(enemy, "getMoveEffectiveness"); - expect(enemy.getMoveEffectiveness(player, allMoves[Moves.THUNDERBOLT])).toBe(2); + game.move.select(Moves.THUNDERBOLT); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("MoveEffectPhase"); + + expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2); }, TIMEOUT); - it("4. Stealth Rock follows the inverse matchups - Stealth Rock against Charizard deals 1/32 of max HP", async () => { + it("Stealth Rock follows the inverse matchups - Stealth Rock against Charizard deals 1/32 of max HP", async () => { game.scene.arena.addTag(ArenaTagType.STEALTH_ROCK, 1, Moves.STEALTH_ROCK, 0); game.override .enemySpecies(Species.CHARIZARD) @@ -95,18 +113,24 @@ describe("Inverse Battle", () => { expect(currentHp).toBeGreaterThan(maxHp * 31 / 32 - 1); }, TIMEOUT); - it("5. Freeze Dry is 2x effective against Water Type like other Ice type Move - Freeze Dry against Squirtle", async () => { - game.override.enemySpecies(Species.SQUIRTLE); + it("Freeze Dry is 2x effective against Water Type like other Ice type Move - Freeze Dry against Squirtle", async () => { + game.override + .moveset([Moves.FREEZE_DRY]) + .enemySpecies(Species.SQUIRTLE); await game.challengeMode.startBattle(); - const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; + vi.spyOn(enemy, "getMoveEffectiveness"); - expect(enemy.getMoveEffectiveness(player, allMoves[Moves.FREEZE_DRY])).toBe(2); + game.move.select(Moves.FREEZE_DRY); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("MoveEffectPhase"); + + expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2); }, TIMEOUT); - it("6. Water Absorb should heal against water moves - Water Absorb against Water gun", async () => { + it("Water Absorb should heal against water moves - Water Absorb against Water gun", async () => { game.override .moveset([Moves.WATER_GUN]) .enemyAbility(Abilities.WATER_ABSORB); @@ -117,13 +141,12 @@ describe("Inverse Battle", () => { enemy.hp = enemy.getMaxHp() - 1; game.move.select(Moves.WATER_GUN); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); - - await game.phaseInterceptor.to(MoveEndPhase); + await game.phaseInterceptor.to("MoveEndPhase"); expect(enemy.hp).toBe(enemy.getMaxHp()); }, TIMEOUT); - it("7. Fire type does not get burned - Will-O-Wisp against Charmander", async () => { + it("Fire type does not get burned - Will-O-Wisp against Charmander", async () => { game.override .moveset([Moves.WILL_O_WISP]) .enemySpecies(Species.CHARMANDER); @@ -135,13 +158,12 @@ describe("Inverse Battle", () => { game.move.select(Moves.WILL_O_WISP); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.move.forceHit(); - - await game.phaseInterceptor.to(MoveEndPhase); + await game.phaseInterceptor.to("MoveEndPhase"); expect(enemy.status?.effect).not.toBe(StatusEffect.BURN); }, TIMEOUT); - it("8. Electric type does not get paralyzed - Nuzzle against Pikachu", async () => { + it("Electric type does not get paralyzed - Nuzzle against Pikachu", async () => { game.override .moveset([Moves.NUZZLE]) .enemySpecies(Species.PIKACHU) @@ -153,14 +175,30 @@ describe("Inverse Battle", () => { game.move.select(Moves.NUZZLE); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); - - await game.phaseInterceptor.to(MoveEndPhase); + await game.phaseInterceptor.to("MoveEndPhase"); expect(enemy.status?.effect).not.toBe(StatusEffect.PARALYSIS); }, TIMEOUT); + it("Ground type is not immune to Thunder Wave - Thunder Wave against Sandshrew", async () => { + game.override + .moveset([Moves.THUNDER_WAVE]) + .enemySpecies(Species.SANDSHREW); - it("10. Anticipation should trigger on 2x effective moves - Anticipation against Thunderbolt", async () => { + await game.challengeMode.startBattle(); + + const enemy = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.THUNDER_WAVE); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.move.forceHit(); + await game.phaseInterceptor.to("MoveEndPhase"); + + expect(enemy.status?.effect).toBe(StatusEffect.PARALYSIS); + }, TIMEOUT); + + + it("Anticipation should trigger on 2x effective moves - Anticipation against Thunderbolt", async () => { game.override .moveset([Moves.THUNDERBOLT]) .enemySpecies(Species.SANDSHREW) @@ -171,7 +209,7 @@ describe("Inverse Battle", () => { expect(game.scene.getEnemyPokemon()?.summonData.abilitiesApplied[0]).toBe(Abilities.ANTICIPATION); }, TIMEOUT); - it("11. Conversion 2 should change the type to the resistive type - Conversion 2 against Dragonite", async () => { + it("Conversion 2 should change the type to the resistive type - Conversion 2 against Dragonite", async () => { game.override .moveset([Moves.CONVERSION_2]) .enemyMoveset([Moves.DRAGON_CLAW, Moves.DRAGON_CLAW, Moves.DRAGON_CLAW, Moves.DRAGON_CLAW]); @@ -183,21 +221,64 @@ describe("Inverse Battle", () => { game.move.select(Moves.CONVERSION_2); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); expect(player.getTypes()[0]).toBe(Type.DRAGON); }, TIMEOUT); - it("12. Flying Press should be 0.25x effective against Grass + Dark Type - Flying Press against Meowscarada", async () => { + it("Flying Press should be 0.25x effective against Grass + Dark Type - Flying Press against Meowscarada", async () => { game.override .moveset([Moves.FLYING_PRESS]) .enemySpecies(Species.MEOWSCARADA); await game.challengeMode.startBattle(); - const player = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; + vi.spyOn(enemy, "getMoveEffectiveness"); - expect(enemy.getMoveEffectiveness(player, allMoves[Moves.FLYING_PRESS])).toBe(0.25); + game.move.select(Moves.FLYING_PRESS); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("MoveEffectPhase"); + + expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(0.25); + }, TIMEOUT); + + it("Scrappy ability has no effect - Tackle against Ghost Type still 2x effective with Scrappy", async () => { + game.override + .moveset([Moves.TACKLE]) + .ability(Abilities.SCRAPPY) + .enemySpecies(Species.GASTLY); + + await game.challengeMode.startBattle(); + + const enemy = game.scene.getEnemyPokemon()!; + vi.spyOn(enemy, "getMoveEffectiveness"); + + game.move.select(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("MoveEffectPhase"); + + expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2); + }, TIMEOUT); + + it("FORESIGHT has no effect - Tackle against Ghost Type still 2x effective with Foresight", async () => { + game.override + .moveset([Moves.FORESIGHT, Moves.TACKLE]) + .enemySpecies(Species.GASTLY); + + await game.challengeMode.startBattle(); + + const enemy = game.scene.getEnemyPokemon()!; + vi.spyOn(enemy, "getMoveEffectiveness"); + + game.move.select(Moves.FORESIGHT); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + await game.phaseInterceptor.to("TurnEndPhase"); + + game.move.select(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.phaseInterceptor.to("MoveEffectPhase"); + + expect(enemy.getMoveEffectiveness).toHaveLastReturnedWith(2); }, TIMEOUT); }); From 2bd07cb84e02d51345a4e2c85543b023a35bdec7 Mon Sep 17 00:00:00 2001 From: flx-sta <50131232+flx-sta@users.noreply.github.com> Date: Sat, 7 Sep 2024 21:37:37 -0700 Subject: [PATCH 34/83] fix and optimize imports (#4061) - remove any `.js` extension imports - remove unncessary dynamic imports of `modifier.ts` file. The file was being imported statically & dynamically. Made it pure static - increase vite chunk-size warning limit Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com> --- src/@types/common.ts | 2 +- src/@types/i18next.d.ts | 2 +- src/battle-scene.ts | 2 +- src/configs/inputs/pad_procon.ts | 2 +- src/data/challenge.ts | 14 ++++---- src/data/egg.ts | 2 +- src/data/pokemon-forms.ts | 2 +- src/data/terrain.ts | 2 +- src/data/variant.ts | 2 +- src/events/arena.ts | 6 ++-- src/inputs-controller.ts | 2 +- src/main.ts | 4 +-- src/modifier/modifier-type.ts | 2 +- src/modifier/modifier.ts | 6 ++-- src/phases/add-enemy-buff-modifier-phase.ts | 10 +++--- src/phases/attempt-capture-phase.ts | 28 +++++++-------- src/phases/battle-end-phase.ts | 4 +-- src/phases/battle-phase.ts | 6 ++-- src/phases/berry-phase.ts | 12 +++---- src/phases/check-switch-phase.ts | 10 +++--- src/phases/common-anim-phase.ts | 6 ++-- src/phases/damage-phase.ts | 10 +++--- src/phases/end-card-phase.ts | 8 ++--- src/phases/end-evolution-phase.ts | 6 ++-- .../enemy-party-member-pokemon-phase.ts | 4 +-- src/phases/exp-phase.ts | 8 ++--- src/phases/field-phase.ts | 2 +- src/phases/game-over-modifier-reward-phase.ts | 6 ++-- src/phases/hide-party-exp-bar-phase.ts | 2 +- src/phases/learn-move-phase.ts | 18 +++++----- src/phases/level-cap-phase.ts | 4 +-- src/phases/level-up-phase.ts | 14 ++++---- src/phases/login-phase.ts | 12 +++---- src/phases/message-phase.ts | 4 +-- src/phases/modifier-reward-phase.ts | 4 +-- src/phases/money-reward-phase.ts | 8 ++--- src/phases/move-anim-test-phase.ts | 10 +++--- src/phases/move-effect-phase.ts | 28 +++++++-------- src/phases/move-end-phase.ts | 6 ++-- src/phases/move-header-phase.ts | 6 ++-- src/phases/move-phase.ts | 36 +++++++++---------- src/phases/new-biome-encounter-phase.ts | 6 ++-- src/phases/next-encounter-phase.ts | 2 +- src/phases/obtain-status-effect-phase.ts | 14 ++++---- src/phases/outdated-phase.ts | 6 ++-- src/phases/party-heal-phase.ts | 4 +-- src/phases/party-member-pokemon-phase.ts | 4 +-- src/phases/party-status-cure-phase.ts | 6 ++-- .../player-party-member-pokemon-phase.ts | 4 +-- src/phases/pokemon-heal-phase.ts | 20 +++++------ src/phases/pokemon-phase.ts | 6 ++-- src/phases/post-game-over-phase.ts | 4 +-- src/phases/post-summon-phase.ts | 10 +++--- src/phases/post-turn-status-effect-phase.ts | 18 +++++----- src/phases/quiet-form-change-phase.ts | 14 ++++---- src/phases/reload-session-phase.ts | 8 ++--- src/phases/return-phase.ts | 4 +-- src/phases/ribbon-modifier-reward-phase.ts | 8 ++--- src/phases/scan-ivs-phase.ts | 14 ++++---- src/phases/select-biome-phase.ts | 14 ++++---- src/phases/select-challenge-phase.ts | 6 ++-- src/phases/select-gender-phase.ts | 10 +++--- src/phases/select-modifier-phase.ts | 16 ++++----- src/phases/select-starter-phase.ts | 24 ++++++------- src/phases/select-target-phase.ts | 8 ++--- src/phases/shiny-sparkle-phase.ts | 4 +-- src/phases/show-ability-phase.ts | 4 +-- src/phases/show-party-exp-bar-phase.ts | 8 ++--- src/phases/show-trainer-phase.ts | 4 +-- src/phases/summon-missing-phase.ts | 4 +-- src/phases/summon-phase.ts | 18 +++++----- src/phases/switch-biome-phase.ts | 6 ++-- src/phases/switch-phase.ts | 6 ++-- src/phases/switch-summon-phase.ts | 20 +++++------ src/phases/test-message-phase.ts | 2 +- src/phases/title-phase.ts | 34 +++++++++--------- src/phases/toggle-double-position-phase.ts | 4 +-- src/phases/trainer-message-test-phase.ts | 6 ++-- src/phases/trainer-victory-phase.ts | 12 +++---- src/phases/turn-end-phase.ts | 18 +++++----- src/phases/turn-init-phase.ts | 8 ++--- src/phases/unavailable-phase.ts | 6 ++-- src/phases/unlock-phase.ts | 8 ++--- src/phases/victory-phase.ts | 10 +++--- src/phases/weather-effect-phase.ts | 2 +- src/plugins/i18n.ts | 22 ++++++------ src/system/arena-data.ts | 2 +- src/system/challenge-data.ts | 2 +- src/system/egg-data.ts | 2 +- src/system/game-data.ts | 24 ++++++------- src/system/settings/settings.ts | 2 +- src/system/voucher.ts | 4 +-- src/test/abilities/tera_shell.test.ts | 2 +- src/test/battle/damage_calculation.test.ts | 2 +- src/test/moves/gigaton_hammer.test.ts | 2 +- src/test/moves/lunar_blessing.test.ts | 4 +-- src/test/utils/helpers/overridesHelper.ts | 10 +++--- src/test/utils/testUtils.ts | 2 +- src/ui/ability-bar.ts | 2 +- src/ui/admin-ui-handler.ts | 4 +-- src/ui/arena-flyout.ts | 10 +++--- src/ui/ball-ui-handler.ts | 2 +- src/ui/battle-flyout.ts | 6 ++-- src/ui/command-ui-handler.ts | 4 +-- src/ui/dropdown.ts | 4 +-- src/ui/egg-counter-container.ts | 4 +-- src/ui/egg-hatch-scene-handler.ts | 2 +- src/ui/fight-ui-handler.ts | 6 ++-- src/ui/filter-bar.ts | 2 +- src/ui/party-ui-handler.ts | 8 ++--- src/ui/rename-form-ui-handler.ts | 2 +- src/ui/run-info-ui-handler.ts | 15 ++++---- src/ui/save-slot-select-ui-handler.ts | 8 ++--- .../settings/abstract-settings-ui-handler.ts | 2 +- .../settings/move-touch-controls-handler.ts | 4 +-- src/ui/settings/navigationMenu.ts | 2 +- src/ui/settings/settings-audio-ui-handler.ts | 2 +- .../settings/settings-display-ui-handler.ts | 2 +- .../settings/settings-gamepad-ui-handler.ts | 2 +- .../settings/settings-keyboard-ui-handler.ts | 2 +- src/ui/time-of-day-widget.ts | 2 +- src/ui/title-ui-handler.ts | 2 +- vite.config.ts | 1 + 123 files changed, 456 insertions(+), 460 deletions(-) diff --git a/src/@types/common.ts b/src/@types/common.ts index 6868d766008..fcd946656dc 100644 --- a/src/@types/common.ts +++ b/src/@types/common.ts @@ -1,3 +1,3 @@ -import BattleScene from "#app/battle-scene.js"; +import BattleScene from "#app/battle-scene"; export type ConditionFn = (scene: BattleScene, args?: any[]) => boolean; diff --git a/src/@types/i18next.d.ts b/src/@types/i18next.d.ts index d895659acef..9e8418a8977 100644 --- a/src/@types/i18next.d.ts +++ b/src/@types/i18next.d.ts @@ -1,4 +1,4 @@ -import { type enConfig } from "#app/locales/en/config.js"; +import { type enConfig } from "#app/locales/en/config"; import { TOptions } from "i18next"; //TODO: this needs to be type properly in the future diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 9123a213f4c..ff4258a13f5 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -63,7 +63,7 @@ import { Moves } from "#enums/moves"; import { PlayerGender } from "#enums/player-gender"; import { Species } from "#enums/species"; import { UiTheme } from "#enums/ui-theme"; -import { TimedEventManager } from "#app/timed-event-manager.js"; +import { TimedEventManager } from "#app/timed-event-manager"; import i18next from "i18next"; import { TrainerType } from "#enums/trainer-type"; import { battleSpecDialogue } from "./data/dialogue"; diff --git a/src/configs/inputs/pad_procon.ts b/src/configs/inputs/pad_procon.ts index 8cb707f882a..be751cc3acc 100644 --- a/src/configs/inputs/pad_procon.ts +++ b/src/configs/inputs/pad_procon.ts @@ -1,4 +1,4 @@ -import {SettingGamepad} from "#app/system/settings/settings-gamepad.js"; +import {SettingGamepad} from "#app/system/settings/settings-gamepad"; import {Button} from "#enums/buttons"; /** diff --git a/src/data/challenge.ts b/src/data/challenge.ts index 62751b92f9c..2205519c532 100644 --- a/src/data/challenge.ts +++ b/src/data/challenge.ts @@ -1,18 +1,18 @@ import * as Utils from "../utils"; import i18next from "i18next"; -import { defaultStarterSpecies, DexAttrProps, GameData } from "#app/system/game-data.js"; +import { defaultStarterSpecies, DexAttrProps, GameData } from "#app/system/game-data"; import PokemonSpecies, { getPokemonSpecies, getPokemonSpeciesForm, speciesStarters } from "./pokemon-species"; -import Pokemon, { PokemonMove } from "#app/field/pokemon.js"; -import { BattleType, FixedBattleConfig } from "#app/battle.js"; -import Trainer, { TrainerVariant } from "#app/field/trainer.js"; -import { GameMode } from "#app/game-mode.js"; +import Pokemon, { PokemonMove } from "#app/field/pokemon"; +import { BattleType, FixedBattleConfig } from "#app/battle"; +import Trainer, { TrainerVariant } from "#app/field/trainer"; +import { GameMode } from "#app/game-mode"; import { Type } from "./type"; import { Challenges } from "#enums/challenges"; import { Species } from "#enums/species"; import { TrainerType } from "#enums/trainer-type"; import { Nature } from "./nature"; -import { Moves } from "#app/enums/moves.js"; -import { TypeColor, TypeShadow } from "#app/enums/color.js"; +import { Moves } from "#app/enums/moves"; +import { TypeColor, TypeShadow } from "#app/enums/color"; import { pokemonEvolutions } from "./pokemon-evolutions"; import { pokemonFormChanges } from "./pokemon-forms"; diff --git a/src/data/egg.ts b/src/data/egg.ts index 508263c9c8e..ce27030ebef 100644 --- a/src/data/egg.ts +++ b/src/data/egg.ts @@ -8,7 +8,7 @@ import { PlayerPokemon } from "#app/field/pokemon"; import i18next from "i18next"; import { EggTier } from "#enums/egg-type"; import { Species } from "#enums/species"; -import { EggSourceType } from "#app/enums/egg-source-types.js"; +import { EggSourceType } from "#app/enums/egg-source-types"; export const EGG_SEED = 1073741824; diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts index bc815b91f3a..0d3e511bcba 100644 --- a/src/data/pokemon-forms.ts +++ b/src/data/pokemon-forms.ts @@ -8,7 +8,7 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { TimeOfDay } from "#enums/time-of-day"; -import { getPokemonNameWithAffix } from "#app/messages.js"; +import { getPokemonNameWithAffix } from "#app/messages"; import i18next from "i18next"; import { WeatherType } from "./weather"; diff --git a/src/data/terrain.ts b/src/data/terrain.ts index d4789078af7..6db68b92239 100644 --- a/src/data/terrain.ts +++ b/src/data/terrain.ts @@ -4,7 +4,7 @@ import { Type } from "./type"; import * as Utils from "../utils"; import { ChangeMovePriorityAbAttr, applyAbAttrs } from "./ability"; import { ProtectAttr } from "./move"; -import { BattlerIndex } from "#app/battle.js"; +import { BattlerIndex } from "#app/battle"; import i18next from "i18next"; export enum TerrainType { diff --git a/src/data/variant.ts b/src/data/variant.ts index 48369d112db..b7a01a4be89 100644 --- a/src/data/variant.ts +++ b/src/data/variant.ts @@ -1,4 +1,4 @@ -import { VariantTier } from "#app/enums/variant-tier.js"; +import { VariantTier } from "#app/enums/variant-tier"; export type Variant = 0 | 1 | 2; diff --git a/src/events/arena.ts b/src/events/arena.ts index 9fbbe572601..c05e67d353c 100644 --- a/src/events/arena.ts +++ b/src/events/arena.ts @@ -1,7 +1,7 @@ -import { ArenaTagSide } from "#app/data/arena-tag.js"; +import { ArenaTagSide } from "#app/data/arena-tag"; import { ArenaTagType } from "#enums/arena-tag-type"; -import { TerrainType } from "#app/data/terrain.js"; -import { WeatherType } from "#app/data/weather.js"; +import { TerrainType } from "#app/data/terrain"; +import { WeatherType } from "#app/data/weather"; /** Alias for all {@linkcode ArenaEvent} type strings */ export enum ArenaEventType { diff --git a/src/inputs-controller.ts b/src/inputs-controller.ts index 652e3d58062..bb3cfcbeb3b 100644 --- a/src/inputs-controller.ts +++ b/src/inputs-controller.ts @@ -16,7 +16,7 @@ import { getIconForLatestInput, swap, } from "#app/configs/inputs/configHandler"; import BattleScene from "./battle-scene"; -import {SettingGamepad} from "#app/system/settings/settings-gamepad.js"; +import {SettingGamepad} from "#app/system/settings/settings-gamepad"; import {SettingKeyboard} from "#app/system/settings/settings-keyboard"; import TouchControl from "#app/touch-controls"; import { Button } from "#enums/buttons"; diff --git a/src/main.ts b/src/main.ts index 8a69d3f1b72..b5f813bdf2f 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,8 +4,8 @@ import InvertPostFX from "./pipelines/invert"; import { version } from "../package.json"; import UIPlugin from "phaser3-rex-plugins/templates/ui/ui-plugin"; import BBCodeTextPlugin from "phaser3-rex-plugins/plugins/bbcodetext-plugin"; -import InputTextPlugin from "phaser3-rex-plugins/plugins/inputtext-plugin.js"; -import TransitionImagePackPlugin from "phaser3-rex-plugins/templates/transitionimagepack/transitionimagepack-plugin.js"; +import InputTextPlugin from "phaser3-rex-plugins/plugins/inputtext-plugin"; +import TransitionImagePackPlugin from "phaser3-rex-plugins/templates/transitionimagepack/transitionimagepack-plugin"; import { LoadingScene } from "./loading-scene"; diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index d6cfd017829..fdfe60332f5 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -25,7 +25,7 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { getPokemonNameWithAffix } from "#app/messages.js"; +import { getPokemonNameWithAffix } from "#app/messages"; import { PermanentStat, TEMP_BATTLE_STATS, TempBattleStat, Stat, getStatKey } from "#app/enums/stat"; const outputModifierData = false; diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index c1d58a7bf39..0b105a0c852 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -26,9 +26,9 @@ import i18next from "i18next"; import { allMoves } from "#app/data/move"; import { Abilities } from "#app/enums/abilities"; -import { LearnMovePhase } from "#app/phases/learn-move-phase.js"; -import { LevelUpPhase } from "#app/phases/level-up-phase.js"; -import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase.js"; +import { LearnMovePhase } from "#app/phases/learn-move-phase"; +import { LevelUpPhase } from "#app/phases/level-up-phase"; +import { PokemonHealPhase } from "#app/phases/pokemon-heal-phase"; export type ModifierPredicate = (modifier: Modifier) => boolean; diff --git a/src/phases/add-enemy-buff-modifier-phase.ts b/src/phases/add-enemy-buff-modifier-phase.ts index a9936eb765d..451e6e2662c 100644 --- a/src/phases/add-enemy-buff-modifier-phase.ts +++ b/src/phases/add-enemy-buff-modifier-phase.ts @@ -1,8 +1,8 @@ -import BattleScene from "#app/battle-scene.js"; -import { ModifierTier } from "#app/modifier/modifier-tier.js"; -import { regenerateModifierPoolThresholds, ModifierPoolType, getEnemyBuffModifierForWave } from "#app/modifier/modifier-type.js"; -import { EnemyPersistentModifier } from "#app/modifier/modifier.js"; -import { Phase } from "#app/phase.js"; +import BattleScene from "#app/battle-scene"; +import { ModifierTier } from "#app/modifier/modifier-tier"; +import { regenerateModifierPoolThresholds, ModifierPoolType, getEnemyBuffModifierForWave } from "#app/modifier/modifier-type"; +import { EnemyPersistentModifier } from "#app/modifier/modifier"; +import { Phase } from "#app/phase"; export class AddEnemyBuffModifierPhase extends Phase { constructor(scene: BattleScene) { diff --git a/src/phases/attempt-capture-phase.ts b/src/phases/attempt-capture-phase.ts index 72995c0f006..55a82affaf6 100644 --- a/src/phases/attempt-capture-phase.ts +++ b/src/phases/attempt-capture-phase.ts @@ -1,17 +1,17 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex } from "#app/battle.js"; -import { getPokeballCatchMultiplier, getPokeballAtlasKey, getPokeballTintColor, doPokeballBounceAnim } from "#app/data/pokeball.js"; -import { getStatusEffectCatchRateMultiplier } from "#app/data/status-effect.js"; -import { PokeballType } from "#app/enums/pokeball.js"; -import { StatusEffect } from "#app/enums/status-effect.js"; -import { addPokeballOpenParticles, addPokeballCaptureStars } from "#app/field/anims.js"; -import { EnemyPokemon } from "#app/field/pokemon.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; -import { PokemonHeldItemModifier } from "#app/modifier/modifier.js"; -import { achvs } from "#app/system/achv.js"; -import { PartyUiMode, PartyOption } from "#app/ui/party-ui-handler.js"; -import { SummaryUiMode } from "#app/ui/summary-ui-handler.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex } from "#app/battle"; +import { getPokeballCatchMultiplier, getPokeballAtlasKey, getPokeballTintColor, doPokeballBounceAnim } from "#app/data/pokeball"; +import { getStatusEffectCatchRateMultiplier } from "#app/data/status-effect"; +import { PokeballType } from "#app/enums/pokeball"; +import { StatusEffect } from "#app/enums/status-effect"; +import { addPokeballOpenParticles, addPokeballCaptureStars } from "#app/field/anims"; +import { EnemyPokemon } from "#app/field/pokemon"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { PokemonHeldItemModifier } from "#app/modifier/modifier"; +import { achvs } from "#app/system/achv"; +import { PartyUiMode, PartyOption } from "#app/ui/party-ui-handler"; +import { SummaryUiMode } from "#app/ui/summary-ui-handler"; +import { Mode } from "#app/ui/ui"; import i18next from "i18next"; import { PokemonPhase } from "./pokemon-phase"; import { VictoryPhase } from "./victory-phase"; diff --git a/src/phases/battle-end-phase.ts b/src/phases/battle-end-phase.ts index 06315668a8b..f08e04b443a 100644 --- a/src/phases/battle-end-phase.ts +++ b/src/phases/battle-end-phase.ts @@ -1,5 +1,5 @@ -import { applyPostBattleAbAttrs, PostBattleAbAttr } from "#app/data/ability.js"; -import { LapsingPersistentModifier, LapsingPokemonHeldItemModifier } from "#app/modifier/modifier.js"; +import { applyPostBattleAbAttrs, PostBattleAbAttr } from "#app/data/ability"; +import { LapsingPersistentModifier, LapsingPokemonHeldItemModifier } from "#app/modifier/modifier"; import { BattlePhase } from "./battle-phase"; import { GameOverPhase } from "./game-over-phase"; diff --git a/src/phases/battle-phase.ts b/src/phases/battle-phase.ts index 3e7e0e28596..b51e19bdf0e 100644 --- a/src/phases/battle-phase.ts +++ b/src/phases/battle-phase.ts @@ -1,6 +1,6 @@ -import BattleScene from "#app/battle-scene.js"; -import { TrainerSlot } from "#app/data/trainer-config.js"; -import { Phase } from "#app/phase.js"; +import BattleScene from "#app/battle-scene"; +import { TrainerSlot } from "#app/data/trainer-config"; +import { Phase } from "#app/phase"; export class BattlePhase extends Phase { constructor(scene: BattleScene) { diff --git a/src/phases/berry-phase.ts b/src/phases/berry-phase.ts index 504fb6ec163..66ecaa6c7f8 100644 --- a/src/phases/berry-phase.ts +++ b/src/phases/berry-phase.ts @@ -1,10 +1,10 @@ -import { applyAbAttrs, PreventBerryUseAbAttr, HealFromBerryUseAbAttr } from "#app/data/ability.js"; -import { CommonAnim } from "#app/data/battle-anims.js"; -import { BerryUsedEvent } from "#app/events/battle-scene.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; -import { BerryModifier } from "#app/modifier/modifier.js"; +import { applyAbAttrs, PreventBerryUseAbAttr, HealFromBerryUseAbAttr } from "#app/data/ability"; +import { CommonAnim } from "#app/data/battle-anims"; +import { BerryUsedEvent } from "#app/events/battle-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { BerryModifier } from "#app/modifier/modifier"; import i18next from "i18next"; -import * as Utils from "#app/utils.js"; +import * as Utils from "#app/utils"; import { FieldPhase } from "./field-phase"; import { CommonAnimPhase } from "./common-anim-phase"; diff --git a/src/phases/check-switch-phase.ts b/src/phases/check-switch-phase.ts index cd8f2b00c46..a069ba224a2 100644 --- a/src/phases/check-switch-phase.ts +++ b/src/phases/check-switch-phase.ts @@ -1,8 +1,8 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattleStyle } from "#app/enums/battle-style.js"; -import { BattlerTagType } from "#app/enums/battler-tag-type.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import { BattleStyle } from "#app/enums/battle-style"; +import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { Mode } from "#app/ui/ui"; import i18next from "i18next"; import { BattlePhase } from "./battle-phase"; import { PostSummonPhase } from "./post-summon-phase"; diff --git a/src/phases/common-anim-phase.ts b/src/phases/common-anim-phase.ts index d3663abe3b6..a85cd7629d9 100644 --- a/src/phases/common-anim-phase.ts +++ b/src/phases/common-anim-phase.ts @@ -1,6 +1,6 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex } from "#app/battle.js"; -import { CommonAnim, CommonBattleAnim } from "#app/data/battle-anims.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex } from "#app/battle"; +import { CommonAnim, CommonBattleAnim } from "#app/data/battle-anims"; import { PokemonPhase } from "./pokemon-phase"; export class CommonAnimPhase extends PokemonPhase { diff --git a/src/phases/damage-phase.ts b/src/phases/damage-phase.ts index 029c1e717f1..5add0345358 100644 --- a/src/phases/damage-phase.ts +++ b/src/phases/damage-phase.ts @@ -1,8 +1,8 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex } from "#app/battle.js"; -import { BattleSpec } from "#app/enums/battle-spec.js"; -import { DamageResult, HitResult } from "#app/field/pokemon.js"; -import * as Utils from "#app/utils.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex } from "#app/battle"; +import { BattleSpec } from "#app/enums/battle-spec"; +import { DamageResult, HitResult } from "#app/field/pokemon"; +import * as Utils from "#app/utils"; import { PokemonPhase } from "./pokemon-phase"; export class DamagePhase extends PokemonPhase { diff --git a/src/phases/end-card-phase.ts b/src/phases/end-card-phase.ts index 0b70664b993..274a745017a 100644 --- a/src/phases/end-card-phase.ts +++ b/src/phases/end-card-phase.ts @@ -1,7 +1,7 @@ -import BattleScene from "#app/battle-scene.js"; -import { PlayerGender } from "#app/enums/player-gender.js"; -import { Phase } from "#app/phase.js"; -import { addTextObject, TextStyle } from "#app/ui/text.js"; +import BattleScene from "#app/battle-scene"; +import { PlayerGender } from "#app/enums/player-gender"; +import { Phase } from "#app/phase"; +import { addTextObject, TextStyle } from "#app/ui/text"; import i18next from "i18next"; export class EndCardPhase extends Phase { diff --git a/src/phases/end-evolution-phase.ts b/src/phases/end-evolution-phase.ts index 2a6d492a425..8a6ce52553d 100644 --- a/src/phases/end-evolution-phase.ts +++ b/src/phases/end-evolution-phase.ts @@ -1,6 +1,6 @@ -import BattleScene from "#app/battle-scene.js"; -import { Phase } from "#app/phase.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import { Phase } from "#app/phase"; +import { Mode } from "#app/ui/ui"; export class EndEvolutionPhase extends Phase { diff --git a/src/phases/enemy-party-member-pokemon-phase.ts b/src/phases/enemy-party-member-pokemon-phase.ts index 10af0913f93..bb34f53b475 100644 --- a/src/phases/enemy-party-member-pokemon-phase.ts +++ b/src/phases/enemy-party-member-pokemon-phase.ts @@ -1,5 +1,5 @@ -import BattleScene from "#app/battle-scene.js"; -import { EnemyPokemon } from "#app/field/pokemon.js"; +import BattleScene from "#app/battle-scene"; +import { EnemyPokemon } from "#app/field/pokemon"; import { PartyMemberPokemonPhase } from "./party-member-pokemon-phase"; export abstract class EnemyPartyMemberPokemonPhase extends PartyMemberPokemonPhase { diff --git a/src/phases/exp-phase.ts b/src/phases/exp-phase.ts index 9c2ba95d550..81982980d2a 100644 --- a/src/phases/exp-phase.ts +++ b/src/phases/exp-phase.ts @@ -1,8 +1,8 @@ -import BattleScene from "#app/battle-scene.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; -import { ExpBoosterModifier } from "#app/modifier/modifier.js"; +import BattleScene from "#app/battle-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { ExpBoosterModifier } from "#app/modifier/modifier"; import i18next from "i18next"; -import * as Utils from "#app/utils.js"; +import * as Utils from "#app/utils"; import { PlayerPartyMemberPokemonPhase } from "./player-party-member-pokemon-phase"; import { LevelUpPhase } from "./level-up-phase"; diff --git a/src/phases/field-phase.ts b/src/phases/field-phase.ts index b65e903a32b..46c3c4983b4 100644 --- a/src/phases/field-phase.ts +++ b/src/phases/field-phase.ts @@ -1,4 +1,4 @@ -import Pokemon from "#app/field/pokemon.js"; +import Pokemon from "#app/field/pokemon"; import { BattlePhase } from "./battle-phase"; type PokemonFunc = (pokemon: Pokemon) => void; diff --git a/src/phases/game-over-modifier-reward-phase.ts b/src/phases/game-over-modifier-reward-phase.ts index c27659bf9d4..a698e62e2e1 100644 --- a/src/phases/game-over-modifier-reward-phase.ts +++ b/src/phases/game-over-modifier-reward-phase.ts @@ -1,6 +1,6 @@ -import BattleScene from "#app/battle-scene.js"; -import { ModifierTypeFunc } from "#app/modifier/modifier-type.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import { ModifierTypeFunc } from "#app/modifier/modifier-type"; +import { Mode } from "#app/ui/ui"; import i18next from "i18next"; import { ModifierRewardPhase } from "./modifier-reward-phase"; diff --git a/src/phases/hide-party-exp-bar-phase.ts b/src/phases/hide-party-exp-bar-phase.ts index c2c9d96462e..303650ea1ad 100644 --- a/src/phases/hide-party-exp-bar-phase.ts +++ b/src/phases/hide-party-exp-bar-phase.ts @@ -1,4 +1,4 @@ -import BattleScene from "#app/battle-scene.js"; +import BattleScene from "#app/battle-scene"; import { BattlePhase } from "./battle-phase"; export class HidePartyExpBarPhase extends BattlePhase { diff --git a/src/phases/learn-move-phase.ts b/src/phases/learn-move-phase.ts index 201019e8860..049fc6951b6 100644 --- a/src/phases/learn-move-phase.ts +++ b/src/phases/learn-move-phase.ts @@ -1,12 +1,12 @@ -import BattleScene from "#app/battle-scene.js"; -import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims.js"; -import { allMoves } from "#app/data/move.js"; -import { SpeciesFormChangeMoveLearnedTrigger } from "#app/data/pokemon-forms.js"; -import { Moves } from "#app/enums/moves.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; -import EvolutionSceneHandler from "#app/ui/evolution-scene-handler.js"; -import { SummaryUiMode } from "#app/ui/summary-ui-handler.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims"; +import { allMoves } from "#app/data/move"; +import { SpeciesFormChangeMoveLearnedTrigger } from "#app/data/pokemon-forms"; +import { Moves } from "#app/enums/moves"; +import { getPokemonNameWithAffix } from "#app/messages"; +import EvolutionSceneHandler from "#app/ui/evolution-scene-handler"; +import { SummaryUiMode } from "#app/ui/summary-ui-handler"; +import { Mode } from "#app/ui/ui"; import i18next from "i18next"; import { PlayerPartyMemberPokemonPhase } from "./player-party-member-pokemon-phase"; diff --git a/src/phases/level-cap-phase.ts b/src/phases/level-cap-phase.ts index db59fbd6473..d1404e45010 100644 --- a/src/phases/level-cap-phase.ts +++ b/src/phases/level-cap-phase.ts @@ -1,5 +1,5 @@ -import BattleScene from "#app/battle-scene.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import { Mode } from "#app/ui/ui"; import i18next from "i18next"; import { FieldPhase } from "./field-phase"; diff --git a/src/phases/level-up-phase.ts b/src/phases/level-up-phase.ts index a8a6b8f3d80..a99e038acba 100644 --- a/src/phases/level-up-phase.ts +++ b/src/phases/level-up-phase.ts @@ -1,11 +1,11 @@ -import BattleScene from "#app/battle-scene.js"; -import { ExpNotification } from "#app/enums/exp-notification.js"; -import { EvolutionPhase } from "#app/phases/evolution-phase.js"; -import { PlayerPokemon } from "#app/field/pokemon.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; -import { LevelAchv } from "#app/system/achv.js"; +import BattleScene from "#app/battle-scene"; +import { ExpNotification } from "#app/enums/exp-notification"; +import { EvolutionPhase } from "#app/phases/evolution-phase"; +import { PlayerPokemon } from "#app/field/pokemon"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { LevelAchv } from "#app/system/achv"; import i18next from "i18next"; -import * as Utils from "#app/utils.js"; +import * as Utils from "#app/utils"; import { PlayerPartyMemberPokemonPhase } from "./player-party-member-pokemon-phase"; import { LearnMovePhase } from "./learn-move-phase"; diff --git a/src/phases/login-phase.ts b/src/phases/login-phase.ts index b58cc9bca1f..89ced201e9e 100644 --- a/src/phases/login-phase.ts +++ b/src/phases/login-phase.ts @@ -1,10 +1,10 @@ -import { updateUserInfo } from "#app/account.js"; -import BattleScene, { bypassLogin } from "#app/battle-scene.js"; -import { Phase } from "#app/phase.js"; -import { handleTutorial, Tutorial } from "#app/tutorial.js"; -import { Mode } from "#app/ui/ui.js"; +import { updateUserInfo } from "#app/account"; +import BattleScene, { bypassLogin } from "#app/battle-scene"; +import { Phase } from "#app/phase"; +import { handleTutorial, Tutorial } from "#app/tutorial"; +import { Mode } from "#app/ui/ui"; import i18next, { t } from "i18next"; -import * as Utils from "#app/utils.js"; +import * as Utils from "#app/utils"; import { SelectGenderPhase } from "./select-gender-phase"; import { UnavailablePhase } from "./unavailable-phase"; diff --git a/src/phases/message-phase.ts b/src/phases/message-phase.ts index 46e907ae2ba..2244980c899 100644 --- a/src/phases/message-phase.ts +++ b/src/phases/message-phase.ts @@ -1,5 +1,5 @@ -import BattleScene from "#app/battle-scene.js"; -import { Phase } from "#app/phase.js"; +import BattleScene from "#app/battle-scene"; +import { Phase } from "#app/phase"; export class MessagePhase extends Phase { private text: string; diff --git a/src/phases/modifier-reward-phase.ts b/src/phases/modifier-reward-phase.ts index 4d083a367a6..20a8366d9c6 100644 --- a/src/phases/modifier-reward-phase.ts +++ b/src/phases/modifier-reward-phase.ts @@ -1,5 +1,5 @@ -import BattleScene from "#app/battle-scene.js"; -import { ModifierType, ModifierTypeFunc, getModifierType } from "#app/modifier/modifier-type.js"; +import BattleScene from "#app/battle-scene"; +import { ModifierType, ModifierTypeFunc, getModifierType } from "#app/modifier/modifier-type"; import i18next from "i18next"; import { BattlePhase } from "./battle-phase"; diff --git a/src/phases/money-reward-phase.ts b/src/phases/money-reward-phase.ts index e0bff608972..2f0a4f7b990 100644 --- a/src/phases/money-reward-phase.ts +++ b/src/phases/money-reward-phase.ts @@ -1,8 +1,8 @@ -import BattleScene from "#app/battle-scene.js"; -import { ArenaTagType } from "#app/enums/arena-tag-type.js"; -import { MoneyMultiplierModifier } from "#app/modifier/modifier.js"; +import BattleScene from "#app/battle-scene"; +import { ArenaTagType } from "#app/enums/arena-tag-type"; +import { MoneyMultiplierModifier } from "#app/modifier/modifier"; import i18next from "i18next"; -import * as Utils from "#app/utils.js"; +import * as Utils from "#app/utils"; import { BattlePhase } from "./battle-phase"; export class MoneyRewardPhase extends BattlePhase { diff --git a/src/phases/move-anim-test-phase.ts b/src/phases/move-anim-test-phase.ts index 7fb3c1d61e7..2d3b54bfd9a 100644 --- a/src/phases/move-anim-test-phase.ts +++ b/src/phases/move-anim-test-phase.ts @@ -1,8 +1,8 @@ -import BattleScene from "#app/battle-scene.js"; -import { initMoveAnim, loadMoveAnimAssets, MoveAnim } from "#app/data/battle-anims.js"; -import { allMoves, SelfStatusMove } from "#app/data/move.js"; -import { Moves } from "#app/enums/moves.js"; -import * as Utils from "#app/utils.js"; +import BattleScene from "#app/battle-scene"; +import { initMoveAnim, loadMoveAnimAssets, MoveAnim } from "#app/data/battle-anims"; +import { allMoves, SelfStatusMove } from "#app/data/move"; +import { Moves } from "#app/enums/moves"; +import * as Utils from "#app/utils"; import { BattlePhase } from "./battle-phase"; export class MoveAnimTestPhase extends BattlePhase { diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts index 9b22c520e19..fb2b82ada03 100644 --- a/src/phases/move-effect-phase.ts +++ b/src/phases/move-effect-phase.ts @@ -1,18 +1,18 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex } from "#app/battle.js"; -import { applyPreAttackAbAttrs, AddSecondStrikeAbAttr, IgnoreMoveEffectsAbAttr, applyPostDefendAbAttrs, PostDefendAbAttr, applyPostAttackAbAttrs, PostAttackAbAttr, MaxMultiHitAbAttr, AlwaysHitAbAttr } from "#app/data/ability.js"; -import { ArenaTagSide, ConditionalProtectTag } from "#app/data/arena-tag.js"; -import { MoveAnim } from "#app/data/battle-anims.js"; -import { BattlerTagLapseType, ProtectedTag, SemiInvulnerableTag } from "#app/data/battler-tags.js"; -import { MoveTarget, applyMoveAttrs, OverrideMoveEffectAttr, MultiHitAttr, AttackMove, FixedDamageAttr, VariableTargetAttr, MissEffectAttr, MoveFlags, applyFilteredMoveAttrs, MoveAttr, MoveEffectAttr, MoveEffectTrigger, ChargeAttr, MoveCategory, NoEffectAttr, HitsTagAttr } from "#app/data/move.js"; -import { SpeciesFormChangePostMoveTrigger } from "#app/data/pokemon-forms.js"; -import { BattlerTagType } from "#app/enums/battler-tag-type.js"; -import { Moves } from "#app/enums/moves.js"; -import Pokemon, { PokemonMove, MoveResult, HitResult } from "#app/field/pokemon.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; -import { PokemonMultiHitModifier, FlinchChanceModifier, EnemyAttackStatusEffectChanceModifier, ContactHeldItemTransferChanceModifier, HitHealModifier } from "#app/modifier/modifier.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex } from "#app/battle"; +import { applyPreAttackAbAttrs, AddSecondStrikeAbAttr, IgnoreMoveEffectsAbAttr, applyPostDefendAbAttrs, PostDefendAbAttr, applyPostAttackAbAttrs, PostAttackAbAttr, MaxMultiHitAbAttr, AlwaysHitAbAttr } from "#app/data/ability"; +import { ArenaTagSide, ConditionalProtectTag } from "#app/data/arena-tag"; +import { MoveAnim } from "#app/data/battle-anims"; +import { BattlerTagLapseType, ProtectedTag, SemiInvulnerableTag } from "#app/data/battler-tags"; +import { MoveTarget, applyMoveAttrs, OverrideMoveEffectAttr, MultiHitAttr, AttackMove, FixedDamageAttr, VariableTargetAttr, MissEffectAttr, MoveFlags, applyFilteredMoveAttrs, MoveAttr, MoveEffectAttr, MoveEffectTrigger, ChargeAttr, MoveCategory, NoEffectAttr, HitsTagAttr } from "#app/data/move"; +import { SpeciesFormChangePostMoveTrigger } from "#app/data/pokemon-forms"; +import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { Moves } from "#app/enums/moves"; +import Pokemon, { PokemonMove, MoveResult, HitResult } from "#app/field/pokemon"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { PokemonMultiHitModifier, FlinchChanceModifier, EnemyAttackStatusEffectChanceModifier, ContactHeldItemTransferChanceModifier, HitHealModifier } from "#app/modifier/modifier"; import i18next from "i18next"; -import * as Utils from "#app/utils.js"; +import * as Utils from "#app/utils"; import { PokemonPhase } from "./pokemon-phase"; export class MoveEffectPhase extends PokemonPhase { diff --git a/src/phases/move-end-phase.ts b/src/phases/move-end-phase.ts index 4bce2185aea..e03f2ec14b0 100644 --- a/src/phases/move-end-phase.ts +++ b/src/phases/move-end-phase.ts @@ -1,6 +1,6 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex } from "#app/battle.js"; -import { BattlerTagLapseType } from "#app/data/battler-tags.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex } from "#app/battle"; +import { BattlerTagLapseType } from "#app/data/battler-tags"; import { PokemonPhase } from "./pokemon-phase"; export class MoveEndPhase extends PokemonPhase { diff --git a/src/phases/move-header-phase.ts b/src/phases/move-header-phase.ts index 5166f287731..c307ff0be6e 100644 --- a/src/phases/move-header-phase.ts +++ b/src/phases/move-header-phase.ts @@ -1,6 +1,6 @@ -import BattleScene from "#app/battle-scene.js"; -import { applyMoveAttrs, MoveHeaderAttr } from "#app/data/move.js"; -import Pokemon, { PokemonMove } from "#app/field/pokemon.js"; +import BattleScene from "#app/battle-scene"; +import { applyMoveAttrs, MoveHeaderAttr } from "#app/data/move"; +import Pokemon, { PokemonMove } from "#app/field/pokemon"; import { BattlePhase } from "./battle-phase"; export class MoveHeaderPhase extends BattlePhase { diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts index 0ccf19a462f..8209bdd44d1 100644 --- a/src/phases/move-phase.ts +++ b/src/phases/move-phase.ts @@ -1,21 +1,21 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex } from "#app/battle.js"; -import { applyAbAttrs, applyPostMoveUsedAbAttrs, applyPreAttackAbAttrs, BlockRedirectAbAttr, IncreasePpAbAttr, PokemonTypeChangeAbAttr, PostMoveUsedAbAttr, RedirectMoveAbAttr } from "#app/data/ability.js"; -import { CommonAnim } from "#app/data/battle-anims.js"; -import { BattlerTagLapseType, CenterOfAttentionTag } from "#app/data/battler-tags.js"; -import { allMoves, applyMoveAttrs, BypassRedirectAttr, BypassSleepAttr, ChargeAttr, CopyMoveAttr, HealStatusEffectAttr, MoveFlags, PreMoveMessageAttr } from "#app/data/move.js"; -import { SpeciesFormChangePreMoveTrigger } from "#app/data/pokemon-forms.js"; -import { getStatusEffectActivationText, getStatusEffectHealText } from "#app/data/status-effect.js"; -import { Type } from "#app/data/type.js"; -import { getTerrainBlockMessage } from "#app/data/weather.js"; -import { Abilities } from "#app/enums/abilities.js"; -import { BattlerTagType } from "#app/enums/battler-tag-type.js"; -import { Moves } from "#app/enums/moves.js"; -import { StatusEffect } from "#app/enums/status-effect.js"; -import { MoveUsedEvent } from "#app/events/battle-scene.js"; -import Pokemon, { MoveResult, PokemonMove, TurnMove } from "#app/field/pokemon.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; -import * as Utils from "#app/utils.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex } from "#app/battle"; +import { applyAbAttrs, applyPostMoveUsedAbAttrs, applyPreAttackAbAttrs, BlockRedirectAbAttr, IncreasePpAbAttr, PokemonTypeChangeAbAttr, PostMoveUsedAbAttr, RedirectMoveAbAttr } from "#app/data/ability"; +import { CommonAnim } from "#app/data/battle-anims"; +import { BattlerTagLapseType, CenterOfAttentionTag } from "#app/data/battler-tags"; +import { allMoves, applyMoveAttrs, BypassRedirectAttr, BypassSleepAttr, ChargeAttr, CopyMoveAttr, HealStatusEffectAttr, MoveFlags, PreMoveMessageAttr } from "#app/data/move"; +import { SpeciesFormChangePreMoveTrigger } from "#app/data/pokemon-forms"; +import { getStatusEffectActivationText, getStatusEffectHealText } from "#app/data/status-effect"; +import { Type } from "#app/data/type"; +import { getTerrainBlockMessage } from "#app/data/weather"; +import { Abilities } from "#app/enums/abilities"; +import { BattlerTagType } from "#app/enums/battler-tag-type"; +import { Moves } from "#app/enums/moves"; +import { StatusEffect } from "#app/enums/status-effect"; +import { MoveUsedEvent } from "#app/events/battle-scene"; +import Pokemon, { MoveResult, PokemonMove, TurnMove } from "#app/field/pokemon"; +import { getPokemonNameWithAffix } from "#app/messages"; +import * as Utils from "#app/utils"; import i18next from "i18next"; import { BattlePhase } from "./battle-phase"; import { CommonAnimPhase } from "./common-anim-phase"; diff --git a/src/phases/new-biome-encounter-phase.ts b/src/phases/new-biome-encounter-phase.ts index c447e78f7b1..9f1209fb7ee 100644 --- a/src/phases/new-biome-encounter-phase.ts +++ b/src/phases/new-biome-encounter-phase.ts @@ -1,6 +1,6 @@ -import BattleScene from "#app/battle-scene.js"; -import { applyAbAttrs, PostBiomeChangeAbAttr } from "#app/data/ability.js"; -import { getRandomWeatherType } from "#app/data/weather.js"; +import BattleScene from "#app/battle-scene"; +import { applyAbAttrs, PostBiomeChangeAbAttr } from "#app/data/ability"; +import { getRandomWeatherType } from "#app/data/weather"; import { NextEncounterPhase } from "./next-encounter-phase"; export class NewBiomeEncounterPhase extends NextEncounterPhase { diff --git a/src/phases/next-encounter-phase.ts b/src/phases/next-encounter-phase.ts index 89987534fc0..d51aa374b6e 100644 --- a/src/phases/next-encounter-phase.ts +++ b/src/phases/next-encounter-phase.ts @@ -1,4 +1,4 @@ -import BattleScene from "#app/battle-scene.js"; +import BattleScene from "#app/battle-scene"; import { EncounterPhase } from "./encounter-phase"; export class NextEncounterPhase extends EncounterPhase { diff --git a/src/phases/obtain-status-effect-phase.ts b/src/phases/obtain-status-effect-phase.ts index ac6e66a2e9f..bb06fafb1c9 100644 --- a/src/phases/obtain-status-effect-phase.ts +++ b/src/phases/obtain-status-effect-phase.ts @@ -1,10 +1,10 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex } from "#app/battle.js"; -import { CommonBattleAnim, CommonAnim } from "#app/data/battle-anims.js"; -import { getStatusEffectObtainText, getStatusEffectOverlapText } from "#app/data/status-effect.js"; -import { StatusEffect } from "#app/enums/status-effect.js"; -import Pokemon from "#app/field/pokemon.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex } from "#app/battle"; +import { CommonBattleAnim, CommonAnim } from "#app/data/battle-anims"; +import { getStatusEffectObtainText, getStatusEffectOverlapText } from "#app/data/status-effect"; +import { StatusEffect } from "#app/enums/status-effect"; +import Pokemon from "#app/field/pokemon"; +import { getPokemonNameWithAffix } from "#app/messages"; import { PokemonPhase } from "./pokemon-phase"; import { PostTurnStatusEffectPhase } from "./post-turn-status-effect-phase"; diff --git a/src/phases/outdated-phase.ts b/src/phases/outdated-phase.ts index 72d1bb3671d..4baf16d2f56 100644 --- a/src/phases/outdated-phase.ts +++ b/src/phases/outdated-phase.ts @@ -1,6 +1,6 @@ -import BattleScene from "#app/battle-scene.js"; -import { Phase } from "#app/phase.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import { Phase } from "#app/phase"; +import { Mode } from "#app/ui/ui"; export class OutdatedPhase extends Phase { constructor(scene: BattleScene) { diff --git a/src/phases/party-heal-phase.ts b/src/phases/party-heal-phase.ts index d9179826a19..e6ee11202df 100644 --- a/src/phases/party-heal-phase.ts +++ b/src/phases/party-heal-phase.ts @@ -1,5 +1,5 @@ -import BattleScene from "#app/battle-scene.js"; -import * as Utils from "#app/utils.js"; +import BattleScene from "#app/battle-scene"; +import * as Utils from "#app/utils"; import { BattlePhase } from "./battle-phase"; export class PartyHealPhase extends BattlePhase { diff --git a/src/phases/party-member-pokemon-phase.ts b/src/phases/party-member-pokemon-phase.ts index 1f27826884e..2b6ca01261d 100644 --- a/src/phases/party-member-pokemon-phase.ts +++ b/src/phases/party-member-pokemon-phase.ts @@ -1,5 +1,5 @@ -import BattleScene from "#app/battle-scene.js"; -import Pokemon from "#app/field/pokemon.js"; +import BattleScene from "#app/battle-scene"; +import Pokemon from "#app/field/pokemon"; import { FieldPhase } from "./field-phase"; export abstract class PartyMemberPokemonPhase extends FieldPhase { diff --git a/src/phases/party-status-cure-phase.ts b/src/phases/party-status-cure-phase.ts index a11aa01b63a..e4903c7fc1f 100644 --- a/src/phases/party-status-cure-phase.ts +++ b/src/phases/party-status-cure-phase.ts @@ -1,6 +1,6 @@ -import BattleScene from "#app/battle-scene.js"; -import { Abilities } from "#app/enums/abilities.js"; -import Pokemon from "#app/field/pokemon.js"; +import BattleScene from "#app/battle-scene"; +import { Abilities } from "#app/enums/abilities"; +import Pokemon from "#app/field/pokemon"; import { BattlePhase } from "./battle-phase"; import { ShowAbilityPhase } from "./show-ability-phase"; diff --git a/src/phases/player-party-member-pokemon-phase.ts b/src/phases/player-party-member-pokemon-phase.ts index 4b1600b33d2..87855b9334c 100644 --- a/src/phases/player-party-member-pokemon-phase.ts +++ b/src/phases/player-party-member-pokemon-phase.ts @@ -1,5 +1,5 @@ -import BattleScene from "#app/battle-scene.js"; -import { PlayerPokemon } from "#app/field/pokemon.js"; +import BattleScene from "#app/battle-scene"; +import { PlayerPokemon } from "#app/field/pokemon"; import { PartyMemberPokemonPhase } from "./party-member-pokemon-phase"; export abstract class PlayerPartyMemberPokemonPhase extends PartyMemberPokemonPhase { diff --git a/src/phases/pokemon-heal-phase.ts b/src/phases/pokemon-heal-phase.ts index 6db8aeb4fca..49db2641e98 100644 --- a/src/phases/pokemon-heal-phase.ts +++ b/src/phases/pokemon-heal-phase.ts @@ -1,14 +1,14 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex } from "#app/battle.js"; -import { CommonAnim } from "#app/data/battle-anims.js"; -import { getStatusEffectHealText } from "#app/data/status-effect.js"; -import { StatusEffect } from "#app/enums/status-effect.js"; -import { HitResult, DamageResult } from "#app/field/pokemon.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; -import { HealingBoosterModifier } from "#app/modifier/modifier.js"; -import { HealAchv } from "#app/system/achv.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex } from "#app/battle"; +import { CommonAnim } from "#app/data/battle-anims"; +import { getStatusEffectHealText } from "#app/data/status-effect"; +import { StatusEffect } from "#app/enums/status-effect"; +import { HitResult, DamageResult } from "#app/field/pokemon"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { HealingBoosterModifier } from "#app/modifier/modifier"; +import { HealAchv } from "#app/system/achv"; import i18next from "i18next"; -import * as Utils from "#app/utils.js"; +import * as Utils from "#app/utils"; import { CommonAnimPhase } from "./common-anim-phase"; export class PokemonHealPhase extends CommonAnimPhase { diff --git a/src/phases/pokemon-phase.ts b/src/phases/pokemon-phase.ts index 871ee57d7a5..b980c1d1719 100644 --- a/src/phases/pokemon-phase.ts +++ b/src/phases/pokemon-phase.ts @@ -1,6 +1,6 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex } from "#app/battle.js"; -import Pokemon from "#app/field/pokemon.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex } from "#app/battle"; +import Pokemon from "#app/field/pokemon"; import { FieldPhase } from "./field-phase"; export abstract class PokemonPhase extends FieldPhase { diff --git a/src/phases/post-game-over-phase.ts b/src/phases/post-game-over-phase.ts index 02413b41a23..beeb30c7260 100644 --- a/src/phases/post-game-over-phase.ts +++ b/src/phases/post-game-over-phase.ts @@ -1,5 +1,5 @@ -import BattleScene from "#app/battle-scene.js"; -import { Phase } from "#app/phase.js"; +import BattleScene from "#app/battle-scene"; +import { Phase } from "#app/phase"; import { EndCardPhase } from "./end-card-phase"; import { TitlePhase } from "./title-phase"; diff --git a/src/phases/post-summon-phase.ts b/src/phases/post-summon-phase.ts index e671bf30ed1..47a5513f0eb 100644 --- a/src/phases/post-summon-phase.ts +++ b/src/phases/post-summon-phase.ts @@ -1,8 +1,8 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex } from "#app/battle.js"; -import { applyPostSummonAbAttrs, PostSummonAbAttr } from "#app/data/ability.js"; -import { ArenaTrapTag } from "#app/data/arena-tag.js"; -import { StatusEffect } from "#app/enums/status-effect.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex } from "#app/battle"; +import { applyPostSummonAbAttrs, PostSummonAbAttr } from "#app/data/ability"; +import { ArenaTrapTag } from "#app/data/arena-tag"; +import { StatusEffect } from "#app/enums/status-effect"; import { PokemonPhase } from "./pokemon-phase"; export class PostSummonPhase extends PokemonPhase { diff --git a/src/phases/post-turn-status-effect-phase.ts b/src/phases/post-turn-status-effect-phase.ts index 47db32303a5..413f9eae65e 100644 --- a/src/phases/post-turn-status-effect-phase.ts +++ b/src/phases/post-turn-status-effect-phase.ts @@ -1,12 +1,12 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex } from "#app/battle.js"; -import { applyAbAttrs, BlockNonDirectDamageAbAttr, BlockStatusDamageAbAttr, ReduceBurnDamageAbAttr } from "#app/data/ability.js"; -import { CommonBattleAnim, CommonAnim } from "#app/data/battle-anims.js"; -import { getStatusEffectActivationText } from "#app/data/status-effect.js"; -import { BattleSpec } from "#app/enums/battle-spec.js"; -import { StatusEffect } from "#app/enums/status-effect.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; -import * as Utils from "#app/utils.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex } from "#app/battle"; +import { applyAbAttrs, BlockNonDirectDamageAbAttr, BlockStatusDamageAbAttr, ReduceBurnDamageAbAttr } from "#app/data/ability"; +import { CommonBattleAnim, CommonAnim } from "#app/data/battle-anims"; +import { getStatusEffectActivationText } from "#app/data/status-effect"; +import { BattleSpec } from "#app/enums/battle-spec"; +import { StatusEffect } from "#app/enums/status-effect"; +import { getPokemonNameWithAffix } from "#app/messages"; +import * as Utils from "#app/utils"; import { PokemonPhase } from "./pokemon-phase"; export class PostTurnStatusEffectPhase extends PokemonPhase { diff --git a/src/phases/quiet-form-change-phase.ts b/src/phases/quiet-form-change-phase.ts index 3d30d36907e..6a1d31d137d 100644 --- a/src/phases/quiet-form-change-phase.ts +++ b/src/phases/quiet-form-change-phase.ts @@ -1,10 +1,10 @@ -import BattleScene from "#app/battle-scene.js"; -import { SemiInvulnerableTag } from "#app/data/battler-tags.js"; -import { SpeciesFormChange, getSpeciesFormChangeMessage } from "#app/data/pokemon-forms.js"; -import { getTypeRgb } from "#app/data/type.js"; -import { BattleSpec } from "#app/enums/battle-spec.js"; -import Pokemon, { EnemyPokemon } from "#app/field/pokemon.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; +import BattleScene from "#app/battle-scene"; +import { SemiInvulnerableTag } from "#app/data/battler-tags"; +import { SpeciesFormChange, getSpeciesFormChangeMessage } from "#app/data/pokemon-forms"; +import { getTypeRgb } from "#app/data/type"; +import { BattleSpec } from "#app/enums/battle-spec"; +import Pokemon, { EnemyPokemon } from "#app/field/pokemon"; +import { getPokemonNameWithAffix } from "#app/messages"; import { BattlePhase } from "./battle-phase"; import { MovePhase } from "./move-phase"; import { PokemonHealPhase } from "./pokemon-heal-phase"; diff --git a/src/phases/reload-session-phase.ts b/src/phases/reload-session-phase.ts index a61c52323bf..f8a38105869 100644 --- a/src/phases/reload-session-phase.ts +++ b/src/phases/reload-session-phase.ts @@ -1,7 +1,7 @@ -import BattleScene from "#app/battle-scene.js"; -import { Phase } from "#app/phase.js"; -import { Mode } from "#app/ui/ui.js"; -import * as Utils from "#app/utils.js"; +import BattleScene from "#app/battle-scene"; +import { Phase } from "#app/phase"; +import { Mode } from "#app/ui/ui"; +import * as Utils from "#app/utils"; export class ReloadSessionPhase extends Phase { private systemDataStr: string | null; diff --git a/src/phases/return-phase.ts b/src/phases/return-phase.ts index e1753670ad4..dfc458eb817 100644 --- a/src/phases/return-phase.ts +++ b/src/phases/return-phase.ts @@ -1,5 +1,5 @@ -import BattleScene from "#app/battle-scene.js"; -import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms.js"; +import BattleScene from "#app/battle-scene"; +import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms"; import { SwitchSummonPhase } from "./switch-summon-phase"; export class ReturnPhase extends SwitchSummonPhase { diff --git a/src/phases/ribbon-modifier-reward-phase.ts b/src/phases/ribbon-modifier-reward-phase.ts index 4a80325b7e7..fabb3bfa1b1 100644 --- a/src/phases/ribbon-modifier-reward-phase.ts +++ b/src/phases/ribbon-modifier-reward-phase.ts @@ -1,7 +1,7 @@ -import BattleScene from "#app/battle-scene.js"; -import PokemonSpecies from "#app/data/pokemon-species.js"; -import { ModifierTypeFunc } from "#app/modifier/modifier-type.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import PokemonSpecies from "#app/data/pokemon-species"; +import { ModifierTypeFunc } from "#app/modifier/modifier-type"; +import { Mode } from "#app/ui/ui"; import i18next from "i18next"; import { ModifierRewardPhase } from "./modifier-reward-phase"; diff --git a/src/phases/scan-ivs-phase.ts b/src/phases/scan-ivs-phase.ts index f5e1a814612..ba27e4f1943 100644 --- a/src/phases/scan-ivs-phase.ts +++ b/src/phases/scan-ivs-phase.ts @@ -1,10 +1,10 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex } from "#app/battle.js"; -import { CommonBattleAnim, CommonAnim } from "#app/data/battle-anims.js"; -import { Stat } from "#app/enums/stat.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; -import { getTextColor, TextStyle } from "#app/ui/text.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex } from "#app/battle"; +import { CommonBattleAnim, CommonAnim } from "#app/data/battle-anims"; +import { Stat } from "#app/enums/stat"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { getTextColor, TextStyle } from "#app/ui/text"; +import { Mode } from "#app/ui/ui"; import i18next from "i18next"; import { PokemonPhase } from "./pokemon-phase"; diff --git a/src/phases/select-biome-phase.ts b/src/phases/select-biome-phase.ts index 68c2cd29f26..fe9b5b3996b 100644 --- a/src/phases/select-biome-phase.ts +++ b/src/phases/select-biome-phase.ts @@ -1,11 +1,11 @@ -import BattleScene from "#app/battle-scene.js"; -import { biomeLinks, getBiomeName } from "#app/data/biomes.js"; -import { Biome } from "#app/enums/biome.js"; -import { MoneyInterestModifier, MapModifier } from "#app/modifier/modifier.js"; -import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import { biomeLinks, getBiomeName } from "#app/data/biomes"; +import { Biome } from "#app/enums/biome"; +import { MoneyInterestModifier, MapModifier } from "#app/modifier/modifier"; +import { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; +import { Mode } from "#app/ui/ui"; import { BattlePhase } from "./battle-phase"; -import * as Utils from "#app/utils.js"; +import * as Utils from "#app/utils"; import { PartyHealPhase } from "./party-heal-phase"; import { SwitchBiomePhase } from "./switch-biome-phase"; diff --git a/src/phases/select-challenge-phase.ts b/src/phases/select-challenge-phase.ts index eaf830e0059..9450c60fec5 100644 --- a/src/phases/select-challenge-phase.ts +++ b/src/phases/select-challenge-phase.ts @@ -1,6 +1,6 @@ -import BattleScene from "#app/battle-scene.js"; -import { Phase } from "#app/phase.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import { Phase } from "#app/phase"; +import { Mode } from "#app/ui/ui"; export class SelectChallengePhase extends Phase { constructor(scene: BattleScene) { diff --git a/src/phases/select-gender-phase.ts b/src/phases/select-gender-phase.ts index 3fc6916e233..7f2c965f1d1 100644 --- a/src/phases/select-gender-phase.ts +++ b/src/phases/select-gender-phase.ts @@ -1,8 +1,8 @@ -import BattleScene from "#app/battle-scene.js"; -import { PlayerGender } from "#app/enums/player-gender.js"; -import { Phase } from "#app/phase.js"; -import { SettingKeys } from "#app/system/settings/settings.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import { PlayerGender } from "#app/enums/player-gender"; +import { Phase } from "#app/phase"; +import { SettingKeys } from "#app/system/settings/settings"; +import { Mode } from "#app/ui/ui"; import i18next from "i18next"; export class SelectGenderPhase extends Phase { diff --git a/src/phases/select-modifier-phase.ts b/src/phases/select-modifier-phase.ts index 1c96d278d69..e14638c5dd2 100644 --- a/src/phases/select-modifier-phase.ts +++ b/src/phases/select-modifier-phase.ts @@ -1,12 +1,12 @@ -import BattleScene from "#app/battle-scene.js"; -import { ModifierTier } from "#app/modifier/modifier-tier.js"; -import { regenerateModifierPoolThresholds, ModifierTypeOption, ModifierType, getPlayerShopModifierTypeOptionsForWave, PokemonModifierType, FusePokemonModifierType, PokemonMoveModifierType, TmModifierType, RememberMoveModifierType, PokemonPpRestoreModifierType, PokemonPpUpModifierType, ModifierPoolType, getPlayerModifierTypeOptions } from "#app/modifier/modifier-type.js"; -import { ExtraModifierModifier, Modifier, PokemonHeldItemModifier } from "#app/modifier/modifier.js"; -import ModifierSelectUiHandler, { SHOP_OPTIONS_ROW_LIMIT } from "#app/ui/modifier-select-ui-handler.js"; -import PartyUiHandler, { PartyUiMode, PartyOption } from "#app/ui/party-ui-handler.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import { ModifierTier } from "#app/modifier/modifier-tier"; +import { regenerateModifierPoolThresholds, ModifierTypeOption, ModifierType, getPlayerShopModifierTypeOptionsForWave, PokemonModifierType, FusePokemonModifierType, PokemonMoveModifierType, TmModifierType, RememberMoveModifierType, PokemonPpRestoreModifierType, PokemonPpUpModifierType, ModifierPoolType, getPlayerModifierTypeOptions } from "#app/modifier/modifier-type"; +import { ExtraModifierModifier, Modifier, PokemonHeldItemModifier } from "#app/modifier/modifier"; +import ModifierSelectUiHandler, { SHOP_OPTIONS_ROW_LIMIT } from "#app/ui/modifier-select-ui-handler"; +import PartyUiHandler, { PartyUiMode, PartyOption } from "#app/ui/party-ui-handler"; +import { Mode } from "#app/ui/ui"; import i18next from "i18next"; -import * as Utils from "#app/utils.js"; +import * as Utils from "#app/utils"; import { BattlePhase } from "./battle-phase"; import Overrides from "#app/overrides"; diff --git a/src/phases/select-starter-phase.ts b/src/phases/select-starter-phase.ts index ad972a49225..cd3c112549c 100644 --- a/src/phases/select-starter-phase.ts +++ b/src/phases/select-starter-phase.ts @@ -1,15 +1,15 @@ -import BattleScene from "#app/battle-scene.js"; -import { applyChallenges, ChallengeType } from "#app/data/challenge.js"; -import { Gender } from "#app/data/gender.js"; -import { SpeciesFormChangeMoveLearnedTrigger } from "#app/data/pokemon-forms.js"; -import { getPokemonSpecies } from "#app/data/pokemon-species.js"; -import { Species } from "#app/enums/species.js"; -import { PlayerPokemon } from "#app/field/pokemon.js"; -import { overrideModifiers, overrideHeldItems } from "#app/modifier/modifier.js"; -import { Phase } from "#app/phase.js"; -import { SaveSlotUiMode } from "#app/ui/save-slot-select-ui-handler.js"; -import { Starter } from "#app/ui/starter-select-ui-handler.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import { applyChallenges, ChallengeType } from "#app/data/challenge"; +import { Gender } from "#app/data/gender"; +import { SpeciesFormChangeMoveLearnedTrigger } from "#app/data/pokemon-forms"; +import { getPokemonSpecies } from "#app/data/pokemon-species"; +import { Species } from "#app/enums/species"; +import { PlayerPokemon } from "#app/field/pokemon"; +import { overrideModifiers, overrideHeldItems } from "#app/modifier/modifier"; +import { Phase } from "#app/phase"; +import { SaveSlotUiMode } from "#app/ui/save-slot-select-ui-handler"; +import { Starter } from "#app/ui/starter-select-ui-handler"; +import { Mode } from "#app/ui/ui"; import SoundFade from "phaser3-rex-plugins/plugins/soundfade"; import { TitlePhase } from "./title-phase"; import Overrides from "#app/overrides"; diff --git a/src/phases/select-target-phase.ts b/src/phases/select-target-phase.ts index fe72335e312..716d2737a6c 100644 --- a/src/phases/select-target-phase.ts +++ b/src/phases/select-target-phase.ts @@ -1,7 +1,7 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex } from "#app/battle.js"; -import { Command } from "#app/ui/command-ui-handler.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex } from "#app/battle"; +import { Command } from "#app/ui/command-ui-handler"; +import { Mode } from "#app/ui/ui"; import { CommandPhase } from "./command-phase"; import { PokemonPhase } from "./pokemon-phase"; diff --git a/src/phases/shiny-sparkle-phase.ts b/src/phases/shiny-sparkle-phase.ts index 4cd2b68f881..49c60a82dd5 100644 --- a/src/phases/shiny-sparkle-phase.ts +++ b/src/phases/shiny-sparkle-phase.ts @@ -1,5 +1,5 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex } from "#app/battle.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex } from "#app/battle"; import { PokemonPhase } from "./pokemon-phase"; export class ShinySparklePhase extends PokemonPhase { diff --git a/src/phases/show-ability-phase.ts b/src/phases/show-ability-phase.ts index ee0b98f7886..cf34e327b4f 100644 --- a/src/phases/show-ability-phase.ts +++ b/src/phases/show-ability-phase.ts @@ -1,5 +1,5 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex } from "#app/battle.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex } from "#app/battle"; import { PokemonPhase } from "./pokemon-phase"; export class ShowAbilityPhase extends PokemonPhase { diff --git a/src/phases/show-party-exp-bar-phase.ts b/src/phases/show-party-exp-bar-phase.ts index 9920472e801..9e019b202a5 100644 --- a/src/phases/show-party-exp-bar-phase.ts +++ b/src/phases/show-party-exp-bar-phase.ts @@ -1,7 +1,7 @@ -import BattleScene from "#app/battle-scene.js"; -import { ExpNotification } from "#app/enums/exp-notification.js"; -import { ExpBoosterModifier } from "#app/modifier/modifier.js"; -import * as Utils from "#app/utils.js"; +import BattleScene from "#app/battle-scene"; +import { ExpNotification } from "#app/enums/exp-notification"; +import { ExpBoosterModifier } from "#app/modifier/modifier"; +import * as Utils from "#app/utils"; import { HidePartyExpBarPhase } from "./hide-party-exp-bar-phase"; import { LevelUpPhase } from "./level-up-phase"; import { PlayerPartyMemberPokemonPhase } from "./player-party-member-pokemon-phase"; diff --git a/src/phases/show-trainer-phase.ts b/src/phases/show-trainer-phase.ts index 8a869f582d8..26ccddd53fc 100644 --- a/src/phases/show-trainer-phase.ts +++ b/src/phases/show-trainer-phase.ts @@ -1,5 +1,5 @@ -import BattleScene from "#app/battle-scene.js"; -import { PlayerGender } from "#app/enums/player-gender.js"; +import BattleScene from "#app/battle-scene"; +import { PlayerGender } from "#app/enums/player-gender"; import { BattlePhase } from "./battle-phase"; export class ShowTrainerPhase extends BattlePhase { diff --git a/src/phases/summon-missing-phase.ts b/src/phases/summon-missing-phase.ts index bb9607285ad..83ac8779dd8 100644 --- a/src/phases/summon-missing-phase.ts +++ b/src/phases/summon-missing-phase.ts @@ -1,5 +1,5 @@ -import BattleScene from "#app/battle-scene.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; +import BattleScene from "#app/battle-scene"; +import { getPokemonNameWithAffix } from "#app/messages"; import i18next from "i18next"; import { SummonPhase } from "./summon-phase"; diff --git a/src/phases/summon-phase.ts b/src/phases/summon-phase.ts index f65a2063d4c..2645060c547 100644 --- a/src/phases/summon-phase.ts +++ b/src/phases/summon-phase.ts @@ -1,12 +1,12 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattleType } from "#app/battle.js"; -import { getPokeballAtlasKey, getPokeballTintColor } from "#app/data/pokeball.js"; -import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms.js"; -import { TrainerSlot } from "#app/data/trainer-config.js"; -import { PlayerGender } from "#app/enums/player-gender.js"; -import { addPokeballOpenParticles } from "#app/field/anims.js"; -import Pokemon, { FieldPosition } from "#app/field/pokemon.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; +import BattleScene from "#app/battle-scene"; +import { BattleType } from "#app/battle"; +import { getPokeballAtlasKey, getPokeballTintColor } from "#app/data/pokeball"; +import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms"; +import { TrainerSlot } from "#app/data/trainer-config"; +import { PlayerGender } from "#app/enums/player-gender"; +import { addPokeballOpenParticles } from "#app/field/anims"; +import Pokemon, { FieldPosition } from "#app/field/pokemon"; +import { getPokemonNameWithAffix } from "#app/messages"; import i18next from "i18next"; import { PartyMemberPokemonPhase } from "./party-member-pokemon-phase"; import { PostSummonPhase } from "./post-summon-phase"; diff --git a/src/phases/switch-biome-phase.ts b/src/phases/switch-biome-phase.ts index f20cd59b240..9cf5635a39f 100644 --- a/src/phases/switch-biome-phase.ts +++ b/src/phases/switch-biome-phase.ts @@ -1,6 +1,6 @@ -import BattleScene from "#app/battle-scene.js"; -import { Biome } from "#app/enums/biome.js"; -import { getBiomeKey } from "#app/field/arena.js"; +import BattleScene from "#app/battle-scene"; +import { Biome } from "#app/enums/biome"; +import { getBiomeKey } from "#app/field/arena"; import { BattlePhase } from "./battle-phase"; export class SwitchBiomePhase extends BattlePhase { diff --git a/src/phases/switch-phase.ts b/src/phases/switch-phase.ts index 93b0943febf..b1a2e991ed8 100644 --- a/src/phases/switch-phase.ts +++ b/src/phases/switch-phase.ts @@ -1,6 +1,6 @@ -import BattleScene from "#app/battle-scene.js"; -import PartyUiHandler, { PartyUiMode, PartyOption } from "#app/ui/party-ui-handler.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import PartyUiHandler, { PartyUiMode, PartyOption } from "#app/ui/party-ui-handler"; +import { Mode } from "#app/ui/ui"; import { BattlePhase } from "./battle-phase"; import { SwitchSummonPhase } from "./switch-summon-phase"; diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts index 8201f2879ed..2a5fd0cc3ac 100644 --- a/src/phases/switch-summon-phase.ts +++ b/src/phases/switch-summon-phase.ts @@ -1,13 +1,13 @@ -import BattleScene from "#app/battle-scene.js"; -import { applyPreSwitchOutAbAttrs, PreSwitchOutAbAttr } from "#app/data/ability.js"; -import { allMoves, ForceSwitchOutAttr } from "#app/data/move.js"; -import { getPokeballTintColor } from "#app/data/pokeball.js"; -import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms.js"; -import { TrainerSlot } from "#app/data/trainer-config.js"; -import Pokemon from "#app/field/pokemon.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; -import { SwitchEffectTransferModifier } from "#app/modifier/modifier.js"; -import { Command } from "#app/ui/command-ui-handler.js"; +import BattleScene from "#app/battle-scene"; +import { applyPreSwitchOutAbAttrs, PreSwitchOutAbAttr } from "#app/data/ability"; +import { allMoves, ForceSwitchOutAttr } from "#app/data/move"; +import { getPokeballTintColor } from "#app/data/pokeball"; +import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms"; +import { TrainerSlot } from "#app/data/trainer-config"; +import Pokemon from "#app/field/pokemon"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { SwitchEffectTransferModifier } from "#app/modifier/modifier"; +import { Command } from "#app/ui/command-ui-handler"; import i18next from "i18next"; import { PostSummonPhase } from "./post-summon-phase"; import { SummonPhase } from "./summon-phase"; diff --git a/src/phases/test-message-phase.ts b/src/phases/test-message-phase.ts index 14fed24ef4b..464a5ed1f94 100644 --- a/src/phases/test-message-phase.ts +++ b/src/phases/test-message-phase.ts @@ -1,4 +1,4 @@ -import BattleScene from "#app/battle-scene.js"; +import BattleScene from "#app/battle-scene"; import { MessagePhase } from "./message-phase"; export class TestMessagePhase extends MessagePhase { diff --git a/src/phases/title-phase.ts b/src/phases/title-phase.ts index 4c89b725c2d..52503501837 100644 --- a/src/phases/title-phase.ts +++ b/src/phases/title-phase.ts @@ -1,21 +1,21 @@ -import { loggedInUser } from "#app/account.js"; -import BattleScene from "#app/battle-scene.js"; -import { BattleType } from "#app/battle.js"; -import { getDailyRunStarters, fetchDailyRunSeed } from "#app/data/daily-run.js"; -import { Gender } from "#app/data/gender.js"; -import { getBiomeKey } from "#app/field/arena.js"; -import { GameModes, GameMode, getGameMode } from "#app/game-mode.js"; -import { regenerateModifierPoolThresholds, ModifierPoolType, modifierTypes, getDailyRunStarterModifiers } from "#app/modifier/modifier-type.js"; -import { Phase } from "#app/phase.js"; -import { SessionSaveData } from "#app/system/game-data.js"; -import { Unlockables } from "#app/system/unlockables.js"; -import { vouchers } from "#app/system/voucher.js"; -import { OptionSelectItem, OptionSelectConfig } from "#app/ui/abstact-option-select-ui-handler.js"; -import { SaveSlotUiMode } from "#app/ui/save-slot-select-ui-handler.js"; -import { Mode } from "#app/ui/ui.js"; +import { loggedInUser } from "#app/account"; +import BattleScene from "#app/battle-scene"; +import { BattleType } from "#app/battle"; +import { getDailyRunStarters, fetchDailyRunSeed } from "#app/data/daily-run"; +import { Gender } from "#app/data/gender"; +import { getBiomeKey } from "#app/field/arena"; +import { GameModes, GameMode, getGameMode } from "#app/game-mode"; +import { regenerateModifierPoolThresholds, ModifierPoolType, modifierTypes, getDailyRunStarterModifiers } from "#app/modifier/modifier-type"; +import { Phase } from "#app/phase"; +import { SessionSaveData } from "#app/system/game-data"; +import { Unlockables } from "#app/system/unlockables"; +import { vouchers } from "#app/system/voucher"; +import { OptionSelectItem, OptionSelectConfig } from "#app/ui/abstact-option-select-ui-handler"; +import { SaveSlotUiMode } from "#app/ui/save-slot-select-ui-handler"; +import { Mode } from "#app/ui/ui"; import i18next from "i18next"; -import * as Utils from "#app/utils.js"; -import { Modifier } from "#app/modifier/modifier.js"; +import * as Utils from "#app/utils"; +import { Modifier } from "#app/modifier/modifier"; import { CheckSwitchPhase } from "./check-switch-phase"; import { EncounterPhase } from "./encounter-phase"; import { SelectChallengePhase } from "./select-challenge-phase"; diff --git a/src/phases/toggle-double-position-phase.ts b/src/phases/toggle-double-position-phase.ts index fe3d0482483..563af8575d7 100644 --- a/src/phases/toggle-double-position-phase.ts +++ b/src/phases/toggle-double-position-phase.ts @@ -1,5 +1,5 @@ -import BattleScene from "#app/battle-scene.js"; -import { FieldPosition } from "#app/field/pokemon.js"; +import BattleScene from "#app/battle-scene"; +import { FieldPosition } from "#app/field/pokemon"; import { BattlePhase } from "./battle-phase"; export class ToggleDoublePositionPhase extends BattlePhase { diff --git a/src/phases/trainer-message-test-phase.ts b/src/phases/trainer-message-test-phase.ts index 4ea451660c3..8075dd761e2 100644 --- a/src/phases/trainer-message-test-phase.ts +++ b/src/phases/trainer-message-test-phase.ts @@ -1,6 +1,6 @@ -import BattleScene from "#app/battle-scene.js"; -import { trainerConfigs } from "#app/data/trainer-config.js"; -import { TrainerType } from "#app/enums/trainer-type.js"; +import BattleScene from "#app/battle-scene"; +import { trainerConfigs } from "#app/data/trainer-config"; +import { TrainerType } from "#app/enums/trainer-type"; import { BattlePhase } from "./battle-phase"; import { TestMessagePhase } from "./test-message-phase"; diff --git a/src/phases/trainer-victory-phase.ts b/src/phases/trainer-victory-phase.ts index a38874c9acd..e925f0c47d4 100644 --- a/src/phases/trainer-victory-phase.ts +++ b/src/phases/trainer-victory-phase.ts @@ -1,10 +1,10 @@ -import BattleScene from "#app/battle-scene.js"; -import { getCharVariantFromDialogue } from "#app/data/dialogue.js"; -import { TrainerType } from "#app/enums/trainer-type.js"; -import { modifierTypes } from "#app/modifier/modifier-type.js"; -import { vouchers } from "#app/system/voucher.js"; +import BattleScene from "#app/battle-scene"; +import { getCharVariantFromDialogue } from "#app/data/dialogue"; +import { TrainerType } from "#app/enums/trainer-type"; +import { modifierTypes } from "#app/modifier/modifier-type"; +import { vouchers } from "#app/system/voucher"; import i18next from "i18next"; -import * as Utils from "#app/utils.js"; +import * as Utils from "#app/utils"; import { BattlePhase } from "./battle-phase"; import { ModifierRewardPhase } from "./modifier-reward-phase"; import { MoneyRewardPhase } from "./money-reward-phase"; diff --git a/src/phases/turn-end-phase.ts b/src/phases/turn-end-phase.ts index c8bd3398bb5..724a5206d74 100644 --- a/src/phases/turn-end-phase.ts +++ b/src/phases/turn-end-phase.ts @@ -1,12 +1,12 @@ -import BattleScene from "#app/battle-scene.js"; -import { applyPostTurnAbAttrs, PostTurnAbAttr } from "#app/data/ability.js"; -import { BattlerTagLapseType } from "#app/data/battler-tags.js"; -import { TerrainType } from "#app/data/terrain.js"; -import { WeatherType } from "#app/enums/weather-type.js"; -import { TurnEndEvent } from "#app/events/battle-scene.js"; -import Pokemon from "#app/field/pokemon.js"; -import { getPokemonNameWithAffix } from "#app/messages.js"; -import { TurnHealModifier, EnemyTurnHealModifier, EnemyStatusEffectHealChanceModifier, TurnStatusEffectModifier, TurnHeldItemTransferModifier } from "#app/modifier/modifier.js"; +import BattleScene from "#app/battle-scene"; +import { applyPostTurnAbAttrs, PostTurnAbAttr } from "#app/data/ability"; +import { BattlerTagLapseType } from "#app/data/battler-tags"; +import { TerrainType } from "#app/data/terrain"; +import { WeatherType } from "#app/enums/weather-type"; +import { TurnEndEvent } from "#app/events/battle-scene"; +import Pokemon from "#app/field/pokemon"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { TurnHealModifier, EnemyTurnHealModifier, EnemyStatusEffectHealChanceModifier, TurnStatusEffectModifier, TurnHeldItemTransferModifier } from "#app/modifier/modifier"; import i18next from "i18next"; import { FieldPhase } from "./field-phase"; import { PokemonHealPhase } from "./pokemon-heal-phase"; diff --git a/src/phases/turn-init-phase.ts b/src/phases/turn-init-phase.ts index a999d57ca0f..568cfdc5714 100644 --- a/src/phases/turn-init-phase.ts +++ b/src/phases/turn-init-phase.ts @@ -1,7 +1,7 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex } from "#app/battle.js"; -import { TurnInitEvent } from "#app/events/battle-scene.js"; -import { PlayerPokemon } from "#app/field/pokemon.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex } from "#app/battle"; +import { TurnInitEvent } from "#app/events/battle-scene"; +import { PlayerPokemon } from "#app/field/pokemon"; import i18next from "i18next"; import { FieldPhase } from "./field-phase"; import { ToggleDoublePositionPhase } from "./toggle-double-position-phase"; diff --git a/src/phases/unavailable-phase.ts b/src/phases/unavailable-phase.ts index 4757af5e15d..59bfca7875e 100644 --- a/src/phases/unavailable-phase.ts +++ b/src/phases/unavailable-phase.ts @@ -1,6 +1,6 @@ -import BattleScene from "#app/battle-scene.js"; -import { Phase } from "#app/phase.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import { Phase } from "#app/phase"; +import { Mode } from "#app/ui/ui"; import { LoginPhase } from "./login-phase"; export class UnavailablePhase extends Phase { diff --git a/src/phases/unlock-phase.ts b/src/phases/unlock-phase.ts index 1662afaa758..65060309a6c 100644 --- a/src/phases/unlock-phase.ts +++ b/src/phases/unlock-phase.ts @@ -1,7 +1,7 @@ -import BattleScene from "#app/battle-scene.js"; -import { Phase } from "#app/phase.js"; -import { Unlockables, getUnlockableName } from "#app/system/unlockables.js"; -import { Mode } from "#app/ui/ui.js"; +import BattleScene from "#app/battle-scene"; +import { Phase } from "#app/phase"; +import { Unlockables, getUnlockableName } from "#app/system/unlockables"; +import { Mode } from "#app/ui/ui"; import i18next from "i18next"; export class UnlockPhase extends Phase { diff --git a/src/phases/victory-phase.ts b/src/phases/victory-phase.ts index b7587de4dbb..9679a79a37d 100644 --- a/src/phases/victory-phase.ts +++ b/src/phases/victory-phase.ts @@ -1,8 +1,8 @@ -import BattleScene from "#app/battle-scene.js"; -import { BattlerIndex, BattleType } from "#app/battle.js"; -import { modifierTypes } from "#app/modifier/modifier-type.js"; -import { ExpShareModifier, ExpBalanceModifier, MultipleParticipantExpBonusModifier, PokemonExpBoosterModifier } from "#app/modifier/modifier.js"; -import * as Utils from "#app/utils.js"; +import BattleScene from "#app/battle-scene"; +import { BattlerIndex, BattleType } from "#app/battle"; +import { modifierTypes } from "#app/modifier/modifier-type"; +import { ExpShareModifier, ExpBalanceModifier, MultipleParticipantExpBonusModifier, PokemonExpBoosterModifier } from "#app/modifier/modifier"; +import * as Utils from "#app/utils"; import Overrides from "#app/overrides"; import { BattleEndPhase } from "./battle-end-phase"; import { NewBattlePhase } from "./new-battle-phase"; diff --git a/src/phases/weather-effect-phase.ts b/src/phases/weather-effect-phase.ts index ccfc9abb64f..e85ef0326f6 100644 --- a/src/phases/weather-effect-phase.ts +++ b/src/phases/weather-effect-phase.ts @@ -2,7 +2,7 @@ import BattleScene from "#app/battle-scene"; import { applyPreWeatherEffectAbAttrs, SuppressWeatherEffectAbAttr, PreWeatherDamageAbAttr, applyAbAttrs, BlockNonDirectDamageAbAttr, applyPostWeatherLapseAbAttrs, PostWeatherLapseAbAttr } from "#app/data/ability.js"; import { CommonAnim } from "#app/data/battle-anims"; import { Weather, getWeatherDamageMessage, getWeatherLapseMessage } from "#app/data/weather"; -import { BattlerTagType } from "#app/enums/battler-tag-type.js"; +import { BattlerTagType } from "#app/enums/battler-tag-type"; import { WeatherType } from "#app/enums/weather-type"; import Pokemon, { HitResult } from "#app/field/pokemon"; import * as Utils from "#app/utils"; diff --git a/src/plugins/i18n.ts b/src/plugins/i18n.ts index 3d24458a06c..705fd5143a4 100644 --- a/src/plugins/i18n.ts +++ b/src/plugins/i18n.ts @@ -2,17 +2,17 @@ import i18next from "i18next"; import LanguageDetector from "i18next-browser-languagedetector"; import processor, { KoreanPostpositionProcessor } from "i18next-korean-postposition-processor"; -import { caEsConfig} from "#app/locales/ca_ES/config.js"; -import { deConfig } from "#app/locales/de/config.js"; -import { enConfig } from "#app/locales/en/config.js"; -import { esConfig } from "#app/locales/es/config.js"; -import { frConfig } from "#app/locales/fr/config.js"; -import { itConfig } from "#app/locales/it/config.js"; -import { koConfig } from "#app/locales/ko/config.js"; -import { jaConfig } from "#app/locales/ja/config.js"; -import { ptBrConfig } from "#app/locales/pt_BR/config.js"; -import { zhCnConfig } from "#app/locales/zh_CN/config.js"; -import { zhTwConfig } from "#app/locales/zh_TW/config.js"; +import { caEsConfig} from "#app/locales/ca_ES/config"; +import { deConfig } from "#app/locales/de/config"; +import { enConfig } from "#app/locales/en/config"; +import { esConfig } from "#app/locales/es/config"; +import { frConfig } from "#app/locales/fr/config"; +import { itConfig } from "#app/locales/it/config"; +import { koConfig } from "#app/locales/ko/config"; +import { jaConfig } from "#app/locales/ja/config"; +import { ptBrConfig } from "#app/locales/pt_BR/config"; +import { zhCnConfig } from "#app/locales/zh_CN/config"; +import { zhTwConfig } from "#app/locales/zh_TW/config"; interface LoadingFontFaceProperty { face: FontFace, diff --git a/src/system/arena-data.ts b/src/system/arena-data.ts index 886129edcf6..5b907805372 100644 --- a/src/system/arena-data.ts +++ b/src/system/arena-data.ts @@ -2,7 +2,7 @@ import { Arena } from "../field/arena"; import { ArenaTag } from "../data/arena-tag"; import { Biome } from "#enums/biome"; import { Weather } from "../data/weather"; -import { Terrain } from "#app/data/terrain.js"; +import { Terrain } from "#app/data/terrain"; export default class ArenaData { public biome: Biome; diff --git a/src/system/challenge-data.ts b/src/system/challenge-data.ts index 69df11dd395..394d63867be 100644 --- a/src/system/challenge-data.ts +++ b/src/system/challenge-data.ts @@ -1,4 +1,4 @@ -import { Challenge, copyChallenge } from "#app/data/challenge.js"; +import { Challenge, copyChallenge } from "#app/data/challenge"; export default class ChallengeData { public id: integer; diff --git a/src/system/egg-data.ts b/src/system/egg-data.ts index b4bd4368bd9..785ae364efe 100644 --- a/src/system/egg-data.ts +++ b/src/system/egg-data.ts @@ -2,7 +2,7 @@ import { EggTier } from "#enums/egg-type"; import { Species } from "#enums/species"; import { VariantTier } from "#enums/variant-tiers"; import { EGG_SEED, Egg } from "../data/egg"; -import { EggSourceType } from "#app/enums/egg-source-types.js"; +import { EggSourceType } from "#app/enums/egg-source-types"; export default class EggData { public id: integer; diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 800b8baecff..677bbe4add6 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -30,20 +30,20 @@ import { TrainerVariant } from "../field/trainer"; import { Variant } from "#app/data/variant"; import {setSettingGamepad, SettingGamepad, settingGamepadDefaults} from "./settings/settings-gamepad"; import {setSettingKeyboard, SettingKeyboard} from "#app/system/settings/settings-keyboard"; -import { TerrainChangedEvent, WeatherChangedEvent } from "#app/events/arena.js"; -import { EnemyAttackStatusEffectChanceModifier } from "../modifier/modifier"; -import { StatusEffect } from "#app/data/status-effect.js"; +import { TerrainChangedEvent, WeatherChangedEvent } from "#app/events/arena"; +import * as Modifier from "../modifier/modifier"; +import { StatusEffect } from "#app/data/status-effect"; import ChallengeData from "./challenge-data"; import { Device } from "#enums/devices"; import { GameDataType } from "#enums/game-data-type"; import { Moves } from "#enums/moves"; import { PlayerGender } from "#enums/player-gender"; import { Species } from "#enums/species"; -import { applyChallenges, ChallengeType } from "#app/data/challenge.js"; -import { WeatherType } from "#app/enums/weather-type.js"; -import { TerrainType } from "#app/data/terrain.js"; -import { OutdatedPhase } from "#app/phases/outdated-phase.js"; -import { ReloadSessionPhase } from "#app/phases/reload-session-phase.js"; +import { applyChallenges, ChallengeType } from "#app/data/challenge"; +import { WeatherType } from "#app/enums/weather-type"; +import { TerrainType } from "#app/data/terrain"; +import { OutdatedPhase } from "#app/phases/outdated-phase"; +import { ReloadSessionPhase } from "#app/phases/reload-session-phase"; import { RUN_HISTORY_LIMIT } from "#app/ui/run-history-ui-handler"; import { applySessionDataPatches, applySettingsDataPatches, applySystemDataPatches } from "./version-converter"; @@ -1065,10 +1065,8 @@ export class GameData { // TODO //scene.arena.tags = sessionData.arena.tags; - const modifiersModule = await import("../modifier/modifier"); - for (const modifierData of sessionData.modifiers) { - const modifier = modifierData.toModifier(scene, modifiersModule[modifierData.className]); + const modifier = modifierData.toModifier(scene, Modifier[modifierData.className]); if (modifier) { scene.addModifier(modifier, true); } @@ -1077,7 +1075,7 @@ export class GameData { scene.updateModifiers(true); for (const enemyModifierData of sessionData.enemyModifiers) { - const modifier = enemyModifierData.toModifier(scene, modifiersModule[enemyModifierData.className]); + const modifier = enemyModifierData.toModifier(scene, Modifier[enemyModifierData.className]); if (modifier) { scene.addEnemyModifier(modifier, true); } @@ -1233,7 +1231,7 @@ export class GameData { if (md?.className === "ExpBalanceModifier") { // Temporarily limit EXP Balance until it gets reworked md.stackCount = Math.min(md.stackCount, 4); } - if (md instanceof EnemyAttackStatusEffectChanceModifier && md.effect === StatusEffect.FREEZE || md.effect === StatusEffect.SLEEP) { + if (md instanceof Modifier.EnemyAttackStatusEffectChanceModifier && md.effect === StatusEffect.FREEZE || md.effect === StatusEffect.SLEEP) { continue; } ret.push(new PersistentModifierData(md, player)); diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts index 6b46b6fe96c..bc88c21e1e1 100644 --- a/src/system/settings/settings.ts +++ b/src/system/settings/settings.ts @@ -8,7 +8,7 @@ import SettingsUiHandler from "#app/ui/settings/settings-ui-handler"; import { EaseType } from "#enums/ease-type"; import { MoneyFormat } from "#enums/money-format"; import { PlayerGender } from "#enums/player-gender"; -import { getIsInitialized, initI18n } from "#app/plugins/i18n.js"; +import { getIsInitialized, initI18n } from "#app/plugins/i18n"; import { ShopCursorTarget } from "#app/enums/shop-cursor-target"; function getTranslation(key: string): string { diff --git a/src/system/voucher.ts b/src/system/voucher.ts index 2f94308d9c8..06edfe5c6a6 100644 --- a/src/system/voucher.ts +++ b/src/system/voucher.ts @@ -3,8 +3,8 @@ import i18next from "i18next"; import { AchvTier, achvs, getAchievementDescription } from "./achv"; import { PlayerGender } from "#enums/player-gender"; import { TrainerType } from "#enums/trainer-type"; -import { ConditionFn } from "#app/@types/common.js"; -import { trainerConfigs } from "#app/data/trainer-config.js"; +import { ConditionFn } from "#app/@types/common"; +import { trainerConfigs } from "#app/data/trainer-config"; export enum VoucherType { REGULAR, diff --git a/src/test/abilities/tera_shell.test.ts b/src/test/abilities/tera_shell.test.ts index f9cb2935619..6a6b7bb252b 100644 --- a/src/test/abilities/tera_shell.test.ts +++ b/src/test/abilities/tera_shell.test.ts @@ -1,7 +1,7 @@ import { Abilities } from "#app/enums/abilities"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; -import { HitResult } from "#app/field/pokemon.js"; +import { HitResult } from "#app/field/pokemon"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; diff --git a/src/test/battle/damage_calculation.test.ts b/src/test/battle/damage_calculation.test.ts index 665000450be..9c7c9dc9d3e 100644 --- a/src/test/battle/damage_calculation.test.ts +++ b/src/test/battle/damage_calculation.test.ts @@ -1,4 +1,4 @@ -import { DamagePhase } from "#app/phases/damage-phase.js"; +import { DamagePhase } from "#app/phases/damage-phase"; import { toDmgValue } from "#app/utils"; import { Abilities } from "#enums/abilities"; import { ArenaTagType } from "#enums/arena-tag-type"; diff --git a/src/test/moves/gigaton_hammer.test.ts b/src/test/moves/gigaton_hammer.test.ts index 9379e9d98b2..0162375cdb2 100644 --- a/src/test/moves/gigaton_hammer.test.ts +++ b/src/test/moves/gigaton_hammer.test.ts @@ -1,4 +1,4 @@ -import { BattlerIndex } from "#app/battle.js"; +import { BattlerIndex } from "#app/battle"; import GameManager from "#app/test/utils/gameManager"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/src/test/moves/lunar_blessing.test.ts b/src/test/moves/lunar_blessing.test.ts index 73647716f06..92428c39029 100644 --- a/src/test/moves/lunar_blessing.test.ts +++ b/src/test/moves/lunar_blessing.test.ts @@ -1,5 +1,5 @@ -import { StatusEffect } from "#app/enums/status-effect.js"; -import { CommandPhase } from "#app/phases/command-phase.js"; +import { StatusEffect } from "#app/enums/status-effect"; +import { CommandPhase } from "#app/phases/command-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; diff --git a/src/test/utils/helpers/overridesHelper.ts b/src/test/utils/helpers/overridesHelper.ts index cc5f9018325..a42ef84b496 100644 --- a/src/test/utils/helpers/overridesHelper.ts +++ b/src/test/utils/helpers/overridesHelper.ts @@ -1,12 +1,12 @@ -import { StatusEffect } from "#app/data/status-effect.js"; +import { StatusEffect } from "#app/data/status-effect"; import { Weather, WeatherType } from "#app/data/weather"; -import { Abilities } from "#app/enums/abilities.js"; +import { Abilities } from "#app/enums/abilities"; import { Biome } from "#app/enums/biome"; -import { Moves } from "#app/enums/moves.js"; -import { Species } from "#app/enums/species.js"; +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; import * as GameMode from "#app/game-mode"; import { GameModes, getGameMode } from "#app/game-mode"; -import { ModifierOverride } from "#app/modifier/modifier-type.js"; +import { ModifierOverride } from "#app/modifier/modifier-type"; import Overrides from "#app/overrides"; import { vi } from "vitest"; import { GameManagerHelper } from "./gameManagerHelper"; diff --git a/src/test/utils/testUtils.ts b/src/test/utils/testUtils.ts index 378c3d23fde..2265cf8d79c 100644 --- a/src/test/utils/testUtils.ts +++ b/src/test/utils/testUtils.ts @@ -1,4 +1,4 @@ -import { Moves } from "#app/enums/moves.js"; +import { Moves } from "#app/enums/moves"; import i18next, { type ParseKeys } from "i18next"; import { vi } from "vitest"; diff --git a/src/ui/ability-bar.ts b/src/ui/ability-bar.ts index b8259af9f3d..a924d545852 100644 --- a/src/ui/ability-bar.ts +++ b/src/ui/ability-bar.ts @@ -1,4 +1,4 @@ -import { getPokemonNameWithAffix } from "#app/messages.js"; +import { getPokemonNameWithAffix } from "#app/messages"; import BattleScene from "../battle-scene"; import Pokemon from "../field/pokemon"; import { TextStyle, addTextObject } from "./text"; diff --git a/src/ui/admin-ui-handler.ts b/src/ui/admin-ui-handler.ts index 5c91a36ab64..c48138853fc 100644 --- a/src/ui/admin-ui-handler.ts +++ b/src/ui/admin-ui-handler.ts @@ -1,9 +1,9 @@ -import BattleScene from "#app/battle-scene.js"; +import BattleScene from "#app/battle-scene"; import { ModalConfig } from "./modal-ui-handler"; import { Mode } from "./ui"; import * as Utils from "../utils"; import { FormModalUiHandler } from "./form-modal-ui-handler"; -import { Button } from "#app/enums/buttons.js"; +import { Button } from "#app/enums/buttons"; export default class AdminUiHandler extends FormModalUiHandler { diff --git a/src/ui/arena-flyout.ts b/src/ui/arena-flyout.ts index 882c15d3d8c..42a2396e665 100644 --- a/src/ui/arena-flyout.ts +++ b/src/ui/arena-flyout.ts @@ -1,10 +1,10 @@ import { addTextObject, TextStyle } from "./text"; -import BattleScene from "#app/battle-scene.js"; -import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag.js"; -import { WeatherType } from "#app/data/weather.js"; -import { TerrainType } from "#app/data/terrain.js"; +import BattleScene from "#app/battle-scene"; +import { ArenaTagSide, ArenaTrapTag } from "#app/data/arena-tag"; +import { WeatherType } from "#app/data/weather"; +import { TerrainType } from "#app/data/terrain"; import { addWindow, WindowVariant } from "./ui-theme"; -import { ArenaEvent, ArenaEventType, TagAddedEvent, TagRemovedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#app/events/arena.js"; +import { ArenaEvent, ArenaEventType, TagAddedEvent, TagRemovedEvent, TerrainChangedEvent, WeatherChangedEvent } from "#app/events/arena"; import { BattleSceneEventType, TurnEndEvent } from "../events/battle-scene"; import { ArenaTagType } from "#enums/arena-tag-type"; import TimeOfDayWidget from "./time-of-day-widget"; diff --git a/src/ui/ball-ui-handler.ts b/src/ui/ball-ui-handler.ts index 04691886d9c..332fe5f65b9 100644 --- a/src/ui/ball-ui-handler.ts +++ b/src/ui/ball-ui-handler.ts @@ -6,7 +6,7 @@ import { Mode } from "./ui"; import UiHandler from "./ui-handler"; import { addWindow } from "./ui-theme"; import {Button} from "#enums/buttons"; -import { CommandPhase } from "#app/phases/command-phase.js"; +import { CommandPhase } from "#app/phases/command-phase"; export default class BallUiHandler extends UiHandler { private pokeballSelectContainer: Phaser.GameObjects.Container; diff --git a/src/ui/battle-flyout.ts b/src/ui/battle-flyout.ts index 6204fa2f928..fe561b76c9f 100644 --- a/src/ui/battle-flyout.ts +++ b/src/ui/battle-flyout.ts @@ -1,13 +1,13 @@ import { default as Pokemon } from "../field/pokemon"; import { addTextObject, TextStyle } from "./text"; import * as Utils from "../utils"; -import BattleScene from "#app/battle-scene.js"; -import Move from "#app/data/move.js"; +import BattleScene from "#app/battle-scene"; +import Move from "#app/data/move"; import { BattleSceneEventType, BerryUsedEvent, MoveUsedEvent } from "../events/battle-scene"; import { BerryType } from "#enums/berry-type"; import { Moves } from "#enums/moves"; import { UiTheme } from "#enums/ui-theme"; -import { getPokemonNameWithAffix } from "#app/messages.js"; +import { getPokemonNameWithAffix } from "#app/messages"; /** Container for info about a {@linkcode Move} */ interface MoveInfo { diff --git a/src/ui/command-ui-handler.ts b/src/ui/command-ui-handler.ts index 27ff923e9a3..764e71a8c3f 100644 --- a/src/ui/command-ui-handler.ts +++ b/src/ui/command-ui-handler.ts @@ -5,8 +5,8 @@ import { Mode } from "./ui"; import UiHandler from "./ui-handler"; import i18next from "i18next"; import {Button} from "#enums/buttons"; -import { getPokemonNameWithAffix } from "#app/messages.js"; -import { CommandPhase } from "#app/phases/command-phase.js"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { CommandPhase } from "#app/phases/command-phase"; export enum Command { FIGHT = 0, diff --git a/src/ui/dropdown.ts b/src/ui/dropdown.ts index 08d55b03cdb..4e1235c211d 100644 --- a/src/ui/dropdown.ts +++ b/src/ui/dropdown.ts @@ -1,5 +1,5 @@ -import BattleScene from "#app/battle-scene.js"; -import { SceneBase } from "#app/scene-base.js"; +import BattleScene from "#app/battle-scene"; +import { SceneBase } from "#app/scene-base"; import { addTextObject, TextStyle } from "./text"; import { addWindow, WindowVariant } from "./ui-theme"; import i18next from "i18next"; diff --git a/src/ui/egg-counter-container.ts b/src/ui/egg-counter-container.ts index a688b8b7efc..21cebf5d97e 100644 --- a/src/ui/egg-counter-container.ts +++ b/src/ui/egg-counter-container.ts @@ -1,7 +1,7 @@ -import BattleScene from "#app/battle-scene.js"; +import BattleScene from "#app/battle-scene"; import { addWindow } from "./ui-theme"; import { addTextObject, TextStyle } from "./text"; -import { EggCountChangedEvent, EggEventType } from "#app/events/egg.js"; +import { EggCountChangedEvent, EggEventType } from "#app/events/egg"; import EggHatchSceneHandler from "./egg-hatch-scene-handler"; /** diff --git a/src/ui/egg-hatch-scene-handler.ts b/src/ui/egg-hatch-scene-handler.ts index 733873b974e..7b01ef7a3a6 100644 --- a/src/ui/egg-hatch-scene-handler.ts +++ b/src/ui/egg-hatch-scene-handler.ts @@ -2,7 +2,7 @@ import BattleScene from "../battle-scene"; import { Mode } from "./ui"; import UiHandler from "./ui-handler"; import {Button} from "#enums/buttons"; -import { EggHatchPhase } from "#app/phases/egg-hatch-phase.js"; +import { EggHatchPhase } from "#app/phases/egg-hatch-phase"; export default class EggHatchSceneHandler extends UiHandler { public eggHatchContainer: Phaser.GameObjects.Container; diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts index 4bbe88dabd9..60db9d19eef 100644 --- a/src/ui/fight-ui-handler.ts +++ b/src/ui/fight-ui-handler.ts @@ -5,11 +5,11 @@ import { Command } from "./command-ui-handler"; import { Mode } from "./ui"; import UiHandler from "./ui-handler"; import * as Utils from "../utils"; -import { MoveCategory } from "#app/data/move.js"; +import { MoveCategory } from "#app/data/move"; import i18next from "i18next"; import {Button} from "#enums/buttons"; -import Pokemon, { PokemonMove } from "#app/field/pokemon.js"; -import { CommandPhase } from "#app/phases/command-phase.js"; +import Pokemon, { PokemonMove } from "#app/field/pokemon"; +import { CommandPhase } from "#app/phases/command-phase"; export default class FightUiHandler extends UiHandler { public static readonly MOVES_CONTAINER_NAME = "moves"; diff --git a/src/ui/filter-bar.ts b/src/ui/filter-bar.ts index 31d7c562da2..aa0f575d398 100644 --- a/src/ui/filter-bar.ts +++ b/src/ui/filter-bar.ts @@ -1,4 +1,4 @@ -import BattleScene from "#app/battle-scene.js"; +import BattleScene from "#app/battle-scene"; import { DropDown, DropDownType } from "./dropdown"; import { StarterContainer } from "./starter-container"; import { addTextObject, getTextColor, TextStyle } from "./text"; diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 98a19402a2b..9e025dbe086 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -15,15 +15,15 @@ import { addWindow } from "./ui-theme"; import { SpeciesFormChangeItemTrigger, FormChangeItem } from "../data/pokemon-forms"; import { getVariantTint } from "#app/data/variant"; import {Button} from "#enums/buttons"; -import { applyChallenges, ChallengeType } from "#app/data/challenge.js"; +import { applyChallenges, ChallengeType } from "#app/data/challenge"; import MoveInfoOverlay from "./move-info-overlay"; import i18next from "i18next"; import BBCodeText from "phaser3-rex-plugins/plugins/bbcodetext"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { getPokemonNameWithAffix } from "#app/messages.js"; -import { CommandPhase } from "#app/phases/command-phase.js"; -import { SelectModifierPhase } from "#app/phases/select-modifier-phase.js"; +import { getPokemonNameWithAffix } from "#app/messages"; +import { CommandPhase } from "#app/phases/command-phase"; +import { SelectModifierPhase } from "#app/phases/select-modifier-phase"; const defaultMessage = i18next.t("partyUiHandler:choosePokemon"); diff --git a/src/ui/rename-form-ui-handler.ts b/src/ui/rename-form-ui-handler.ts index 33885509344..078177cafb1 100644 --- a/src/ui/rename-form-ui-handler.ts +++ b/src/ui/rename-form-ui-handler.ts @@ -1,7 +1,7 @@ import { FormModalUiHandler } from "./form-modal-ui-handler"; import { ModalConfig } from "./modal-ui-handler"; import i18next from "i18next"; -import { PlayerPokemon } from "#app/field/pokemon.js"; +import { PlayerPokemon } from "#app/field/pokemon"; export default class RenameFormUiHandler extends FormModalUiHandler { getModalTitle(config?: ModalConfig): string { diff --git a/src/ui/run-info-ui-handler.ts b/src/ui/run-info-ui-handler.ts index 7a183a11d29..d6bafb8599e 100644 --- a/src/ui/run-info-ui-handler.ts +++ b/src/ui/run-info-ui-handler.ts @@ -18,8 +18,7 @@ import { Type, getTypeRgb } from "../data/type"; import { TypeColor, TypeShadow } from "#app/enums/color"; import { getNatureStatMultiplier, getNatureName } from "../data/nature"; import { getVariantTint } from "#app/data/variant"; -import { PokemonHeldItemModifier, TerastallizeModifier } from "../modifier/modifier"; -import {modifierSortFunc} from "../modifier/modifier"; +import * as Modifier from "../modifier/modifier"; import { Species } from "#enums/species"; import { PlayerGender } from "#enums/player-gender"; @@ -68,7 +67,7 @@ export default class RunInfoUiHandler extends UiHandler { override async setup() { this.runContainer = this.scene.add.container(1, -(this.scene.game.canvas.height / 6) + 1); // The import of the modifiersModule is loaded here to sidestep async/await issues. - this.modifiersModule = await import("../modifier/modifier"); + this.modifiersModule = Modifier; this.runContainer.setVisible(false); } @@ -303,7 +302,7 @@ export default class RunInfoUiHandler extends UiHandler { const teraPokemon = {}; this.runInfo.enemyModifiers.forEach((m) => { const modifier = m.toModifier(this.scene, this.modifiersModule[m.className]); - if (modifier instanceof TerastallizeModifier) { + if (modifier instanceof Modifier.TerastallizeModifier) { const teraDetails = modifier?.getArgs(); const pkmnId = teraDetails[0]; teraPokemon[pkmnId] = teraDetails[1]; @@ -434,7 +433,7 @@ export default class RunInfoUiHandler extends UiHandler { modifierIconsContainer.setScale(0.45); for (const m of this.runInfo.modifiers) { const modifier = m.toModifier(this.scene, this.modifiersModule[m.className]); - if (modifier instanceof PokemonHeldItemModifier) { + if (modifier instanceof Modifier.PokemonHeldItemModifier) { continue; } const icon = modifier?.getIcon(this.scene, false); @@ -635,17 +634,17 @@ export default class RunInfoUiHandler extends UiHandler { // Endless/Endless Spliced have a different scale because Pokemon tend to accumulate more items in these runs. const heldItemsScale = (this.runInfo.gameMode === GameModes.SPLICED_ENDLESS || this.runInfo.gameMode === GameModes.ENDLESS) ? 0.25 : 0.5; const heldItemsContainer = this.scene.add.container(-82, 2); - const heldItemsList : PokemonHeldItemModifier[] = []; + const heldItemsList : Modifier.PokemonHeldItemModifier[] = []; if (this.runInfo.modifiers.length) { for (const m of this.runInfo.modifiers) { const modifier = m.toModifier(this.scene, this.modifiersModule[m.className]); - if (modifier instanceof PokemonHeldItemModifier && modifier.pokemonId === pokemon.id) { + if (modifier instanceof Modifier.PokemonHeldItemModifier && modifier.pokemonId === pokemon.id) { modifier.stackCount = m["stackCount"]; heldItemsList.push(modifier); } } if (heldItemsList.length > 0) { - (heldItemsList as PokemonHeldItemModifier[]).sort(modifierSortFunc); + (heldItemsList as Modifier.PokemonHeldItemModifier[]).sort(Modifier.modifierSortFunc); let row = 0; for (const [index, item] of heldItemsList.entries()) { if ( index > 36 ) { diff --git a/src/ui/save-slot-select-ui-handler.ts b/src/ui/save-slot-select-ui-handler.ts index e6ab0d3b3c3..89b20322a68 100644 --- a/src/ui/save-slot-select-ui-handler.ts +++ b/src/ui/save-slot-select-ui-handler.ts @@ -2,7 +2,7 @@ import i18next from "i18next"; import BattleScene from "../battle-scene"; import { Button } from "#enums/buttons"; import { GameMode } from "../game-mode"; -import { PokemonHeldItemModifier } from "../modifier/modifier"; +import * as Modifier from "../modifier/modifier"; import { SessionSaveData } from "../system/game-data"; import PokemonData from "../system/pokemon-data"; import * as Utils from "../utils"; @@ -306,14 +306,12 @@ class SessionSlot extends Phaser.GameObjects.Container { this.add(pokemonIconsContainer); - const modifiersModule = await import("../modifier/modifier"); - const modifierIconsContainer = this.scene.add.container(148, 30); modifierIconsContainer.setScale(0.5); let visibleModifierIndex = 0; for (const m of data.modifiers) { - const modifier = m.toModifier(this.scene, modifiersModule[m.className]); - if (modifier instanceof PokemonHeldItemModifier) { + const modifier = m.toModifier(this.scene, Modifier[m.className]); + if (modifier instanceof Modifier.PokemonHeldItemModifier) { continue; } const icon = modifier?.getIcon(this.scene, false); diff --git a/src/ui/settings/abstract-settings-ui-handler.ts b/src/ui/settings/abstract-settings-ui-handler.ts index f21f2ebcc9d..570377eab43 100644 --- a/src/ui/settings/abstract-settings-ui-handler.ts +++ b/src/ui/settings/abstract-settings-ui-handler.ts @@ -5,7 +5,7 @@ import { Mode } from "../ui"; import UiHandler from "../ui-handler"; import { addWindow } from "../ui-theme"; import {Button} from "#enums/buttons"; -import {InputsIcons} from "#app/ui/settings/abstract-control-settings-ui-handler.js"; +import {InputsIcons} from "#app/ui/settings/abstract-control-settings-ui-handler"; import NavigationMenu, {NavigationManager} from "#app/ui/settings/navigationMenu"; import { Setting, SettingKeys, SettingType } from "#app/system/settings/settings"; import i18next from "i18next"; diff --git a/src/ui/settings/move-touch-controls-handler.ts b/src/ui/settings/move-touch-controls-handler.ts index cf56bf47d3b..cff68fa523d 100644 --- a/src/ui/settings/move-touch-controls-handler.ts +++ b/src/ui/settings/move-touch-controls-handler.ts @@ -1,5 +1,5 @@ -import TouchControl from "#app/touch-controls.js"; -import UI from "#app/ui/ui.js"; +import TouchControl from "#app/touch-controls"; +import UI from "#app/ui/ui"; import { Scene } from "phaser"; export const TOUCH_CONTROL_POSITIONS_LANDSCAPE = "touchControlPositionsLandscape"; diff --git a/src/ui/settings/navigationMenu.ts b/src/ui/settings/navigationMenu.ts index 370b6f67c76..7d7761b7b69 100644 --- a/src/ui/settings/navigationMenu.ts +++ b/src/ui/settings/navigationMenu.ts @@ -1,6 +1,6 @@ import BattleScene from "#app/battle-scene"; import {Mode} from "#app/ui/ui"; -import {InputsIcons} from "#app/ui/settings/abstract-control-settings-ui-handler.js"; +import {InputsIcons} from "#app/ui/settings/abstract-control-settings-ui-handler"; import {addTextObject, setTextStyle, TextStyle} from "#app/ui/text"; import {addWindow} from "#app/ui/ui-theme"; import {Button} from "#enums/buttons"; diff --git a/src/ui/settings/settings-audio-ui-handler.ts b/src/ui/settings/settings-audio-ui-handler.ts index 4a895fc3170..86c6a9bce40 100644 --- a/src/ui/settings/settings-audio-ui-handler.ts +++ b/src/ui/settings/settings-audio-ui-handler.ts @@ -1,6 +1,6 @@ import BattleScene from "../../battle-scene"; import { Mode } from "../ui"; -"#app/inputs-controller.js"; +"#app/inputs-controller"; import AbstractSettingsUiHandler from "./abstract-settings-ui-handler"; import { SettingType } from "#app/system/settings/settings"; diff --git a/src/ui/settings/settings-display-ui-handler.ts b/src/ui/settings/settings-display-ui-handler.ts index 25dda6e9bfb..3d602c50a78 100644 --- a/src/ui/settings/settings-display-ui-handler.ts +++ b/src/ui/settings/settings-display-ui-handler.ts @@ -1,6 +1,6 @@ import BattleScene from "../../battle-scene"; import { Mode } from "../ui"; -"#app/inputs-controller.js"; +"#app/inputs-controller"; import AbstractSettingsUiHandler from "./abstract-settings-ui-handler"; import { SettingKeys, SettingType } from "#app/system/settings/settings"; diff --git a/src/ui/settings/settings-gamepad-ui-handler.ts b/src/ui/settings/settings-gamepad-ui-handler.ts index 902d7eff34e..63a9d2ab23b 100644 --- a/src/ui/settings/settings-gamepad-ui-handler.ts +++ b/src/ui/settings/settings-gamepad-ui-handler.ts @@ -12,7 +12,7 @@ import pad_xbox360 from "#app/configs/inputs/pad_xbox360"; import pad_dualshock from "#app/configs/inputs/pad_dualshock"; import pad_unlicensedSNES from "#app/configs/inputs/pad_unlicensedSNES"; import {InterfaceConfig} from "#app/inputs-controller"; -import AbstractControlSettingsUiHandler from "#app/ui/settings/abstract-control-settings-ui-handler.js"; +import AbstractControlSettingsUiHandler from "#app/ui/settings/abstract-control-settings-ui-handler"; import {Device} from "#enums/devices"; import {truncateString} from "#app/utils"; import i18next from "i18next"; diff --git a/src/ui/settings/settings-keyboard-ui-handler.ts b/src/ui/settings/settings-keyboard-ui-handler.ts index dc6de8c90dc..7e020034bc6 100644 --- a/src/ui/settings/settings-keyboard-ui-handler.ts +++ b/src/ui/settings/settings-keyboard-ui-handler.ts @@ -9,7 +9,7 @@ import { settingKeyboardOptions } from "#app/system/settings/settings-keyboard"; import {reverseValueToKeySetting, truncateString} from "#app/utils"; -import AbstractControlSettingsUiHandler from "#app/ui/settings/abstract-control-settings-ui-handler.js"; +import AbstractControlSettingsUiHandler from "#app/ui/settings/abstract-control-settings-ui-handler"; import {InterfaceConfig} from "#app/inputs-controller"; import {addTextObject, TextStyle} from "#app/ui/text"; import {deleteBind} from "#app/configs/inputs/configHandler"; diff --git a/src/ui/time-of-day-widget.ts b/src/ui/time-of-day-widget.ts index 5d2f184e679..ea80a6e524a 100644 --- a/src/ui/time-of-day-widget.ts +++ b/src/ui/time-of-day-widget.ts @@ -1,5 +1,5 @@ import * as Utils from "../utils"; -import BattleScene from "#app/battle-scene.js"; +import BattleScene from "#app/battle-scene"; import { BattleSceneEventType } from "../events/battle-scene"; import { EaseType } from "#enums/ease-type"; import { TimeOfDay } from "#enums/time-of-day"; diff --git a/src/ui/title-ui-handler.ts b/src/ui/title-ui-handler.ts index 3c25ed34d61..67a4f7260e6 100644 --- a/src/ui/title-ui-handler.ts +++ b/src/ui/title-ui-handler.ts @@ -5,7 +5,7 @@ import * as Utils from "../utils"; import { TextStyle, addTextObject, getTextStyleOptions } from "./text"; import { getBattleCountSplashMessage, getSplashMessages } from "../data/splash-messages"; import i18next from "i18next"; -import { TimedEventDisplay } from "#app/timed-event-manager.js"; +import { TimedEventDisplay } from "#app/timed-event-manager"; export default class TitleUiHandler extends OptionSelectUiHandler { private titleContainer: Phaser.GameObjects.Container; diff --git a/vite.config.ts b/vite.config.ts index 8fa7d799f27..1fd85e2572f 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -10,6 +10,7 @@ export const defaultConfig: UserConfig = { clearScreen: false, appType: "mpa", build: { + chunkSizeWarningLimit: 10000, minify: 'esbuild', sourcemap: false, rollupOptions: { From 0bdb6970772572ba0749838733551cbe98c93173 Mon Sep 17 00:00:00 2001 From: James Diefenbach <105332964+j-diefenbach@users.noreply.github.com> Date: Sun, 8 Sep 2024 16:18:51 +1000 Subject: [PATCH 35/83] [Hotfix] Show enemy item icons after egg summary (#4101) Co-authored-by: James Diefenbach --- src/phases/egg-summary-phase.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/phases/egg-summary-phase.ts b/src/phases/egg-summary-phase.ts index 190af17c724..1aa432829a1 100644 --- a/src/phases/egg-summary-phase.ts +++ b/src/phases/egg-summary-phase.ts @@ -45,6 +45,7 @@ export class EggSummaryPhase extends Phase { end() { this.eggHatchHandler.clear(); this.scene.ui.setModeForceTransition(Mode.MESSAGE).then(() => {}); + this.scene.time.delayedCall(250, () => this.scene.setModifiersVisible(true)); super.end(); } } From 8082e6dc58ecdc1961c412e1312fbc037f942161 Mon Sep 17 00:00:00 2001 From: innerthunder <168692175+innerthunder@users.noreply.github.com> Date: Sat, 7 Sep 2024 23:29:49 -0700 Subject: [PATCH 36/83] [Hotfix] Fix harsh weather cancelling moves based on base type (#4097) --- src/data/weather.ts | 8 +++++--- src/field/arena.ts | 4 ++-- src/phases/move-phase.ts | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/data/weather.ts b/src/data/weather.ts index 2421f719e6e..afdd0a958cf 100644 --- a/src/data/weather.ts +++ b/src/data/weather.ts @@ -88,12 +88,14 @@ export class Weather { return 1; } - isMoveWeatherCancelled(move: Move): boolean { + isMoveWeatherCancelled(user: Pokemon, move: Move): boolean { + const moveType = user.getMoveType(move); + switch (this.weatherType) { case WeatherType.HARSH_SUN: - return move instanceof AttackMove && move.type === Type.WATER; + return move instanceof AttackMove && moveType === Type.WATER; case WeatherType.HEAVY_RAIN: - return move instanceof AttackMove && move.type === Type.FIRE; + return move instanceof AttackMove && moveType === Type.FIRE; } return false; diff --git a/src/field/arena.ts b/src/field/arena.ts index e8defbd1a8e..1e1df38af21 100644 --- a/src/field/arena.ts +++ b/src/field/arena.ts @@ -391,8 +391,8 @@ export class Arena { return true; } - isMoveWeatherCancelled(move: Move) { - return this.weather && !this.weather.isEffectSuppressed(this.scene) && this.weather.isMoveWeatherCancelled(move); + isMoveWeatherCancelled(user: Pokemon, move: Move) { + return this.weather && !this.weather.isEffectSuppressed(this.scene) && this.weather.isMoveWeatherCancelled(user, move); } isMoveTerrainCancelled(user: Pokemon, targets: BattlerIndex[], move: Move) { diff --git a/src/phases/move-phase.ts b/src/phases/move-phase.ts index 0ccf19a462f..975e3d32185 100644 --- a/src/phases/move-phase.ts +++ b/src/phases/move-phase.ts @@ -204,7 +204,7 @@ export class MovePhase extends BattlePhase { let success = this.move.getMove().applyConditions(this.pokemon, targets[0], this.move.getMove()); const cancelled = new Utils.BooleanHolder(false); let failedText = this.move.getMove().getFailedText(this.pokemon, targets[0], this.move.getMove(), cancelled); - if (success && this.scene.arena.isMoveWeatherCancelled(this.move.getMove())) { + if (success && this.scene.arena.isMoveWeatherCancelled(this.pokemon, this.move.getMove())) { success = false; } else if (success && this.scene.arena.isMoveTerrainCancelled(this.pokemon, this.targets, this.move.getMove())) { success = false; From 7ab0bbbd94014a8a4809e408f01d3e86381cf015 Mon Sep 17 00:00:00 2001 From: James Diefenbach <105332964+j-diefenbach@users.noreply.github.com> Date: Sun, 8 Sep 2024 16:45:30 +1000 Subject: [PATCH 37/83] [Hotfix] Fix cases where hatched Pokemon don't get an egg move (#4102) Co-authored-by: James Diefenbach --- src/phases/egg-hatch-phase.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/phases/egg-hatch-phase.ts b/src/phases/egg-hatch-phase.ts index 4b03aa62f02..90aceeb46bc 100644 --- a/src/phases/egg-hatch-phase.ts +++ b/src/phases/egg-hatch-phase.ts @@ -448,6 +448,7 @@ export class EggHatchPhase extends Phase { */ generatePokemon(): PlayerPokemon { this.eggHatchData = this.eggLapsePhase.generatePokemon(this.egg); + this.eggMoveIndex = this.eggHatchData.eggMoveIndex; return this.eggHatchData.pokemon; } } From 55b89e82c77a1fc9ba492d023519d49a666a4efe Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Sat, 7 Sep 2024 23:46:56 -0700 Subject: [PATCH 38/83] [Hotfix] Remove extra Roark victory line, fix baton pass i18n in `achv.ts` (#4103) --- src/data/dialogue.ts | 3 +-- src/system/achv.ts | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/data/dialogue.ts b/src/data/dialogue.ts index a2ba06b657f..355f05523d1 100644 --- a/src/data/dialogue.ts +++ b/src/data/dialogue.ts @@ -1569,8 +1569,7 @@ export const trainerTypeDialogue: TrainerTypeDialogue = { "dialogue:roark.victory.1", "dialogue:roark.victory.2", "dialogue:roark.victory.3", - "dialogue:roark.victory.4", - "dialogue:roark.victory.5" + "dialogue:roark.victory.4" ], defeat: [ "dialogue:roark.defeat.1", diff --git a/src/system/achv.ts b/src/system/achv.ts index 89e5493eb2e..6170fe23e1d 100644 --- a/src/system/achv.ts +++ b/src/system/achv.ts @@ -7,7 +7,7 @@ import * as Utils from "../utils"; import { PlayerGender } from "#enums/player-gender"; import { Challenge, FreshStartChallenge, SingleGenerationChallenge, SingleTypeChallenge, InverseBattleChallenge } from "#app/data/challenge"; import { ConditionFn } from "#app/@types/common"; -import { Stat, getShortenedStatKey } from "#app/enums/stat"; +import { Stat, getShortenedStatKey } from "#app/enums/stat"; import { Challenges } from "#app/enums/challenges"; export enum AchvTier { @@ -197,7 +197,7 @@ export function getAchievementDescription(localizationKey: string): string { case "100_RIBBONS": return i18next.t("achv:RibbonAchv.description", {context: genderStr, "ribbonAmount": achvs._100_RIBBONS.ribbonAmount.toLocaleString("en-US")}); case "TRANSFER_MAX_STAT_STAGE": - return i18next.t("achv:TRANSFER_MAX_BATTLE_STAT.description", { context: genderStr }); + return i18next.t("achv:TRANSFER_MAX_STAT_STAGE.description", { context: genderStr }); case "MAX_FRIENDSHIP": return i18next.t("achv:MAX_FRIENDSHIP.description", { context: genderStr }); case "MEGA_EVOLVE": From 4a98c3642787f7599a797293fdb217e9194b2ceb Mon Sep 17 00:00:00 2001 From: Mumble <171087428+frutescens@users.noreply.github.com> Date: Sat, 7 Sep 2024 23:58:24 -0700 Subject: [PATCH 39/83] [Hotfix] Properly whitelisting fused Pokemon that happen to have Pokemon with alt. forms (#4104) --- src/battle-scene.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 9123a213f4c..8a4e98b25e8 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -2767,7 +2767,7 @@ export default class BattleScene extends SceneBase { keys.push("pkmn__" + p.species.getSpriteId(p.gender === Gender.FEMALE, p.species.formIndex, p.shiny, p.variant, true)); keys.push("cry/" + p.species.getCryKey(p.species.formIndex)); if (p.fusionSpecies && p.getSpeciesForm() !== p.getFusionSpeciesForm()) { - keys.push("cry/"+p.getFusionSpeciesForm().getCryKey(p.fusionSpecies.formIndex)); + keys.push("cry/"+p.fusionSpecies.getCryKey(p.fusionFormIndex)); } }); // enemyParty has to be operated on separately from playerParty because playerPokemon =/= enemyPokemon @@ -2776,7 +2776,7 @@ export default class BattleScene extends SceneBase { keys.push(p.species.getSpriteKey(p.gender === Gender.FEMALE, p.species.formIndex, p.shiny, p.variant)); keys.push("cry/" + p.species.getCryKey(p.species.formIndex)); if (p.fusionSpecies && p.getSpeciesForm() !== p.getFusionSpeciesForm()) { - keys.push("cry/"+p.getFusionSpeciesForm().getCryKey(p.fusionSpecies.formIndex)); + keys.push("cry/"+p.fusionSpecies.getCryKey(p.fusionFormIndex)); } }); return keys; From df250c8b90c7ca0ebc23906689409243f4484b90 Mon Sep 17 00:00:00 2001 From: Lugiad Date: Sun, 8 Sep 2024 13:57:17 +0200 Subject: [PATCH 40/83] [Localization] New translations batch locales (Move-disabling effects, abilities triggers, error messages and some misc ajustements) (#4068) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update battle.json * Update battler-tags.json * Update battle.json * Update battle.json * Update battler-tags.json * Update battle.json * Update battler-tags.json * Update battler-tags.json * Update battle.json * Update battle.json * Update battler-tags.json * Update battler-tags.json * Update battle.json * Update battle.json * Update battler-tags.json * Update battler-tags.json * Update battle.json * Update battle.json * Update battler-tags.json * Update battle.json * Update battle.json * Update battle.json * Update battler-tags.json * Update battle.json * Update battle.json * Update src/locales/de/battle.json Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> * Update src/locales/de/battler-tags.json Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> * Update battler-tags.json * Update src/locales/ko/battle.json Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com> * Update src/locales/ko/battler-tags.json Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com> * Update src/locales/it/battle.json Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com> * Update src/locales/it/battler-tags.json Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com> * Update menu.json * Update ability-trigger.json * Update ability-trigger.json * Update ability-trigger.json * Update ability-trigger.json * Update ability-trigger.json * Update ability-trigger.json * Update ability-trigger.json * Update ability-trigger.json * Update menu.json * Update menu.json * Update menu.json * Update menu.json * Update menu.json * Update menu.json * Update menu.json * Update menu.json * Update src/locales/de/ability-trigger.json Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> * Update src/locales/de/ability-trigger.json Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> * Update src/locales/de/menu.json Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> * Update src/locales/ko/ability-trigger.json Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com> * Update src/locales/ko/menu.json Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com> * Update src/locales/ko/ability-trigger.json Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com> * Update src/locales/ko/menu.json Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com> * Update menu.json * Update ability-trigger.json * Update ability-trigger.json * Update ability-trigger.json * Update ability-trigger.json * Update ability-trigger.json * Update ability-trigger.json * Update menu.json * Update ability-trigger.json * Update battle.json * Update battler-tags.json * Update src/locales/zh_CN/battle.json Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> * Update src/locales/zh_TW/battle.json Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update menu.json * Update battler-tags.json * Update battle.json * Update ability-trigger.json * Update battler-tags.json * Update battler-tags.json * Update battler-tags.json * Update battler-tags.json * Update modifier-type.json * Update menu.json * Update battle.json * Update tutorial.json * Update tutorial.json * Update egg.json * Update battle.json * Update battle.json * Update tutorial.json * Update egg.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update modifier-type.json * Update challenges.json * Update src/locales/ko/modifier-type.json Co-authored-by: Enoch * Update src/locales/ko/modifier-type.json Co-authored-by: Enoch * Update src/locales/ja/battle.json Co-authored-by: Chapybara-jp * Update src/locales/ja/menu.json Co-authored-by: Chapybara-jp * Update src/locales/ja/modifier-type.json Co-authored-by: Chapybara-jp * Update src/locales/ja/modifier-type.json Co-authored-by: Chapybara-jp * Update src/locales/ja/modifier-type.json Co-authored-by: Chapybara-jp * Update dialogue.json * Update dialogue-misc.json * Update dialogue-final-boss.json * Update dialogue-double-battle.json * Update ability-trigger.json * Update achv.json * Update arena-tag.json * Update battle.json * Update battler-tags.json * Update command-ui-handler.json * Update menu.json * Update modifier-type.json * Update modifier.json * Update move-trigger.json * Update pokemon-info-container.json * Update pokemon-info.json * Update splash-messages.json * Update status-effect.json * Update tutorial.json * Update voucher.json * Update weather.json * Update ability-trigger.json * Update src/locales/de/modifier-type.json Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> * Update src/locales/de/modifier-type.json Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> * Update modifier-type.json * Update bgm-name.json * Update bgm-name.json * Update src/locales/it/menu.json Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com> * types_ja.png update * Apply suggestions from code review Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> --------- Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com> Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com> Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com> Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> Co-authored-by: Enoch Co-authored-by: Chapybara-jp --- public/images/types_ja.png | Bin 9300 -> 7057 bytes src/locales/de/ability-trigger.json | 4 +- src/locales/de/battle.json | 3 +- src/locales/de/battler-tags.json | 6 +- src/locales/de/menu.json | 6 +- src/locales/de/modifier-type.json | 8 +- src/locales/en/ability-trigger.json | 4 +- src/locales/en/challenges.json | 4 +- src/locales/es/ability-trigger.json | 2 + src/locales/es/battle.json | 3 +- src/locales/es/battler-tags.json | 4 +- src/locales/es/menu.json | 4 +- src/locales/es/modifier-type.json | 8 +- src/locales/fr/ability-trigger.json | 18 +-- src/locales/fr/achv.json | 4 +- src/locales/fr/arena-tag.json | 2 +- src/locales/fr/battle.json | 117 +++++++++--------- src/locales/fr/battler-tags.json | 32 ++--- src/locales/fr/command-ui-handler.json | 4 +- src/locales/fr/dialogue-double-battle.json | 42 +++---- src/locales/fr/dialogue-final-boss.json | 6 +- src/locales/fr/dialogue-misc.json | 6 +- src/locales/fr/dialogue.json | 132 ++++++++++----------- src/locales/fr/egg.json | 4 +- src/locales/fr/menu.json | 26 ++-- src/locales/fr/modifier-type.json | 24 ++-- src/locales/fr/modifier.json | 2 +- src/locales/fr/move-trigger.json | 16 +-- src/locales/fr/pokemon-info-container.json | 8 +- src/locales/fr/pokemon-info.json | 4 +- src/locales/fr/splash-messages.json | 66 +++++------ src/locales/fr/status-effect.json | 4 +- src/locales/fr/tutorial.json | 18 +-- src/locales/fr/voucher.json | 10 +- src/locales/fr/weather.json | 54 ++++----- src/locales/it/ability-trigger.json | 4 +- src/locales/it/battle.json | 3 +- src/locales/it/battler-tags.json | 6 +- src/locales/it/menu.json | 6 +- src/locales/it/modifier-type.json | 8 +- src/locales/ja/ability-trigger.json | 4 +- src/locales/ja/battle.json | 3 +- src/locales/ja/battler-tags.json | 4 +- src/locales/ja/menu.json | 4 +- src/locales/ja/modifier-type.json | 8 +- src/locales/ko/ability-trigger.json | 4 +- src/locales/ko/battle.json | 3 +- src/locales/ko/battler-tags.json | 6 +- src/locales/ko/menu.json | 4 +- src/locales/ko/modifier-type.json | 8 +- src/locales/pt_BR/battle.json | 2 +- src/locales/pt_BR/battler-tags.json | 2 +- src/locales/pt_BR/modifier-type.json | 8 +- src/locales/zh_CN/ability-trigger.json | 4 +- src/locales/zh_CN/battle.json | 3 +- src/locales/zh_CN/battler-tags.json | 6 +- src/locales/zh_CN/menu.json | 6 +- src/locales/zh_CN/modifier-type.json | 8 +- src/locales/zh_TW/ability-trigger.json | 4 +- src/locales/zh_TW/battle.json | 3 +- src/locales/zh_TW/battler-tags.json | 6 +- src/locales/zh_TW/menu.json | 6 +- src/locales/zh_TW/modifier-type.json | 8 +- 63 files changed, 444 insertions(+), 352 deletions(-) diff --git a/public/images/types_ja.png b/public/images/types_ja.png index e60d8e071aa42c3ae09c7ae30937704d465606a0..a6f3b00607f6eaa8c3a4f88cf54bc4f14fbd6710 100644 GIT binary patch delta 4764 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 YXO}q%hF2Z^R{rltSIYofpke9vKl Date: Sun, 8 Sep 2024 13:42:11 -0700 Subject: [PATCH 41/83] [Hotfix][Bug] Retrieves the correct cry for Fused Pokemon (#4116) * [DOCS] adding JSDocs to `arena.ts` (#3590) * adding some docs * Update src/field/pokemon.ts Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * seems like battleStats changed to statStages * Apply suggestions from code review editing doc text Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> * Update tsdocs, convert comment to tsdoc in `pokemon.ts` --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> * [Bug] Fix scrappy (+ some immunity move and ability) in inverse battle (#4067) * fix scrappy + etc. update inverse battle test code * update test code following request from swain * fix and optimize imports (#4061) - remove any `.js` extension imports - remove unncessary dynamic imports of `modifier.ts` file. The file was being imported statically & dynamically. Made it pure static - increase vite chunk-size warning limit Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com> * Fusion hotfix * Revert "fix and optimize imports (#4061)" This reverts commit 287d671cfdc8b2d45b2d206386e980c11ee85f8e. * Revert "[Bug] Fix scrappy (+ some immunity move and ability) in inverse battle (#4067)" This reverts commit 9fd34c95d565efb78240321062521e8acbc28739. * Revert "[DOCS] adding JSDocs to `arena.ts` (#3590)" This reverts commit 0742efd1963b8b9e0b17797ceb3dd576a765ecf6. * typo * Fixed fusionFaintCry to return correct cry --------- Co-authored-by: DustinLin <39450497+DustinLin@users.noreply.github.com> Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com> Co-authored-by: frutescens --- src/field/pokemon.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index f522d50f357..7d7fae064cf 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -2829,7 +2829,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } private fusionFaintCry(callback: Function): void { - const key = `cry/${this.getSpeciesForm().getCryKey(this.formIndex)}`; + const key = `cry/${this.species.getCryKey(this.formIndex)}`; let i = 0; let rate = 0.85; const cry = this.scene.playSound(key, { rate: rate }) as AnySound; @@ -2837,7 +2837,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const tintSprite = this.getTintSprite(); let duration = cry.totalDuration * 1000; - const fusionCryKey = `cry/${this.getFusionSpeciesForm().getCryKey(this.fusionFormIndex)}`; + const fusionCryKey = `cry/${this.fusionSpecies?.getCryKey(this.fusionFormIndex)}`; let fusionCry = this.scene.playSound(fusionCryKey, { rate: rate }) as AnySound; fusionCry.stop(); duration = Math.min(duration, fusionCry.totalDuration * 1000); From 021f31b589d40e97c5ca422ce190a2945925b1fe Mon Sep 17 00:00:00 2001 From: Mumble <171087428+frutescens@users.noreply.github.com> Date: Sun, 8 Sep 2024 16:03:37 -0700 Subject: [PATCH 42/83] [Hotfix] Retrieve the right cry when alternate-form Pokemon faint + retrieve the correct sprite key (#4117) * [DOCS] adding JSDocs to `arena.ts` (#3590) * adding some docs * Update src/field/pokemon.ts Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * seems like battleStats changed to statStages * Apply suggestions from code review editing doc text Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> * Update tsdocs, convert comment to tsdoc in `pokemon.ts` --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> * [Bug] Fix scrappy (+ some immunity move and ability) in inverse battle (#4067) * fix scrappy + etc. update inverse battle test code * update test code following request from swain * fix and optimize imports (#4061) - remove any `.js` extension imports - remove unncessary dynamic imports of `modifier.ts` file. The file was being imported statically & dynamically. Made it pure static - increase vite chunk-size warning limit Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com> * Fusion hotfix * returned main * Faint cry properly retrieved for non fused Pokemon with forms * Revert "[DOCS] adding JSDocs to `arena.ts` (#3590)" This reverts commit b73fd97760bc7fbd7c35062d3763d30820ddbded. * Revert "[Bug] Fix scrappy (+ some immunity move and ability) in inverse battle (#4067)" This reverts commit 31fcbf49f49ee1106b25fe5d9737507b3e7615e8. * Revert "fix and optimize imports (#4061)" This reverts commit d1bd6974e435c9ddd2222194b8ef282a87b03047. * Fixed sprite key generation --------- Co-authored-by: DustinLin <39450497+DustinLin@users.noreply.github.com> Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com> Co-authored-by: frutescens --- src/battle-scene.ts | 6 +++--- src/field/pokemon.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 8a4e98b25e8..12f424f63b3 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -2763,8 +2763,8 @@ export default class BattleScene extends SceneBase { const keys: string[] = []; const playerParty = this.getParty(); playerParty.forEach(p => { - keys.push("pkmn__" + p.species.getSpriteId(p.gender === Gender.FEMALE, p.species.formIndex, p.shiny, p.variant)); - keys.push("pkmn__" + p.species.getSpriteId(p.gender === Gender.FEMALE, p.species.formIndex, p.shiny, p.variant, true)); + keys.push(p.getSpriteKey(true)); + keys.push(p.getBattleSpriteKey(true, true)); keys.push("cry/" + p.species.getCryKey(p.species.formIndex)); if (p.fusionSpecies && p.getSpeciesForm() !== p.getFusionSpeciesForm()) { keys.push("cry/"+p.fusionSpecies.getCryKey(p.fusionFormIndex)); @@ -2773,7 +2773,7 @@ export default class BattleScene extends SceneBase { // enemyParty has to be operated on separately from playerParty because playerPokemon =/= enemyPokemon const enemyParty = this.getEnemyParty(); enemyParty.forEach(p => { - keys.push(p.species.getSpriteKey(p.gender === Gender.FEMALE, p.species.formIndex, p.shiny, p.variant)); + keys.push(p.getSpriteKey(true)); keys.push("cry/" + p.species.getCryKey(p.species.formIndex)); if (p.fusionSpecies && p.getSpeciesForm() !== p.getFusionSpeciesForm()) { keys.push("cry/"+p.fusionSpecies.getCryKey(p.fusionFormIndex)); diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 7d7fae064cf..91b57501371 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -2771,7 +2771,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return this.fusionFaintCry(callback); } - const key = `cry/${this.getSpeciesForm().getCryKey(this.formIndex)}`; + const key = `cry/${this.species.getCryKey(this.formIndex)}`; //eslint-disable-next-line @typescript-eslint/no-unused-vars let i = 0; let rate = 0.85; From 93d6375894d78e3c63045034c0861ac59f564e76 Mon Sep 17 00:00:00 2001 From: Opaque02 <66582645+Opaque02@users.noreply.github.com> Date: Mon, 9 Sep 2024 09:57:44 +1000 Subject: [PATCH 43/83] Updated all fields (except passwords) to allow for 20 characters (#4119) --- src/ui/form-modal-ui-handler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/form-modal-ui-handler.ts b/src/ui/form-modal-ui-handler.ts index 8c4ea5f6768..331154263ad 100644 --- a/src/ui/form-modal-ui-handler.ts +++ b/src/ui/form-modal-ui-handler.ts @@ -60,7 +60,7 @@ export abstract class FormModalUiHandler extends ModalUiHandler { const inputBg = addWindow(this.scene, 0, 0, 80, 16, false, false, 0, 0, WindowVariant.XTHIN); const isPassword = field.includes(i18next.t("menu:password")) || field.includes(i18next.t("menu:confirmPassword")); - const input = addTextInputObject(this.scene, 4, -2, 440, 116, TextStyle.TOOLTIP_CONTENT, { type: isPassword ? "password" : "text", maxLength: isPassword ? 64 : 18 }); + const input = addTextInputObject(this.scene, 4, -2, 440, 116, TextStyle.TOOLTIP_CONTENT, { type: isPassword ? "password" : "text", maxLength: isPassword ? 64 : 20 }); input.setOrigin(0, 0); inputContainer.add(inputBg); From 38cb10ff97a7e5404ec8be6e992f9ededfd066c0 Mon Sep 17 00:00:00 2001 From: "Amani H." <109637146+xsn34kzx@users.noreply.github.com> Date: Sun, 8 Sep 2024 21:50:00 -0400 Subject: [PATCH 44/83] [Hotfix] Fix System Data Conversion Failure (#4123) --- src/system/version-converter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/system/version-converter.ts b/src/system/version-converter.ts index ed65fcd99b8..0aa2b16b695 100644 --- a/src/system/version-converter.ts +++ b/src/system/version-converter.ts @@ -102,7 +102,7 @@ export function applySystemDataPatches(data: SystemSaveData) { // --- PATCHES --- // Fix Starter Data - if (data.gameVersion) { + if (data.starterData) { for (const starterId of defaultStarterSpecies) { data.starterData[starterId].abilityAttr |= AbilityAttr.ABILITY_1; data.dexData[starterId].caughtAttr |= DexAttr.FEMALE; From a30201f185df88bfffce1e419d0b40d9aac6023d Mon Sep 17 00:00:00 2001 From: Mumble <171087428+frutescens@users.noreply.github.com> Date: Sun, 8 Sep 2024 19:12:37 -0700 Subject: [PATCH 45/83] [Hotfix] Retrieving the correct form index for correct cry keys (#4121) * [DOCS] adding JSDocs to `arena.ts` (#3590) * adding some docs * Update src/field/pokemon.ts Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * seems like battleStats changed to statStages * Apply suggestions from code review editing doc text Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> * Update tsdocs, convert comment to tsdoc in `pokemon.ts` --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> * [Bug] Fix scrappy (+ some immunity move and ability) in inverse battle (#4067) * fix scrappy + etc. update inverse battle test code * update test code following request from swain * fix and optimize imports (#4061) - remove any `.js` extension imports - remove unncessary dynamic imports of `modifier.ts` file. The file was being imported statically & dynamically. Made it pure static - increase vite chunk-size warning limit Co-authored-by: Mumble <171087428+frutescens@users.noreply.github.com> * returned main * Fixed cry key * Revert "[DOCS] adding JSDocs to `arena.ts` (#3590)" This reverts commit 675e6a063590ad8b7f3c8c951cfeddc9a74db274. * Revert "[Bug] Fix scrappy (+ some immunity move and ability) in inverse battle (#4067)" This reverts commit 45af0dd170afd50e045bdbef4b05002b1f1e0fcf. * Revert "fix and optimize imports (#4061)" This reverts commit e12548cdb0d53f109c8c5d80b2e0dd2c22c2fc8b. --------- Co-authored-by: DustinLin <39450497+DustinLin@users.noreply.github.com> Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> Co-authored-by: Leo Kim <47556641+KimJeongSun@users.noreply.github.com> Co-authored-by: frutescens --- src/battle-scene.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 12f424f63b3..8e6f9afb34c 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -2765,8 +2765,8 @@ export default class BattleScene extends SceneBase { playerParty.forEach(p => { keys.push(p.getSpriteKey(true)); keys.push(p.getBattleSpriteKey(true, true)); - keys.push("cry/" + p.species.getCryKey(p.species.formIndex)); - if (p.fusionSpecies && p.getSpeciesForm() !== p.getFusionSpeciesForm()) { + keys.push("cry/" + p.species.getCryKey(p.formIndex)); + if (p.fusionSpecies) { keys.push("cry/"+p.fusionSpecies.getCryKey(p.fusionFormIndex)); } }); @@ -2774,8 +2774,8 @@ export default class BattleScene extends SceneBase { const enemyParty = this.getEnemyParty(); enemyParty.forEach(p => { keys.push(p.getSpriteKey(true)); - keys.push("cry/" + p.species.getCryKey(p.species.formIndex)); - if (p.fusionSpecies && p.getSpeciesForm() !== p.getFusionSpeciesForm()) { + keys.push("cry/" + p.species.getCryKey(p.formIndex)); + if (p.fusionSpecies) { keys.push("cry/"+p.fusionSpecies.getCryKey(p.fusionFormIndex)); } }); From 68b956cbe6d0ce3da0d55c7a6a86cdb8dca045b3 Mon Sep 17 00:00:00 2001 From: innerthunder <168692175+innerthunder@users.noreply.github.com> Date: Sun, 8 Sep 2024 20:48:09 -0700 Subject: [PATCH 46/83] [Bug] Fix incorrect defensive properties on Terastallized Pokemon (#4070) * Fix incorrect defensive properties on Terastallized Pokemon * Add tests to `effectiveness.test.ts` * Suppress errors from Tera achievement validation --- src/field/pokemon.ts | 5 +++- src/test/moves/effectiveness.test.ts | 39 +++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 863b0f41d2c..6d29e30254a 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1049,6 +1049,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const teraType = this.getTeraType(); if (teraType !== Type.UNKNOWN) { types.push(teraType); + if (forDefend) { + return types; + } } } @@ -1368,7 +1371,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { : 1); applyMoveAttrs(VariableMoveTypeMultiplierAttr, source, this, move, typeMultiplier); - if (this.getTypes().find(t => move.isTypeImmune(source, this, t))) { + if (this.getTypes(true, true).find(t => move.isTypeImmune(source, this, t))) { typeMultiplier.value = 0; } diff --git a/src/test/moves/effectiveness.test.ts b/src/test/moves/effectiveness.test.ts index af44586b69d..d1903c79844 100644 --- a/src/test/moves/effectiveness.test.ts +++ b/src/test/moves/effectiveness.test.ts @@ -1,23 +1,32 @@ import { allMoves } from "#app/data/move"; import { getPokemonSpecies } from "#app/data/pokemon-species"; import { TrainerSlot } from "#app/data/trainer-config"; +import { Type } from "#app/data/type"; import { Abilities } from "#app/enums/abilities"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import * as Messages from "#app/messages"; +import { TerastallizeModifier } from "#app/modifier/modifier"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, describe, expect, it, vi } from "vitest"; function testMoveEffectiveness(game: GameManager, move: Moves, targetSpecies: Species, - expected: number, targetAbility: Abilities = Abilities.BALL_FETCH): void { + expected: number, targetAbility: Abilities = Abilities.BALL_FETCH, teraType?: Type): void { // Suppress getPokemonNameWithAffix because it calls on a null battle spec vi.spyOn(Messages, "getPokemonNameWithAffix").mockReturnValue(""); game.override.enemyAbility(targetAbility); + + if (teraType !== undefined) { + game.override.enemyHeldItems([{ name:"TERA_SHARD", type: teraType }]); + } + const user = game.scene.addPlayerPokemon(getPokemonSpecies(Species.SNORLAX), 5); const target = game.scene.addEnemyPokemon(getPokemonSpecies(targetSpecies), 5, TrainerSlot.NONE); expect(target.getMoveEffectiveness(user, allMoves[move])).toBe(expected); + user.destroy(); + target.destroy(); } describe("Moves - Type Effectiveness", () => { @@ -29,6 +38,8 @@ describe("Moves - Type Effectiveness", () => { type: Phaser.HEADLESS, }); game = new GameManager(phaserGame); + TerastallizeModifier.prototype.apply = (args) => true; + game.override.ability(Abilities.BALL_FETCH); }); @@ -67,4 +78,30 @@ describe("Moves - Type Effectiveness", () => { it("Electric-type attacks are negated by Volt Absorb", () => testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.GYARADOS, 0, Abilities.VOLT_ABSORB) ); + + it("Electric-type attacks are super-effective against Tera-Water Pokemon", + () => testMoveEffectiveness(game, Moves.THUNDERBOLT, Species.EXCADRILL, 2, Abilities.BALL_FETCH, Type.WATER) + ); + + it("Powder moves have no effect on Grass-type Pokemon", + () => testMoveEffectiveness(game, Moves.SLEEP_POWDER, Species.AMOONGUSS, 0) + ); + + it("Powder moves have no effect on Tera-Grass Pokemon", + () => testMoveEffectiveness(game, Moves.SLEEP_POWDER, Species.SNORLAX, 0, Abilities.BALL_FETCH, Type.GRASS) + ); + + it("Prankster-boosted status moves have no effect on Dark-type Pokemon", + () => { + game.override.ability(Abilities.PRANKSTER); + testMoveEffectiveness(game, Moves.BABY_DOLL_EYES, Species.MIGHTYENA, 0); + } + ); + + it("Prankster-boosted status moves have no effect on Tera-Dark Pokemon", + () => { + game.override.ability(Abilities.PRANKSTER); + testMoveEffectiveness(game, Moves.BABY_DOLL_EYES, Species.SNORLAX, 0, Abilities.BALL_FETCH, Type.DARK); + } + ); }); From 06f98f6737ba959f2894c1dc48fbdac7e3ecf5ed Mon Sep 17 00:00:00 2001 From: "Adrian T." <68144167+torranx@users.noreply.github.com> Date: Mon, 9 Sep 2024 11:50:47 +0800 Subject: [PATCH 47/83] [Bug] Fix console error from undefined stockpilingTag (#4118) --- src/data/move.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/move.ts b/src/data/move.ts index 19014c0eb30..e6e7f574671 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -3472,7 +3472,7 @@ export class SpitUpPowerAttr extends VariablePowerAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const stockpilingTag = user.getTag(StockpilingTag); - if (stockpilingTag !== null && stockpilingTag.stockpiledCount > 0) { + if (stockpilingTag && stockpilingTag.stockpiledCount > 0) { const power = args[0] as Utils.IntegerHolder; power.value = this.multiplier * stockpilingTag.stockpiledCount; return true; @@ -3490,7 +3490,7 @@ export class SwallowHealAttr extends HealAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { const stockpilingTag = user.getTag(StockpilingTag); - if (stockpilingTag !== null && stockpilingTag?.stockpiledCount > 0) { + if (stockpilingTag && stockpilingTag.stockpiledCount > 0) { const stockpiled = stockpilingTag.stockpiledCount; let healRatio: number; From 39b6a725175aa41b250719945dbf709768813daa Mon Sep 17 00:00:00 2001 From: flx-sta <50131232+flx-sta@users.noreply.github.com> Date: Sun, 8 Sep 2024 22:10:47 -0700 Subject: [PATCH 48/83] [Bug] Fix #762: All Pokemon become invisible when capturing then switching with your only pokemon that was not fainted (#4025) * fix #762 by using slotIndex to add to party for now the new pokemon was ALWAYS just pushed to the party array. Now it's put into the slot that was also previously selected as the mon to release * add docs for `Pokemon.addToParty()` * add simple tests for addToParty * update `isBetween` docs. Remove `.js` imports --- src/constants.ts | 1 + src/field/pokemon.ts | 19 +++++++++++++--- src/phases/attempt-capture-phase.ts | 6 ++--- src/test/field/pokemon.test.ts | 35 +++++++++++++++++++++++++++++ src/utils.ts | 11 +++++++++ 5 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 src/constants.ts diff --git a/src/constants.ts b/src/constants.ts new file mode 100644 index 00000000000..a2f7e47b996 --- /dev/null +++ b/src/constants.ts @@ -0,0 +1 @@ +export const PLAYER_PARTY_MAX_SIZE = 6; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 6d29e30254a..e2f238e29af 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -58,6 +58,7 @@ import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; import { SwitchSummonPhase } from "#app/phases/switch-summon-phase"; import { ToggleDoublePositionPhase } from "#app/phases/toggle-double-position-phase"; import { Challenges } from "#enums/challenges"; +import { PLAYER_PARTY_MAX_SIZE } from "#app/constants"; export enum FieldPosition { CENTER, @@ -4465,17 +4466,29 @@ export class EnemyPokemon extends Pokemon { return BattlerIndex.ENEMY + this.getFieldIndex(); } - addToParty(pokeballType: PokeballType) { + /** + * Add a new pokemon to the player's party (at `slotIndex` if set). + * @param pokeballType the type of pokeball the pokemon was caught with + * @param slotIndex an optional index to place the pokemon in the party + * @returns the pokemon that was added or null if the pokemon could not be added + */ + addToParty(pokeballType: PokeballType, slotIndex: number = -1) { const party = this.scene.getParty(); let ret: PlayerPokemon | null = null; - if (party.length < 6) { + if (party.length < PLAYER_PARTY_MAX_SIZE) { this.pokeball = pokeballType; this.metLevel = this.level; this.metBiome = this.scene.arena.biomeType; this.metSpecies = this.species.speciesId; const newPokemon = this.scene.addPlayerPokemon(this.species, this.level, this.abilityIndex, this.formIndex, this.gender, this.shiny, this.variant, this.ivs, this.nature, this); - party.push(newPokemon); + + if (Utils.isBetween(slotIndex, 0, PLAYER_PARTY_MAX_SIZE - 1)) { + party.splice(slotIndex, 0, newPokemon); + } else { + party.push(newPokemon); + } + ret = newPokemon; this.scene.triggerPokemonFormChange(newPokemon, SpeciesFormChangeActiveTrigger, true); } diff --git a/src/phases/attempt-capture-phase.ts b/src/phases/attempt-capture-phase.ts index 55a82affaf6..cf9ce997bfd 100644 --- a/src/phases/attempt-capture-phase.ts +++ b/src/phases/attempt-capture-phase.ts @@ -221,8 +221,8 @@ export class AttemptCapturePhase extends PokemonPhase { this.scene.clearEnemyHeldItemModifiers(); this.scene.field.remove(pokemon, true); }; - const addToParty = () => { - const newPokemon = pokemon.addToParty(this.pokeballType); + const addToParty = (slotIndex?: number) => { + const newPokemon = pokemon.addToParty(this.pokeballType, slotIndex); const modifiers = this.scene.findModifiers(m => m instanceof PokemonHeldItemModifier, false); if (this.scene.getParty().filter(p => p.isShiny()).length === 6) { this.scene.validateAchv(achvs.SHINY_PARTY); @@ -253,7 +253,7 @@ export class AttemptCapturePhase extends PokemonPhase { this.scene.ui.setMode(Mode.PARTY, PartyUiMode.RELEASE, this.fieldIndex, (slotIndex: integer, _option: PartyOption) => { this.scene.ui.setMode(Mode.MESSAGE).then(() => { if (slotIndex < 6) { - addToParty(); + addToParty(slotIndex); } else { promptRelease(); } diff --git a/src/test/field/pokemon.test.ts b/src/test/field/pokemon.test.ts index d597cd5219c..f7c1cf8bc3d 100644 --- a/src/test/field/pokemon.test.ts +++ b/src/test/field/pokemon.test.ts @@ -1,6 +1,8 @@ import { Species } from "#app/enums/species"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import GameManager from "../utils/gameManager"; +import { PokeballType } from "#app/enums/pokeball"; +import BattleScene from "#app/battle-scene"; describe("Spec - Pokemon", () => { let phaserGame: Phaser.Game; @@ -28,4 +30,37 @@ describe("Spec - Pokemon", () => { expect(pkm.trySetStatus(undefined)).toBe(true); }); + + describe("Add To Party", () => { + let scene: BattleScene; + + beforeEach(async () => { + game.override.enemySpecies(Species.ZUBAT); + await game.classicMode.runToSummon([Species.ABRA, Species.ABRA, Species.ABRA, Species.ABRA, Species.ABRA]); // 5 Abra, only 1 slot left + scene = game.scene; + }); + + it("should append a new pokemon by default", async () => { + const zubat = scene.getEnemyPokemon()!; + zubat.addToParty(PokeballType.LUXURY_BALL); + + const party = scene.getParty(); + expect(party).toHaveLength(6); + party.forEach((pkm, index) =>{ + expect(pkm.species.speciesId).toBe(index === 5 ? Species.ZUBAT : Species.ABRA); + }); + }); + + it("should put a new pokemon into the passed slotIndex", async () => { + const slotIndex = 1; + const zubat = scene.getEnemyPokemon()!; + zubat.addToParty(PokeballType.LUXURY_BALL, slotIndex); + + const party = scene.getParty(); + expect(party).toHaveLength(6); + party.forEach((pkm, index) =>{ + expect(pkm.species.speciesId).toBe(index === slotIndex ? Species.ZUBAT : Species.ABRA); + }); + }); + }); }); diff --git a/src/utils.ts b/src/utils.ts index 592981c7643..7decf9bb4c0 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -609,3 +609,14 @@ export function toDmgValue(value: number, minValue: number = 1) { export function getLocalizedSpriteKey(baseKey: string) { return `${baseKey}${verifyLang(i18next.resolvedLanguage) ? `_${i18next.resolvedLanguage}` : ""}`; } + +/** + * Check if a number is **inclusive** between two numbers + * @param num the number to check + * @param min the minimum value (included) + * @param max the maximum value (included) + * @returns true if number is **inclusive** between min and max + */ +export function isBetween(num: number, min: number, max: number): boolean { + return num >= min && num <= max; +} From c710f85fd3bb133a814207fecc6bbd0f04d0ce62 Mon Sep 17 00:00:00 2001 From: innerthunder <168692175+innerthunder@users.noreply.github.com> Date: Sun, 8 Sep 2024 23:19:59 -0700 Subject: [PATCH 49/83] Fix `Pokemon.isTrapped` only checking enemy Pokemon for trapping abilities (#4124) --- src/field/pokemon.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index e2f238e29af..a1305b6b1b2 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1324,9 +1324,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } const trappedByAbility = new Utils.BooleanHolder(false); + const opposingField = this.isPlayer() ? this.scene.getEnemyField() : this.scene.getPlayerField(); - this.scene.getEnemyField()!.forEach(enemyPokemon => - applyCheckTrappedAbAttrs(CheckTrappedAbAttr, enemyPokemon, trappedByAbility, this, trappedAbMessages, simulated) + opposingField.forEach(opponent => + applyCheckTrappedAbAttrs(CheckTrappedAbAttr, opponent, trappedByAbility, this, trappedAbMessages, simulated) ); return (trappedByAbility.value || !!this.getTag(TrappedTag)); From f5bf766ff7ed0314e98b6d12e6a238848407e0e1 Mon Sep 17 00:00:00 2001 From: "Adrian T." <68144167+torranx@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:42:53 +0800 Subject: [PATCH 50/83] [Move] Fully implement Tar Shot (#4043) --- src/data/battler-tags.ts | 33 ++++++++ src/data/move.ts | 2 +- src/enums/battler-tag-type.ts | 1 + src/field/pokemon.ts | 10 ++- src/locales/en/battler-tags.json | 3 +- src/test/moves/tar_shot.test.ts | 133 +++++++++++++++++++++++++++++++ 6 files changed, 177 insertions(+), 5 deletions(-) create mode 100644 src/test/moves/tar_shot.test.ts diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index ddb85600c18..c26412c776f 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -1984,7 +1984,38 @@ export class ExposedTag extends BattlerTag { } } +/** + * Tag that doubles the type effectiveness of Fire-type moves. + * @extends BattlerTag + */ +export class TarShotTag extends BattlerTag { + constructor() { + super(BattlerTagType.TAR_SHOT, BattlerTagLapseType.CUSTOM, 0); + } + /** + * If the Pokemon is terastallized, the tag cannot be added. + * @param {Pokemon} pokemon the {@linkcode Pokemon} to which the tag is added + * @returns whether the tag is applied + */ + override canAdd(pokemon: Pokemon): boolean { + return !pokemon.isTerastallized(); + } + + override onAdd(pokemon: Pokemon): void { + pokemon.scene.queueMessage(i18next.t("battlerTags:tarShotOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })); + } +} + +/** + * Retrieves a {@linkcode BattlerTag} based on the provided tag type, turn count, source move, and source ID. + * + * @param {BattlerTagType} tagType the type of the {@linkcode BattlerTagType}. + * @param turnCount the turn count. + * @param {Moves} sourceMove the source {@linkcode Moves}. + * @param sourceId the source ID. + * @returns {BattlerTag} the corresponding {@linkcode BattlerTag} object. + */ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, sourceMove: Moves, sourceId: number): BattlerTag { switch (tagType) { case BattlerTagType.RECHARGING: @@ -2125,6 +2156,8 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source case BattlerTagType.GULP_MISSILE_ARROKUDA: case BattlerTagType.GULP_MISSILE_PIKACHU: return new GulpMissileTag(tagType, sourceMove); + case BattlerTagType.TAR_SHOT: + return new TarShotTag(); case BattlerTagType.NONE: default: return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId); diff --git a/src/data/move.ts b/src/data/move.ts index e6e7f574671..21b859b22ac 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -8644,7 +8644,7 @@ export function initMoves() { .condition((user, target, move) => user.getTag(TrappedTag)?.sourceMove !== Moves.NO_RETREAT), // fails if the user is currently trapped by No Retreat new StatusMove(Moves.TAR_SHOT, Type.ROCK, 100, 15, -1, 0, 8) .attr(StatStageChangeAttr, [ Stat.SPD ], -1) - .partial(), + .attr(AddBattlerTagAttr, BattlerTagType.TAR_SHOT, false), new StatusMove(Moves.MAGIC_POWDER, Type.PSYCHIC, 100, 20, -1, 0, 8) .attr(ChangeTypeAttr, Type.PSYCHIC) .powderMove(), diff --git a/src/enums/battler-tag-type.ts b/src/enums/battler-tag-type.ts index a2bcf9e4c0e..0878bd00cd5 100644 --- a/src/enums/battler-tag-type.ts +++ b/src/enums/battler-tag-type.ts @@ -73,4 +73,5 @@ export enum BattlerTagType { SHELL_TRAP = "SHELL_TRAP", DRAGON_CHEER = "DRAGON_CHEER", NO_RETREAT = "NO_RETREAT", + TAR_SHOT = "TAR_SHOT", } diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index a1305b6b1b2..01d728d6de0 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -17,7 +17,7 @@ import { initMoveAnim, loadMoveAnimAssets } from "../data/battle-anims"; import { Status, StatusEffect, getRandomStatus } from "../data/status-effect"; import { pokemonEvolutions, pokemonPrevolutions, SpeciesFormEvolution, SpeciesEvolutionCondition, FusionSpeciesFormEvolution } from "../data/pokemon-evolutions"; import { reverseCompatibleTms, tmSpecies, tmPoolTiers } from "../data/tms"; -import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HighestStatBoostTag, TypeImmuneTag, getBattlerTag, SemiInvulnerableTag, TypeBoostTag, MoveRestrictionBattlerTag, ExposedTag, DragonCheerTag, CritBoostTag, TrappedTag } from "../data/battler-tags"; +import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HighestStatBoostTag, TypeImmuneTag, getBattlerTag, SemiInvulnerableTag, TypeBoostTag, MoveRestrictionBattlerTag, ExposedTag, DragonCheerTag, CritBoostTag, TrappedTag, TarShotTag } from "../data/battler-tags"; import { WeatherType } from "../data/weather"; import { ArenaTagSide, NoCritTag, WeakenMoveScreenTag } from "../data/arena-tag"; import { Ability, AbAttr, StatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, IgnoreOpponentStatStagesAbAttr, MoveImmunityAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, StabBoostAbAttr, StatusEffectImmunityAbAttr, TypeImmunityAbAttr, WeightMultiplierAbAttr, allAbilities, applyAbAttrs, applyStatMultiplierAbAttrs, applyPreApplyBattlerTagAbAttrs, applyPreAttackAbAttrs, applyPreDefendAbAttrs, applyPreSetStatusAbAttrs, UnsuppressableAbilityAbAttr, SuppressFieldAbilitiesAbAttr, NoFusionAbilityAbAttr, MultCritAbAttr, IgnoreTypeImmunityAbAttr, DamageBoostAbAttr, IgnoreTypeStatusEffectImmunityAbAttr, ConditionalCritAbAttr, applyFieldStatMultiplierAbAttrs, FieldMultiplyStatAbAttr, AddSecondStrikeAbAttr, UserFieldStatusEffectImmunityAbAttr, UserFieldBattlerTagImmunityAbAttr, BattlerTagImmunityAbAttr, MoveTypeChangeAbAttr, FullHpResistTypeAbAttr, applyCheckTrappedAbAttrs, CheckTrappedAbAttr } from "../data/ability"; @@ -1353,7 +1353,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { /** * Calculates the effectiveness of a move against the Pokémon. - * + * This includes modifiers from move and ability attributes. * @param source {@linkcode Pokemon} The attacking Pokémon. * @param move {@linkcode Move} The move being used by the attacking Pokémon. * @param ignoreAbility Whether to ignore abilities that might affect type effectiveness or immunity (defaults to `false`). @@ -1377,6 +1377,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { typeMultiplier.value = 0; } + if (this.getTag(TarShotTag) && (this.getMoveType(move) === Type.FIRE)) { + typeMultiplier.value *= 2; + } + const cancelledHolder = cancelled ?? new Utils.BooleanHolder(false); if (!ignoreAbility) { applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelledHolder, simulated, typeMultiplier); @@ -1408,7 +1412,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } /** - * Calculates the type effectiveness multiplier for an attack type + * Calculates the move's type effectiveness multiplier based on the target's type/s. * @param moveType {@linkcode Type} the type of the move being used * @param source {@linkcode Pokemon} the Pokemon using the move * @param ignoreStrongWinds whether or not this ignores strong winds (anticipation, forewarn, stealth rocks) diff --git a/src/locales/en/battler-tags.json b/src/locales/en/battler-tags.json index 222aee4087c..5c351fc6961 100644 --- a/src/locales/en/battler-tags.json +++ b/src/locales/en/battler-tags.json @@ -69,5 +69,6 @@ "cursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!", "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!", "disabledOnAdd": "{{pokemonNameWithAffix}}'s {{moveName}}\nwas disabled!", - "disabledLapse": "{{pokemonNameWithAffix}}'s {{moveName}}\nis no longer disabled." + "disabledLapse": "{{pokemonNameWithAffix}}'s {{moveName}}\nis no longer disabled.", + "tarShotOnAdd": "{{pokemonNameWithAffix}} became weaker to fire!" } diff --git a/src/test/moves/tar_shot.test.ts b/src/test/moves/tar_shot.test.ts new file mode 100644 index 00000000000..15667122a37 --- /dev/null +++ b/src/test/moves/tar_shot.test.ts @@ -0,0 +1,133 @@ +import { BattlerIndex } from "#app/battle"; +import { Type } from "#app/data/type"; +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; +import { Stat } from "#app/enums/stat"; +import { Abilities } from "#enums/abilities"; +import GameManager from "#test/utils/gameManager"; +import { SPLASH_ONLY } from "#test/utils/testUtils"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Moves - Tar Shot", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + const TIMEOUT = 20 * 1000; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .battleType("single") + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(SPLASH_ONLY) + .enemySpecies(Species.TANGELA) + .enemyLevel(1000) + .moveset([Moves.TAR_SHOT, Moves.FIRE_PUNCH]) + .disableCrits(); + }); + + it("lowers the target's Speed stat by one stage and doubles the effectiveness of Fire-type moves used on the target", async () => { + await game.classicMode.startBattle([Species.PIKACHU]); + + const enemy = game.scene.getEnemyPokemon()!; + + vi.spyOn(enemy, "getMoveEffectiveness"); + + game.move.select(Moves.TAR_SHOT); + + await game.phaseInterceptor.to("TurnEndPhase"); + expect(enemy.getStatStage(Stat.SPD)).toBe(-1); + + await game.toNextTurn(); + + game.move.select(Moves.FIRE_PUNCH); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + + await game.phaseInterceptor.to("MoveEndPhase"); + expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4); + }, TIMEOUT); + + it("will not double the effectiveness of Fire-type moves used on a target that is already under the effect of Tar Shot (but may still lower its Speed)", async () => { + await game.classicMode.startBattle([Species.PIKACHU]); + + const enemy = game.scene.getEnemyPokemon()!; + + vi.spyOn(enemy, "getMoveEffectiveness"); + + game.move.select(Moves.TAR_SHOT); + + await game.phaseInterceptor.to("TurnEndPhase"); + expect(enemy.getStatStage(Stat.SPD)).toBe(-1); + + await game.toNextTurn(); + + game.move.select(Moves.TAR_SHOT); + + await game.phaseInterceptor.to("TurnEndPhase"); + expect(enemy.getStatStage(Stat.SPD)).toBe(-2); + + await game.toNextTurn(); + + game.move.select(Moves.FIRE_PUNCH); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + + await game.phaseInterceptor.to("MoveEndPhase"); + expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4); + }, TIMEOUT); + + it("does not double the effectiveness of Fire-type moves against a Pokémon that is Terastallized", async () => { + game.override.enemyHeldItems([{ name: "TERA_SHARD", type: Type.GRASS }]).enemySpecies(Species.SPRIGATITO); + await game.classicMode.startBattle([Species.PIKACHU]); + + const enemy = game.scene.getEnemyPokemon()!; + + vi.spyOn(enemy, "getMoveEffectiveness"); + + game.move.select(Moves.TAR_SHOT); + + await game.phaseInterceptor.to("TurnEndPhase"); + expect(enemy.getStatStage(Stat.SPD)).toBe(-1); + + await game.toNextTurn(); + + game.move.select(Moves.FIRE_PUNCH); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + + await game.phaseInterceptor.to("MoveEndPhase"); + expect(enemy.getMoveEffectiveness).toHaveReturnedWith(2); + }, TIMEOUT); + + it("doubles the effectiveness of Fire-type moves against a Pokémon that is already under the effects of Tar Shot before it Terastallized", async () => { + game.override.enemySpecies(Species.SPRIGATITO); + await game.classicMode.startBattle([Species.PIKACHU]); + + const enemy = game.scene.getEnemyPokemon()!; + + vi.spyOn(enemy, "getMoveEffectiveness"); + + game.move.select(Moves.TAR_SHOT); + + await game.phaseInterceptor.to("TurnEndPhase"); + expect(enemy.getStatStage(Stat.SPD)).toBe(-1); + + await game.toNextTurn(); + + game.override.enemyHeldItems([{ name: "TERA_SHARD", type: Type.GRASS }]); + + game.move.select(Moves.FIRE_PUNCH); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + + await game.phaseInterceptor.to("MoveEndPhase"); + expect(enemy.getMoveEffectiveness).toHaveReturnedWith(4); + }, TIMEOUT); +}); From 16fc3a87b7c550041cccf91855b7ee8d2cae98f8 Mon Sep 17 00:00:00 2001 From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com> Date: Mon, 9 Sep 2024 09:07:05 -0400 Subject: [PATCH 51/83] Fix usedTMs crash (#4132) --- src/field/pokemon.ts | 2 -- src/phases/learn-move-phase.ts | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 91b57501371..2f918eaca2f 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -3524,7 +3524,6 @@ export default interface Pokemon { export class PlayerPokemon extends Pokemon { public compatibleTms: Moves[]; - public usedTms: Moves[]; constructor(scene: BattleScene, species: PokemonSpecies, level: integer, abilityIndex?: integer, formIndex?: integer, gender?: Gender, shiny?: boolean, variant?: Variant, ivs?: integer[], nature?: Nature, dataSource?: Pokemon | PokemonData) { super(scene, 106, 148, species, level, abilityIndex, formIndex, gender, shiny, variant, ivs, nature, dataSource); @@ -3548,7 +3547,6 @@ export class PlayerPokemon extends Pokemon { } } this.generateCompatibleTms(); - this.usedTms = []; } initBattleInfo(): void { diff --git a/src/phases/learn-move-phase.ts b/src/phases/learn-move-phase.ts index 201019e8860..26088f5b835 100644 --- a/src/phases/learn-move-phase.ts +++ b/src/phases/learn-move-phase.ts @@ -44,6 +44,9 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { if (emptyMoveIndex > -1) { pokemon.setMove(emptyMoveIndex, this.moveId); if (this.fromTM) { + if (!pokemon.usedTMs) { + pokemon.usedTMs = []; + } pokemon.usedTMs.push(this.moveId); } initMoveAnim(this.scene, this.moveId).then(() => { @@ -91,6 +94,9 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { this.scene.ui.showText(i18next.t("battle:learnMoveForgetSuccess", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: pokemon.moveset[moveIndex]!.getName() }), null, () => { // TODO: is the bang correct? this.scene.ui.showText(i18next.t("battle:learnMoveAnd"), null, () => { if (this.fromTM) { + if (!pokemon.usedTMs) { + pokemon.usedTMs = []; + } pokemon.usedTMs.push(this.moveId); } pokemon.setMove(moveIndex, Moves.NONE); From 26eb63cf67ce77fa62072033397d3f22dcf6e42b Mon Sep 17 00:00:00 2001 From: Mumble <171087428+frutescens@users.noreply.github.com> Date: Mon, 9 Sep 2024 09:11:46 -0700 Subject: [PATCH 52/83] [Refactor] Cleaning up Learn move phase (#3672) * Learn Move Phase rewrite * Typedocs * messages with confirm do not need an extra button press no more * Added Documentation * This does not work * so sad * Some updates * Eslint issues + clean up * Additions to handle learning during evolution + test fixes * some more checks * Update src/overrides.ts Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * Update src/test/phases/learn-move-phase.test.ts Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * Added new function and updated tests * Fixed bracketing and added parameter types * Added Sketch to the conditional * Added some fixes. Weird stuff going on. * Whoops * async implementation done * Update src/phases/learn-move-phase.ts Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * Made showText=> summary a promise * adapt learn-move-phase to `async-await` * await add --------- Co-authored-by: frutescens Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- src/phases/learn-move-phase.ts | 198 +++++++++++++--------- src/test/phases/learn-move-phase.test.ts | 47 +++++ src/test/utils/helpers/overridesHelper.ts | 11 ++ src/test/utils/phaseInterceptor.ts | 2 + src/ui/ui.ts | 6 + 5 files changed, 186 insertions(+), 78 deletions(-) create mode 100644 src/test/phases/learn-move-phase.test.ts diff --git a/src/phases/learn-move-phase.ts b/src/phases/learn-move-phase.ts index 049fc6951b6..fad7eac9b68 100644 --- a/src/phases/learn-move-phase.ts +++ b/src/phases/learn-move-phase.ts @@ -1,6 +1,6 @@ import BattleScene from "#app/battle-scene"; import { initMoveAnim, loadMoveAnimAssets } from "#app/data/battle-anims"; -import { allMoves } from "#app/data/move"; +import Move, { allMoves } from "#app/data/move"; import { SpeciesFormChangeMoveLearnedTrigger } from "#app/data/pokemon-forms"; import { Moves } from "#app/enums/moves"; import { getPokemonNameWithAffix } from "#app/messages"; @@ -9,14 +9,15 @@ import { SummaryUiMode } from "#app/ui/summary-ui-handler"; import { Mode } from "#app/ui/ui"; import i18next from "i18next"; import { PlayerPartyMemberPokemonPhase } from "./player-party-member-pokemon-phase"; +import Pokemon from "#app/field/pokemon"; export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { private moveId: Moves; + private messageMode: Mode; private fromTM: boolean; constructor(scene: BattleScene, partyMemberIndex: integer, moveId: Moves, fromTM?: boolean) { super(scene, partyMemberIndex); - this.moveId = moveId; this.fromTM = fromTM ?? false; } @@ -26,87 +27,128 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { const pokemon = this.getPokemon(); const move = allMoves[this.moveId]; + const currentMoveset = pokemon.getMoveset(); - const existingMoveIndex = pokemon.getMoveset().findIndex(m => m?.moveId === move.id); - - if (existingMoveIndex > -1) { + // The game first checks if the Pokemon already has the move and ends the phase if it does. + const hasMoveAlready = currentMoveset.some(m => m?.moveId === move.id) && this.moveId !== Moves.SKETCH; + if (hasMoveAlready) { return this.end(); } - const emptyMoveIndex = pokemon.getMoveset().length < 4 - ? pokemon.getMoveset().length - : pokemon.getMoveset().findIndex(m => m === null); - - const messageMode = this.scene.ui.getHandler() instanceof EvolutionSceneHandler - ? Mode.EVOLUTION_SCENE - : Mode.MESSAGE; - - if (emptyMoveIndex > -1) { - pokemon.setMove(emptyMoveIndex, this.moveId); - if (this.fromTM) { - pokemon.usedTMs.push(this.moveId); - } - initMoveAnim(this.scene, this.moveId).then(() => { - loadMoveAnimAssets(this.scene, [this.moveId], true) - .then(() => { - this.scene.ui.setMode(messageMode).then(() => { - // Sound loaded into game as is - this.scene.playSound("level_up_fanfare"); - this.scene.ui.showText(i18next.t("battle:learnMove", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name }), null, () => { - this.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeMoveLearnedTrigger, true); - this.end(); - }, messageMode === Mode.EVOLUTION_SCENE ? 1000 : null, true); - }); - }); - }); + this.messageMode = this.scene.ui.getHandler() instanceof EvolutionSceneHandler ? Mode.EVOLUTION_SCENE : Mode.MESSAGE; + this.scene.ui.setMode(this.messageMode); + // If the Pokemon has less than 4 moves, the new move is added to the largest empty moveset index + // If it has 4 moves, the phase then checks if the player wants to replace the move itself. + if (currentMoveset.length < 4) { + this.learnMove(currentMoveset.length, move, pokemon); } else { - this.scene.ui.setMode(messageMode).then(() => { - this.scene.ui.showText(i18next.t("battle:learnMovePrompt", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name }), null, () => { - this.scene.ui.showText(i18next.t("battle:learnMoveLimitReached", { pokemonName: getPokemonNameWithAffix(pokemon) }), null, () => { - this.scene.ui.showText(i18next.t("battle:learnMoveReplaceQuestion", { moveName: move.name }), null, () => { - const noHandler = () => { - this.scene.ui.setMode(messageMode).then(() => { - this.scene.ui.showText(i18next.t("battle:learnMoveStopTeaching", { moveName: move.name }), null, () => { - this.scene.ui.setModeWithoutClear(Mode.CONFIRM, () => { - this.scene.ui.setMode(messageMode); - this.scene.ui.showText(i18next.t("battle:learnMoveNotLearned", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name }), null, () => this.end(), null, true); - }, () => { - this.scene.ui.setMode(messageMode); - this.scene.unshiftPhase(new LearnMovePhase(this.scene, this.partyMemberIndex, this.moveId)); - this.end(); - }); - }); - }); - }; - this.scene.ui.setModeWithoutClear(Mode.CONFIRM, () => { - this.scene.ui.setMode(messageMode); - this.scene.ui.showText(i18next.t("battle:learnMoveForgetQuestion"), null, () => { - this.scene.ui.setModeWithoutClear(Mode.SUMMARY, this.getPokemon(), SummaryUiMode.LEARN_MOVE, move, (moveIndex: integer) => { - if (moveIndex === 4) { - noHandler(); - return; - } - this.scene.ui.setMode(messageMode).then(() => { - this.scene.ui.showText(i18next.t("battle:countdownPoof"), null, () => { - this.scene.ui.showText(i18next.t("battle:learnMoveForgetSuccess", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: pokemon.moveset[moveIndex]!.getName() }), null, () => { // TODO: is the bang correct? - this.scene.ui.showText(i18next.t("battle:learnMoveAnd"), null, () => { - if (this.fromTM) { - pokemon.usedTMs.push(this.moveId); - } - pokemon.setMove(moveIndex, Moves.NONE); - this.scene.unshiftPhase(new LearnMovePhase(this.scene, this.partyMemberIndex, this.moveId)); - this.end(); - }, null, true); - }, null, true); - }, null, true); - }); - }); - }, null, true); - }, noHandler); - }); - }, null, true); - }, null, true); - }); + this.replaceMoveCheck(move, pokemon); } } + + /** + * This displays a chain of messages (listed below) and asks if the user wishes to forget a move. + * + * > [Pokemon] wants to learn the move [MoveName] + * > However, [Pokemon] already knows four moves. + * > Should a move be forgotten and replaced with [MoveName]? --> `Mode.CONFIRM` -> Yes: Go to `this.forgetMoveProcess()`, No: Go to `this.rejectMoveAndEnd()` + * @param move The Move to be learned + * @param Pokemon The Pokemon learning the move + */ + async replaceMoveCheck(move: Move, pokemon: Pokemon) { + const learnMovePrompt = i18next.t("battle:learnMovePrompt", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name }); + const moveLimitReached = i18next.t("battle:learnMoveLimitReached", { pokemonName: getPokemonNameWithAffix(pokemon) }); + const shouldReplaceQ = i18next.t("battle:learnMoveReplaceQuestion", { moveName: move.name }); + const preQText = [learnMovePrompt, moveLimitReached].join("$"); + await this.scene.ui.showTextPromise(preQText); + await this.scene.ui.showTextPromise(shouldReplaceQ, undefined, false); + await this.scene.ui.setModeWithoutClear(Mode.CONFIRM, + () => this.forgetMoveProcess(move, pokemon), // Yes + () => { // No + this.scene.ui.setMode(this.messageMode); + this.rejectMoveAndEnd(move, pokemon); + } + ); + } + + /** + * This facilitates the process in which an old move is chosen to be forgotten. + * + * > Which move should be forgotten? + * + * The game then goes `Mode.SUMMARY` to select a move to be forgotten. + * If a player does not select a move or chooses the new move (`moveIndex === 4`), the game goes to `this.rejectMoveAndEnd()`. + * If an old move is selected, the function then passes the `moveIndex` to `this.learnMove()` + * @param move The Move to be learned + * @param Pokemon The Pokemon learning the move + */ + async forgetMoveProcess(move: Move, pokemon: Pokemon) { + this.scene.ui.setMode(this.messageMode); + await this.scene.ui.showTextPromise(i18next.t("battle:learnMoveForgetQuestion"), undefined, true); + await this.scene.ui.setModeWithoutClear(Mode.SUMMARY, pokemon, SummaryUiMode.LEARN_MOVE, move, (moveIndex: integer) => { + if (moveIndex === 4) { + this.scene.ui.setMode(this.messageMode).then(() => this.rejectMoveAndEnd(move, pokemon)); + return; + } + const forgetSuccessText = i18next.t("battle:learnMoveForgetSuccess", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: pokemon.moveset[moveIndex]!.getName() }); + const fullText = [i18next.t("battle:countdownPoof"), forgetSuccessText, i18next.t("battle:learnMoveAnd")].join("$"); + this.scene.ui.setMode(this.messageMode).then(() => this.learnMove(moveIndex, move, pokemon, fullText)); + }); + } + + /** + * This asks the player if they wish to end the current move learning process. + * + * > Stop trying to teach [MoveName]? --> `Mode.CONFIRM` --> Yes: > [Pokemon] did not learn the move [MoveName], No: `this.replaceMoveCheck()` + * + * If the player wishes to not teach the Pokemon the move, it displays a message and ends the phase. + * If the player reconsiders, it repeats the process for a Pokemon with a full moveset once again. + * @param move The Move to be learned + * @param Pokemon The Pokemon learning the move + */ + async rejectMoveAndEnd(move: Move, pokemon: Pokemon) { + await this.scene.ui.showTextPromise(i18next.t("battle:learnMoveStopTeaching", { moveName: move.name }), undefined, false); + this.scene.ui.setModeWithoutClear(Mode.CONFIRM, + () => { + this.scene.ui.setMode(this.messageMode); + this.scene.ui.showTextPromise(i18next.t("battle:learnMoveNotLearned", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name }), undefined, true).then(() => this.end()); + }, + () => { + this.scene.ui.setMode(this.messageMode); + this.replaceMoveCheck(move, pokemon); + } + ); + } + + /** + * This teaches the Pokemon the new move and ends the phase. + * When a Pokemon forgets a move and learns a new one, its 'Learn Move' message is significantly longer. + * + * Pokemon with a `moveset.length < 4` + * > [Pokemon] learned [MoveName] + * + * Pokemon with a `moveset.length > 4` + * > 1... 2... and 3... and Poof! + * > [Pokemon] forgot how to use [MoveName] + * > And... + * > [Pokemon] learned [MoveName]! + * @param move The Move to be learned + * @param Pokemon The Pokemon learning the move + */ + async learnMove(index: number, move: Move, pokemon: Pokemon, textMessage?: string) { + if (this.fromTM) { + pokemon.usedTMs.push(this.moveId); + } + pokemon.setMove(index, this.moveId); + initMoveAnim(this.scene, this.moveId).then(() => { + loadMoveAnimAssets(this.scene, [this.moveId], true); + this.scene.playSound("level_up_fanfare"); // Sound loaded into game as is + }); + this.scene.ui.setMode(this.messageMode); + const learnMoveText = i18next.t("battle:learnMove", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name }); + textMessage = textMessage ? textMessage+"$"+learnMoveText : learnMoveText; + await this.scene.ui.showTextPromise(textMessage, this.messageMode === Mode.EVOLUTION_SCENE ? 1000 : undefined, true); + this.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeMoveLearnedTrigger, true); + this.end(); + } } diff --git a/src/test/phases/learn-move-phase.test.ts b/src/test/phases/learn-move-phase.test.ts new file mode 100644 index 00000000000..60cdbee8570 --- /dev/null +++ b/src/test/phases/learn-move-phase.test.ts @@ -0,0 +1,47 @@ +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; +import Phaser from "phaser"; +import GameManager from "#test/utils/gameManager"; +import { Species } from "#enums/species"; +import { Moves } from "#enums/moves"; +import { LearnMovePhase } from "#app/phases/learn-move-phase"; + +describe("Learn Move Phase", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override.xpMultiplier(50); + }); + + it("If Pokemon has less than 4 moves, its newest move will be added to the lowest empty index", async () => { + game.override.moveset([Moves.SPLASH]); + await game.startBattle([Species.BULBASAUR]); + const pokemon = game.scene.getPlayerPokemon()!; + const newMovePos = pokemon?.getMoveset().length; + game.move.select(Moves.SPLASH); + await game.doKillOpponents(); + await game.phaseInterceptor.to(LearnMovePhase); + const levelMove = pokemon.getLevelMoves(5)[0]; + const levelReq = levelMove[0]; + const levelMoveId = levelMove[1]; + expect(pokemon.level).toBeGreaterThanOrEqual(levelReq); + expect(pokemon?.getMoveset()[newMovePos]?.moveId).toBe(levelMoveId); + }); + + /** + * Future Tests: + * If a Pokemon has four moves, the user can specify an old move to be forgotten and a new move will take its place. + * If a Pokemon has four moves, the user can reject the new move, keeping the moveset the same. + */ +}); diff --git a/src/test/utils/helpers/overridesHelper.ts b/src/test/utils/helpers/overridesHelper.ts index a42ef84b496..3eeeecbc5f8 100644 --- a/src/test/utils/helpers/overridesHelper.ts +++ b/src/test/utils/helpers/overridesHelper.ts @@ -48,6 +48,17 @@ export class OverridesHelper extends GameManagerHelper { return this; } + /** + * Override the XP Multiplier + * @param value the XP multiplier to set + * @returns `this` + */ + xpMultiplier(value: number): this { + vi.spyOn(Overrides, "XP_MULTIPLIER_OVERRIDE", "get").mockReturnValue(value); + this.log(`XP Multiplier set to ${value}!`); + return this; + } + /** * Override the player (pokemon) starting held items * @param items the items to hold diff --git a/src/test/utils/phaseInterceptor.ts b/src/test/utils/phaseInterceptor.ts index 2eb5324a2aa..a89d1788be9 100644 --- a/src/test/utils/phaseInterceptor.ts +++ b/src/test/utils/phaseInterceptor.ts @@ -12,6 +12,7 @@ import { EndEvolutionPhase } from "#app/phases/end-evolution-phase"; import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; import { EvolutionPhase } from "#app/phases/evolution-phase"; import { FaintPhase } from "#app/phases/faint-phase"; +import { LearnMovePhase } from "#app/phases/learn-move-phase"; import { LevelCapPhase } from "#app/phases/level-cap-phase"; import { LoginPhase } from "#app/phases/login-phase"; import { MessagePhase } from "#app/phases/message-phase"; @@ -89,6 +90,7 @@ export default class PhaseInterceptor { [NextEncounterPhase, this.startPhase], [NewBattlePhase, this.startPhase], [VictoryPhase, this.startPhase], + [LearnMovePhase, this.startPhase], [MoveEndPhase, this.startPhase], [StatStageChangePhase, this.startPhase], [ShinySparklePhase, this.startPhase], diff --git a/src/ui/ui.ts b/src/ui/ui.ts index 6c988b43043..a9bcbbf0cb5 100644 --- a/src/ui/ui.ts +++ b/src/ui/ui.ts @@ -289,6 +289,12 @@ export default class UI extends Phaser.GameObjects.Container { return handler.processInput(button); } + showTextPromise(text: string, callbackDelay: number = 0, prompt: boolean = true, promptDelay?: integer | null): Promise { + return new Promise(resolve => { + this.showText(text ?? "", null, () => resolve(), callbackDelay, prompt, promptDelay); + }); + } + showText(text: string, delay?: integer | null, callback?: Function | null, callbackDelay?: integer | null, prompt?: boolean | null, promptDelay?: integer | null): void { if (prompt && text.indexOf("$") > -1) { const messagePages = text.split(/\$/g).map(m => m.trim()); From e84fe8c24e75bf7d0af92f08ed55dab1df8770f9 Mon Sep 17 00:00:00 2001 From: Chapybara-jp Date: Mon, 9 Sep 2024 18:50:30 +0200 Subject: [PATCH 53/83] [Localisation] [JA] Translated/updated spacing in several files, fixed Ice Face bug (#4129) * Update ability-trigger.json * Update ability.json * Update arena-flyout.json * Update arena-tag.json * Update battle.json * Update fight-ui-handler.json * Update berry.json * Update menu.json * Update party-ui-handler.json * Update starter-select-ui-handler.json * Update tutorial.json * Update move.json * Update battle.json * Update arena-flyout.json * Update arena-flyout.json * Update arena-tag.json * Update party-ui-handler.json * Update settings.json --- src/locales/ja/ability-trigger.json | 4 +- src/locales/ja/ability.json | 620 +++--- src/locales/ja/arena-flyout.json | 3 +- src/locales/ja/arena-tag.json | 10 +- src/locales/ja/battle.json | 5 +- src/locales/ja/berry.json | 22 +- src/locales/ja/fight-ui-handler.json | 2 +- src/locales/ja/menu.json | 6 +- src/locales/ja/move.json | 1872 ++++++++--------- src/locales/ja/party-ui-handler.json | 41 +- src/locales/ja/settings.json | 2 +- src/locales/ja/starter-select-ui-handler.json | 2 +- src/locales/ja/tutorial.json | 18 +- 13 files changed, 1327 insertions(+), 1280 deletions(-) diff --git a/src/locales/ja/ability-trigger.json b/src/locales/ja/ability-trigger.json index 1b30e52c490..26d27701aef 100644 --- a/src/locales/ja/ability-trigger.json +++ b/src/locales/ja/ability-trigger.json @@ -2,11 +2,11 @@ "blockRecoilDamage": "{{pokemonName}}は　{{abilityName}}で　反動ダメージを　受けない！", "badDreams": "{{pokemonName}}は　ナイトメアに うなされている！", "costar": "{{pokemonName}}は　{{allyName}}の\n能力変化を　コピーした！", - "iceFaceAvoidedDamage": "{{pokemonName}}は\n{{abilityName}}で　ダメージを　受けない！", + "iceFaceAvoidedDamage": "{{pokemonNameWithAffix}}は\n{{abilityName}}で　ダメージを　受けない！", "perishBody": "{{pokemonName}}の {{abilityName}}で\nおたがいは　3ターン後に　ほろびいてしまう！", "poisonHeal": "{{pokemonName}}は　{{abilityName}}で　回復した！", "trace": "{{pokemonName}}は　相手の　{{targetName}}の\n{{abilityName}}を　トレースした！", - "windPowerCharged": "{{pokemonName}}は\n{{moveName}}を　受けて　じゅうでんした！", + "windPowerCharged": "{{pokemonNameWithAffix}}は\n{{moveName}}を　受けて　じゅうでんした！", "quickDraw": "{{pokemonName}}は　クイックドロウで\n行動が　はやくなった！", "disguiseAvoidedDamage": "{{pokemonNameWithAffix}}の\nばけのかわが　はがれた！", "blockItemTheft": "{{pokemonNameWithAffix}}の　{{abilityName}}で\n道具を　うばわれない！", diff --git a/src/locales/ja/ability.json b/src/locales/ja/ability.json index bfbf5d3a3c8..c44eeb06234 100644 --- a/src/locales/ja/ability.json +++ b/src/locales/ja/ability.json @@ -1,1071 +1,1071 @@ { "stench": { "name": "あくしゅう", - "description": "臭い においを 放つことによって 攻撃した ときに 相手を ひるませることが ある。" + "description": "臭い　においを　放つことによって　攻撃した　ときに　相手を　ひるませることが　ある。" }, "drizzle": { "name": "あめふらし", - "description": "登場 したときに 天気を 雨に する。" + "description": "登場　したときに　天気を　雨に　する。" }, "speedBoost": { "name": "かそく", - "description": "毎ターン 素早さが 上がる。" + "description": "毎ターン　素早さが　上がる。" }, "battleArmor": { "name": "カブトアーマー", - "description": "硬い 甲羅に 守られて 相手の 攻撃が 急所に 当たらない。" + "description": "硬い　甲羅に　守られて　相手の　攻撃が　急所に　当たらない。" }, "sturdy": { "name": "がんじょう", - "description": "相手の 技を 受けても 一撃で 倒されることが ない。 一撃必殺技も 効かない。" + "description": "相手の　技を　受けても　一撃で　倒されることが　ない。　一撃必殺技も　効かない。" }, "damp": { "name": "しめりけ", - "description": "あたりを 湿らせることに よって じばく などの 爆発する 技を だれも 使えなくなる。" + "description": "あたりを　湿らせることに　よって　じばく　などの　爆発する　技を　だれも　使えなくなる。" }, "limber": { "name": "じゅうなん", - "description": "柔軟な 体によって まひ状態に ならない。" + "description": "柔軟な　体によって　まひ状態に　ならない。" }, "sandVeil": { "name": "すながくれ", - "description": "砂あらしの とき 回避率が 上がる。" + "description": "砂あらしの　とき　回避率が　上がる。" }, "static": { "name": "せいでんき", - "description": "静電気を 体に まとい 触った 相手を まひさせる ことがある。" + "description": "静電気を　体に　まとい　触った　相手を　まひさせる　ことがある。" }, "voltAbsorb": { "name": "ちくでん", - "description": "でんきタイプの 技を 受けると ダメージを 受けずに 回復する。" + "description": "でんきタイプの　技を　受けると　ダメージを　受けずに　回復する。" }, "waterAbsorb": { "name": "ちょすい", - "description": "みずタイプの 技を 受けると ダメージを 受けずに 回復する。" + "description": "みずタイプの　技を　受けると　ダメージを　受けずに　回復する。" }, "oblivious": { "name": "どんかん", - "description": "鈍感なので メロメロや ちょうはつ状態に ならない。" + "description": "鈍感なので　メロメロや　ちょうはつ状態に　ならない。" }, "cloudNine": { "name": "ノーてんき", - "description": "あらゆる 天気の 影響が なくなって しまう。" + "description": "あらゆる　天気の　影響が　なくなって　しまう。" }, "compoundEyes": { "name": "ふくがん", - "description": "複眼を 持っているため 技の 命中率が 上がる。" + "description": "複眼を　持っているため　技の　命中率が　上がる。" }, "insomnia": { "name": "ふみん", - "description": "眠れない 体質 なので ねむり状態に ならない。" + "description": "眠れない　体質　なので　ねむり状態に　ならない。" }, "colorChange": { "name": "へんしょく", - "description": "相手から 受けた 技の タイプに 自分の タイプが 変化 する。" + "description": "相手から　受けた　技の　タイプに　自分の　タイプが　変化　する。" }, "immunity": { "name": "めんえき", - "description": "体内に 免疫を 持っているため どく状態に ならない。" + "description": "体内に　免疫を　持っているため　どく状態に　ならない。" }, "flashFire": { "name": "もらいび", - "description": "ほのおタイプの 技を 受けると 炎を もらい 自分が 出す ほのおタイプの 技が 強くなる。" + "description": "ほのおタイプの　技を　受けると　炎を　もらい　自分が　出す　ほのおタイプの　技が　強くなる。" }, "shieldDust": { "name": "りんぷん", - "description": "りんぷんに 守られて 技の 追加効果を 受けなくなる。" + "description": "りんぷんに　守られて　技の　追加効果を　受けなくなる。" }, "ownTempo": { "name": "マイペース", - "description": "マイペースなので こんらん状態に ならない。" + "description": "マイペースなので　こんらん状態に　ならない。" }, "suctionCups": { "name": "きゅうばん", - "description": "吸盤で 地面に 張り付き ポケモンを 入れ替えさせる 技や 道具が 効かなくなる。" + "description": "吸盤で　地面に　張り付き　ポケモンを　入れ替えさせる　技や　道具が　効かなくなる。" }, "intimidate": { "name": "いかく", - "description": "登場 したとき 威嚇して 相手を 萎縮させ 相手の 攻撃を 下げて しまう。" + "description": "登場　したとき　威嚇して　相手を　萎縮させ　相手の　攻撃を　下げて　しまう。" }, "shadowTag": { "name": "かげふみ", - "description": "相手の 影を 踏み 逃げたり 交代 できなくする。" + "description": "相手の　影を　踏み　逃げたり　交代　できなくする。" }, "roughSkin": { "name": "さめはだ", - "description": "攻撃を 受けたとき 自分に 触れた 相手を ざらざらの 肌で キズつける。" + "description": "攻撃を　受けたとき　自分に　触れた　相手を　ざらざらの　肌で　キズつける。" }, "wonderGuard": { "name": "ふしぎなまもり", - "description": "効果バツグンの 技しか 当たらない 不思議な 力。" + "description": "効果バツグンの　技しか　当たらない　不思議な　力。" }, "levitate": { "name": "ふゆう", - "description": "地面から 浮くことによって じめんタイプの 技を 受けない。" + "description": "地面から　浮くことによって　じめんタイプの　技を　受けない。" }, "effectSpore": { "name": "ほうし", - "description": "攻撃で 自分に 触れた 相手を どくや まひや ねむり状態に する ことがある。" + "description": "攻撃で　自分に　触れた　相手を　どくや　まひや　ねむり状態に　する　ことがある。" }, "synchronize": { "name": "シンクロ", - "description": "自分が なってしまった どくや まひや やけどを 相手に うつす。" + "description": "自分が　なってしまった　どくや　まひや　やけどを　相手に　うつす。" }, "clearBody": { "name": "クリアボディ", - "description": "相手の 技や 特性で 能力を 下げられない。" + "description": "相手の　技や　特性で　能力を　下げられない。" }, "naturalCure": { "name": "しぜんかいふく", - "description": "手持ちに ひっこむと 状態異常が 治る。" + "description": "手持ちに　ひっこむと　状態異常が　治る。" }, "lightningRod": { "name": "ひらいしん", - "description": "でんきタイプの 技を 自分に 寄せつけ ダメージを 受けずに 特攻が 上がる。" + "description": "でんきタイプの　技を　自分に　寄せつけ　ダメージを　受けずに　特攻が　上がる。" }, "sereneGrace": { "name": "てんのめぐみ", - "description": "天の恵みの おかげで 技の 追加効果が でやすい。" + "description": "天の恵みの　おかげで　技の　追加効果が　でやすい。" }, "swiftSwim": { "name": "すいすい", - "description": "天気が 雨のとき 素早さが 上がる。" + "description": "天気が　雨のとき　素早さが　上がる。" }, "chlorophyll": { "name": "ようりょくそ", - "description": "天気が 晴れのとき 素早さが 上がる。" + "description": "天気が　晴れのとき　素早さが　上がる。" }, "illuminate": { "name": "はっこう", - "description": "あたりを 明るくすることで 命中率を 下げられない。" + "description": "あたりを　明るくすることで　命中率を　下げられない。" }, "trace": { "name": "トレース", - "description": "登場 したとき 相手の 特性を トレースして 同じ 特性に なる。" + "description": "登場　したとき　相手の　特性を　トレースして　同じ　特性に　なる。" }, "hugePower": { "name": "ちからもち", - "description": "物理攻撃の 威力が ２倍になる。" + "description": "物理攻撃の　威力が　２倍になる。" }, "poisonPoint": { "name": "どくのトゲ", - "description": "自分に 触った 相手を どく状態に することがある。" + "description": "自分に　触った　相手を　どく状態に　することがある。" }, "innerFocus": { "name": "せいしんりょく", - "description": "鍛えられた 精神に よって 相手の 攻撃に ひるまない。" + "description": "鍛えられた　精神に　よって　相手の　攻撃に　ひるまない。" }, "magmaArmor": { "name": "マグマのよろい", - "description": "熱い マグマを 身にまとい こおり状態に ならない。" + "description": "熱い　マグマを　身にまとい　こおり状態に　ならない。" }, "waterVeil": { "name": "みずのベール", - "description": "水のベールを 身にまとい やけど状態に ならない。" + "description": "水のベールを　身にまとい　やけど状態に　ならない。" }, "magnetPull": { "name": "じりょく", - "description": "はがねタイプの ポケモンを 磁力で 引きつけて 逃げられなくする。" + "description": "はがねタイプの　ポケモンを　磁力で　引きつけて　逃げられなくする。" }, "soundproof": { "name": "ぼうおん", - "description": "音を 遮断 することに よって 音の 攻撃を 受けない。" + "description": "音を　遮断　することに　よって　音の　攻撃を　受けない。" }, "rainDish": { "name": "あめうけざら", - "description": "天気が 雨のとき 少しずつ ＨＰを 回復する。" + "description": "天気が　雨のとき　少しずつ　ＨＰを　回復する。" }, "sandStream": { "name": "すなおこし", - "description": "登場 したとき 天気を 砂あらしにする。" + "description": "登場　したとき　天気を　砂あらしにする。" }, "pressure": { "name": "プレッシャー", - "description": "プレッシャーを あたえて 相手の 使う 技の ＰＰを 多く 減らす。" + "description": "プレッシャーを　あたえて　相手の　使う　技の　ＰＰを　多く　減らす。" }, "thickFat": { "name": "あついしぼう", - "description": "厚い 脂肪で 守られているので ほのおタイプと こおりタイプの 技の ダメージを 半減させる。" + "description": "厚い　脂肪で　守られているので　ほのおタイプと　こおりタイプの　技の　ダメージを　半減させる。" }, "earlyBird": { "name": "はやおき", - "description": "ねむり状態に なっても ２倍の 早さで 目覚める ことが できる。" + "description": "ねむり状態に　なっても　２倍の　早さで　目覚める　ことが　できる。" }, "flameBody": { "name": "ほのおのからだ", - "description": "自分に 触った 相手を やけど状態に する ことがある。" + "description": "自分に　触った　相手を　やけど状態に　する　ことがある。" }, "runAway": { "name": "にげあし", - "description": "野生の ポケモンから 必ず 逃げられる。" + "description": "野生の　ポケモンから　必ず　逃げられる。" }, "keenEye": { "name": "するどいめ", - "description": "鋭い 目の おかげで 命中率を 下げられない。" + "description": "鋭い　目の　おかげで　命中率を　下げられない。" }, "hyperCutter": { "name": "かいりきバサミ", - "description": "力自慢の ハサミを 持っているので 相手に 攻撃を 下げられない。" + "description": "力自慢の　ハサミを　持っているので　相手に　攻撃を　下げられない。" }, "pickup": { "name": "ものひろい", - "description": "戦闘が 終わったとき 相手の 持った 道具を 一つ 拾ってくることが ある。" + "description": "戦闘が　終わったとき　相手の　持った　道具を　一つ　拾ってくることが　ある。" }, "truant": { "name": "なまけ", - "description": "技を 出すと 次の ターンは 休んでしまう。" + "description": "技を　出すと　次の　ターンは　休んでしまう。" }, "hustle": { "name": "はりきり", - "description": "自分の 攻撃が 高くなるが 命中率が 下がる。" + "description": "自分の　攻撃が　高くなるが　命中率が　下がる。" }, "cuteCharm": { "name": "メロメロボディ", - "description": "自分に 触った 相手を メロメロに することが ある。" + "description": "自分に　触った　相手を　メロメロに　することが　ある。" }, "plus": { "name": "プラス", - "description": "プラスか マイナスの 特性を 持つ ポケモンが 仲間に いると 自分の 特攻が 上がる。" + "description": "プラスか　マイナスの　特性を　持つ　ポケモンが　仲間に　いると　自分の　特攻が　上がる。" }, "minus": { "name": "マイナス", - "description": "プラスか マイナスの 特性を 持つ ポケモンが 仲間に いると 自分の 特攻が 上がる。" + "description": "プラスか　マイナスの　特性を　持つ　ポケモンが　仲間に　いると　自分の　特攻が　上がる。" }, "forecast": { "name": "てんきや", - "description": "天気の 影響を 受けて みずタイプ ほのおタイプ こおりタイプの どれかに 変化する。" + "description": "天気の　影響を　受けて　みずタイプ　ほのおタイプ　こおりタイプの　どれかに　変化する。" }, "stickyHold": { "name": "ねんちゃく", - "description": "粘着質の 体に 道具が くっついているため 相手に 道具を 奪われない。" + "description": "粘着質の　体に　道具が　くっついているため　相手に　道具を　奪われない。" }, "shedSkin": { "name": "だっぴ", - "description": "体の 皮を 脱ぎ捨てることで 状態異常を 治すことが ある。" + "description": "体の　皮を　脱ぎ捨てることで　状態異常を　治すことが　ある。" }, "guts": { "name": "こんじょう", - "description": "状態異常に なると 根性を だして 攻撃が 上がる。" + "description": "状態異常に　なると　根性を　だして　攻撃が　上がる。" }, "marvelScale": { "name": "ふしぎなうろこ", - "description": "状態異常に なると 不思議なウロコが 反応して 防御が 上がる。" + "description": "状態異常に　なると　不思議なウロコが　反応して　防御が　上がる。" }, "liquidOoze": { "name": "ヘドロえき", - "description": "ヘドロ液を 吸い取った 相手は 強烈な 悪臭で ダメージを 受けて ＨＰを 減らす。" + "description": "ヘドロ液を　吸い取った　相手は　強烈な　悪臭で　ダメージを　受けて　ＨＰを　減らす。" }, "overgrow": { "name": "しんりょく", - "description": "ＨＰが 減ったとき くさタイプの 技の 威力が 上がる。" + "description": "ＨＰが　減ったとき　くさタイプの　技の　威力が　上がる。" }, "blaze": { "name": "もうか", - "description": "ＨＰが 減ったとき ほのおタイプの 技の 威力が 上がる。" + "description": "ＨＰが　減ったとき　ほのおタイプの　技の　威力が　上がる。" }, "torrent": { "name": "げきりゅう", - "description": "ＨＰが 減ったとき みずタイプの 技の 威力が 上がる。" + "description": "ＨＰが　減ったとき　みずタイプの　技の　威力が　上がる。" }, "swarm": { "name": "むしのしらせ", - "description": "ＨＰが 減ったとき むしタイプの 技の 威力が 上がる。" + "description": "ＨＰが　減ったとき　むしタイプの　技の　威力が　上がる。" }, "rockHead": { "name": "いしあたま", - "description": "反動を 受ける 技を 出しても ＨＰが 減らない。" + "description": "反動を　受ける　技を　出しても　ＨＰが　減らない。" }, "drought": { "name": "ひでり", - "description": "登場 したときに 天気を 晴れに する。" + "description": "登場　したときに　天気を　晴れに　する。" }, "arenaTrap": { "name": "ありじごく", - "description": "戦闘で 相手を 逃げられなくする。" + "description": "戦闘で　相手を　逃げられなくする。" }, "vitalSpirit": { "name": "やるき", - "description": "やる気を だすことに よって ねむり状態に ならない。" + "description": "やる気を　だすことに　よって　ねむり状態に　ならない。" }, "whiteSmoke": { "name": "しろいけむり", - "description": "白い煙に 守られて 相手に 能力を 下げられない。" + "description": "白い煙に　守られて　相手に　能力を　下げられない。" }, "purePower": { "name": "ヨガパワー", - "description": "ヨガの 力で 物理攻撃の 威力が ２倍に なる。" + "description": "ヨガの　力で　物理攻撃の　威力が　２倍に　なる。" }, "shellArmor": { "name": "シェルアーマー", - "description": "硬い 殻に 守られ 相手の 攻撃が 急所に 当たらない。" + "description": "硬い　殻に　守られ　相手の　攻撃が　急所に　当たらない。" }, "airLock": { "name": "エアロック", - "description": "あらゆる 天気の 影響が なくなって しまう。" + "description": "あらゆる　天気の　影響が　なくなって　しまう。" }, "tangledFeet": { "name": "ちどりあし", - "description": "こんらん状態の ときは 回避率が アップする。" + "description": "こんらん状態の　ときは　回避率が　アップする。" }, "motorDrive": { "name": "でんきエンジン", - "description": "でんきタイプの 技を 受けると ダメージを 受けずに 素早さが 上がる。" + "description": "でんきタイプの　技を　受けると　ダメージを　受けずに　素早さが　上がる。" }, "rivalry": { "name": "とうそうしん", - "description": "性別が 同じだと 闘争心を 燃やして 強くなる。 性別が 違うと 弱くなる。" + "description": "性別が　同じだと　闘争心を　燃やして　強くなる。　性別が　違うと　弱くなる。" }, "steadfast": { "name": "ふくつのこころ", - "description": "ひるむ たびに 不屈の心を 燃やして 素早さが 上がる。" + "description": "ひるむ　たびに　不屈の心を　燃やして　素早さが　上がる。" }, "snowCloak": { "name": "ゆきがくれ", - "description": "天気が ゆきのとき 回避率が 上がる。" + "description": "天気が　ゆきのとき　回避率が　上がる。" }, "gluttony": { "name": "くいしんぼう", - "description": "ＨＰが 少なくなったら 食べる きのみを ＨＰ 半分の 時に 食べてしまう。" + "description": "ＨＰが　少なくなったら　食べる　きのみを　ＨＰ　半分の　時に　食べてしまう。" }, "angerPoint": { "name": "いかりのつぼ", - "description": "急所に 攻撃が 当たると 怒りくるって 攻撃力が 最大に なる。" + "description": "急所に　攻撃が　当たると　怒りくるって　攻撃力が　最大に　なる。" }, "unburden": { "name": "かるわざ", - "description": "持っていた 道具が なくなると 素早さが 上がる。" + "description": "持っていた　道具が　なくなると　素早さが　上がる。" }, "heatproof": { "name": "たいねつ", - "description": "耐熱の 体に よって ほのおタイプの 技の 威力を 半減させる。" + "description": "耐熱の　体に　よって　ほのおタイプの　技の　威力を　半減させる。" }, "simple": { "name": "たんじゅん", - "description": "能力 変化が いつもの ２倍に なる。" + "description": "能力　変化が　いつもの　２倍に　なる。" }, "drySkin": { "name": "かんそうはだ", - "description": "天気が 雨の時や みずタイプの 技で ＨＰが 回復し はれの時や ほのおタイプの 技で 減ってしまう。" + "description": "天気が　雨の時や　みずタイプの　技で　ＨＰが　回復し　はれの時や　ほのおタイプの　技で　減ってしまう。" }, "download": { "name": "ダウンロード", - "description": "相手の 防御と 特防を くらべて 低い ほうの 能力に あわせて 自分の 攻撃か 特攻を 上げる。" + "description": "相手の　防御と　特防を　くらべて　低い　ほうの　能力に　あわせて　自分の　攻撃か　特攻を　上げる。" }, "ironFist": { "name": "てつのこぶし", - "description": "パンチを 使う 技の 威力が 上がる。" + "description": "パンチを　使う　技の　威力が　上がる。" }, "poisonHeal": { "name": "ポイズンヒール", - "description": "どく状態に なると ＨＰが 減らずに 増えていく。" + "description": "どく状態に　なると　ＨＰが　減らずに　増えていく。" }, "adaptability": { "name": "てきおうりょく", - "description": "自分と おなじ タイプの 技の 威力が 上がる。" + "description": "自分と　おなじ　タイプの　技の　威力が　上がる。" }, "skillLink": { "name": "スキルリンク", - "description": "連続技を 使うと いつも 最高回数 出すことが できる。" + "description": "連続技を　使うと　いつも　最高回数　出すことが　できる。" }, "hydration": { "name": "うるおいボディ", - "description": "天気が 雨のとき 状態異常が 治る。" + "description": "天気が　雨のとき　状態異常が　治る。" }, "solarPower": { "name": "サンパワー", - "description": "天気が 晴れると 特攻が 上がるが 毎ターン ＨＰが 減る。" + "description": "天気が　晴れると　特攻が　上がるが　毎ターン　ＨＰが　減る。" }, "quickFeet": { "name": "はやあし", - "description": "状態異常に なると 素早さが 上がる。" + "description": "状態異常に　なると　素早さが　上がる。" }, "normalize": { "name": "ノーマルスキン", - "description": "どんな タイプの 技でも すべて ノーマルタイプに なる。 威力が 少し 上がる。" + "description": "どんな　タイプの　技でも　すべて　ノーマルタイプに　なる。　威力が　少し　上がる。" }, "sniper": { "name": "スナイパー", - "description": "攻撃を 急所に 当てると 威力が さらに 上がる。" + "description": "攻撃を　急所に　当てると　威力が　さらに　上がる。" }, "magicGuard": { "name": "マジックガード", - "description": "攻撃 以外では ダメージを 受けない。" + "description": "攻撃　以外では　ダメージを　受けない。" }, "noGuard": { "name": "ノーガード", - "description": "ノーガード戦法に よって お互いの 出す 技が かならず 当たる ようになる。" + "description": "ノーガード戦法に　よって　お互いの　出す　技が　かならず　当たる　ようになる。" }, "stall": { "name": "あとだし", - "description": "技を 出す 順番が かならず 最後に なる。" + "description": "技を　出す　順番が　かならず　最後に　なる。" }, "technician": { "name": "テクニシャン", - "description": "威力が 低い 技の 威力を 高くして 攻撃できる。" + "description": "威力が　低い　技の　威力を　高くして　攻撃できる。" }, "leafGuard": { "name": "リーフガード", - "description": "天気が 晴れのときは 状態異常に ならない。" + "description": "天気が　晴れのときは　状態異常に　ならない。" }, "klutz": { "name": "ぶきよう", - "description": "持っている 道具を 使うことが できない。" + "description": "持っている　道具を　使うことが　できない。" }, "moldBreaker": { "name": "かたやぶり", - "description": "相手の 特性に ジャマされる ことなく 相手に 技を 出すことが できる。" + "description": "相手の　特性に　ジャマされる　ことなく　相手に　技を　出すことが　できる。" }, "superLuck": { "name": "きょううん", - "description": "強運を 持っているため 相手の 急所に 攻撃が 当たりやすい。" + "description": "強運を　持っているため　相手の　急所に　攻撃が　当たりやすい。" }, "aftermath": { "name": "ゆうばく", - "description": "ひんしに なったとき 触った 相手に ダメージを あたえる。" + "description": "ひんしに　なったとき　触った　相手に　ダメージを　あたえる。" }, "anticipation": { "name": "きけんよち", - "description": "相手の 持つ 危険な 技を 察知する ことができる。" + "description": "相手の　持つ　危険な　技を　察知する　ことができる。" }, "forewarn": { "name": "よちむ", - "description": "登場 したとき 相手の 持つ 技を ひとつだけ 読み取る。" + "description": "登場　したとき　相手の　持つ　技を　ひとつだけ　読み取る。" }, "unaware": { "name": "てんねん", - "description": "相手の 能力の 変化を 無視して 攻撃が できる。" + "description": "相手の　能力の　変化を　無視して　攻撃が　できる。" }, "tintedLens": { "name": "いろめがね", - "description": "効果が いまひとつの 技を 通常の 威力で 出すことが できる。" + "description": "効果が　いまひとつの　技を　通常の　威力で　出すことが　できる。" }, "filter": { "name": "フィルター", - "description": "効果バツグンに なってしまう 攻撃の 威力を 弱める ことが できる。" + "description": "効果バツグンに　なってしまう　攻撃の　威力を　弱める　ことが　できる。" }, "slowStart": { "name": "スロースタート", - "description": "５ターンの あいだ 攻撃と 素早さが 半分に なる。" + "description": "５ターンの　あいだ　攻撃と　素早さが　半分に　なる。" }, "scrappy": { "name": "きもったま", - "description": "ゴーストタイプの ポケモンに ノーマルタイプと かくとうタイプの 技を 当てることが できる。" + "description": "ゴーストタイプの　ポケモンに　ノーマルタイプと　かくとうタイプの　技を　当てることが　できる。" }, "stormDrain": { "name": "よびみず", - "description": "みずタイプの 技を 自分に よせつけ ダメージは 受けずに 特攻が 上がる。" + "description": "みずタイプの　技を　自分に　よせつけ　ダメージは　受けずに　特攻が　上がる。" }, "iceBody": { "name": "アイスボディ", - "description": "天気が ゆきのとき HPを 少しずつ 回復 する。" + "description": "天気が　ゆきのとき　HPを　少しずつ　回復　する。" }, "solidRock": { "name": "ハードロック", - "description": "効果バツグンに なってしまう 攻撃の 威力を 弱める ことが できる。" + "description": "効果バツグンに　なってしまう　攻撃の　威力を　弱める　ことが　できる。" }, "snowWarning": { "name": "ゆきふらし", - "description": "登場 したときに 天気を ゆきに する。" + "description": "登場　したときに　天気を　ゆきに　する。" }, "honeyGather": { "name": "みつあつめ", - "description": "戦闘が 終わったとき あまいミツを 拾う。そのあまいミツが 売られて お金を もらう。" + "description": "戦闘が　終わったとき　あまいミツを　拾う。そのあまいミツが　売られて　お金を　もらう。" }, "frisk": { "name": "おみとおし", - "description": "登場 したとき 相手の 持ち物を 見通すことが できる。" + "description": "登場　したとき　相手の　持ち物を　見通すことが　できる。" }, "reckless": { "name": "すてみ", - "description": "反動で ダメージを 受ける 技の 威力が 上がる。" + "description": "反動で　ダメージを　受ける　技の　威力が　上がる。" }, "multitype": { "name": "マルチタイプ", - "description": "持っている プレートや Ｚクリスタルの タイプによって 自分の タイプが 変わる。" + "description": "持っている　プレートや　Ｚクリスタルの　タイプによって　自分の　タイプが　変わる。" }, "flowerGift": { "name": "フラワーギフト", - "description": "天気が 晴れのとき 自分と 味方の 攻撃と 特防の 能力が 上がる。" + "description": "天気が　晴れのとき　自分と　味方の　攻撃と　特防の　能力が　上がる。" }, "badDreams": { "name": "ナイトメア", - "description": "ねむり状態の 相手に ダメージを あたえる。" + "description": "ねむり状態の　相手に　ダメージを　あたえる。" }, "pickpocket": { "name": "わるいてぐせ", - "description": "触られた 相手の 道具を 盗んで しまう。" + "description": "触られた　相手の　道具を　盗んで　しまう。" }, "sheerForce": { "name": "ちからずく", - "description": "技の 追加効果は なくなるが そのぶん 高い 威力で 技を 出すことが できる。" + "description": "技の　追加効果は　なくなるが　そのぶん　高い　威力で　技を　出すことが　できる。" }, "contrary": { "name": "あまのじゃく", - "description": "能力の 変化が 逆転して 上がるときに 下がり 下がるときに 上がる。" + "description": "能力の　変化が　逆転して　上がるときに　下がり　下がるときに　上がる。" }, "unnerve": { "name": "きんちょうかん", - "description": "相手を 緊張させて きのみを 食べられなく させる。" + "description": "相手を　緊張させて　きのみを　食べられなく　させる。" }, "defiant": { "name": "まけんき", - "description": "能力を 下げられると 攻撃が ぐーんと 上がる。" + "description": "能力を　下げられると　攻撃が　ぐーんと　上がる。" }, "defeatist": { "name": "よわき", - "description": "ＨＰが 半分に なると 弱気に なって 攻撃と 特攻が 半減する。" + "description": "ＨＰが　半分に　なると　弱気に　なって　攻撃と　特攻が　半減する。" }, "cursedBody": { "name": "のろわれボディ", - "description": "攻撃を 受けると 相手の 技を かなしばり状態に することが ある。" + "description": "攻撃を　受けると　相手の　技を　かなしばり状態に　することが　ある。" }, "healer": { "name": "いやしのこころ", - "description": "状態異常の 味方を たまに 治してあげる。" + "description": "状態異常の　味方を　たまに　治してあげる。" }, "friendGuard": { "name": "フレンドガード", - "description": "味方の ダメージを 減らすことが できる。" + "description": "味方の　ダメージを　減らすことが　できる。" }, "weakArmor": { "name": "くだけるよろい", - "description": "物理技で ダメージを 受けると 防御が 下がり 素早さが ぐーんと 上がる。" + "description": "物理技で　ダメージを　受けると　防御が　下がり　素早さが　ぐーんと　上がる。" }, "heavyMetal": { "name": "ヘヴィメタル", - "description": "自分の 重さが ２倍に なる。" + "description": "自分の　重さが　２倍に　なる。" }, "lightMetal": { "name": "ライトメタル", - "description": "自分の 重さが 半分に なる。" + "description": "自分の　重さが　半分に　なる。" }, "multiscale": { "name": "マルチスケイル", - "description": "ＨＰが 満タンの ときに 受ける ダメージが 少なくなる。" + "description": "ＨＰが　満タンの　ときに　受ける　ダメージが　少なくなる。" }, "toxicBoost": { "name": "どくぼうそう", - "description": "どく状態に なったとき 物理技の 威力が 上がる。" + "description": "どく状態に　なったとき　物理技の　威力が　上がる。" }, "flareBoost": { "name": "ねつぼうそう", - "description": "やけど状態に なったとき 特殊技の 威力が 上がる。" + "description": "やけど状態に　なったとき　特殊技の　威力が　上がる。" }, "harvest": { "name": "しゅうかく", - "description": "使った きのみを 何回も 作りだす。" + "description": "使った　きのみを　何回も　作りだす。" }, "telepathy": { "name": "テレパシー", - "description": "味方の 攻撃を 読み取って 技を 回避する。" + "description": "味方の　攻撃を　読み取って　技を　回避する。" }, "moody": { "name": "ムラっけ", - "description": "毎ターン 能力の どれかが ぐーんと 上がって どれかが 下がる。" + "description": "毎ターン　能力の　どれかが　ぐーんと　上がって　どれかが　下がる。" }, "overcoat": { "name": "ぼうじん", - "description": "すなあらしや あられなどの ダメージを 受けない。 粉の 技を 受けない。" + "description": "すなあらしや　あられなどの　ダメージを　受けない。　粉の　技を　受けない。" }, "poisonTouch": { "name": "どくしゅ", - "description": "触る だけで 相手を どく 状態に することがある。" + "description": "触る　だけで　相手を　どく　状態に　することがある。" }, "regenerator": { "name": "さいせいりょく", - "description": "手持ちに 引っ込むと ＨＰが 少し 回復する。" + "description": "手持ちに　引っ込むと　ＨＰが　少し　回復する。" }, "bigPecks": { "name": "はとむね", - "description": "防御を 下げる 効果を 受けない。" + "description": "防御を　下げる　効果を　受けない。" }, "sandRush": { "name": "すなかき", - "description": "天気が すなあらし のとき 素早さが 上がる。" + "description": "天気が　すなあらし　のとき　素早さが　上がる。" }, "wonderSkin": { "name": "ミラクルスキン", - "description": "変化技を 受けにくい 体に なっている。" + "description": "変化技を　受けにくい　体に　なっている。" }, "analytic": { "name": "アナライズ", - "description": "いちばん 最後に 技を 出すと 技の 威力が 上がる。" + "description": "いちばん　最後に　技を　出すと　技の　威力が　上がる。" }, "illusion": { "name": "イリュージョン", - "description": "手持ちの いちばん うしろに いる ポケモンに なりきって 登場して 相手を 化かす。" + "description": "手持ちの　いちばん　うしろに　いる　ポケモンに　なりきって　登場して　相手を　化かす。" }, "imposter": { "name": "かわりもの", - "description": "目の前の ポケモンに 変身 してしまう。" + "description": "目の前の　ポケモンに　変身　してしまう。" }, "infiltrator": { "name": "すりぬけ", - "description": "相手の 壁や 身代わりを すりぬけて 攻撃 できる" + "description": "相手の　壁や　身代わりを　すりぬけて　攻撃　できる" }, "mummy": { "name": "ミイラ", - "description": "相手に 触られると 相手を ミイラに してしまう。" + "description": "相手に　触られると　相手を　ミイラに　してしまう。" }, "moxie": { "name": "じしんかじょう", - "description": "相手を 倒すと 自信が ついて 攻撃が 上がる。" + "description": "相手を　倒すと　自信が　ついて　攻撃が　上がる。" }, "justified": { "name": "せいぎのこころ", - "description": "あくタイプの 攻撃を 受けると 正義感で 攻撃が 上がる。" + "description": "あくタイプの　攻撃を　受けると　正義感で　攻撃が　上がる。" }, "rattled": { "name": "びびり", - "description": "あく ゴースト むしタイプの 攻撃を 受けたり いかくを されると びびって 素早さが 上がる。" + "description": "あく　ゴースト　むしタイプの　攻撃を　受けたり　いかくを　されると　びびって　素早さが　上がる。" }, "magicBounce": { "name": "マジックミラー", - "description": "相手に だされた 変化技を 受けずに そのまま 返す ことが できる。" + "description": "相手に　だされた　変化技を　受けずに　そのまま　返す　ことが　できる。" }, "sapSipper": { "name": "そうしょく", - "description": "くさタイプの 技を 受けると ダメージを 受けずに 攻撃が 上がる。" + "description": "くさタイプの　技を　受けると　ダメージを　受けずに　攻撃が　上がる。" }, "prankster": { "name": "いたずらごころ", - "description": "変化技を 先制で 出すことが できる。" + "description": "変化技を　先制で　出すことが　できる。" }, "sandForce": { "name": "すなのちから", - "description": "天気が すなあらしの とき いわタイプと じめんタイプと はがねタイプの 威力が 上がる。" + "description": "天気が　すなあらしの　とき　いわタイプと　じめんタイプと　はがねタイプの　威力が　上がる。" }, "ironBarbs": { "name": "てつのトゲ", - "description": "自分に 触った 相手に 鉄のトゲで ダメージを あたえる。" + "description": "自分に　触った　相手に　鉄のトゲで　ダメージを　あたえる。" }, "zenMode": { "name": "ダルマモード", - "description": "ＨＰが 半分 以下に なると 姿が 変化する。" + "description": "ＨＰが　半分　以下に　なると　姿が　変化する。" }, "victoryStar": { "name": "しょうりのほし", - "description": "自分や 味方の 命中率が 上がる。" + "description": "自分や　味方の　命中率が　上がる。" }, "turboblaze": { "name": "ターボブレイズ", - "description": "相手の 特性に ジャマされる ことなく 相手に 技を 出すことが できる。" + "description": "相手の　特性に　ジャマされる　ことなく　相手に　技を　出すことが　できる。" }, "teravolt": { "name": "テラボルテージ", - "description": "相手の 特性に ジャマされる ことなく 相手に 技を 出すことが できる。" + "description": "相手の　特性に　ジャマされる　ことなく　相手に　技を　出すことが　できる。" }, "aromaVeil": { "name": "アロマベール", - "description": "自分と 味方への メンタル 攻撃を 防ぐことが できる。" + "description": "自分と　味方への　メンタル　攻撃を　防ぐことが　できる。" }, "flowerVeil": { "name": "フラワーベール", - "description": "味方の 草ポケモンは 能力が 下がらず 状態異常にも ならない。" + "description": "味方の　草ポケモンは　能力が　下がらず　状態異常にも　ならない。" }, "cheekPouch": { "name": "ほおぶくろ", - "description": "どんな きのみでも 食べると ＨＰも 回復する。" + "description": "どんな　きのみでも　食べると　ＨＰも　回復する。" }, "protean": { "name": "へんげんじざい", - "description": "自分が 出す 技と 同じ タイプに 変化する。" + "description": "自分が　出す　技と　同じ　タイプに　変化する。" }, "furCoat": { "name": "ファーコート", - "description": "相手から 受ける 物理技の ダメージが 半分に なる。" + "description": "相手から　受ける　物理技の　ダメージが　半分に　なる。" }, "magician": { "name": "マジシャン", - "description": "技を 当てた 相手の 道具を 奪ってしまう。" + "description": "技を　当てた　相手の　道具を　奪ってしまう。" }, "bulletproof": { "name": "ぼうだん", - "description": "相手の 弾や 爆弾などの 技を 防ぐことが できる。" + "description": "相手の　弾や　爆弾などの　技を　防ぐことが　できる。" }, "competitive": { "name": "かちき", - "description": "能力を 下げられると 特攻が ぐーんと 上がる。" + "description": "能力を　下げられると　特攻が　ぐーんと　上がる。" }, "strongJaw": { "name": "がんじょうあご", - "description": "あごが 頑丈で 噛む 技の 威力が 高くなる。" + "description": "あごが　頑丈で　噛む　技の　威力が　高くなる。" }, "refrigerate": { "name": "フリーズスキン", - "description": "ノーマルタイプの 技が こおりタイプに なる。 威力が 少し 上がる。" + "description": "ノーマルタイプの　技が　こおりタイプに　なる。　威力が　少し　上がる。" }, "sweetVeil": { "name": "スイートベール", - "description": "味方の ポケモンは 眠らなくなる。" + "description": "味方の　ポケモンは　眠らなくなる。" }, "stanceChange": { "name": "バトルスイッチ", - "description": "攻撃技を 出すと ブレードフォルムに 技 キングシールドを 出すと シールドフォルムに 変化する。" + "description": "攻撃技を　出すと　ブレードフォルムに　技　キングシールドを　出すと　シールドフォルムに　変化する。" }, "galeWings": { "name": "はやてのつばさ", - "description": "ＨＰが 満タン だと ひこうタイプの 技を 先制で 出すことが できる。" + "description": "ＨＰが　満タン　だと　ひこうタイプの　技を　先制で　出すことが　できる。" }, "megaLauncher": { "name": "メガランチャー", - "description": "波動の 技の 威力が 高くなる。" + "description": "波動の　技の　威力が　高くなる。" }, "grassPelt": { "name": "くさのけがわ", - "description": "グラスフィールドのとき 防御が 上がる。" + "description": "グラスフィールドのとき　防御が　上がる。" }, "symbiosis": { "name": "きょうせい", - "description": "味方が 道具を 使うと 自分の 持っている 道具を 味方に 渡す。" + "description": "味方が　道具を　使うと　自分の　持っている　道具を　味方に　渡す。" }, "toughClaws": { "name": "かたいツメ", - "description": "相手に 接触する 技の 威力が 高くなる。" + "description": "相手に　接触する　技の　威力が　高くなる。" }, "pixilate": { "name": "フェアリースキン", - "description": "ノーマルタイプの 技が フェアリータイプになる。 威力が 少し 上がる。" + "description": "ノーマルタイプの　技が　フェアリータイプになる。　威力が　少し　上がる。" }, "gooey": { "name": "ぬめぬめ", - "description": "攻撃で 自分に 触れた 相手の 素早さを 下げる。" + "description": "攻撃で　自分に　触れた　相手の　素早さを　下げる。" }, "aerilate": { "name": "スカイスキン", - "description": "ノーマルタイプの 技が ひこうタイプになる。 威力が 少し 上がる。" + "description": "ノーマルタイプの　技が　ひこうタイプになる。　威力が　少し　上がる。" }, "parentalBond": { "name": "おやこあい", - "description": "親子 ２匹で ２回 攻撃することが できる。" + "description": "親子　２匹で　２回　攻撃することが　できる。" }, "darkAura": { "name": "ダークオーラ", - "description": "全員の あくタイプの 技が 強くなる。" + "description": "全員の　あくタイプの　技が　強くなる。" }, "fairyAura": { "name": "フェアリーオーラ", - "description": "全員の フェアリータイプの 技が 強くなる。" + "description": "全員の　フェアリータイプの　技が　強くなる。" }, "auraBreak": { "name": "オーラブレイク", - "description": "オーラの 効果を 逆転させて 威力を 下げる。" + "description": "オーラの　効果を　逆転させて　威力を　下げる。" }, "primordialSea": { "name": "はじまりのうみ", - "description": "ほのおタイプの 攻撃を 受けない 天気にする。" + "description": "ほのおタイプの　攻撃を　受けない　天気にする。" }, "desolateLand": { "name": "おわりのだいち", - "description": "みずタイプの 攻撃を 受けない 天気にする。" + "description": "みずタイプの　攻撃を　受けない　天気にする。" }, "deltaStream": { "name": "デルタストリーム", - "description": "ひこうタイプの 弱点が なくなる 天気にする。" + "description": "ひこうタイプの　弱点が　なくなる　天気にする。" }, "stamina": { "name": "じきゅうりょく", - "description": "攻撃を 受けると 防御が 上がる。" + "description": "攻撃を　受けると　防御が　上がる。" }, "wimpOut": { "name": "にげごし", - "description": "ＨＰが 半分に なると あわてて 逃げ出して 手持ちに 引っ込んで しまう。" + "description": "ＨＰが　半分に　なると　あわてて　逃げ出して　手持ちに　引っ込んで　しまう。" }, "emergencyExit": { "name": "ききかいひ", - "description": "ＨＰが 半分に なると 危険を 回避するため 手持ちに 引っ込んで しまう。" + "description": "ＨＰが　半分に　なると　危険を　回避するため　手持ちに　引っ込んで　しまう。" }, "waterCompaction": { "name": "みずがため", - "description": "みずタイプの 技を 受けると 防御が ぐーんと 上がる。" + "description": "みずタイプの　技を　受けると　防御が　ぐーんと　上がる。" }, "merciless": { "name": "ひとでなし", - "description": "どく状態の 相手を 攻撃すると かならず 急所に 当たる。" + "description": "どく状態の　相手を　攻撃すると　かならず　急所に　当たる。" }, "shieldsDown": { "name": "リミットシールド", - "description": "ＨＰが 半分に なると 殻が 壊れて 攻撃的に なる。" + "description": "ＨＰが　半分に　なると　殻が　壊れて　攻撃的に　なる。" }, "stakeout": { "name": "はりこみ", - "description": "交代で 出てきた 相手に ２倍の ダメージで 攻撃 できる。" + "description": "交代で　出てきた　相手に　２倍の　ダメージで　攻撃　できる。" }, "waterBubble": { "name": "すいほう", - "description": "自分に 対する ほのおタイプの 技の 威力を 下げる。 やけど しない。" + "description": "自分に　対する　ほのおタイプの　技の　威力を　下げる。　やけど　しない。" }, "steelworker": { "name": "はがねつかい", - "description": "はがねタイプの 技の 威力が 上がる。" + "description": "はがねタイプの　技の　威力が　上がる。" }, "berserk": { "name": "ぎゃくじょう", - "description": "相手の 攻撃で ＨＰが 半分に なると 特攻が 上がる。" + "description": "相手の　攻撃で　ＨＰが　半分に　なると　特攻が　上がる。" }, "slushRush": { "name": "ゆきかき", - "description": "天気が ゆき のとき 素早さが 上がる。" + "description": "天気が　ゆき　のとき　素早さが　上がる。" }, "longReach": { "name": "えんかく", - "description": "すべての 技を 相手に 接触 しないで 出すことが できる。" + "description": "すべての　技を　相手に　接触　しないで　出すことが　できる。" }, "liquidVoice": { "name": "うるおいボイス", - "description": "すべての 音技が みずタイプに なる。" + "description": "すべての　音技が　みずタイプに　なる。" }, "triage": { "name": "ヒーリングシフト", - "description": "回復技を 先制で 出すことが できる。" + "description": "回復技を　先制で　出すことが　できる。" }, "galvanize": { "name": "エレキスキン", - "description": "ノーマルタイプの 技が でんきタイプになる。 威力が 少し 上がる。" + "description": "ノーマルタイプの　技が　でんきタイプになる。　威力が　少し　上がる。" }, "surgeSurfer": { "name": "サーフテール", - "description": "エレキフィールド のとき 素早さが ２倍に なる。" + "description": "エレキフィールド　のとき　素早さが　２倍に　なる。" }, "schooling": { "name": "ぎょぐん", - "description": "ＨＰが 多いときは 群れて 強くなる。 ＨＰの 残りが 少なくなると 群れは 散り散りに なってしまう。" + "description": "ＨＰが　多いときは　群れて　強くなる。　ＨＰの　残りが　少なくなると　群れは　散り散りに　なってしまう。" }, "disguise": { "name": "ばけのかわ", - "description": "体を 被う 化けの皮で １回 攻撃を 防ぐことが できる。" + "description": "体を　被う　化けの皮で　１回　攻撃を　防ぐことが　できる。" }, "battleBond": { "name": "きずなへんげ", - "description": "相手を 倒すと トレーナーとの キズナが 深まり サトシゲッコウガに 変化する。みずしゅりけんが 強くなる。" + "description": "相手を　倒すと　トレーナーとの　キズナが　深まり　サトシゲッコウガに　変化する。みずしゅりけんが　強くなる。" }, "powerConstruct": { "name": "スワームチェンジ", - "description": "ＨＰが 半分に なると セルたちが 応援に 駆けつけ パーフェクトフォルムに 姿を 変える。" + "description": "ＨＰが　半分に　なると　セルたちが　応援に　駆けつけ　パーフェクトフォルムに　姿を　変える。" }, "corrosion": { "name": "ふしょく", - "description": "はがねタイプや どくタイプも どく状態に することが できる。" + "description": "はがねタイプや　どくタイプも　どく状態に　することが　できる。" }, "comatose": { "name": "ぜったいねむり", - "description": "つねに 夢うつつの 状態で 絶対に 目覚めない。 眠ったまま 攻撃が できる。" + "description": "つねに　夢うつつの　状態で　絶対に　目覚めない。　眠ったまま　攻撃が　できる。" }, "queenlyMajesty": { "name": "じょおうのいげん", - "description": "相手に 威圧感を あたえ こちらに むかって 先制技を 出せない ようにする。" + "description": "相手に　威圧感を　あたえ　こちらに　むかって　先制技を　出せない　ようにする。" }, "innardsOut": { "name": "とびだすなかみ", - "description": "相手に 倒されたとき ＨＰの 残りの ぶんだけ 相手に ダメージを あたえる。" + "description": "相手に　倒されたとき　ＨＰの　残りの　ぶんだけ　相手に　ダメージを　あたえる。" }, "dancer": { "name": "おどりこ", - "description": "だれかが 踊り技を 使うと 自分も それに 続いて 踊り技を 出すことが できる。" + "description": "だれかが　踊り技を　使うと　自分も　それに　続いて　踊り技を　出すことが　できる。" }, "battery": { "name": "バッテリー", - "description": "味方の 特殊技の 威力を 上げる。" + "description": "味方の　特殊技の　威力を　上げる。" }, "fluffy": { "name": "もふもふ", - "description": "相手から 受けた 接触する 技の ダメージを 半減するが ほのおタイプの 技の ダメージは ２倍になる。" + "description": "相手から　受けた　接触する　技の　ダメージを　半減するが　ほのおタイプの　技の　ダメージは　２倍になる。" }, "dazzling": { "name": "ビビッドボディ", - "description": "相手を びっくり させて こちらに むかって 先制技を 出せない ようにする。" + "description": "相手を　びっくり　させて　こちらに　むかって　先制技を　出せない　ようにする。" }, "soulHeart": { "name": "ソウルハート", - "description": "ポケモンが ひんしに なるたびに 特攻が 上がる。" + "description": "ポケモンが　ひんしに　なるたびに　特攻が　上がる。" }, "tanglingHair": { "name": "カーリーヘアー", - "description": "攻撃で 自分に 触れた 相手の 素早さを 下げる。" + "description": "攻撃で　自分に　触れた　相手の　素早さを　下げる。" }, "receiver": { "name": "レシーバー", - "description": "倒された 味方の 特性を 受け継いで 同じ 特性に なる。" + "description": "倒された　味方の　特性を　受け継いで　同じ　特性に　なる。" }, "powerOfAlchemy": { "name": "かがくのちから", - "description": "倒された 味方の 特性を 受け継いで 同じ 特性に なる。" + "description": "倒された　味方の　特性を　受け継いで　同じ　特性に　なる。" }, "beastBoost": { "name": "ビーストブースト", - "description": "相手を 倒したとき 自分の いちばん 高い 能力が 上がる。" + "description": "相手を　倒したとき　自分の　いちばん　高い　能力が　上がる。" }, "rksSystem": { "name": "ＡＲシステム", - "description": "持っている メモリで 自分の タイプが 変わる。" + "description": "持っている　メモリで　自分の　タイプが　変わる。" }, "electricSurge": { "name": "エレキメイカー", - "description": "登場 したときに エレキフィールドを はりめぐらせる。" + "description": "登場　したときに　エレキフィールドを　はりめぐらせる。" }, "psychicSurge": { "name": "サイコメイカー", - "description": "登場 したときに サイコフィールドを はりめぐらせる。" + "description": "登場　したときに　サイコフィールドを　はりめぐらせる。" }, "mistySurge": { "name": "ミストメイカー", - "description": "登場 したときに ミストフィールドを はりめぐらせる。" + "description": "登場　したときに　ミストフィールドを　はりめぐらせる。" }, "grassySurge": { "name": "グラスメイカー", - "description": "登場 したときに グラスフィールドを はりめぐらせる。" + "description": "登場　したときに　グラスフィールドを　はりめぐらせる。" }, "fullMetalBody": { "name": "メタルプロテクト", - "description": "相手の 技や 特性で 能力を 下げられない。" + "description": "相手の　技や　特性で　能力を　下げられない。" }, "shadowShield": { "name": "ファントムガード", - "description": "ＨＰが 満タンの ときに 受ける ダメージが 少なくなる。" + "description": "ＨＰが　満タンの　ときに　受ける　ダメージが　少なくなる。" }, "prismArmor": { "name": "プリズムアーマー", - "description": "効果バツグンに なってしまう 攻撃の 威力を 弱める ことが できる。" + "description": "効果バツグンに　なってしまう　攻撃の　威力を　弱める　ことが　できる。" }, "neuroforce": { "name": "ブレインフォース", - "description": "効果バツグンの 攻撃で 威力が さらに 上がる。" + "description": "効果バツグンの　攻撃で　威力が　さらに　上がる。" }, "intrepidSword": { "name": "ふとうのけん", - "description": "登場 したときに 攻撃が 上がる。" + "description": "登場　したときに　攻撃が　上がる。" }, "dauntlessShield": { "name": "ふくつのたて", - "description": "登場 したときに 防御が 上がる。" + "description": "登場　したときに　防御が　上がる。" }, "libero": { "name": "リベロ", - "description": "自分が 出す 技と 同じ タイプに 変化する。" + "description": "自分が　出す　技と　同じ　タイプに　変化する。" }, "ballFetch": { "name": "たまひろい", - "description": "1回目に 投げて 失敗 した モンスターボールを 拾ってくる。" + "description": "1回目に　投げて　失敗　した　モンスターボールを　拾ってくる。" }, "cottonDown": { "name": "わたげ", - "description": "攻撃を 受けると わたげを ばらまいて 自分以外の ポケモン すべての 素早さを 下げる。" + "description": "攻撃を　受けると　わたげを　ばらまいて　自分以外の　ポケモン　すべての　素早さを　下げる。" }, "propellerTail": { "name": "スクリューおびれ", - "description": "相手の 技を 引き受ける 特性や 技の 影響を 無視 できる。" + "description": "相手の　技を　引き受ける　特性や　技の　影響を　無視　できる。" }, "mirrorArmor": { "name": "ミラーアーマー", - "description": "自分が 受けた 能力 ダウンの 効果 だけを 跳ね返す。" + "description": "自分が　受けた　能力　ダウンの　効果　だけを　跳ね返す。" }, "gulpMissile": { "name": "うのミサイル", - "description": "なみのりか ダイビングを すると 獲物を くわえてくる。 ダメージを 受けると 獲物を 吐きだして 攻撃。" + "description": "なみのりか　ダイビングを　すると　獲物を　くわえてくる。　ダメージを　受けると　獲物を　吐きだして　攻撃。" }, "stalwart": { "name": "すじがねいり", - "description": "相手の 技を 引き受ける 特性や 技の 影響を 無視 できる。" + "description": "相手の　技を　引き受ける　特性や　技の　影響を　無視　できる。" }, "steamEngine": { "name": "じょうききかん", - "description": "みずタイプ ほのおタイプの 技を 受けると 素早さが ぐぐーんと 上がる。" + "description": "みずタイプ　ほのおタイプの　技を　受けると　素早さが　ぐぐーんと　上がる。" }, "punkRock": { "name": "パンクロック", - "description": "音技の 威力が 上がる。 受けた 音技の ダメージは 半分に なる。" + "description": "音技の　威力が　上がる。　受けた　音技の　ダメージは　半分に　なる。" }, "sandSpit": { "name": "すなはき", - "description": "攻撃を 受けると 砂あらしを 起こす。" + "description": "攻撃を　受けると　砂あらしを　起こす。" }, "iceScales": { "name": "こおりのりんぷん", - "description": "こおりのりんぷんに 守られて 特殊攻撃で 受ける ダメージが 半減 する。" + "description": "こおりのりんぷんに　守られて　特殊攻撃で　受ける　ダメージが　半減　する。" }, "ripen": { "name": "じゅくせい", - "description": "熟成 させることで きのみの 効果が 倍に なる。" + "description": "熟成　させることで　きのみの　効果が　倍に　なる。" }, "iceFace": { "name": "アイスフェイス", - "description": "物理攻撃は 頭の 氷が みがわりに なるが 姿も 変わる。 氷は あられが 降ると 元に戻る。" + "description": "物理攻撃は　頭の　氷が　みがわりに　なるが　姿も　変わる。　氷は　あられが　降ると　元に戻る。" }, "powerSpot": { "name": "パワースポット", - "description": "隣に いるだけで 技の 威力が 上がる。" + "description": "隣に　いるだけで　技の　威力が　上がる。" }, "mimicry": { "name": "ぎたい", - "description": "フィールドの 状態に あわせて ポケモンの タイプが 変わる。" + "description": "フィールドの　状態に　あわせて　ポケモンの　タイプが　変わる。" }, "screenCleaner": { "name": "バリアフリー", - "description": "登場 したときに 敵と 味方の ひかりのかべ リフレクター オーロラベールの 効果が 消える。" + "description": "登場　したときに　敵と　味方の　ひかりのかべ　リフレクター　オーロラベールの　効果が　消える。" }, "steelySpirit": { "name": "はがねのせいしん", - "description": "味方の はがねタイプの 攻撃の 威力が 上がる。" + "description": "味方の　はがねタイプの　攻撃の　威力が　上がる。" }, "perishBody": { "name": "ほろびのボディ", - "description": "接触する 技を 受けると お互い ３ターン たつと ひんしになる。 交代すると 効果は なくなる。" + "description": "接触する　技を　受けると　お互い　３ターン　たつと　ひんしになる。　交代すると　効果は　なくなる。" }, "wanderingSpirit": { "name": "さまようたましい", - "description": "接触する 技で 攻撃 してきた ポケモンと 特性を 入れ替える。" + "description": "接触する　技で　攻撃　してきた　ポケモンと　特性を　入れ替える。" }, "gorillaTactics": { "name": "ごりむちゅう", - "description": "攻撃は 上がるが 最初に 選んだ 技しか 出せなくなる。" + "description": "攻撃は　上がるが　最初に　選んだ　技しか　出せなくなる。" }, "neutralizingGas": { "name": "かがくへんかガス", - "description": "かがくへんかガスの ポケモンが 場にいると すべての ポケモンの 特性の 効果が 消えたり 発動 しなくなる。" + "description": "かがくへんかガスの　ポケモンが　場にいると　すべての　ポケモンの　特性の　効果が　消えたり　発動　しなくなる。" }, "pastelVeil": { "name": "パステルベール", - "description": "自分も 味方も どくの 状態異常を 受けなくなる。" + "description": "自分も　味方も　どくの　状態異常を　受けなくなる。" }, "hungerSwitch": { "name": "はらぺこスイッチ", - "description": "ターンの 終わりに まんぷくもよう はらぺこもよう まんぷくもよう……と 交互に 姿を 変える。" + "description": "ターンの　終わりに　まんぷくもよう　はらぺこもよう　まんぷくもよう……と　交互に　姿を　変える。" }, "quickDraw": { "name": "クイックドロウ", - "description": "相手より 先に 行動できることが ある。" + "description": "相手より　先に　行動できることが　ある。" }, "unseenFist": { "name": "ふかしのこぶし", - "description": "相手に 接触する 技なら 守りの 効果を 無視して 攻撃することが できる。" + "description": "相手に　接触する　技なら　守りの　効果を　無視して　攻撃することが　できる。" }, "curiousMedicine": { "name": "きみょうなくすり", - "description": "登場 したときに 貝がらから 薬を 振りまいて 味方の 能力変化を 元に戻す。" + "description": "登場　したときに　貝がらから　薬を　振りまいて　味方の　能力変化を　元に戻す。" }, "transistor": { "name": "トランジスタ", - "description": "でんきタイプの 技の 威力が 上がる。" + "description": "でんきタイプの　技の　威力が　上がる。" }, "dragonsMaw": { "name": "りゅうのあぎと", - "description": "ドラゴンタイプの 技の 威力が 上がる。" + "description": "ドラゴンタイプの　技の　威力が　上がる。" }, "chillingNeigh": { "name": "しろのいななき", - "description": "相手を 倒すと 冷たい 声で いなないて 攻撃が 上がる。" + "description": "相手を　倒すと　冷たい　声で　いなないて　攻撃が　上がる。" }, "grimNeigh": { "name": "くろのいななき", - "description": "相手を 倒すと 恐ろしい 声で いなないて 特攻が 上がる。" + "description": "相手を　倒すと　恐ろしい　声で　いなないて　特攻が　上がる。" }, "asOneGlastrier": { "name": "じんばいったい", - "description": "バドレックスの きんちょうかんと ブリザポスの しろのいななきの 二つの 特性を あわせ持つ。" + "description": "バドレックスの　きんちょうかんと　ブリザポスの　しろのいななきの　二つの　特性を　あわせ持つ。" }, "asOneSpectrier": { "name": "じんばいったい", - "description": "バドレックスの きんちょうかんと レイスポスの くろのいななきの 二つの 特性を あわせ持つ。" + "description": "バドレックスの　きんちょうかんと　レイスポスの　くろのいななきの　二つの　特性を　あわせ持つ。" }, "lingeringAroma": { "name": "とれないにおい", @@ -1073,170 +1073,170 @@ }, "seedSower": { "name": "こぼれダネ", - "description": "攻撃を 受けると グラスフィールドに する。" + "description": "攻撃を　受けると　グラスフィールドに　する。" }, "thermalExchange": { "name": "ねつこうかん", - "description": "ほのおタイプの 技を 受けると 攻撃が 上がる。 やけど状態に ならない。" + "description": "ほのおタイプの　技を　受けると　攻撃が　上がる。　やけど状態に　ならない。" }, "angerShell": { "name": "いかりのこうら", - "description": "相手の攻撃で HPが 半分に なると 怒りで 防御と 特防が 下がるが 攻撃 特攻 素早さが 上がる。" + "description": "相手の攻撃で　HPが　半分に　なると　怒りで　防御と　特防が　下がるが　攻撃　特攻　素早さが　上がる。" }, "purifyingSalt": { "name": "きよめのしお", - "description": "清らかな塩で 状態異常に ならない。 ゴーストタイプの 技の ダメージを 半減させる。" + "description": "清らかな塩で　状態異常に　ならない。　ゴーストタイプの　技の　ダメージを　半減させる。" }, "wellBakedBody": { "name": "こんがりボディ", - "description": "ほのおタイプの 技を 受けると ダメージを 受けずに 防御が ぐーんと 上がる。" + "description": "ほのおタイプの　技を　受けると　ダメージを　受けずに　防御が　ぐーんと　上がる。" }, "windRider": { "name": "かぜのり", - "description": "おいかぜが 吹いたり 風技を 受けると ダメージを 受けずに 攻撃が 上がる。" + "description": "おいかぜが　吹いたり　風技を　受けると　ダメージを　受けずに　攻撃が　上がる。" }, "guardDog": { "name": "ばんけん", - "description": "いかく されると 攻撃が 上がる。 ポケモンを 入れ替えさせる 技や 道具が 効かない。" + "description": "いかく　されると　攻撃が　上がる。　ポケモンを　入れ替えさせる　技や　道具が　効かない。" }, "rockyPayload": { "name": "いわはこび", - "description": "いわタイプの 技の 威力が 上がる。" + "description": "いわタイプの　技の　威力が　上がる。" }, "windPower": { "name": "ふうりょくでんき", - "description": "風技を 受けると じゅうでん 状態に なる。" + "description": "風技を　受けると　じゅうでん　状態に　なる。" }, "zeroToHero": { "name": "マイティチェンジ", - "description": "手持ちに ひっこむと マイティフォルムに 変化する。" + "description": "手持ちに　ひっこむと　マイティフォルムに　変化する。" }, "commander": { "name": "しれいとう", - "description": "登場したとき 味方に ヘイラッシャが いると 口の中に 入って そこから 指令を だす。" + "description": "登場したとき　味方に　ヘイラッシャが　いると　口の中に　入って　そこから　指令を　だす。" }, "electromorphosis": { "name": "でんきにかえる", - "description": "ダメージを 受けると じゅうでん 状態に なる。" + "description": "ダメージを　受けると　じゅうでん　状態に　なる。" }, "protosynthesis": { "name": "こだいかっせい", - "description": "ブーストエナジーを 持たせるか 天気が 晴れのとき いちばん 高い能力が 上がる。" + "description": "ブーストエナジーを　持たせるか　天気が　晴れのとき　いちばん　高い能力が　上がる。" }, "quarkDrive": { "name": "クォークチャージ", - "description": "ブーストエナジーを 持たせるか エレキフィールドのとき いちばん 高い能力が 上がる。" + "description": "ブーストエナジーを　持たせるか　エレキフィールドのとき　いちばん　高い能力が　上がる。" }, "goodAsGold": { "name": "おうごんのからだ", - "description": "酸化せず 丈夫な 黄金の体は 相手からの 変化技を 受けない。" + "description": "酸化せず　丈夫な　黄金の体は　相手からの　変化技を　受けない。" }, "vesselOfRuin": { "name": "わざわいのうつわ", - "description": "災厄を 呼ぶ 器の力で 自分以外の 特攻が 弱くなる。" + "description": "災厄を　呼ぶ　器の力で　自分以外の　特攻が　弱くなる。" }, "swordOfRuin": { "name": "わざわいのつるぎ", - "description": "災厄を 呼ぶ 剣の力で 自分以外の 防御が 弱くなる。" + "description": "災厄を　呼ぶ　剣の力で　自分以外の　防御が　弱くなる。" }, "tabletsOfRuin": { "name": "わざわいのおふだ", - "description": "災厄を 呼ぶ 木札の力で 自分以外の 攻撃が 弱くなる。" + "description": "災厄を　呼ぶ　木札の力で　自分以外の　攻撃が　弱くなる。" }, "beadsOfRuin": { "name": "わざわいのたま", - "description": "災厄を 呼ぶ 勾玉の力で 自分以外の 特防が 弱くなる。" + "description": "災厄を　呼ぶ　勾玉の力で　自分以外の　特防が　弱くなる。" }, "orichalcumPulse": { "name": "ひひいろのこどう", - "description": "登場したとき 天気を 晴れにする。 日差しが 強いと 古代の 鼓動により 攻撃が 高まる。" + "description": "登場したとき　天気を　晴れにする。　日差しが　強いと　古代の　鼓動により　攻撃が　高まる。" }, "hadronEngine": { "name": "ハドロンエンジン", - "description": "登場したとき エレキフィールドを はる。 エレキフィールドだと 未来の 機関により 特攻が 高まる。" + "description": "登場したとき　エレキフィールドを　はる。　エレキフィールドだと　未来の　機関により　特攻が　高まる。" }, "opportunist": { "name": "びんじょう", - "description": "相手の 能力が 上がったとき 自分も 便乗して 同じように 能力を 上げる。" + "description": "相手の　能力が　上がったとき　自分も　便乗して　同じように　能力を　上げる。" }, "cudChew": { "name": "はんすう", - "description": "きのみを 食べると 次のターンの 終わりに 胃から 出して もう1回だけ 食べる。" + "description": "きのみを　食べると　次のターンの　終わりに　胃から　出して　もう1回だけ　食べる。" }, "sharpness": { "name": "きれあじ", - "description": "相手を 切る技の 威力が 上がる。" + "description": "相手を　切る技の　威力が　上がる。" }, "supremeOverlord": { "name": "そうだいしょう", - "description": "登場したとき 今まで 倒された 味方の 数が 多いほど 少しずつ 攻撃と 特攻が 上がる。" + "description": "登場したとき　今まで　倒された　味方の　数が　多いほど　少しずつ　攻撃と　特攻が　上がる。" }, "costar": { "name": "きょうえん", - "description": "登場 したときに 味方の 能力変化を コピーする。" + "description": "登場　したときに　味方の　能力変化を　コピーする。" }, "toxicDebris": { "name": "どくげしょう", - "description": "物理技で ダメージを 受けると 相手の 足下に どくびしが ちらばる。" + "description": "物理技で　ダメージを　受けると　相手の　足下に　どくびしが　ちらばる。" }, "armorTail": { "name": "テイルアーマー", - "description": "頭を包む 謎のしっぽが こちらに むかって 先制技を 出せない ようにする。" + "description": "頭を包む　謎のしっぽが　こちらに　むかって　先制技を　出せない　ようにする。" }, "earthEater": { "name": "どしょく", - "description": "じめんタイプの 技を 受けると ダメージを 受けずに 回復する。" + "description": "じめんタイプの　技を　受けると　ダメージを　受けずに　回復する。" }, "myceliumMight": { "name": "きんしのちから", - "description": "変化技を 出すとき 必ず 行動が 遅くなるが 相手の 特性に ジャマされない。" + "description": "変化技を　出すとき　必ず　行動が　遅くなるが　相手の　特性に　ジャマされない。" }, "mindsEye": { "name": "しんがん", - "description": "ノーマル かくとうタイプの技を ゴーストタイプに 当てることが できる。 相手の 回避率の 変化を 無視し 命中率も 下げられない。" + "description": "ノーマル　かくとうタイプの技を　ゴーストタイプに　当てることが　できる。　相手の　回避率の　変化を　無視し　命中率も　下げられない。" }, "supersweetSyrup": { "name": "かんろなミツ", - "description": "最初に 登場 したとき 甘ったるい 蜜の香りを ふりまいて 相手の 回避率を 下げる。" + "description": "最初に　登場　したとき　甘ったるい　蜜の香りを　ふりまいて　相手の　回避率を　下げる。" }, "hospitality": { "name": "おもてなし", - "description": "登場したとき 味方を もてなして HPを 少しだけ 回復してあげる。" + "description": "登場したとき　味方を　もてなして　HPを　少しだけ　回復してあげる。" }, "toxicChain": { "name": "どくのくさり", - "description": "毒素を ふくんだ 鎖の力で 技を 当てた 相手を 猛毒の状態に することが ある。" + "description": "毒素を　ふくんだ　鎖の力で　技を　当てた　相手を　猛毒の状態に　することが　ある。" }, "embodyAspectTeal": { "name": "おもかげやどし", - "description": "思い出を 心に 宿すことで みどりのめんを かがやかせ 自分の 素早さを 上げる。" + "description": "思い出を　心に　宿すことで　みどりのめんを　かがやかせ　自分の　素早さを　上げる。" }, "embodyAspectWellspring": { "name": "おもかげやどし", - "description": "思い出を 心に 宿すことで いどのめんを かがやかせ 自分の 特防を 上げる。" + "description": "思い出を　心に　宿すことで　いどのめんを　かがやかせ　自分の　特防を　上げる。" }, "embodyAspectHearthflame": { "name": "おもかげやどし", - "description": "思い出を 心に 宿すことで かまどのめんを かがやかせ 自分の 攻撃を 上げる。" + "description": "思い出を　心に　宿すことで　かまどのめんを　かがやかせ　自分の　攻撃を　上げる。" }, "embodyAspectCornerstone": { "name": "おもかげやどし", - "description": "思い出を 心に 宿すことで いしずえのめんを かがやかせ 自分の 防御を 上げる。" + "description": "思い出を　心に　宿すことで　いしずえのめんを　かがやかせ　自分の　防御を　上げる。" }, "teraShift": { "name": "テラスチェンジ", - "description": "登場したとき 周囲の エネルギーを 吸収し テラスタルフォルムに 変化する。" + "description": "登場したとき　周囲の　エネルギーを　吸収し　テラスタルフォルムに　変化する。" }, "teraShell": { "name": "テラスシェル", - "description": "全タイプの力を 秘めた甲羅は HPが 満タンの ときに 受ける ダメージを すべて 今ひとつに する。" + "description": "全タイプの力を　秘めた甲羅は　HPが　満タンの　ときに　受ける　ダメージを　すべて　今ひとつに　する。" }, "teraformZero": { "name": "ゼロフォーミング", - "description": "テラパゴスが ステラフォルムに なったとき 秘められた力で 天気と フィールドの 影響を すべて ゼロにする。" + "description": "テラパゴスが　ステラフォルムに　なったとき　秘められた力で　天気と　フィールドの　影響を　すべて　ゼロにする。" }, "poisonPuppeteer": { "name": "どくくぐつ", - "description": "モモワロウの 技によって どく状態に なった 相手は こんらん状態にも なってしまう。" + "description": "モモワロウの　技によって　どく状態に　なった　相手は　こんらん状態にも　なってしまう。" } -} \ No newline at end of file +} diff --git a/src/locales/ja/arena-flyout.json b/src/locales/ja/arena-flyout.json index fa29b4567c5..8585b8e8fb4 100644 --- a/src/locales/ja/arena-flyout.json +++ b/src/locales/ja/arena-flyout.json @@ -39,5 +39,6 @@ "matBlock": "たたみがえし", "craftyShield": "トリックガード", "tailwind": "おいかぜ", - "happyHour": "ハッピータイム" + "happyHour": "ハッピータイム", + "safeguard": "しんぴなまもり" } diff --git a/src/locales/ja/arena-tag.json b/src/locales/ja/arena-tag.json index 56be30d8d55..a81942338fd 100644 --- a/src/locales/ja/arena-tag.json +++ b/src/locales/ja/arena-tag.json @@ -47,5 +47,11 @@ "tailwindOnRemovePlayer": "味方の　追い風が　止んだ！", "tailwindOnRemoveEnemy": "相手の　追い風が　止んだ！", "happyHourOnAdd": "みんなが　ハッピーな気分に\n包まれた！", - "happyHourOnRemove": "みんなの　気分が　元に戻った" -} \ No newline at end of file + "happyHourOnRemove": "みんなの　気分が　元に戻った", + "safeguardOnAdd": "場の全体は　神秘のベールに　包まれた！", + "safeguardOnAddPlayer": "味方は　神秘のベールに　包まれた！", + "safeguardOnAddEnemy": "相手は　神秘のベールに　包まれた！", + "safeguardOnRemove": "場の全体を　包んでいた\n神秘のベールが　なくなった！", + "safeguardOnRemovePlayer": "味方を　包んでいた\n神秘のベールが　なくなった！", + "safeguardOnRemoveEnemy": "相手を　包んでいた\n神秘のベールが　なくなった！" +} diff --git a/src/locales/ja/battle.json b/src/locales/ja/battle.json index 636d17f23d6..1fe24068cdf 100644 --- a/src/locales/ja/battle.json +++ b/src/locales/ja/battle.json @@ -4,7 +4,7 @@ "trainerAppearedDouble": "{{trainerName}}が\n勝負を しかけてきた！", "trainerSendOut": "{{trainerName}}は\n{{pokemonName}}を　繰り出した！", "singleWildAppeared": "あっ！　野生の　{{pokemonName}}が　飛び出してきた！", - "multiWildAppeared": "あっ！　野生の {{pokemonName1}}と\n{{pokemonName2}}が 飛び出してきた！", + "multiWildAppeared": "あっ！　野生の {{pokemonName1}}と\n{{pokemonName2}}が　飛び出してきた！", "playerComeBack": "{{pokemonName}}!　戻れ！", "trainerComeBack": "{{trainerName}}は\n{{pokemonName}}を 引っ込めた！", "playerGo": "ゆけっ！ {{pokemonName}}！", @@ -51,7 +51,7 @@ "noPokeballStrong": "相手の　ポケモンが　強すぎて　捕まえられない！\nまずは　弱めよう！", "noEscapeForce": "見えない　力の　せいで\n逃げることが できない！", "noEscapeTrainer": "ダメだ！　勝負の最中に\n相手に　背中を　見せられない！", - "noEscapePokemon": "{{pokemonName}}の　{{moveName}}で　{{escapeVerb}}!", + "noEscapePokemon": "{{pokemonName}}の　{{moveName}}で\n{{escapeVerb}}!", "runAwaySuccess": " うまく　逃げ切れた！", "runAwayCannotEscape": "逃げることが　できない！", "escapeVerbSwitch": "入れ替えることが　できない", @@ -62,6 +62,7 @@ "skipItemQuestion": "本当に　アイテムを　取らずに　進みますか？", "itemStackFull": "{{fullItemName}}の　スタックが　いっぱいです。\n代わりに　{{itemName}}を　取得します。", "eggHatching": "おや？", + "eggSkipPrompt": "タマゴは　ふかします！\nタマゴまとめに　飛ばしますか？", "ivScannerUseQuestion": "{{pokemonName}}を\n個体値スキャナーで　操作しますか?", "wildPokemonWithAffix": "野生の　{{pokemonName}}", "foePokemonWithAffix": "相手の　{{pokemonName}}", diff --git a/src/locales/ja/berry.json b/src/locales/ja/berry.json index 73d13d5e8f0..1d1e01296d1 100644 --- a/src/locales/ja/berry.json +++ b/src/locales/ja/berry.json @@ -1,46 +1,46 @@ { "SITRUS": { "name": "オボンのみ", - "effect": "持たせると HPが 50％以下になるとき　HPを 25％ 回復する" + "effect": "持たせると　HPが　50%以下に　なるとき　HPを 25%　回復する" }, "LUM": { "name": "ラムのみ", - "effect": "持たせると 状態異常や 混乱になるとき 回復する\n" + "effect": "持たせると　状態異常や　混乱に　なるとき　回復する" }, "ENIGMA": { "name": "ナゾのみ", - "effect": "持たせると 効果バツグンの 技を 受けたとき HPを ２５％回復する" + "effect": "持たせると　効果バツグンの　技を　受けたとき　HPを　25%回復する" }, "LIECHI": { "name": "チイラのみ", - "effect": "持たせると HPが 25%以下に なるとき 攻撃が あがる" + "effect": "持たせると　HPが　25%以下に　なるとき　攻撃が　あがる" }, "GANLON": { "name": "リュガのみ", - "effect": "持たせると HPが 25%以下に なるとき 防御が あがる\n" + "effect": "持たせると　HPが　25%以下に　なるとき　防御が　あがる" }, "PETAYA": { "name": "ヤタピのみ", - "effect": "持たせると HPが 25%以下に なるとき 特攻が あがる\n" + "effect": "持たせると　HPが　25%以下に　なるとき　特攻が　あがる" }, "APICOT": { "name": "ズアのみ", - "effect": "持たせると HPが 25%以下に なるとき 特防が あがる\n" + "effect": "持たせると　HPが　25%以下に　なるとき　特防が　あがる" }, "SALAC": { "name": "カムラのみ", - "effect": "持たせると HPが 25%以下に なるとき 素早さが あがる" + "effect": "持たせると　HPが　25%以下に　なるとき　素早さが　あがる" }, "LANSAT": { "name": "サンのみ", - "effect": "持たせると HPが 25%以下に なるとき 攻撃が 急所に 当たりやすくなる" + "effect": "持たせると　HPが　25%以下に　なるとき　攻撃が　急所に　当たりやすくなる" }, "STARF": { "name": "スターのみ", - "effect": "持たせると HPが 25%以下に なるとき どれか 1つの 能力が ぐーんと あがる" + "effect": "持たせると　HPが　25%以下に　なるとき　どれか　1つの　能力が　ぐーんと　あがる" }, "LEPPA": { "name": "ヒメリのみ", - "effect": "持たせると PPが 0になる 技のPPを 10回復する" + "effect": "持たせると　PPが0になる　技の　PPを　10回復する" } } diff --git a/src/locales/ja/fight-ui-handler.json b/src/locales/ja/fight-ui-handler.json index 41ec140c2ca..c0c725ccaf3 100644 --- a/src/locales/ja/fight-ui-handler.json +++ b/src/locales/ja/fight-ui-handler.json @@ -2,6 +2,6 @@ "pp": "PP", "power": "威力", "accuracy": "命中", - "abilityFlyInText": " {{pokemonName}}の\n{{passive}}：{{abilityName}}", + "abilityFlyInText": " {{pokemonName}}の\n{{passive}} {{abilityName}}", "passive": "パッシブ " } diff --git a/src/locales/ja/menu.json b/src/locales/ja/menu.json index 3630f7590ba..f0914a7941c 100644 --- a/src/locales/ja/menu.json +++ b/src/locales/ja/menu.json @@ -22,7 +22,7 @@ "unmatchingPassword": "入力したパスワードが 一致しません", "passwordNotMatchingConfirmPassword": "パスワードは パスワード確認と 一致する 必要があります", "confirmPassword": "パスワード確認", - "registrationAgeWarning": "登録では １３歳以上 であることを 確認します。", + "registrationAgeWarning": "登録では 13歳以上 であることを 確認します。", "backToLogin": "ログインへ", "failedToLoadSaveData": "セーブデータの　読み込みは　不可能でした。ページを　再読み込み　してください。\n長い間に続く　場合は　管理者に　連絡してください。", "sessionSuccess": "セッションが　正常に　読み込まれました。", @@ -46,10 +46,10 @@ "yes": "はい", "no": "いいえ", "disclaimer": "免責", - "disclaimerDescription": "このゲームは 未完成作品です。\nセーブデータの 損失を含める ゲーム性に関する 問題が 起きる可能性が あります。\nなお、ゲームは 予告なく変更される 可能性もあり、さらに更新され、完成されるとも 限りません。", + "disclaimerDescription": "このゲームは 未完成作品です。\nセーブデータの 損失を含める ゲーム性に関する 問題が 起きる可能性が あります。\nなお、ゲームは 予告なく変更される 可能性もあり、\nさらに更新され、完成されるとも 限りません。", "choosePokemon": "ポケモンを選ぶ", "renamePokemon": "ニックネームを変える", - "rename": "変える", + "rename": "名前を変える", "nickname": "ニックネーム", "errorServerDown": "おや！\nサーバーとの 接続中に 問題が 発生しました。\nゲームは 自動的に 再接続されます から\nウィンドウは 開いたままに しておいても よろしいです。", "noSaves": "何の　セーブファイルも　ありません！", diff --git a/src/locales/ja/move.json b/src/locales/ja/move.json index fbeb2132d23..2e602407902 100644 --- a/src/locales/ja/move.json +++ b/src/locales/ja/move.json @@ -1,2491 +1,2491 @@ { "pound": { "name": "はたく", - "effect": "長い しっぽや 手などを 使って 相手を はたいて 攻撃する。" + "effect": "長い　しっぽや　手などを　使って　相手を　はたいて　攻撃する。" }, "karateChop": { "name": "からてチョップ", - "effect": "鋭い チョップで 相手を たたいて 攻撃する。 急所に 当たりやすい。" + "effect": "鋭い　チョップで　相手を　たたいて　攻撃する。　急所に　当たりやすい。" }, "doubleSlap": { "name": "おうふくビンタ", - "effect": "おうふく ビンタで 相手を たたいて 攻撃する。 ２ー５回の 間 連続で だす。" + "effect": "おうふく　ビンタで　相手を　たたいて　攻撃する。　２ー５回の　間　連続で　だす。" }, "cometPunch": { "name": "れんぞくパンチ", - "effect": "どとうの パンチで 相手を なぐりつけて 攻撃する。 ２ー５回の 間 連続で だす。" + "effect": "どとうの　パンチで　相手を　なぐりつけて　攻撃する。　２ー５回の　間　連続で　だす。" }, "megaPunch": { "name": "メガトンパンチ", - "effect": "力を こめた パンチで 相手を 攻撃する。" + "effect": "力を　こめた　パンチで　相手を　攻撃する。" }, "payDay": { "name": "ネコにこばん", - "effect": "相手の 体に 小判を 投げつけて 攻撃する。 戦闘の あとで お金が もらえる。" + "effect": "相手の　体に　小判を　投げつけて　攻撃する。　戦闘の　あとで　お金が　もらえる。" }, "firePunch": { "name": "ほのおのパンチ", - "effect": "炎を こめた パンチで 相手を 攻撃する。 やけど状態に することが ある。" + "effect": "炎を　こめた　パンチで　相手を　攻撃する。　やけど状態に　することが　ある。" }, "icePunch": { "name": "れいとうパンチ", - "effect": "冷気を こめた パンチで 相手を 攻撃する。 こおり状態に することが ある。" + "effect": "冷気を　こめた　パンチで　相手を　攻撃する。　こおり状態に　することが　ある。" }, "thunderPunch": { "name": "かみなりパンチ", - "effect": "電撃を こめた パンチで 相手を 攻撃する。 まひ状態に することが ある。" + "effect": "電撃を　こめた　パンチで　相手を　攻撃する。　まひ状態に　することが　ある。" }, "scratch": { "name": "ひっかく", - "effect": "硬く とがった 鋭い ツメで 相手を ひっかいて 攻撃する。" + "effect": "硬く　とがった　鋭い　ツメで　相手を　ひっかいて　攻撃する。" }, "viseGrip": { "name": "はさむ", - "effect": "相手を 両側から はさんで ダメージを あたえる。" + "effect": "相手を　両側から　はさんで　ダメージを　あたえる。" }, "guillotine": { "name": "ハサミギロチン", - "effect": "大きな ハサミで 相手を 切り裂いて 攻撃する。 当たれば 一撃で ひんしに する。" + "effect": "大きな　ハサミで　相手を　切り裂いて　攻撃する。　当たれば　一撃で　ひんしに　する。" }, "razorWind": { "name": "かまいたち", - "effect": "風の 刃を つくり ２ターン目に 相手を 攻撃する。 急所に 当たりやすい。" + "effect": "風の　刃を　つくり　２ターン目に　相手を　攻撃する。　急所に　当たりやすい。" }, "swordsDance": { "name": "つるぎのまい", - "effect": "戦いの舞を 激しく おどって 気合を 高める。 自分の 攻撃を ぐーんと あげる。" + "effect": "戦いの舞を　激しく　おどって　気合を　高める。　自分の　攻撃を　ぐーんと　あげる。" }, "cut": { "name": "いあいぎり", - "effect": "カマや ツメなどで 相手を 切りつけて 攻撃する。" + "effect": "カマや　ツメなどで　相手を　切りつけて　攻撃する。" }, "gust": { "name": "かぜおこし", - "effect": "翼で おこした 激しい 風を 相手に ぶつけて 攻撃する。" + "effect": "翼で　おこした　激しい　風を　相手に　ぶつけて　攻撃する。" }, "wingAttack": { "name": "つばさでうつ", - "effect": "大きく ひろげた りっぱな 翼を 相手に ぶつけて 攻撃する。" + "effect": "大きく　ひろげた　りっぱな　翼を　相手に　ぶつけて　攻撃する。" }, "whirlwind": { "name": "ふきとばし", - "effect": "相手を 吹きとばして 控えの ポケモンを ひきずりだす。 野生の 場合は 戦闘が 終わる。" + "effect": "相手を　吹きとばして　控えの　ポケモンを　ひきずりだす。　野生の　場合は　戦闘が　終わる。" }, "fly": { "name": "そらをとぶ", - "effect": "１ターン目で 空へ 飛び ２ターン目に 相手を 攻撃する。" + "effect": "１ターン目で　空へ　飛び　２ターン目に　相手を　攻撃する。" }, "bind": { "name": "しめつける", - "effect": "長い 体や つるなどを 使い ４ー５ターンの 間 相手を 締めつけて 攻撃する。" + "effect": "長い　体や　つるなどを　使い　４ー５ターンの　間　相手を　締めつけて　攻撃する。" }, "slam": { "name": "たたきつける", - "effect": "長い しっぽや つるなどを 使い 相手を たたきつけて 攻撃する。" + "effect": "長い　しっぽや　つるなどを　使い　相手を　たたきつけて　攻撃する。" }, "vineWhip": { "name": "つるのムチ", - "effect": "ムチのように しなる 細長い つるで 相手を たたきつけて 攻撃する。" + "effect": "ムチのように　しなる　細長い　つるで　相手を　たたきつけて　攻撃する。" }, "stomp": { "name": "ふみつけ", - "effect": "大きな 足で 相手を 踏みつけて 攻撃する。 相手を ひるませることが ある。" + "effect": "大きな　足で　相手を　踏みつけて　攻撃する。　相手を　ひるませることが　ある。" }, "doubleKick": { "name": "にどげり", - "effect": "２本の 足で 相手を けとばして 攻撃する。 ２回連続で ダメージを 与える。" + "effect": "２本の　足で　相手を　けとばして　攻撃する。　２回連続で　ダメージを　与える。" }, "megaKick": { "name": "メガトンキック", - "effect": "ものすごい 力を こめた キックで 相手を けとばして 攻撃する。" + "effect": "ものすごい　力を　こめた　キックで　相手を　けとばして　攻撃する。" }, "jumpKick": { "name": "とびげり", - "effect": "高い ジャンプからの キックで 相手を 攻撃する。 はずすと 自分が ダメージを 受ける。" + "effect": "高い　ジャンプからの　キックで　相手を　攻撃する。　はずすと　自分が　ダメージを　受ける。" }, "rollingKick": { "name": "まわしげり", - "effect": "体を 素早く 回転させながら けとばして 攻撃する。 相手を ひるませる ことが ある。" + "effect": "体を　素早く　回転させながら　けとばして　攻撃する。　相手を　ひるませる　ことが　ある。" }, "sandAttack": { "name": "すなかけ", - "effect": "相手の 顔に 砂を かけて 命中率を さげる。" + "effect": "相手の　顔に　砂を　かけて　命中率を　さげる。" }, "headbutt": { "name": "ずつき", - "effect": "頭を 突きだして まっすぐ つっこんで 攻撃する。 相手を ひるませることが ある。" + "effect": "頭を　突きだして　まっすぐ　つっこんで　攻撃する。　相手を　ひるませることが　ある。" }, "hornAttack": { "name": "つのでつく", - "effect": "鋭く とがった つので 相手を 攻撃する。" + "effect": "鋭く　とがった　つので　相手を　攻撃する。" }, "furyAttack": { "name": "みだれづき", - "effect": "つのや くちばしで 相手を つついて 攻撃する。 ２ー５回の 間 連続で だす。" + "effect": "つのや　くちばしで　相手を　つついて　攻撃する。　２ー５回の　間　連続で　だす。" }, "hornDrill": { "name": "つのドリル", - "effect": "回転する つのを 相手に 突き刺して 攻撃する。 当たれば 一撃で ひんしに する。" + "effect": "回転する　つのを　相手に　突き刺して　攻撃する。　当たれば　一撃で　ひんしに　する。" }, "tackle": { "name": "たいあたり", - "effect": "相手に むかって 全身で ぶつかっていき 攻撃する。" + "effect": "相手に　むかって　全身で　ぶつかっていき　攻撃する。" }, "bodySlam": { "name": "のしかかり", - "effect": "全身で 相手に のしかかり 攻撃する。 まひ状態に することが ある。" + "effect": "全身で　相手に　のしかかり　攻撃する。　まひ状態に　することが　ある。" }, "wrap": { "name": "まきつく", - "effect": "長い 体や つるなどを 使って ４ー５ターンの 間 相手に まきついて 攻撃する。" + "effect": "長い　体や　つるなどを　使って　４ー５ターンの　間　相手に　まきついて　攻撃する。" }, "takeDown": { "name": "とっしん", - "effect": "すごい 勢いで 相手に ぶつかって 攻撃する。 自分も 少し ダメージを 受ける。" + "effect": "すごい　勢いで　相手に　ぶつかって　攻撃する。　自分も　少し　ダメージを　受ける。" }, "thrash": { "name": "あばれる", - "effect": "２ー３ターンの 間 暴れまくって 相手を 攻撃する。 暴れたあとは 混乱する。" + "effect": "２ー３ターンの　間　暴れまくって　相手を　攻撃する。　暴れたあとは　混乱する。" }, "doubleEdge": { "name": "すてみタックル", - "effect": "命を 懸けて 相手に 突進して 攻撃する。 自分も かなり ダメージを 受ける。" + "effect": "命を　懸けて　相手に　突進して　攻撃する。　自分も　かなり　ダメージを　受ける。" }, "tailWhip": { "name": "しっぽをふる", - "effect": "しっぽを 左右に かわいく ふって 油断を 誘う。 相手の 防御を さげる。" + "effect": "しっぽを　左右に　かわいく　ふって　油断を　誘う。　相手の　防御を　さげる。" }, "poisonSting": { "name": "どくばり", - "effect": "毒の ある ハリを 相手に 突き刺して 攻撃する。 毒状態に することが ある。" + "effect": "毒の　ある　ハリを　相手に　突き刺して　攻撃する。　毒状態に　することが　ある。" }, "twineedle": { "name": "ダブルニードル", - "effect": "２本の ハリを 相手に 突き刺し ２回連続で ダメージ。 毒状態に することが ある。" + "effect": "２本の　ハリを　相手に　突き刺し　２回連続で　ダメージ。　毒状態に　することが　ある。" }, "pinMissile": { "name": "ミサイルばり", - "effect": "鋭い ハリを 相手に 発射して 攻撃する。 ２ー５回の 間 連続で だす。" + "effect": "鋭い　ハリを　相手に　発射して　攻撃する。　２ー５回の　間　連続で　だす。" }, "leer": { "name": "にらみつける", - "effect": "鋭い 目つきで おびえさせて 相手の 防御を さげる。" + "effect": "鋭い　目つきで　おびえさせて　相手の　防御を　さげる。" }, "bite": { "name": "かみつく", - "effect": "鋭く とがった 歯で かみついて 攻撃する。 相手を ひるませることが ある。" + "effect": "鋭く　とがった　歯で　かみついて　攻撃する。　相手を　ひるませることが　ある。" }, "growl": { "name": "なきごえ", - "effect": "かわいい なきごえを 聞かせて 気を ひき 油断を させて 相手の 攻撃を さげる。" + "effect": "かわいい　なきごえを　聞かせて　気を　ひき　油断を　させて　相手の　攻撃を　さげる。" }, "roar": { "name": "ほえる", - "effect": "相手を 逃がして 控えの ポケモンを ひきずりだす。 野生の 場合は 戦闘が 終わる。" + "effect": "相手を　逃がして　控えの　ポケモンを　ひきずりだす。　野生の　場合は　戦闘が　終わる。" }, "sing": { "name": "うたう", - "effect": "心地好い きれいな 歌声を 聞かせて 相手を 眠り状態に する。" + "effect": "心地好い　きれいな　歌声を　聞かせて　相手を　眠り状態に　する。" }, "supersonic": { "name": "ちょうおんぱ", - "effect": "特殊な 音波を 体から 発して 相手を 混乱させる。" + "effect": "特殊な　音波を　体から　発して　相手を　混乱させる。" }, "sonicBoom": { "name": "ソニックブーム", - "effect": "衝撃波を 相手に ぶつけて 攻撃する。 ２０の ダメージを 決まって 与える。" + "effect": "衝撃波を　相手に　ぶつけて　攻撃する。　２０の　ダメージを　決まって　与える。" }, "disable": { "name": "かなしばり", - "effect": "相手の 動きを とめて 直前に だしていた 技を ４ターンの 間 使えなくする。" + "effect": "相手の　動きを　とめて　直前に　だしていた　技を　４ターンの　間　使えなくする。" }, "acid": { "name": "ようかいえき", - "effect": "強い 酸を 相手に かけて 攻撃する。 相手の 特防を さげることが ある。" + "effect": "強い　酸を　相手に　かけて　攻撃する。　相手の　特防を　さげることが　ある。" }, "ember": { "name": "ひのこ", - "effect": "小さな 炎を 相手に 発射して 攻撃する。 やけど状態に することが ある。" + "effect": "小さな　炎を　相手に　発射して　攻撃する。　やけど状態に　することが　ある。" }, "flamethrower": { "name": "かえんほうしゃ", - "effect": "激しい 炎を 相手に 発射して 攻撃する。 やけど状態に することが ある。" + "effect": "激しい　炎を　相手に　発射して　攻撃する。　やけど状態に　することが　ある。" }, "mist": { "name": "しろいきり", - "effect": "白い霧で 体を おおう。 ５ターンの 間 相手に 能力を さげられなく なる。" + "effect": "白い霧で　体を　おおう。　５ターンの　間　相手に　能力を　さげられなく　なる。" }, "waterGun": { "name": "みずでっぽう", - "effect": "水を 勢いよく 相手に 発射して 攻撃する。" + "effect": "水を　勢いよく　相手に　発射して　攻撃する。" }, "hydroPump": { "name": "ハイドロポンプ", - "effect": "大量の 水を 激しい 勢いで 相手に 発射して 攻撃する。" + "effect": "大量の　水を　激しい　勢いで　相手に　発射して　攻撃する。" }, "surf": { "name": "なみのり", - "effect": "大きな 波で 自分の 周りに いるものを 攻撃する。" + "effect": "大きな　波で　自分の　周りに　いるものを　攻撃する。" }, "iceBeam": { "name": "れいとうビーム", - "effect": "凍える ビームを 相手に 発射して 攻撃する。 こおり状態に することが ある。" + "effect": "凍える　ビームを　相手に　発射して　攻撃する。　こおり状態に　することが　ある。" }, "blizzard": { "name": "ふぶき", - "effect": "激しい 吹雪を 相手に 吹きつけて 攻撃する。 こおり状態に することが ある。" + "effect": "激しい　吹雪を　相手に　吹きつけて　攻撃する。　こおり状態に　することが　ある。" }, "psybeam": { "name": "サイケこうせん", - "effect": "不思議な 光線を 相手に 発射して 攻撃する。 混乱させることが ある。" + "effect": "不思議な　光線を　相手に　発射して　攻撃する。　混乱させることが　ある。" }, "bubbleBeam": { "name": "バブルこうせん", - "effect": "泡を 勢いよく 相手に 発射して 攻撃する。 素早さを さげる ことが ある。" + "effect": "泡を　勢いよく　相手に　発射して　攻撃する。　素早さを　さげる　ことが　ある。" }, "auroraBeam": { "name": "オーロラビーム", - "effect": "にじいろの ビームを 相手に 発射して 攻撃する。 攻撃を さげる ことが ある。" + "effect": "にじいろの　ビームを　相手に　発射して　攻撃する。　攻撃を　さげる　ことが　ある。" }, "hyperBeam": { "name": "はかいこうせん", - "effect": "強い 光線を 相手に 発射して 攻撃する。 次の ターンは 動けなくなる。" + "effect": "強い　光線を　相手に　発射して　攻撃する。　次の　ターンは　動けなくなる。" }, "peck": { "name": "つつく", - "effect": "鋭く とがった くちばしや つので 相手を 突いて 攻撃する。" + "effect": "鋭く　とがった　くちばしや　つので　相手を　突いて　攻撃する。" }, "drillPeck": { "name": "ドリルくちばし", - "effect": "回転しながら とがった くちばしを 相手に 突き刺して 攻撃する。" + "effect": "回転しながら　とがった　くちばしを　相手に　突き刺して　攻撃する。" }, "submission": { "name": "じごくぐるま", - "effect": "地面に 自分ごと 相手を 投げつけて 攻撃する。 自分も 少し ダメージを 受ける。" + "effect": "地面に　自分ごと　相手を　投げつけて　攻撃する。　自分も　少し　ダメージを　受ける。" }, "lowKick": { "name": "けたぐり", - "effect": "足を 強く けり 相手を 転ばせて 攻撃する。 相手が 重いほど 威力が あがる。" + "effect": "足を　強く　けり　相手を　転ばせて　攻撃する。　相手が　重いほど　威力が　あがる。" }, "counter": { "name": "カウンター", - "effect": "相手から 受けた 物理攻撃の ダメージを ２倍に して 同じ 相手に 返す。" + "effect": "相手から　受けた　物理攻撃の　ダメージを　２倍に　して　同じ　相手に　返す。" }, "seismicToss": { "name": "ちきゅうなげ", - "effect": "引力を 使い 投げとばす。 自分の レベルと 同じ ダメージを 相手に 与える。" + "effect": "引力を　使い　投げとばす。　自分の　レベルと　同じ　ダメージを　相手に　与える。" }, "strength": { "name": "かいりき", - "effect": "こん身の 力で 相手を なぐりつけて 攻撃する。" + "effect": "こん身の　力で　相手を　なぐりつけて　攻撃する。" }, "absorb": { "name": "すいとる", - "effect": "養分を 吸い取り 攻撃する。 相手に 与えた ダメージの 半分の ＨＰを 回復できる。" + "effect": "養分を　吸い取り　攻撃する。　相手に　与えた　ダメージの　半分の　ＨＰを　回復できる。" }, "megaDrain": { "name": "メガドレイン", - "effect": "養分を 吸い取り 攻撃する。 相手に 与えた ダメージの 半分の ＨＰを 回復できる。" + "effect": "養分を　吸い取り　攻撃する。　相手に　与えた　ダメージの　半分の　ＨＰを　回復できる。" }, "leechSeed": { "name": "やどりぎのタネ", - "effect": "植えつけた 相手の ＨＰを 毎ターン 少しだけ 吸い取り 自分の ＨＰを 回復する。" + "effect": "植えつけた　相手の　ＨＰを　毎ターン　少しだけ　吸い取り　自分の　ＨＰを　回復する。" }, "growth": { "name": "せいちょう", - "effect": "体を 一気に 大きく 生長させて 攻撃と 特攻を あげる。" + "effect": "体を　一気に　大きく　生長させて　攻撃と　特攻を　あげる。" }, "razorLeaf": { "name": "はっぱカッター", - "effect": "はっぱを とばして 相手を 切りつけて 攻撃する。 急所に 当たりやすい。" + "effect": "はっぱを　とばして　相手を　切りつけて　攻撃する。　急所に　当たりやすい。" }, "solarBeam": { "name": "ソーラービーム", - "effect": "１ターン目に 光を いっぱいに 集め ２ターン目に 光の 束を 発射して 攻撃する。" + "effect": "１ターン目に　光を　いっぱいに　集め　２ターン目に　光の　束を　発射して　攻撃する。" }, "poisonPowder": { "name": "どくのこな", - "effect": "毒の ある 粉を たくさん ふりまいて 相手を 毒状態に する。" + "effect": "毒の　ある　粉を　たくさん　ふりまいて　相手を　毒状態に　する。" }, "stunSpore": { "name": "しびれごな", - "effect": "しびれる 粉を たくさん ふりまいて 相手を まひ状態に する。" + "effect": "しびれる　粉を　たくさん　ふりまいて　相手を　まひ状態に　する。" }, "sleepPowder": { "name": "ねむりごな", - "effect": "眠くなる 粉を たくさん ふりまいて 相手を 眠り状態に する。" + "effect": "眠くなる　粉を　たくさん　ふりまいて　相手を　眠り状態に　する。" }, "petalDance": { "name": "はなびらのまい", - "effect": "２ー３ターンの 間 花を まきちらして 相手を 攻撃する。 まきちらした あとは 混乱する。" + "effect": "２ー３ターンの　間　花を　まきちらして　相手を　攻撃する。　まきちらした　あとは　混乱する。" }, "stringShot": { "name": "いとをはく", - "effect": "口から 吹きだした 糸を まきつけて 相手の 素早さを がくっと さげる。" + "effect": "口から　吹きだした　糸を　まきつけて　相手の　素早さを　がくっと　さげる。" }, "dragonRage": { "name": "りゅうのいかり", - "effect": "怒りの 衝撃波を 相手に ぶつけて 攻撃する。 ４０の ダメージを 決まって 与える。" + "effect": "怒りの　衝撃波を　相手に　ぶつけて　攻撃する。　４０の　ダメージを　決まって　与える。" }, "fireSpin": { "name": "ほのおのうず", - "effect": "激しく 渦をまく 炎の中に ４ー５ターンの 間 相手を 閉じこめて 攻撃する。" + "effect": "激しく　渦をまく　炎の中に　４ー５ターンの　間　相手を　閉じこめて　攻撃する。" }, "thunderShock": { "name": "でんきショック", - "effect": "電気の 刺激を 相手に 浴びせて 攻撃する。 まひ状態に することが ある。" + "effect": "電気の　刺激を　相手に　浴びせて　攻撃する。　まひ状態に　することが　ある。" }, "thunderbolt": { "name": "１０まんボルト", - "effect": "強い 電撃を 相手に 浴びせて 攻撃する。 まひ状態に することが ある。" + "effect": "強い　電撃を　相手に　浴びせて　攻撃する。　まひ状態に　することが　ある。" }, "thunderWave": { "name": "でんじは", - "effect": "弱い 電撃を 浴びせることで 相手を まひ状態に する。" + "effect": "弱い　電撃を　浴びせることで　相手を　まひ状態に　する。" }, "thunder": { "name": "かみなり", - "effect": "激しい 雷を 相手に 落として 攻撃する。 まひ状態に することが ある。" + "effect": "激しい　雷を　相手に　落として　攻撃する。　まひ状態に　することが　ある。" }, "rockThrow": { "name": "いわおとし", - "effect": "小さな 岩を 持ちあげて 相手に 投げつけて 攻撃する。" + "effect": "小さな　岩を　持ちあげて　相手に　投げつけて　攻撃する。" }, "earthquake": { "name": "じしん", - "effect": "地震の 衝撃で 自分の 周りに いるものを 攻撃する。" + "effect": "地震の　衝撃で　自分の　周りに　いるものを　攻撃する。" }, "fissure": { "name": "じわれ", - "effect": "地割れの 裂け目に 相手を 落として 攻撃する。 当たれば 一撃で ひんしに する。" + "effect": "地割れの　裂け目に　相手を　落として　攻撃する。　当たれば　一撃で　ひんしに　する。" }, "dig": { "name": "あなをほる", - "effect": "１ターン目に 潜り ２ターン目で 相手を 攻撃する。" + "effect": "１ターン目に　潜り　２ターン目で　相手を　攻撃する。" }, "toxic": { "name": "どくどく", - "effect": "相手を 猛毒の 状態に する。 ターンが すすむほど 毒の ダメージが 増えていく。" + "effect": "相手を　猛毒の　状態に　する。　ターンが　すすむほど　毒の　ダメージが　増えていく。" }, "confusion": { "name": "ねんりき", - "effect": "弱い 念力を 相手に 送って 攻撃する。 相手を 混乱させることが ある。" + "effect": "弱い　念力を　相手に　送って　攻撃する。　相手を　混乱させることが　ある。" }, "psychic": { "name": "サイコキネシス", - "effect": "強い 念力を 相手に 送って 攻撃する。 相手の 特防を さげることが ある。" + "effect": "強い　念力を　相手に　送って　攻撃する。　相手の　特防を　さげることが　ある。" }, "hypnosis": { "name": "さいみんじゅつ", - "effect": "眠気を 誘う 暗示を かけて 相手を 眠り状態に する。" + "effect": "眠気を　誘う　暗示を　かけて　相手を　眠り状態に　する。" }, "meditate": { "name": "ヨガのポーズ", - "effect": "眠っている 力を 体の 奥から ひきだして 自分の 攻撃を あげる。" + "effect": "眠っている　力を　体の　奥から　ひきだして　自分の　攻撃を　あげる。" }, "agility": { "name": "こうそくいどう", - "effect": "力を ぬいて 体を 軽くして 高速で 動く。 自分の 素早さを ぐーんと あげる。" + "effect": "力を　ぬいて　体を　軽くして　高速で　動く。　自分の　素早さを　ぐーんと　あげる。" }, "quickAttack": { "name": "でんこうせっか", - "effect": "目にも 留まらぬ ものすごい 速さで 相手に つっこむ。 必ず 先制攻撃 できる。" + "effect": "目にも　留まらぬ　ものすごい　速さで　相手に　つっこむ。　必ず　先制攻撃　できる。" }, "rage": { "name": "いかり", - "effect": "技を だしたときに 攻撃を 受けると 怒りの 力で 攻撃が あがる。" + "effect": "技を　だしたときに　攻撃を　受けると　怒りの　力で　攻撃が　あがる。" }, "teleport": { "name": "テレポート", - "effect": "ひかえの ポケモンが いるときに 使うと 入れ替わる。 野生の ポケモンは 逃げてしまう。" + "effect": "ひかえの　ポケモンが　いるときに　使うと　入れ替わる。　野生の　ポケモンは　逃げてしまう。" }, "nightShade": { "name": "ナイトヘッド", - "effect": "恐ろしい 幻を みせて 自分の レベルと 同じだけの ダメージを 相手に 与える。" + "effect": "恐ろしい　幻を　みせて　自分の　レベルと　同じだけの　ダメージを　相手に　与える。" }, "mimic": { "name": "ものまね", - "effect": "相手が 最後に 使った 技を 戦闘の あいだ 自分の 技に することが できる。" + "effect": "相手が　最後に　使った　技を　戦闘の　あいだ　自分の　技に　することが　できる。" }, "screech": { "name": "いやなおと", - "effect": "おもわず 耳を ふさぎたくなる いやなおとを だして 相手の 防御を がくっと さげる。" + "effect": "おもわず　耳を　ふさぎたくなる　いやなおとを　だして　相手の　防御を　がくっと　さげる。" }, "doubleTeam": { "name": "かげぶんしん", - "effect": "素早い 動きで 分身を つくり 相手を まどわせて 回避率を あげる。" + "effect": "素早い　動きで　分身を　つくり　相手を　まどわせて　回避率を　あげる。" }, "recover": { "name": "じこさいせい", - "effect": "細胞を 再生させて 自分の 最大ＨＰの 半分の ＨＰを 回復する。" + "effect": "細胞を　再生させて　自分の　最大ＨＰの　半分の　ＨＰを　回復する。" }, "harden": { "name": "かたくなる", - "effect": "全身に 力を こめて 体を 硬くして 自分の 防御を あげる。" + "effect": "全身に　力を　こめて　体を　硬くして　自分の　防御を　あげる。" }, "minimize": { "name": "ちいさくなる", - "effect": "体を ちぢめて 小さく みせて 自分の 回避率を ぐーんと あげる。" + "effect": "体を　ちぢめて　小さく　みせて　自分の　回避率を　ぐーんと　あげる。" }, "smokescreen": { "name": "えんまく", - "effect": "煙や 墨などを 吹きかけて 相手の 命中率を さげる。" + "effect": "煙や　墨などを　吹きかけて　相手の　命中率を　さげる。" }, "confuseRay": { "name": "あやしいひかり", - "effect": "怪しい 光を 相手に みせて まどわせる。 相手を 混乱させる。" + "effect": "怪しい　光を　相手に　みせて　まどわせる。　相手を　混乱させる。" }, "withdraw": { "name": "からにこもる", - "effect": "殻に 潜りこんで 身を守り 自分の 防御を あげる。" + "effect": "殻に　潜りこんで　身を守り　自分の　防御を　あげる。" }, "defenseCurl": { "name": "まるくなる", - "effect": "体を まるめて ちぢこまり 自分の 防御を あげる。" + "effect": "体を　まるめて　ちぢこまり　自分の　防御を　あげる。" }, "barrier": { "name": "バリアー", - "effect": "頑丈な 壁を つくって 自分の 防御を ぐーんと あげる。" + "effect": "頑丈な　壁を　つくって　自分の　防御を　ぐーんと　あげる。" }, "lightScreen": { "name": "ひかりのかべ", - "effect": "５ターンの 間 不思議な かべで 相手から 受ける 特殊攻撃の ダメージを 弱める。" + "effect": "５ターンの　間　不思議な　かべで　相手から　受ける　特殊攻撃の　ダメージを　弱める。" }, "haze": { "name": "くろいきり", - "effect": "黒い霧を だして 戦闘に でている ポケモン 全員の 能力変化を もとに もどす。" + "effect": "黒い霧を　だして　戦闘に　でている　ポケモン　全員の　能力変化を　もとに　もどす。" }, "reflect": { "name": "リフレクター", - "effect": "５ターンの 間 不思議な かべで 相手から 受ける 物理攻撃の ダメージを 弱める。" + "effect": "５ターンの　間　不思議な　かべで　相手から　受ける　物理攻撃の　ダメージを　弱める。" }, "focusEnergy": { "name": "きあいだめ", - "effect": "深く 息を 吸い 気合を こめる。 自分の 攻撃が 急所に 当たりやすくなる。" + "effect": "深く　息を　吸い　気合を　こめる。　自分の　攻撃が　急所に　当たりやすくなる。" }, "bide": { "name": "がまん", - "effect": "２ターンの 間 攻撃に たえて 受けた ダメージを ２倍にして 相手に 返す。" + "effect": "２ターンの　間　攻撃に　たえて　受けた　ダメージを　２倍にして　相手に　返す。" }, "metronome": { "name": "ゆびをふる", - "effect": "指をふり 自分の 脳を 刺激して すべての 技の なかから どれか １つを くりだす。" + "effect": "指をふり　自分の　脳を　刺激して　すべての　技の　なかから　どれか　１つを　くりだす。" }, "mirrorMove": { "name": "オウムがえし", - "effect": "相手の 使った 技を まねして 自分も 同じ技を 使う。" + "effect": "相手の　使った　技を　まねして　自分も　同じ技を　使う。" }, "selfDestruct": { "name": "じばく", - "effect": "爆発を おこして 自分の 周りに いるものを 攻撃する。 使ったあとに ひんしに なる。" + "effect": "爆発を　おこして　自分の　周りに　いるものを　攻撃する。　使ったあとに　ひんしに　なる。" }, "eggBomb": { "name": "タマゴばくだん", - "effect": "大きな タマゴを 力いっぱい 相手に 投げつけて 攻撃する。" + "effect": "大きな　タマゴを　力いっぱい　相手に　投げつけて　攻撃する。" }, "lick": { "name": "したでなめる", - "effect": "長い 舌で 相手を なめまわして 攻撃する。 まひ状態に することが ある。" + "effect": "長い　舌で　相手を　なめまわして　攻撃する。　まひ状態に　することが　ある。" }, "smog": { "name": "スモッグ", - "effect": "汚れた ガスを 相手に 吹きつけて 攻撃する。 毒状態に することが ある。" + "effect": "汚れた　ガスを　相手に　吹きつけて　攻撃する。　毒状態に　することが　ある。" }, "sludge": { "name": "ヘドロこうげき", - "effect": "汚い ヘドロを 相手に 投げつけて 攻撃する。 毒状態に することが ある。" + "effect": "汚い　ヘドロを　相手に　投げつけて　攻撃する。　毒状態に　することが　ある。" }, "boneClub": { "name": "ホネこんぼう", - "effect": "手に 持った ホネで 相手を なぐりつけて 攻撃する。 相手を ひるませることが ある。" + "effect": "手に　持った　ホネで　相手を　なぐりつけて　攻撃する。　相手を　ひるませることが　ある。" }, "fireBlast": { "name": "だいもんじ", - "effect": "大の字の 炎で 相手を 焼きつくす。 やけど状態に することが ある。" + "effect": "大の字の　炎で　相手を　焼きつくす。　やけど状態に　することが　ある。" }, "waterfall": { "name": "たきのぼり", - "effect": "すごい 勢いで 相手に つっこむ。 相手を ひるませることが ある。" + "effect": "すごい　勢いで　相手に　つっこむ。　相手を　ひるませることが　ある。" }, "clamp": { "name": "からではさむ", - "effect": "とても 頑丈な ぶあつい 殻に ４ー５ターンの 間 相手を はさんで 攻撃する。" + "effect": "とても　頑丈な　ぶあつい　殻に　４ー５ターンの　間　相手を　はさんで　攻撃する。" }, "swift": { "name": "スピードスター", - "effect": "星型の 光を 発射して 相手を 攻撃する。 攻撃は 必ず 命中する。" + "effect": "星型の　光を　発射して　相手を　攻撃する。　攻撃は　必ず　命中する。" }, "skullBash": { "name": "ロケットずつき", - "effect": "１ターン目に 頭を ひっこめて 防御を あげる。 ２ターン目に 相手を 攻撃する。" + "effect": "１ターン目に　頭を　ひっこめて　防御を　あげる。　２ターン目に　相手を　攻撃する。" }, "spikeCannon": { "name": "とげキャノン", - "effect": "鋭い ハリを 相手に 発射して 攻撃する。 ２ー５回の 間 連続で だす。" + "effect": "鋭い　ハリを　相手に　発射して　攻撃する。　２ー５回の　間　連続で　だす。" }, "constrict": { "name": "からみつく", - "effect": "触手や ツタなどを からみつけて 攻撃する。相手の 素早さを さげることが ある。" + "effect": "触手や　ツタなどを　からみつけて　攻撃する。相手の　素早さを　さげることが　ある。" }, "amnesia": { "name": "ドわすれ", - "effect": "頭を からにして 一瞬 なにかを 忘れることで 自分の 特防を ぐーんと あげる。" + "effect": "頭を　からにして　一瞬　なにかを　忘れることで　自分の　特防を　ぐーんと　あげる。" }, "kinesis": { "name": "スプーンまげ", - "effect": "スプーンを まげて 注意を ひき 相手の 命中率を さげる。" + "effect": "スプーンを　まげて　注意を　ひき　相手の　命中率を　さげる。" }, "softBoiled": { "name": "タマゴうみ", - "effect": "最大ＨＰの 半分 自分の ＨＰを 回復する。" + "effect": "最大ＨＰの　半分　自分の　ＨＰを　回復する。" }, "highJumpKick": { "name": "とびひざげり", - "effect": "ジャンプからの ひざげりで 相手を 攻撃する。 はずすと 自分が ダメージを 受ける。" + "effect": "ジャンプからの　ひざげりで　相手を　攻撃する。　はずすと　自分が　ダメージを　受ける。" }, "glare": { "name": "へびにらみ", - "effect": "おなかの 模様で おびえさせて 相手を まひの 状態に する。" + "effect": "おなかの　模様で　おびえさせて　相手を　まひの　状態に　する。" }, "dreamEater": { "name": "ゆめくい", - "effect": "寝ている 相手の 夢を 食べて 攻撃する。 ダメージの 半分の ＨＰを 回復する。" + "effect": "寝ている　相手の　夢を　食べて　攻撃する。　ダメージの　半分の　ＨＰを　回復する。" }, "poisonGas": { "name": "どくガス", - "effect": "毒ガスを 相手の 顔に 吹きかけて 毒の 状態に する。" + "effect": "毒ガスを　相手の　顔に　吹きかけて　毒の　状態に　する。" }, "barrage": { "name": "たまなげ", - "effect": "まるい ものを 相手に 投げつけて 攻撃する。 ２ー５回の 間 連続で だす。" + "effect": "まるい　ものを　相手に　投げつけて　攻撃する。　２ー５回の　間　連続で　だす。" }, "leechLife": { "name": "きゅうけつ", - "effect": "血を 吸い取って 相手を 攻撃する。 与えた ダメージの 半分の ＨＰを 回復できる。" + "effect": "血を　吸い取って　相手を　攻撃する。　与えた　ダメージの　半分の　ＨＰを　回復できる。" }, "lovelyKiss": { "name": "あくまのキッス", - "effect": "恐ろしい 顔で キスを せまる。 相手を 眠り状態に する。" + "effect": "恐ろしい　顔で　キスを　せまる。　相手を　眠り状態に　する。" }, "skyAttack": { "name": "ゴッドバード", - "effect": "２ターン目に 相手を 攻撃する。 たまに ひるませる。 急所にも 当たりやすい。" + "effect": "２ターン目に　相手を　攻撃する。　たまに　ひるませる。　急所にも　当たりやすい。" }, "transform": { "name": "へんしん", - "effect": "相手の ポケモンに 変身することで 相手と まったく 同じ 技が 使える。" + "effect": "相手の　ポケモンに　変身することで　相手と　まったく　同じ　技が　使える。" }, "bubble": { "name": "あわ", - "effect": "無数の 泡を 相手に 吹きかけて 攻撃する。 相手の 素早さを さげることが ある。" + "effect": "無数の　泡を　相手に　吹きかけて　攻撃する。　相手の　素早さを　さげることが　ある。" }, "dizzyPunch": { "name": "ピヨピヨパンチ", - "effect": "リズミカルに パンチを くりだして 相手を 攻撃する。 混乱させることが ある。" + "effect": "リズミカルに　パンチを　くりだして　相手を　攻撃する。　混乱させることが　ある。" }, "spore": { "name": "キノコのほうし", - "effect": "催眠効果の ある 胞子を パラパラと ふりまき 相手を 眠り状態に する。" + "effect": "催眠効果の　ある　胞子を　パラパラと　ふりまき　相手を　眠り状態に　する。" }, "flash": { "name": "フラッシュ", - "effect": "まぶしい 光で 相手の 命中率を さげる。" + "effect": "まぶしい　光で　相手の　命中率を　さげる。" }, "psywave": { "name": "サイコウェーブ", - "effect": "不思議な 念波を 相手に 発射して 攻撃する。 使うたびに ダメージが 変わる。" + "effect": "不思議な　念波を　相手に　発射して　攻撃する。　使うたびに　ダメージが　変わる。" }, "splash": { "name": "はねる", - "effect": "攻撃もせずに ピョン ピョンと 跳ねるだけで なにも おこらない……。" + "effect": "攻撃もせずに　ピョン　ピョンと　跳ねるだけで　なにも　おこらない……。" }, "acidArmor": { "name": "とける", - "effect": "細胞の 変化で 液状に なり 自分の 防御を ぐーんと あげる。" + "effect": "細胞の　変化で　液状に　なり　自分の　防御を　ぐーんと　あげる。" }, "crabhammer": { "name": "クラブハンマー", - "effect": "大きな ハサミを 相手に たたきつけて 攻撃する。 急所に 当たりやすい。" + "effect": "大きな　ハサミを　相手に　たたきつけて　攻撃する。　急所に　当たりやすい。" }, "explosion": { "name": "だいばくはつ", - "effect": "大きな 爆発で 自分の 周りに いるものを 攻撃する。 使ったあとに ひんしに なる。" + "effect": "大きな　爆発で　自分の　周りに　いるものを　攻撃する。　使ったあとに　ひんしに　なる。" }, "furySwipes": { "name": "みだれひっかき", - "effect": "ツメや カマなどで 相手を ひっかいて 攻撃する。 ２ー５回の 間 連続で だす。" + "effect": "ツメや　カマなどで　相手を　ひっかいて　攻撃する。　２ー５回の　間　連続で　だす。" }, "bonemerang": { "name": "ホネブーメラン", - "effect": "手に 持った ホネを 相手に 投げつけ 行きと 帰りの ２回連続で ダメージを 与える。" + "effect": "手に　持った　ホネを　相手に　投げつけ　行きと　帰りの　２回連続で　ダメージを　与える。" }, "rest": { "name": "ねむる", - "effect": "２ターンの 間 眠り続ける。 自分の ＨＰと 状態異常を すべて 回復する。" + "effect": "２ターンの　間　眠り続ける。　自分の　ＨＰと　状態異常を　すべて　回復する。" }, "rockSlide": { "name": "いわなだれ", - "effect": "大きな 岩を 激しく ぶつけて 攻撃する。 相手を ひるませることが ある。" + "effect": "大きな　岩を　激しく　ぶつけて　攻撃する。　相手を　ひるませることが　ある。" }, "hyperFang": { "name": "ひっさつまえば", - "effect": "鋭い 前歯で 強く かみついて 攻撃する。 相手を ひるませることが ある。" + "effect": "鋭い　前歯で　強く　かみついて　攻撃する。　相手を　ひるませることが　ある。" }, "sharpen": { "name": "かくばる", - "effect": "体の かどを 増やして カクカクに なることで 自分の 攻撃を あげる。" + "effect": "体の　かどを　増やして　カクカクに　なることで　自分の　攻撃を　あげる。" }, "conversion": { "name": "テクスチャー", - "effect": "自分の タイプを おぼえている 技で 一番 上の 技と 同じ タイプに する。" + "effect": "自分の　タイプを　おぼえている　技で　一番　上の　技と　同じ　タイプに　する。" }, "triAttack": { "name": "トライアタック", - "effect": "３つの 光線で 攻撃する。 まひか やけどか こおり状態の どれかに することが ある。" + "effect": "３つの　光線で　攻撃する。　まひか　やけどか　こおり状態の　どれかに　することが　ある。" }, "superFang": { "name": "いかりのまえば", - "effect": "鋭い 前歯で 激しく かみついて 攻撃する。 相手の ＨＰは 半分に なる。" + "effect": "鋭い　前歯で　激しく　かみついて　攻撃する。　相手の　ＨＰは　半分に　なる。" }, "slash": { "name": "きりさく", - "effect": "ツメや カマなどで 相手を 切り裂いて 攻撃する。 急所に 当たりやすい。" + "effect": "ツメや　カマなどで　相手を　切り裂いて　攻撃する。　急所に　当たりやすい。" }, "substitute": { "name": "みがわり", - "effect": "自分の ＨＰを 少し 削って 分身を だす。 分身は 自分の 身代わりに なる。" + "effect": "自分の　ＨＰを　少し　削って　分身を　だす。　分身は　自分の　身代わりに　なる。" }, "struggle": { "name": "わるあがき", - "effect": "自分の ＰＰが なくなると あがいて 相手を 攻撃する。 自分も 少し ダメージを 受ける。" + "effect": "自分の　ＰＰが　なくなると　あがいて　相手を　攻撃する。　自分も　少し　ダメージを　受ける。" }, "sketch": { "name": "スケッチ", - "effect": "相手が 使った 技を 自分の ものに する。 １回 使うと スケッチは 消える。" + "effect": "相手が　使った　技を　自分の　ものに　する。　１回　使うと　スケッチは　消える。" }, "tripleKick": { "name": "トリプルキック", - "effect": "３回連続で キックを くりだして 攻撃する。 技が 当たるたびに 威力は あがる。" + "effect": "３回連続で　キックを　くりだして　攻撃する。　技が　当たるたびに　威力は　あがる。" }, "thief": { "name": "どろぼう", - "effect": "攻撃と 同時に 道具を 盗もうとする。 盗む 可能性は 30％。" + "effect": "攻撃と　同時に　道具を　盗もうとする。　盗む　可能性は　30％。" }, "spiderWeb": { "name": "クモのす", - "effect": "ネバネバした 細い 糸を グルグルと からませて 相手を 戦闘から 逃げられなくする。" + "effect": "ネバネバした　細い　糸を　グルグルと　からませて　相手を　戦闘から　逃げられなくする。" }, "mindReader": { "name": "こころのめ", - "effect": "相手の 動きを 心で 感じて 次の 攻撃が 必ず 相手に 当たるように する。" + "effect": "相手の　動きを　心で　感じて　次の　攻撃が　必ず　相手に　当たるように　する。" }, "nightmare": { "name": "あくむ", - "effect": "眠り状態の 相手に 悪夢を みせて 毎ターン 少しずつ ＨＰを 減らしていく。" + "effect": "眠り状態の　相手に　悪夢を　みせて　毎ターン　少しずつ　ＨＰを　減らしていく。" }, "flameWheel": { "name": "かえんぐるま", - "effect": "炎を まとい 相手に 突進して 攻撃する。 やけど状態に することが ある。" + "effect": "炎を　まとい　相手に　突進して　攻撃する。　やけど状態に　することが　ある。" }, "snore": { "name": "いびき", - "effect": "自分が 寝ているときに 雑音を だして 攻撃する。 相手を ひるませることが ある。" + "effect": "自分が　寝ているときに　雑音を　だして　攻撃する。　相手を　ひるませることが　ある。" }, "curse": { "name": "のろい", - "effect": "使う ポケモンが ゴーストタイプと それ以外 とでは 効果が 変わる。" + "effect": "使う　ポケモンが　ゴーストタイプと　それ以外　とでは　効果が　変わる。" }, "flail": { "name": "じたばた", - "effect": "じたばた 暴れて 攻撃する。 自分の ＨＰが 少ないほど 技の 威力は あがる。" + "effect": "じたばた　暴れて　攻撃する。　自分の　ＨＰが　少ないほど　技の　威力は　あがる。" }, "conversion2": { "name": "テクスチャー２", - "effect": "相手が 最後に 使った技に 抵抗できる ように 自分の タイプを 変化させる。" + "effect": "相手が　最後に　使った技に　抵抗できる　ように　自分の　タイプを　変化させる。" }, "aeroblast": { "name": "エアロブラスト", - "effect": "空気の 渦を 発射して 攻撃する。 急所に 当たりやすい。" + "effect": "空気の　渦を　発射して　攻撃する。　急所に　当たりやすい。" }, "cottonSpore": { "name": "わたほうし", - "effect": "綿のような フワフワの 胞子を まとわり つかせて 相手の 素早さを がくっと さげる。" + "effect": "綿のような　フワフワの　胞子を　まとわり　つかせて　相手の　素早さを　がくっと　さげる。" }, "reversal": { "name": "きしかいせい", - "effect": "力を ふりしぼり 攻撃する。 自分の ＨＰが 少ないほど 技の 威力は あがる。" + "effect": "力を　ふりしぼり　攻撃する。　自分の　ＨＰが　少ないほど　技の　威力は　あがる。" }, "spite": { "name": "うらみ", - "effect": "相手が 最後に 使った技に 恨みを 抱いて その技の ＰＰを ４だけ 減らす。" + "effect": "相手が　最後に　使った技に　恨みを　抱いて　その技の　ＰＰを　４だけ　減らす。" }, "powderSnow": { "name": "こなゆき", - "effect": "冷たい 粉雪を 相手に 吹きつけて 攻撃する。 こおり状態に することが ある。" + "effect": "冷たい　粉雪を　相手に　吹きつけて　攻撃する。　こおり状態に　することが　ある。" }, "protect": { "name": "まもる", - "effect": "相手の 攻撃を まったく 受けない。 連続で だすと 失敗しやすい。" + "effect": "相手の　攻撃を　まったく　受けない。　連続で　だすと　失敗しやすい。" }, "machPunch": { "name": "マッハパンチ", - "effect": "目にも 留まらぬ ものすごい 速さで パンチを くりだす。 必ず 先制攻撃 できる。" + "effect": "目にも　留まらぬ　ものすごい　速さで　パンチを　くりだす。　必ず　先制攻撃　できる。" }, "scaryFace": { "name": "こわいかお", - "effect": "恐ろしい 顔で にらみ おびえさせて 相手の 素早さを がくっと さげる。" + "effect": "恐ろしい　顔で　にらみ　おびえさせて　相手の　素早さを　がくっと　さげる。" }, "feintAttack": { "name": "だましうち", - "effect": "さりげなく 相手に ちかづき 油断した すきを みて なぐりつける。 攻撃は 必ず 命中する。" + "effect": "さりげなく　相手に　ちかづき　油断した　すきを　みて　なぐりつける。　攻撃は　必ず　命中する。" }, "sweetKiss": { "name": "てんしのキッス", - "effect": "天使のように かわいく キスして 相手を 混乱させる。" + "effect": "天使のように　かわいく　キスして　相手を　混乱させる。" }, "bellyDrum": { "name": "はらだいこ", - "effect": "自分の ＨＰを 最大ＨＰの 半分 減らして 自分の 攻撃を 最大に あげる。" + "effect": "自分の　ＨＰを　最大ＨＰの　半分　減らして　自分の　攻撃を　最大に　あげる。" }, "sludgeBomb": { "name": "ヘドロばくだん", - "effect": "汚い ヘドロを 相手に 投げつけて 攻撃する。 毒状態に することが ある。" + "effect": "汚い　ヘドロを　相手に　投げつけて　攻撃する。　毒状態に　することが　ある。" }, "mudSlap": { "name": "どろかけ", - "effect": "相手の 顔などに 泥を 投げつけて 攻撃する。 命中率を さげる。" + "effect": "相手の　顔などに　泥を　投げつけて　攻撃する。　命中率を　さげる。" }, "octazooka": { "name": "オクタンほう", - "effect": "相手の 顔などに 墨を 吹きかけて 攻撃する。 命中率を さげることが ある。" + "effect": "相手の　顔などに　墨を　吹きかけて　攻撃する。　命中率を　さげることが　ある。" }, "spikes": { "name": "まきびし", - "effect": "相手の 足下に まきびしを しかける。交代で でてきた 相手の ポケモンに ダメージを 与える。" + "effect": "相手の　足下に　まきびしを　しかける。交代で　でてきた　相手の　ポケモンに　ダメージを　与える。" }, "zapCannon": { "name": "でんじほう", - "effect": "大砲の ような 電気を 発射して 攻撃する。 相手を まひの 状態に する。" + "effect": "大砲の　ような　電気を　発射して　攻撃する。　相手を　まひの　状態に　する。" }, "foresight": { "name": "みやぶる", - "effect": "ゴーストタイプに 効果がない 技や 回避率の 高い 相手に 攻撃が 当たるように なる。" + "effect": "ゴーストタイプに　効果がない　技や　回避率の　高い　相手に　攻撃が　当たるように　なる。" }, "destinyBond": { "name": "みちづれ", - "effect": "技のあと 相手の 攻撃で ひんしに なると 攻撃 相手も ひんしにする。 連続して 出すと 失敗する。" + "effect": "技のあと　相手の　攻撃で　ひんしに　なると　攻撃　相手も　ひんしにする。　連続して　出すと　失敗する。" }, "perishSong": { "name": "ほろびのうた", - "effect": "歌を 聴いた ポケモンは ３ターン たつと ひんしに なる。 交代すると 効果は なくなる。" + "effect": "歌を　聴いた　ポケモンは　３ターン　たつと　ひんしに　なる。　交代すると　効果は　なくなる。" }, "icyWind": { "name": "こごえるかぜ", - "effect": "凍てつく 冷気を 相手に 吹きつけて 攻撃する。 相手の 素早さを さげる。" + "effect": "凍てつく　冷気を　相手に　吹きつけて　攻撃する。　相手の　素早さを　さげる。" }, "detect": { "name": "みきり", - "effect": "相手の 攻撃を まったく 受けない。 連続で だすと 失敗しやすい。" + "effect": "相手の　攻撃を　まったく　受けない。　連続で　だすと　失敗しやすい。" }, "boneRush": { "name": "ボーンラッシュ", - "effect": "硬い ホネで 相手を なぐりつけて 攻撃する。 ２ー５回の 間 連続で だす。" + "effect": "硬い　ホネで　相手を　なぐりつけて　攻撃する。　２ー５回の　間　連続で　だす。" }, "lockOn": { "name": "ロックオン", - "effect": "照準を しっかり あわせて 次の 攻撃が 必ず 相手に 当たるように する。" + "effect": "照準を　しっかり　あわせて　次の　攻撃が　必ず　相手に　当たるように　する。" }, "outrage": { "name": "げきりん", - "effect": "２ー３ターンの 間 暴れまくって 相手を 攻撃する。 暴れたあとは 混乱する。" + "effect": "２ー３ターンの　間　暴れまくって　相手を　攻撃する。　暴れたあとは　混乱する。" }, "sandstorm": { "name": "すなあらし", - "effect": "５ターンの 間 砂あらしで いわ じめん はがねタイプ 以外に ダメージ。 いわタイプの 特防が あがる。" + "effect": "５ターンの　間　砂あらしで　いわ　じめん　はがねタイプ　以外に　ダメージ。　いわタイプの　特防が　あがる。" }, "gigaDrain": { "name": "ギガドレイン", - "effect": "養分を 吸い取り 攻撃する。 相手に 与えた ダメージの 半分の ＨＰを 回復できる。" + "effect": "養分を　吸い取り　攻撃する。　相手に　与えた　ダメージの　半分の　ＨＰを　回復できる。" }, "endure": { "name": "こらえる", - "effect": "攻撃を 受けても ＨＰを 必ず １だけ 残せる。 連続で だすと 失敗しやすい。" + "effect": "攻撃を　受けても　ＨＰを　必ず　１だけ　残せる。　連続で　だすと　失敗しやすい。" }, "charm": { "name": "あまえる", - "effect": "かわいく みつめて 油断を 誘い 相手の 攻撃を がくっと さげる。" + "effect": "かわいく　みつめて　油断を　誘い　相手の　攻撃を　がくっと　さげる。" }, "rollout": { "name": "ころがる", - "effect": "５ターンの 間 転がり続けて 攻撃する。 技が 当たるたびに 威力が あがる。" + "effect": "５ターンの　間　転がり続けて　攻撃する。　技が　当たるたびに　威力が　あがる。" }, "falseSwipe": { "name": "みねうち", - "effect": "相手の ＨＰが 必ず １だけ 残るように 手加減して 攻撃する。" + "effect": "相手の　ＨＰが　必ず　１だけ　残るように　手加減して　攻撃する。" }, "swagger": { "name": "いばる", - "effect": "相手を 怒らせて 混乱させる。 怒りで 相手の 攻撃は ぐーんと あがってしまう。" + "effect": "相手を　怒らせて　混乱させる。　怒りで　相手の　攻撃は　ぐーんと　あがってしまう。" }, "milkDrink": { "name": "ミルクのみ", - "effect": "最大ＨＰの 半分 自分の ＨＰを 回復する。" + "effect": "最大ＨＰの　半分　自分の　ＨＰを　回復する。" }, "spark": { "name": "スパーク", - "effect": "電気を まとい 相手に 突進して 攻撃する。 まひ状態に することが ある。" + "effect": "電気を　まとい　相手に　突進して　攻撃する。　まひ状態に　することが　ある。" }, "furyCutter": { "name": "れんぞくぎり", - "effect": "カマや ツメなどで 相手を 切りつけて 攻撃する。 連続で 当てると 威力が あがる。" + "effect": "カマや　ツメなどで　相手を　切りつけて　攻撃する。　連続で　当てると　威力が　あがる。" }, "steelWing": { "name": "はがねのつばさ", - "effect": "硬い 翼を 相手に たたきつけて 攻撃する。 自分の 防御が あがることが ある。" + "effect": "硬い　翼を　相手に　たたきつけて　攻撃する。　自分の　防御が　あがることが　ある。" }, "meanLook": { "name": "くろいまなざし", - "effect": "吸いこまれるような 黒い まなざしで じっと みつめて 相手を 戦闘から 逃げられなくする。" + "effect": "吸いこまれるような　黒い　まなざしで　じっと　みつめて　相手を　戦闘から　逃げられなくする。" }, "attract": { "name": "メロメロ", - "effect": "♂なら♀を ♀なら♂を 誘惑して メロメロに する。 相手は 技が だしにくくなる。" + "effect": "♂なら♀を　♀なら♂を　誘惑して　メロメロに　する。　相手は　技が　だしにくくなる。" }, "sleepTalk": { "name": "ねごと", - "effect": "自分が おぼえている 技の うち どれか １つを くりだす。 自分が 寝ているときだけ 使える。" + "effect": "自分が　おぼえている　技の　うち　どれか　１つを　くりだす。　自分が　寝ているときだけ　使える。" }, "healBell": { "name": "いやしのすず", - "effect": "心地好い 鈴の 音色を 聞かせて 味方 全員の 状態異常を 回復 する。" + "effect": "心地好い　鈴の　音色を　聞かせて　味方　全員の　状態異常を　回復　する。" }, "return": { "name": "おんがえし", - "effect": "トレーナーの ために 全力で 相手を 攻撃する。 なついているほど 威力は あがる。" + "effect": "トレーナーの　ために　全力で　相手を　攻撃する。　なついているほど　威力は　あがる。" }, "present": { "name": "プレゼント", - "effect": "わなを しかけた 箱を 相手に わたして 攻撃する。ＨＰが 回復して しまうことも ある。" + "effect": "わなを　しかけた　箱を　相手に　わたして　攻撃する。ＨＰが　回復して　しまうことも　ある。" }, "frustration": { "name": "やつあたり", - "effect": "不満を はらすため 全力で 相手を 攻撃する。 なついていないほど 威力は あがる。" + "effect": "不満を　はらすため　全力で　相手を　攻撃する。　なついていないほど　威力は　あがる。" }, "safeguard": { "name": "しんぴのまもり", - "effect": "５ターンの 間 不思議な 力に 守られて 状態異常に ならなくなる。" + "effect": "５ターンの　間　不思議な　力に　守られて　状態異常に　ならなくなる。" }, "painSplit": { "name": "いたみわけ", - "effect": "自分の ＨＰと 相手の ＨＰを あわせて それを 自分と 相手で なかよく わける。" + "effect": "自分の　ＨＰと　相手の　ＨＰを　あわせて　それを　自分と　相手で　なかよく　わける。" }, "sacredFire": { "name": "せいなるほのお", - "effect": "神秘の 炎で 相手を 焼きつくして 攻撃する。 やけど状態に することが ある。" + "effect": "神秘の　炎で　相手を　焼きつくして　攻撃する。　やけど状態に　することが　ある。" }, "magnitude": { "name": "マグニチュード", - "effect": "地面を 揺らして 自分の 周りに いるものを 攻撃する。 技の 威力は いろいろ 変わる。" + "effect": "地面を　揺らして　自分の　周りに　いるものを　攻撃する。　技の　威力は　いろいろ　変わる。" }, "dynamicPunch": { "name": "ばくれつパンチ", - "effect": "こん身の 力で パンチを くりだして 攻撃する。 相手を 必ず 混乱させる。" + "effect": "こん身の　力で　パンチを　くりだして　攻撃する。　相手を　必ず　混乱させる。" }, "megahorn": { "name": "メガホーン", - "effect": "硬くて りっぱな つので おもいっきり 相手を 突き刺して 攻撃する。" + "effect": "硬くて　りっぱな　つので　おもいっきり　相手を　突き刺して　攻撃する。" }, "dragonBreath": { "name": "りゅうのいぶき", - "effect": "ものすごい 息を 相手に 吹きつけて 攻撃する。 まひ状態に することが ある。" + "effect": "ものすごい　息を　相手に　吹きつけて　攻撃する。　まひ状態に　することが　ある。" }, "batonPass": { "name": "バトンタッチ", - "effect": "控えの ポケモンと 入れ替わる。 能力変化は 替わった ポケモンが そのまま 受けつぐ。" + "effect": "控えの　ポケモンと　入れ替わる。　能力変化は　替わった　ポケモンが　そのまま　受けつぐ。" }, "encore": { "name": "アンコール", - "effect": "相手に アンコールした 技を ３回 続けて 出させる。" + "effect": "相手に　アンコールした　技を　３回　続けて　出させる。" }, "pursuit": { "name": "おいうち", - "effect": "相手 ポケモンが 入れ替わるときに 技を だしていると 倍の 威力で 攻撃できる。" + "effect": "相手　ポケモンが　入れ替わるときに　技を　だしていると　倍の　威力で　攻撃できる。" }, "rapidSpin": { "name": "こうそくスピン", - "effect": "回転して 相手を 攻撃する。 しめつける まきつく やどりぎのタネ など 吹きとばす。自分の 素早さも あがる。" + "effect": "回転して　相手を　攻撃する。　しめつける　まきつく　やどりぎのタネ　など　吹きとばす。自分の　素早さも　あがる。" }, "sweetScent": { "name": "あまいかおり", - "effect": "香りで 相手の 回避率を がくっと さげる。" + "effect": "香りで　相手の　回避率を　がくっと　さげる。" }, "ironTail": { "name": "アイアンテール", - "effect": "硬い しっぽで 相手を たたきつけて 攻撃する。 相手の 防御を さげることが ある。" + "effect": "硬い　しっぽで　相手を　たたきつけて　攻撃する。　相手の　防御を　さげることが　ある。" }, "metalClaw": { "name": "メタルクロー", - "effect": "鋼鉄の ツメで 相手を 切り裂いて 攻撃する。 自分の 攻撃が あがることが ある。" + "effect": "鋼鉄の　ツメで　相手を　切り裂いて　攻撃する。　自分の　攻撃が　あがることが　ある。" }, "vitalThrow": { "name": "あてみなげ", - "effect": "相手より あとに 攻撃する。 そのかわり 自分の 攻撃は 必ず 命中する。" + "effect": "相手より　あとに　攻撃する。　そのかわり　自分の　攻撃は　必ず　命中する。" }, "morningSun": { "name": "あさのひざし", - "effect": "自分の ＨＰを 回復する。 天気に よって 回復の 量が 変化する。" + "effect": "自分の　ＨＰを　回復する。　天気に　よって　回復の　量が　変化する。" }, "synthesis": { "name": "こうごうせい", - "effect": "自分の ＨＰを 回復する。 天気に よって 回復の 量が 変化する。" + "effect": "自分の　ＨＰを　回復する。　天気に　よって　回復の　量が　変化する。" }, "moonlight": { "name": "つきのひかり", - "effect": "自分の ＨＰを 回復する。 天気に よって 回復の 量が 変化する。" + "effect": "自分の　ＨＰを　回復する。　天気に　よって　回復の　量が　変化する。" }, "hiddenPower": { "name": "めざめるパワー", - "effect": "技を 使った ポケモンに よって 技の タイプが 変わる。" + "effect": "技を　使った　ポケモンに　よって　技の　タイプが　変わる。" }, "crossChop": { "name": "クロスチョップ", - "effect": "両手チョップを 相手に たたきつけて 攻撃する。 急所に 当たりやすい。" + "effect": "両手チョップを　相手に　たたきつけて　攻撃する。　急所に　当たりやすい。" }, "twister": { "name": "たつまき", - "effect": "竜巻を おこして 相手を まきこみ 攻撃する。 相手を ひるませることが ある。" + "effect": "竜巻を　おこして　相手を　まきこみ　攻撃する。　相手を　ひるませることが　ある。" }, "rainDance": { "name": "あまごい", - "effect": "５ターンの 間 雨を 降らせて みずタイプの 威力を あげる。 ほのおタイプの 威力は さがる。" + "effect": "５ターンの　間　雨を　降らせて　みずタイプの　威力を　あげる。　ほのおタイプの　威力は　さがる。" }, "sunnyDay": { "name": "にほんばれ", - "effect": "５ターンの 間 日差しを 強くして ほのおタイプの 威力を あげる。 みずタイプの 威力は さがる。" + "effect": "５ターンの　間　日差しを　強くして　ほのおタイプの　威力を　あげる。　みずタイプの　威力は　さがる。" }, "crunch": { "name": "かみくだく", - "effect": "鋭い 歯で 相手を かみくだいて 攻撃する。 相手の 防御を さげることが ある。" + "effect": "鋭い　歯で　相手を　かみくだいて　攻撃する。　相手の　防御を　さげることが　ある。" }, "mirrorCoat": { "name": "ミラーコート", - "effect": "相手から 受けた 特殊攻撃の ダメージを ２倍に して その相手に 返す。" + "effect": "相手から　受けた　特殊攻撃の　ダメージを　２倍に　して　その相手に　返す。" }, "psychUp": { "name": "じこあんじ", - "effect": "自分に 暗示を かけることで 能力変化の 状態を 相手と 同じにする。" + "effect": "自分に　暗示を　かけることで　能力変化の　状態を　相手と　同じにする。" }, "extremeSpeed": { "name": "しんそく", - "effect": "目にも 留まらぬ ものすごい 速さで 相手に 突進して 攻撃する。 必ず 先制攻撃 できる。" + "effect": "目にも　留まらぬ　ものすごい　速さで　相手に　突進して　攻撃する。　必ず　先制攻撃　できる。" }, "ancientPower": { "name": "げんしのちから", - "effect": "原始の 力で 攻撃する。 自分の すべての 能力が あがることが ある。" + "effect": "原始の　力で　攻撃する。　自分の　すべての　能力が　あがることが　ある。" }, "shadowBall": { "name": "シャドーボール", - "effect": "黒い影の 塊を 投げつけて 攻撃する。 相手の 特防を さげることが ある。" + "effect": "黒い影の　塊を　投げつけて　攻撃する。　相手の　特防を　さげることが　ある。" }, "futureSight": { "name": "みらいよち", - "effect": "技を 使った ２ターン後に 相手に 念力の 塊を 送って 攻撃する。" + "effect": "技を　使った　２ターン後に　相手に　念力の　塊を　送って　攻撃する。" }, "rockSmash": { "name": "いわくだき", - "effect": "パンチで 攻撃する。相手の 防御を さげる ことが ある。" + "effect": "パンチで　攻撃する。相手の　防御を　さげる　ことが　ある。" }, "whirlpool": { "name": "うずしお", - "effect": "激しく 渦をまく 水の中に ４ー５ターンの 間 相手を 閉じこめて 攻撃する。" + "effect": "激しく　渦をまく　水の中に　４ー５ターンの　間　相手を　閉じこめて　攻撃する。" }, "beatUp": { "name": "ふくろだたき", - "effect": "味方 全員で 攻撃する。 仲間の ポケモンが 多いほど 技の 攻撃回数が 増える。" + "effect": "味方　全員で　攻撃する。　仲間の　ポケモンが　多いほど　技の　攻撃回数が　増える。" }, "fakeOut": { "name": "ねこだまし", - "effect": "先制攻撃で 相手を ひるませる。 戦闘に でたら すぐに ださないと 成功しない。" + "effect": "先制攻撃で　相手を　ひるませる。　戦闘に　でたら　すぐに　ださないと　成功しない。" }, "uproar": { "name": "さわぐ", - "effect": "３ターンの 間 騒いで 相手を 攻撃する。 そのあいだは だれも 眠れなくなる。" + "effect": "３ターンの　間　騒いで　相手を　攻撃する。　そのあいだは　だれも　眠れなくなる。" }, "stockpile": { "name": "たくわえる", - "effect": "力を 蓄えて 自分の 防御と 特防を あげる。 最大 ３回まで 蓄えられる。" + "effect": "力を　蓄えて　自分の　防御と　特防を　あげる。　最大　３回まで　蓄えられる。" }, "spitUp": { "name": "はきだす", - "effect": "蓄えた 力を 相手に ぶつけて 攻撃する。 蓄えているほど 威力が あがる。" + "effect": "蓄えた　力を　相手に　ぶつけて　攻撃する。　蓄えているほど　威力が　あがる。" }, "swallow": { "name": "のみこむ", - "effect": "蓄えた 力を のみこんで 自分の ＨＰを 回復する。 蓄えているほど 回復する。" + "effect": "蓄えた　力を　のみこんで　自分の　ＨＰを　回復する。　蓄えているほど　回復する。" }, "heatWave": { "name": "ねっぷう", - "effect": "熱い 息を 相手に 吹きつけて 攻撃する。 やけど状態に することが ある。" + "effect": "熱い　息を　相手に　吹きつけて　攻撃する。　やけど状態に　することが　ある。" }, "hail": { "name": "あられ", - "effect": "５ターンの 間 あられを 降らして こおりタイプで ない ポケモン 全員に ダメージを 与える。" + "effect": "５ターンの　間　あられを　降らして　こおりタイプで　ない　ポケモン　全員に　ダメージを　与える。" }, "torment": { "name": "いちゃもん", - "effect": "相手に いちゃもんを つけて 同じ 技を ２回連続で だせなくする。" + "effect": "相手に　いちゃもんを　つけて　同じ　技を　２回連続で　だせなくする。" }, "flatter": { "name": "おだてる", - "effect": "相手を おだてて 混乱させる。 同時に 相手の 特攻も あげてしまう。" + "effect": "相手を　おだてて　混乱させる。　同時に　相手の　特攻も　あげてしまう。" }, "willOWisp": { "name": "おにび", - "effect": "不気味で 怪しい 炎を 放って 相手を やけどの 状態に する。" + "effect": "不気味で　怪しい　炎を　放って　相手を　やけどの　状態に　する。" }, "memento": { "name": "おきみやげ", - "effect": "自分は ひんしに なるが そのかわりに 相手の 攻撃と 特攻を がくっと さげる。" + "effect": "自分は　ひんしに　なるが　そのかわりに　相手の　攻撃と　特攻を　がくっと　さげる。" }, "facade": { "name": "からげんき", - "effect": "自分が 毒 まひ やけど 状態のとき 相手に くりだすと 技の 威力が ２倍に なる。" + "effect": "自分が　毒　まひ　やけど　状態のとき　相手に　くりだすと　技の　威力が　２倍に　なる。" }, "focusPunch": { "name": "きあいパンチ", - "effect": "精神を 高めて パンチを くりだす。 技を だすまでに 攻撃を 受けると 失敗する。" + "effect": "精神を　高めて　パンチを　くりだす。　技を　だすまでに　攻撃を　受けると　失敗する。" }, "smellingSalts": { "name": "きつけ", - "effect": "まひ状態の 相手には 威力が ２倍に なるが かわりに 相手の まひが 治る。" + "effect": "まひ状態の　相手には　威力が　２倍に　なるが　かわりに　相手の　まひが　治る。" }, "followMe": { "name": "このゆびとまれ", - "effect": "自分に 注目させて 相手からの 攻撃を すべて 自分に むけさせる。" + "effect": "自分に　注目させて　相手からの　攻撃を　すべて　自分に　むけさせる。" }, "naturePower": { "name": "しぜんのちから", - "effect": "自然の 力で 攻撃する。 使う 場所で でてくる 技が 変化する。" + "effect": "自然の　力で　攻撃する。　使う　場所で　でてくる　技が　変化する。" }, "charge": { "name": "じゅうでん", - "effect": "次の ターンに だす でんきタイプの 技の 威力を あげる。 自分の 特防も あがる。" + "effect": "次の　ターンに　だす　でんきタイプの　技の　威力を　あげる。　自分の　特防も　あがる。" }, "taunt": { "name": "ちょうはつ", - "effect": "相手を 怒らせる。 ３ターンの 間 相手は ダメージを 与える 技しか だせなくなる。" + "effect": "相手を　怒らせる。　３ターンの　間　相手は　ダメージを　与える　技しか　だせなくなる。" }, "helpingHand": { "name": "てだすけ", - "effect": "仲間を 助ける。 てだすけ された ポケモンの 技の 威力は いつもより 大きくなる。" + "effect": "仲間を　助ける。　てだすけ　された　ポケモンの　技の　威力は　いつもより　大きくなる。" }, "trick": { "name": "トリック", - "effect": "相手の すきを ついて 自分と 相手の 持ち物を 交換する。" + "effect": "相手の　すきを　ついて　自分と　相手の　持ち物を　交換する。" }, "rolePlay": { "name": "なりきり", - "effect": "相手に なりきって 自分も 相手と 同じ 特性に 変化する。" + "effect": "相手に　なりきって　自分も　相手と　同じ　特性に　変化する。" }, "wish": { "name": "ねがいごと", - "effect": "次の ターンに 自分 もしくは 入れ替わった ポケモンの ＨＰを 最大ＨＰの 半分 回復する。" + "effect": "次の　ターンに　自分　もしくは　入れ替わった　ポケモンの　ＨＰを　最大ＨＰの　半分　回復する。" }, "assist": { "name": "ねこのて", - "effect": "大急ぎで 味方の 助けを かりて 味方の ポケモンが おぼえている 技を どれか １つ 使う。" + "effect": "大急ぎで　味方の　助けを　かりて　味方の　ポケモンが　おぼえている　技を　どれか　１つ　使う。" }, "ingrain": { "name": "ねをはる", - "effect": "大地に 根を 張り 毎ターン 自分の ＨＰを 回復する。 根を 張っているので 入れ替えられない。" + "effect": "大地に　根を　張り　毎ターン　自分の　ＨＰを　回復する。　根を　張っているので　入れ替えられない。" }, "superpower": { "name": "ばかぢから", - "effect": "すごい 力を 発揮して 相手を 攻撃する。自分の 攻撃と 防御が さがる。" + "effect": "すごい　力を　発揮して　相手を　攻撃する。自分の　攻撃と　防御が　さがる。" }, "magicCoat": { "name": "マジックコート", - "effect": "状態異常に なる 技や やどりぎのタネ などを だされたとき 相手に 跳ね返す。" + "effect": "状態異常に　なる　技や　やどりぎのタネ　などを　だされたとき　相手に　跳ね返す。" }, "recycle": { "name": "リサイクル", - "effect": "戦闘中に 使って なくなった 自分の 持ち物を 再生させて 使えるように する。" + "effect": "戦闘中に　使って　なくなった　自分の　持ち物を　再生させて　使えるように　する。" }, "revenge": { "name": "リベンジ", - "effect": "相手から 技を 受けていると その相手に 対して 与える ダメージが ２倍に なる。" + "effect": "相手から　技を　受けていると　その相手に　対して　与える　ダメージが　２倍に　なる。" }, "brickBreak": { "name": "かわらわり", - "effect": "手刀を 勢いよく 振りおろして 相手を 攻撃する。 ひかりのかべや リフレクター なども 破壊できる。" + "effect": "手刀を　勢いよく　振りおろして　相手を　攻撃する。　ひかりのかべや　リフレクター　なども　破壊できる。" }, "yawn": { "name": "あくび", - "effect": "大きな あくびで 眠気を 誘う。 次の ターンに 相手を 眠り状態に する。" + "effect": "大きな　あくびで　眠気を　誘う。　次の　ターンに　相手を　眠り状態に　する。" }, "knockOff": { "name": "はたきおとす", - "effect": "相手の 持ち物を はたき 落として 戦闘が 終わるまで 使えなくする。 物を持つ 相手には ダメージが増す。" + "effect": "相手の　持ち物を　はたき　落として　戦闘が　終わるまで　使えなくする。　物を持つ　相手には　ダメージが増す。" }, "endeavor": { "name": "がむしゃら", - "effect": "相手の ＨＰが 自分の ＨＰと 同じくらいに なるように ダメージを 与える。" + "effect": "相手の　ＨＰが　自分の　ＨＰと　同じくらいに　なるように　ダメージを　与える。" }, "eruption": { "name": "ふんか", - "effect": "怒りを 爆発させて 相手を 攻撃する。 自分の ＨＰが 少ないほど 技の 威力は さがる。" + "effect": "怒りを　爆発させて　相手を　攻撃する。　自分の　ＨＰが　少ないほど　技の　威力は　さがる。" }, "skillSwap": { "name": "スキルスワップ", - "effect": "超能力で 自分の 特性と 相手の 特性を 入れ替える。" + "effect": "超能力で　自分の　特性と　相手の　特性を　入れ替える。" }, "imprison": { "name": "ふういん", - "effect": "相手が 自分と 同じ 技を おぼえていたら 相手だけ その技を 使えなくする。" + "effect": "相手が　自分と　同じ　技を　おぼえていたら　相手だけ　その技を　使えなくする。" }, "refresh": { "name": "リフレッシュ", - "effect": "体を やすめて 自分が おっている 毒 まひ やけどの 状態異常を 治す。" + "effect": "体を　やすめて　自分が　おっている　毒　まひ　やけどの　状態異常を　治す。" }, "grudge": { "name": "おんねん", - "effect": "相手の 技で ひんしに されたとき おんねんを かけて その技の ＰＰを ０に する。" + "effect": "相手の　技で　ひんしに　されたとき　おんねんを　かけて　その技の　ＰＰを　０に　する。" }, "snatch": { "name": "よこどり", - "effect": "相手が 使おうと した 回復技や 能力変化の 技を うばって 自分に 使う。" + "effect": "相手が　使おうと　した　回復技や　能力変化の　技を　うばって　自分に　使う。" }, "secretPower": { "name": "ひみつのちから", - "effect": "使う場所で 追加効果が 変化する 攻撃。" + "effect": "使う場所で　追加効果が　変化する　攻撃。" }, "dive": { "name": "ダイビング", - "effect": "１ターン目で 潜り ２ターン目に 浮きあがって 攻撃する。" + "effect": "１ターン目で　潜り　２ターン目に　浮きあがって　攻撃する。" }, "armThrust": { "name": "つっぱり", - "effect": "ひらいた 両手で 相手を つっぱって 攻撃する。 ２ー５回の 間 連続で だす。" + "effect": "ひらいた　両手で　相手を　つっぱって　攻撃する。　２ー５回の　間　連続で　だす。" }, "camouflage": { "name": "ほごしょく", - "effect": "水辺や 草むら どうくつなど いる 場所に あわせて 自分の タイプを 変える。" + "effect": "水辺や　草むら　どうくつなど　いる　場所に　あわせて　自分の　タイプを　変える。" }, "tailGlow": { "name": "ほたるび", - "effect": "点滅する 光を 眺めて 自分の 精神を 統一し 特攻を ぐぐーんと あげる。" + "effect": "点滅する　光を　眺めて　自分の　精神を　統一し　特攻を　ぐぐーんと　あげる。" }, "lusterPurge": { "name": "ラスターパージ", - "effect": "まばゆい 光を 解放して 攻撃する。 相手の 特防を さげることが ある。" + "effect": "まばゆい　光を　解放して　攻撃する。　相手の　特防を　さげることが　ある。" }, "mistBall": { "name": "ミストボール", - "effect": "霧状の 羽毛で 包みこみ 攻撃する。 相手の 特攻を さげることが ある。" + "effect": "霧状の　羽毛で　包みこみ　攻撃する。　相手の　特攻を　さげることが　ある。" }, "featherDance": { "name": "フェザーダンス", - "effect": "羽毛を ふりまいて 相手の 体に からませる。 相手の 攻撃を がくっと さげる。" + "effect": "羽毛を　ふりまいて　相手の　体に　からませる。　相手の　攻撃を　がくっと　さげる。" }, "teeterDance": { "name": "フラフラダンス", - "effect": "フラフラと ダンスを おどって 自分の 周りに いるものを 混乱状態に させる。" + "effect": "フラフラと　ダンスを　おどって　自分の　周りに　いるものを　混乱状態に　させる。" }, "blazeKick": { "name": "ブレイズキック", - "effect": "攻撃した 相手を やけど状態に することが ある。 急所にも 当たりやすい。" + "effect": "攻撃した　相手を　やけど状態に　することが　ある。　急所にも　当たりやすい。" }, "mudSport": { "name": "どろあそび", - "effect": "あたりを 泥まみれにする。 ５ターンの 間 でんきタイプの 技を 弱める。" + "effect": "あたりを　泥まみれにする。　５ターンの　間　でんきタイプの　技を　弱める。" }, "iceBall": { "name": "アイスボール", - "effect": "５ターンの 間 相手を 攻撃する。 技が 当たるたび 威力が あがる。" + "effect": "５ターンの　間　相手を　攻撃する。　技が　当たるたび　威力が　あがる。" }, "needleArm": { "name": "ニードルアーム", - "effect": "トゲの 腕を 激しく ふるって 攻撃する。 相手を ひるませることが ある。" + "effect": "トゲの　腕を　激しく　ふるって　攻撃する。　相手を　ひるませることが　ある。" }, "slackOff": { "name": "なまける", - "effect": "怠けて やすむ。 自分の ＨＰを 最大ＨＰの 半分 回復する。" + "effect": "怠けて　やすむ。　自分の　ＨＰを　最大ＨＰの　半分　回復する。" }, "hyperVoice": { "name": "ハイパーボイス", - "effect": "うるさく 響く 大きな 振動を 相手に 与えて 攻撃する。" + "effect": "うるさく　響く　大きな　振動を　相手に　与えて　攻撃する。" }, "poisonFang": { "name": "どくどくのキバ", - "effect": "毒の ある キバで 相手に かみついて 攻撃する。 猛毒を おわせる ことが ある。" + "effect": "毒の　ある　キバで　相手に　かみついて　攻撃する。　猛毒を　おわせる　ことが　ある。" }, "crushClaw": { "name": "ブレイククロー", - "effect": "硬く 鋭い ツメで 切り裂いて 攻撃する。 相手の 防御を さげることが ある。" + "effect": "硬く　鋭い　ツメで　切り裂いて　攻撃する。　相手の　防御を　さげることが　ある。" }, "blastBurn": { "name": "ブラストバーン", - "effect": "爆発の 炎で 相手を 焼きつくして 攻撃する。 次の ターンは 動けなくなる。" + "effect": "爆発の　炎で　相手を　焼きつくして　攻撃する。　次の　ターンは　動けなくなる。" }, "hydroCannon": { "name": "ハイドロカノン", - "effect": "水の 大砲を 相手に 発射して 攻撃する。 次の ターンは 動けなくなる。" + "effect": "水の　大砲を　相手に　発射して　攻撃する。　次の　ターンは　動けなくなる。" }, "meteorMash": { "name": "コメットパンチ", - "effect": "すい星の ごとく パンチを くりだして 相手を 攻撃する。 自分の 攻撃が あがることが ある。" + "effect": "すい星の　ごとく　パンチを　くりだして　相手を　攻撃する。　自分の　攻撃が　あがることが　ある。" }, "astonish": { "name": "おどろかす", - "effect": "大きな 声などで 不意に 驚かして 攻撃する。 相手を ひるませることが ある。" + "effect": "大きな　声などで　不意に　驚かして　攻撃する。　相手を　ひるませることが　ある。" }, "weatherBall": { "name": "ウェザーボール", - "effect": "使ったときの 天気に よって 技の タイプと 威力が 変わる。" + "effect": "使ったときの　天気に　よって　技の　タイプと　威力が　変わる。" }, "aromatherapy": { "name": "アロマセラピー", - "effect": "心地好い やすらぐ 香りを かがせて 味方全員の 状態異常を 回復する。" + "effect": "心地好い　やすらぐ　香りを　かがせて　味方全員の　状態異常を　回復する。" }, "fakeTears": { "name": "うそなき", - "effect": "ないた ふりをして 涙を 流す。 こまらせる ことで 相手の 特防を がくっと さげる。" + "effect": "ないた　ふりをして　涙を　流す。　こまらせる　ことで　相手の　特防を　がくっと　さげる。" }, "airCutter": { "name": "エアカッター", - "effect": "鋭い 風で 相手を 切りつけて 攻撃する。 急所に 当たりやすい。" + "effect": "鋭い　風で　相手を　切りつけて　攻撃する。　急所に　当たりやすい。" }, "overheat": { "name": "オーバーヒート", - "effect": "フルパワーで 相手を 攻撃する。 使うと 反動で 自分の 特攻が がくっと さがる。" + "effect": "フルパワーで　相手を　攻撃する。　使うと　反動で　自分の　特攻が　がくっと　さがる。" }, "odorSleuth": { "name": "かぎわける", - "effect": "ゴーストタイプに 効果がない 技や 回避率の 高い 相手に 攻撃が 当たるように なる。" + "effect": "ゴーストタイプに　効果がない　技や　回避率の　高い　相手に　攻撃が　当たるように　なる。" }, "rockTomb": { "name": "がんせきふうじ", - "effect": "岩石を 投げつけて 攻撃する。 相手の 動きを 封じることで 素早さを さげる。" + "effect": "岩石を　投げつけて　攻撃する。　相手の　動きを　封じることで　素早さを　さげる。" }, "silverWind": { "name": "ぎんいろのかぜ", - "effect": "風に りんぷんを のせて 相手を 攻撃する。自分の すべての 能力が あがることが ある。" + "effect": "風に　りんぷんを　のせて　相手を　攻撃する。自分の　すべての　能力が　あがることが　ある。" }, "metalSound": { "name": "きんぞくおん", - "effect": "金属を こすって でるような いやな 音を 聞かせる。 相手の 特防を がくっと さげる。" + "effect": "金属を　こすって　でるような　いやな　音を　聞かせる。　相手の　特防を　がくっと　さげる。" }, "grassWhistle": { "name": "くさぶえ", - "effect": "心地好い 笛の 音色を 聞かせて 相手を 眠りの 状態に する。" + "effect": "心地好い　笛の　音色を　聞かせて　相手を　眠りの　状態に　する。" }, "tickle": { "name": "くすぐる", - "effect": "体を くすぐり 笑わせる ことで 相手の 攻撃と 防御を さげる。" + "effect": "体を　くすぐり　笑わせる　ことで　相手の　攻撃と　防御を　さげる。" }, "cosmicPower": { "name": "コスモパワー", - "effect": "宇宙から 神秘の 力を とりこむ ことで 自分の 防御と 特防を あげる。" + "effect": "宇宙から　神秘の　力を　とりこむ　ことで　自分の　防御と　特防を　あげる。" }, "waterSpout": { "name": "しおふき", - "effect": "潮を 吹きつけて 攻撃する。 自分の ＨＰが 少ないほど 技の 威力は さがる。" + "effect": "潮を　吹きつけて　攻撃する。　自分の　ＨＰが　少ないほど　技の　威力は　さがる。" }, "signalBeam": { "name": "シグナルビーム", - "effect": "不思議な 光を 発射して 攻撃する。 相手を 混乱させることが ある。" + "effect": "不思議な　光を　発射して　攻撃する。　相手を　混乱させることが　ある。" }, "shadowPunch": { "name": "シャドーパンチ", - "effect": "影に まぎれて パンチを くりだす。 攻撃は 必ず 命中する。" + "effect": "影に　まぎれて　パンチを　くりだす。　攻撃は　必ず　命中する。" }, "extrasensory": { "name": "じんつうりき", - "effect": "みえない 不思議な 力を 送って 攻撃する。 相手を ひるませることが ある。" + "effect": "みえない　不思議な　力を　送って　攻撃する。　相手を　ひるませることが　ある。" }, "skyUppercut": { "name": "スカイアッパー", - "effect": "空に むかうような 高い アッパーで 相手を 突きあげて 攻撃する。" + "effect": "空に　むかうような　高い　アッパーで　相手を　突きあげて　攻撃する。" }, "sandTomb": { "name": "すなじごく", - "effect": "激しく 吹きあれる 砂あらしの 中に ４ー５ターンの 間 相手を 閉じこめて 攻撃する。" + "effect": "激しく　吹きあれる　砂あらしの　中に　４ー５ターンの　間　相手を　閉じこめて　攻撃する。" }, "sheerCold": { "name": "ぜったいれいど", - "effect": "相手を 一撃で 瀕死に する。 こおりタイプ 以外の ポケモンが 使うと 当たりにくい。" + "effect": "相手を　一撃で　瀕死に　する。　こおりタイプ　以外の　ポケモンが　使うと　当たりにくい。" }, "muddyWater": { "name": "だくりゅう", - "effect": "濁った 水を 相手に 発射して 攻撃する。 命中率を さげることが ある。" + "effect": "濁った　水を　相手に　発射して　攻撃する。　命中率を　さげることが　ある。" }, "bulletSeed": { "name": "タネマシンガン", - "effect": "タネを 勢いよく 相手に 発射して 攻撃する。 ２ー５回の 間 連続で だす。" + "effect": "タネを　勢いよく　相手に　発射して　攻撃する。　２ー５回の　間　連続で　だす。" }, "aerialAce": { "name": "つばめがえし", - "effect": "素早い 動きで 相手を ほんろうして 切りつける。 攻撃は 必ず 命中する。" + "effect": "素早い　動きで　相手を　ほんろうして　切りつける。　攻撃は　必ず　命中する。" }, "icicleSpear": { "name": "つららばり", - "effect": "鋭い 氷柱を 相手に 発射して 攻撃する。 ２ー５回の 間 連続で だす。" + "effect": "鋭い　氷柱を　相手に　発射して　攻撃する。　２ー５回の　間　連続で　だす。" }, "ironDefense": { "name": "てっぺき", - "effect": "皮膚を 鉄のように 硬くする ことで 自分の 防御を ぐーんと あげる。" + "effect": "皮膚を　鉄のように　硬くする　ことで　自分の　防御を　ぐーんと　あげる。" }, "block": { "name": "とおせんぼう", - "effect": "両手を ひろげて たちはだかり 相手の 逃げ道を ふさいで 逃げられなくする。" + "effect": "両手を　ひろげて　たちはだかり　相手の　逃げ道を　ふさいで　逃げられなくする。" }, "howl": { "name": "とおぼえ", - "effect": "大声で ほえて 気合を 高め 自分と 味方の 攻撃を あげる。" + "effect": "大声で　ほえて　気合を　高め　自分と　味方の　攻撃を　あげる。" }, "dragonClaw": { "name": "ドラゴンクロー", - "effect": "鋭く とがった 巨大な ツメで 相手を 切り裂いて 攻撃する。" + "effect": "鋭く　とがった　巨大な　ツメで　相手を　切り裂いて　攻撃する。" }, "frenzyPlant": { "name": "ハードプラント", - "effect": "大きな 樹木で 相手を たたきつけて 攻撃する。 次の ターンは 動けなくなる。" + "effect": "大きな　樹木で　相手を　たたきつけて　攻撃する。　次の　ターンは　動けなくなる。" }, "bulkUp": { "name": "ビルドアップ", - "effect": "体に 力を こめて 筋肉を ぶあつく することで 自分の 攻撃と 防御を あげる。" + "effect": "体に　力を　こめて　筋肉を　ぶあつく　することで　自分の　攻撃と　防御を　あげる。" }, "bounce": { "name": "とびはねる", - "effect": "空高く 飛び跳ねて ２ターン目に 相手を 攻撃する。 まひ状態に することが ある。" + "effect": "空高く　飛び跳ねて　２ターン目に　相手を　攻撃する。　まひ状態に　することが　ある。" }, "mudShot": { "name": "マッドショット", - "effect": "泥の 塊を 相手に 投げつけて 攻撃する。 同時に 相手の 素早さを さげる。" + "effect": "泥の　塊を　相手に　投げつけて　攻撃する。　同時に　相手の　素早さを　さげる。" }, "poisonTail": { "name": "ポイズンテール", - "effect": "しっぽで たたく。 毒状態に することが あり 急所にも 当たりやすい。" + "effect": "しっぽで　たたく。　毒状態に　することが　あり　急所にも　当たりやすい。" }, "covet": { "name": "ほしがる", - "effect": "かわいく あまえながら 相手に ちかづき 持っている 道具を うばおうとする。 うばう 可能性は ３０％。" + "effect": "かわいく　あまえながら　相手に　ちかづき　持っている　道具を　うばおうとする。　うばう　可能性は　３０％。" }, "voltTackle": { "name": "ボルテッカー", - "effect": "電気を まとって 突進する。 自分も かなり ダメージを 受ける。 まひ状態に することが ある。" + "effect": "電気を　まとって　突進する。　自分も　かなり　ダメージを　受ける。　まひ状態に　することが　ある。" }, "magicalLeaf": { "name": "マジカルリーフ", - "effect": "相手を 追跡する 不思議な はっぱを まきちらす。 攻撃は 必ず 命中する。" + "effect": "相手を　追跡する　不思議な　はっぱを　まきちらす。　攻撃は　必ず　命中する。" }, "waterSport": { "name": "みずあそび", - "effect": "あたりを 水で びしょびしょにする。 ５ターンの 間 ほのおタイプの 技を 弱める。" + "effect": "あたりを　水で　びしょびしょにする。　５ターンの　間　ほのおタイプの　技を　弱める。" }, "calmMind": { "name": "めいそう", - "effect": "静かに 精神を 統一し 心を 鎮めることで 自分の 特攻と 特防を あげる。" + "effect": "静かに　精神を　統一し　心を　鎮めることで　自分の　特攻と　特防を　あげる。" }, "leafBlade": { "name": "リーフブレード", - "effect": "はっぱを 剣のように あやつり 相手を 切りつけて 攻撃する。 急所に 当たりやすい。" + "effect": "はっぱを　剣のように　あやつり　相手を　切りつけて　攻撃する。　急所に　当たりやすい。" }, "dragonDance": { "name": "りゅうのまい", - "effect": "神秘的で 力強い 舞を 激しく おどる。 自分の 攻撃と 素早さを あげる。" + "effect": "神秘的で　力強い　舞を　激しく　おどる。　自分の　攻撃と　素早さを　あげる。" }, "rockBlast": { "name": "ロックブラスト", - "effect": "硬い 岩石を 相手に 発射して 攻撃する。 ２ー５回の 間 連続で だす。" + "effect": "硬い　岩石を　相手に　発射して　攻撃する。　２ー５回の　間　連続で　だす。" }, "shockWave": { "name": "でんげきは", - "effect": "電撃を 素早く 相手に 浴びせる。 攻撃は 必ず 命中する。" + "effect": "電撃を　素早く　相手に　浴びせる。　攻撃は　必ず　命中する。" }, "waterPulse": { "name": "みずのはどう", - "effect": "水の 振動を 相手に 与えて 攻撃する。 相手を 混乱させることが ある。" + "effect": "水の　振動を　相手に　与えて　攻撃する。　相手を　混乱させることが　ある。" }, "doomDesire": { "name": "はめつのねがい", - "effect": "技を 使った ２ターン後に 無数の 光の 束で 相手を 攻撃する。" + "effect": "技を　使った　２ターン後に　無数の　光の　束で　相手を　攻撃する。" }, "psychoBoost": { "name": "サイコブースト", - "effect": "フルパワーで 相手を 攻撃する。 使うと 反動で 自分の 特攻が がくっと さがる。" + "effect": "フルパワーで　相手を　攻撃する。　使うと　反動で　自分の　特攻が　がくっと　さがる。" }, "roost": { "name": "はねやすめ", - "effect": "地面に 降りて 体を やすめる。 最大ＨＰの 半分の ＨＰを 回復する。" + "effect": "地面に　降りて　体を　やすめる。　最大ＨＰの　半分の　ＨＰを　回復する。" }, "gravity": { "name": "じゅうりょく", - "effect": "５ターンの間 ふゆうや ひこうタイプに じめんタイプの 技が 当たるようになる。 空中に 飛ぶ 技も 使えない。" + "effect": "５ターンの間　ふゆうや　ひこうタイプに　じめんタイプの　技が　当たるようになる。　空中に　飛ぶ　技も　使えない。" }, "miracleEye": { "name": "ミラクルアイ", - "effect": "あくタイプに 効果がない 技や 回避率の 高い 相手に 攻撃が 当たるように なる。" + "effect": "あくタイプに　効果がない　技や　回避率の　高い　相手に　攻撃が　当たるように　なる。" }, "wakeUpSlap": { "name": "めざましビンタ", - "effect": "眠り状態の 相手に 大きな ダメージを 与える。 かわりに 相手は 眠りから さめる。" + "effect": "眠り状態の　相手に　大きな　ダメージを　与える。　かわりに　相手は　眠りから　さめる。" }, "hammerArm": { "name": "アームハンマー", - "effect": "強くて 重い こぶしを ふるって ダメージを 与える。 自分の 素早さが さがる。" + "effect": "強くて　重い　こぶしを　ふるって　ダメージを　与える。　自分の　素早さが　さがる。" }, "gyroBall": { "name": "ジャイロボール", - "effect": "体を 高速に 回転させて 体当たりする。相手より 素早さが 低いほど 強い。" + "effect": "体を　高速に　回転させて　体当たりする。相手より　素早さが　低いほど　強い。" }, "healingWish": { "name": "いやしのねがい", - "effect": "自分は ひんしに なるが 控えから でてくる ポケモンの 状態異常と ＨＰを 回復する。" + "effect": "自分は　ひんしに　なるが　控えから　でてくる　ポケモンの　状態異常と　ＨＰを　回復する。" }, "brine": { "name": "しおみず", - "effect": "相手が ＨＰの 半分くらい きずを おっていると 技の 威力が ２倍に なる。" + "effect": "相手が　ＨＰの　半分くらい　きずを　おっていると　技の　威力が　２倍に　なる。" }, "naturalGift": { "name": "しぜんのめぐみ", - "effect": "きのみから 力を もらい 攻撃する。持たせた きのみで 技の タイプと 威力が 変わる。" + "effect": "きのみから　力を　もらい　攻撃する。持たせた　きのみで　技の　タイプと　威力が　変わる。" }, "feint": { "name": "フェイント", - "effect": "まもるや みきり などを している 相手に 攻撃が できる。 守りの 効果を 解除させる。" + "effect": "まもるや　みきり　などを　している　相手に　攻撃が　できる。　守りの　効果を　解除させる。" }, "pluck": { "name": "ついばむ", - "effect": "くちばしで 攻撃。 相手が きのみを 持っているとき 食べて きのみの 効果を 受けられる。" + "effect": "くちばしで　攻撃。　相手が　きのみを　持っているとき　食べて　きのみの　効果を　受けられる。" }, "tailwind": { "name": "おいかぜ", - "effect": "激しく 吹きあれる 風の渦を つくり ４ターンの 間 味方 全員の 素早さを あげる。" + "effect": "激しく　吹きあれる　風の渦を　つくり　４ターンの　間　味方　全員の　素早さを　あげる。" }, "acupressure": { "name": "つぼをつく", - "effect": "つぼおしで 体を 活性化させる。 能力の どれか １つを ぐーんと あげる。" + "effect": "つぼおしで　体を　活性化させる。　能力の　どれか　１つを　ぐーんと　あげる。" }, "metalBurst": { "name": "メタルバースト", - "effect": "技を だす前に 最後に 受けた 技の ダメージを 大きくして だした 相手に 返す。" + "effect": "技を　だす前に　最後に　受けた　技の　ダメージを　大きくして　だした　相手に　返す。" }, "uTurn": { "name": "とんぼがえり", - "effect": "攻撃したあと ものすごい スピードで もどってきて 控えの ポケモンと 入れ替わる。" + "effect": "攻撃したあと　ものすごい　スピードで　もどってきて　控えの　ポケモンと　入れ替わる。" }, "closeCombat": { "name": "インファイト", - "effect": "守りを 捨てて 相手の ふところに 突撃する。 自分の 防御と 特防が さがる。" + "effect": "守りを　捨てて　相手の　ふところに　突撃する。　自分の　防御と　特防が　さがる。" }, "payback": { "name": "しっぺがえし", - "effect": "ためこんで 攻撃する。 相手より あとに 攻撃できると 技の 威力は ２倍に なる。" + "effect": "ためこんで　攻撃する。　相手より　あとに　攻撃できると　技の　威力は　２倍に　なる。" }, "assurance": { "name": "ダメおし", - "effect": "そのターンに 相手が すでに ダメージを 受けていたら 技の 威力は ２倍に なる。" + "effect": "そのターンに　相手が　すでに　ダメージを　受けていたら　技の　威力は　２倍に　なる。" }, "embargo": { "name": "さしおさえ", - "effect": "持たせた 道具を ５ターンの 間 使えなくする。 トレーナーも その ポケモンには 道具を 使えない。" + "effect": "持たせた　道具を　５ターンの　間　使えなくする。　トレーナーも　その　ポケモンには　道具を　使えない。" }, "fling": { "name": "なげつける", - "effect": "持たせた 道具を 素早く 投げつけて 攻撃する。 道具で 威力と 効果が 変わる。" + "effect": "持たせた　道具を　素早く　投げつけて　攻撃する。　道具で　威力と　効果が　変わる。" }, "psychoShift": { "name": "サイコシフト", - "effect": "超能力で 暗示を かけて 自分の 受けている 状態異常を 相手に うつす。" + "effect": "超能力で　暗示を　かけて　自分の　受けている　状態異常を　相手に　うつす。" }, "trumpCard": { "name": "きりふだ", - "effect": "きりふだの 残り ＰＰが 少なければ 少ないほど 技の 威力が あがる。" + "effect": "きりふだの　残り　ＰＰが　少なければ　少ないほど　技の　威力が　あがる。" }, "healBlock": { "name": "かいふくふうじ", - "effect": "５ターンの 間 技や 特性や 持っている 道具によって ＨＰを 回復 できなくする。" + "effect": "５ターンの　間　技や　特性や　持っている　道具によって　ＨＰを　回復　できなくする。" }, "wringOut": { "name": "しぼりとる", - "effect": "強く 締めあげて 攻撃を する。 相手の ＨＰが 残っているほど 威力は あがる。" + "effect": "強く　締めあげて　攻撃を　する。　相手の　ＨＰが　残っているほど　威力は　あがる。" }, "powerTrick": { "name": "パワートリック", - "effect": "超能力で 自分の 攻撃と 防御の 力を 交換する。" + "effect": "超能力で　自分の　攻撃と　防御の　力を　交換する。" }, "gastroAcid": { "name": "いえき", - "effect": "胃液を 相手の 体に 吐きつける。 ついた 胃液は 相手の 特性の 効果を 消す。" + "effect": "胃液を　相手の　体に　吐きつける。　ついた　胃液は　相手の　特性の　効果を　消す。" }, "luckyChant": { "name": "おまじない", - "effect": "天に むかって おいのりを ささげ ５ターンの 間 相手の 攻撃を 急所に 当たらなくする。" + "effect": "天に　むかって　おいのりを　ささげ　５ターンの　間　相手の　攻撃を　急所に　当たらなくする。" }, "meFirst": { "name": "さきどり", - "effect": "威力を あげて 相手が だそうとする 技を 先にだす。 先に だせないと 失敗する。" + "effect": "威力を　あげて　相手が　だそうとする　技を　先にだす。　先に　だせないと　失敗する。" }, "copycat": { "name": "まねっこ", - "effect": "直前に でた 技を まねして 同じ 技を だす。 技が でていないと 失敗する。" + "effect": "直前に　でた　技を　まねして　同じ　技を　だす。　技が　でていないと　失敗する。" }, "powerSwap": { "name": "パワースワップ", - "effect": "超能力で 自分と 相手の 攻撃と 特攻の 能力変化を 入れ替える。" + "effect": "超能力で　自分と　相手の　攻撃と　特攻の　能力変化を　入れ替える。" }, "guardSwap": { "name": "ガードスワップ", - "effect": "超能力で 自分と 相手の 防御と 特防の 能力変化を 入れ替える。" + "effect": "超能力で　自分と　相手の　防御と　特防の　能力変化を　入れ替える。" }, "punishment": { "name": "おしおき", - "effect": "能力変化で 相手が パワーアップ しているほど 技の 威力が あがる。" + "effect": "能力変化で　相手が　パワーアップ　しているほど　技の　威力が　あがる。" }, "lastResort": { "name": "とっておき", - "effect": "戦闘中に おぼえている 技を すべて 使うと はじめて だせる とっておきの 技。" + "effect": "戦闘中に　おぼえている　技を　すべて　使うと　はじめて　だせる　とっておきの　技。" }, "worrySeed": { "name": "なやみのタネ", - "effect": "心を なやませる タネを 植えつける。 相手を 眠れなくして 特性を ふみんに する。" + "effect": "心を　なやませる　タネを　植えつける。　相手を　眠れなくして　特性を　ふみんに　する。" }, "suckerPunch": { "name": "ふいうち", - "effect": "相手より 先に 攻撃 できる。 相手が だす技が 攻撃技でないと 失敗する。" + "effect": "相手より　先に　攻撃　できる。　相手が　だす技が　攻撃技でないと　失敗する。" }, "toxicSpikes": { "name": "どくびし", - "effect": "相手の 足下に どくびしを しかける。 交代で でてきた 相手の ポケモンに 毒を おわせる。" + "effect": "相手の　足下に　どくびしを　しかける。　交代で　でてきた　相手の　ポケモンに　毒を　おわせる。" }, "heartSwap": { "name": "ハートスワップ", - "effect": "超能力で 自分と 相手に かかっている 能力変化を 入れ替える。" + "effect": "超能力で　自分と　相手に　かかっている　能力変化を　入れ替える。" }, "aquaRing": { "name": "アクアリング", - "effect": "自分の 体の 周りを 水で つくった ベールで おおう。 毎ターン ＨＰを 回復する。" + "effect": "自分の　体の　周りを　水で　つくった　ベールで　おおう。　毎ターン　ＨＰを　回復する。" }, "magnetRise": { "name": "でんじふゆう", - "effect": "電気で つくった 磁力の 力で 宙に 浮かぶ。 ５ターンの 間 浮遊できる。" + "effect": "電気で　つくった　磁力の　力で　宙に　浮かぶ。　５ターンの　間　浮遊できる。" }, "flareBlitz": { "name": "フレアドライブ", - "effect": "炎を まとって 突進する。 自分も かなり ダメージを 受ける。 やけど状態に することが ある。" + "effect": "炎を　まとって　突進する。　自分も　かなり　ダメージを　受ける。　やけど状態に　することが　ある。" }, "forcePalm": { "name": "はっけい", - "effect": "相手の 体に 衝撃波を 当てて 攻撃する。 まひ状態に することが ある。" + "effect": "相手の　体に　衝撃波を　当てて　攻撃する。　まひ状態に　することが　ある。" }, "auraSphere": { "name": "はどうだん", - "effect": "体の 奥から 波導の 力を 相手に うち放つ。 攻撃は 必ず 命中する。" + "effect": "体の　奥から　波導の　力を　相手に　うち放つ。　攻撃は　必ず　命中する。" }, "rockPolish": { "name": "ロックカット", - "effect": "自分の 体を 磨いて 空気の 抵抗を 少なくする。素早さを ぐーんと あげることが できる。" + "effect": "自分の　体を　磨いて　空気の　抵抗を　少なくする。素早さを　ぐーんと　あげることが　できる。" }, "poisonJab": { "name": "どくづき", - "effect": "毒に そまった 触手や 腕で 相手を 突き刺す。 毒状態に することが ある。" + "effect": "毒に　そまった　触手や　腕で　相手を　突き刺す。　毒状態に　することが　ある。" }, "darkPulse": { "name": "あくのはどう", - "effect": "体から 悪意に みちた 恐ろしい オーラを 発する。 相手を ひるませることが ある。" + "effect": "体から　悪意に　みちた　恐ろしい　オーラを　発する。　相手を　ひるませることが　ある。" }, "nightSlash": { "name": "つじぎり", - "effect": "一瞬の すきを ついて 相手を 切りはらう。 急所に 当たりやすい。" + "effect": "一瞬の　すきを　ついて　相手を　切りはらう。　急所に　当たりやすい。" }, "aquaTail": { "name": "アクアテール", - "effect": "激しく あれくるう 荒波の ように 大きな しっぽを ふって 相手を 攻撃する。" + "effect": "激しく　あれくるう　荒波の　ように　大きな　しっぽを　ふって　相手を　攻撃する。" }, "seedBomb": { "name": "タネばくだん", - "effect": "硬い 殻を もつ 大きな タネを 上から たたきつけて 相手を 攻撃する。" + "effect": "硬い　殻を　もつ　大きな　タネを　上から　たたきつけて　相手を　攻撃する。" }, "airSlash": { "name": "エアスラッシュ", - "effect": "空をも 切り裂く 空気の 刃で 攻撃する。 相手を ひるませることが ある。" + "effect": "空をも　切り裂く　空気の　刃で　攻撃する。　相手を　ひるませることが　ある。" }, "xScissor": { "name": "シザークロス", - "effect": "カマや ツメを ハサミのように 交差させながら 相手を 切り裂く。" + "effect": "カマや　ツメを　ハサミのように　交差させながら　相手を　切り裂く。" }, "bugBuzz": { "name": "むしのさざめき", - "effect": "振動で 音波を おこして 攻撃する。相手の 特防を さげることが ある。" + "effect": "振動で　音波を　おこして　攻撃する。相手の　特防を　さげることが　ある。" }, "dragonPulse": { "name": "りゅうのはどう", - "effect": "大きな 口から 衝撃波を まきおこして 相手を 攻撃する。" + "effect": "大きな　口から　衝撃波を　まきおこして　相手を　攻撃する。" }, "dragonRush": { "name": "ドラゴンダイブ", - "effect": "すさまじい 殺気で 威圧しながら 体当たりする。 相手を ひるませることが ある。" + "effect": "すさまじい　殺気で　威圧しながら　体当たりする。　相手を　ひるませることが　ある。" }, "powerGem": { "name": "パワージェム", - "effect": "宝石のように きらめく 光を 発射して 相手を 攻撃する。" + "effect": "宝石のように　きらめく　光を　発射して　相手を　攻撃する。" }, "drainPunch": { "name": "ドレインパンチ", - "effect": "こぶしから 相手の 力を 吸い取る。 与えた ダメージの 半分の ＨＰを 回復できる。" + "effect": "こぶしから　相手の　力を　吸い取る。　与えた　ダメージの　半分の　ＨＰを　回復できる。" }, "vacuumWave": { "name": "しんくうは", - "effect": "こぶしを ふって 真空の 波を まきおこす。 必ず 先制攻撃できる。" + "effect": "こぶしを　ふって　真空の　波を　まきおこす。　必ず　先制攻撃できる。" }, "focusBlast": { "name": "きあいだま", - "effect": "気合を 高めて ありったけの 力を 放出する。 相手の 特防を さげることが ある。" + "effect": "気合を　高めて　ありったけの　力を　放出する。　相手の　特防を　さげることが　ある。" }, "energyBall": { "name": "エナジーボール", - "effect": "自然から 集めた 命の力を 発射する。 相手の 特防を さげることがある。" + "effect": "自然から　集めた　命の力を　発射する。　相手の　特防を　さげることがある。" }, "braveBird": { "name": "ブレイブバード", - "effect": "はねを おりたたみ 低空飛行で 突撃する。 自分も かなり ダメージを 受ける。" + "effect": "はねを　おりたたみ　低空飛行で　突撃する。　自分も　かなり　ダメージを　受ける。" }, "earthPower": { "name": "だいちのちから", - "effect": "相手の 足下へ 大地の力を 放出する。相手の 特防を さげることが ある。" + "effect": "相手の　足下へ　大地の力を　放出する。相手の　特防を　さげることが　ある。" }, "switcheroo": { "name": "すりかえ", - "effect": "目にも とまらぬ 速さで 自分と 相手の 持ち物を 交換する。" + "effect": "目にも　とまらぬ　速さで　自分と　相手の　持ち物を　交換する。" }, "gigaImpact": { "name": "ギガインパクト", - "effect": "持てる 力を すべて 使って 相手に 突撃する。 次の ターンは 動けなくなる。" + "effect": "持てる　力を　すべて　使って　相手に　突撃する。　次の　ターンは　動けなくなる。" }, "nastyPlot": { "name": "わるだくみ", - "effect": "悪いことを 考えて 頭を 活性化させる。 自分の 特攻を ぐーんと あげる。" + "effect": "悪いことを　考えて　頭を　活性化させる。　自分の　特攻を　ぐーんと　あげる。" }, "bulletPunch": { "name": "バレットパンチ", - "effect": "弾丸の ような 速くて 硬い パンチを 相手に くりだす。 必ず 先制攻撃 できる。" + "effect": "弾丸の　ような　速くて　硬い　パンチを　相手に　くりだす。　必ず　先制攻撃　できる。" }, "avalanche": { "name": "ゆきなだれ", - "effect": "相手から 技を 受けていると その 相手に 対して 技の 威力が ２倍に なる。" + "effect": "相手から　技を　受けていると　その　相手に　対して　技の　威力が　２倍に　なる。" }, "iceShard": { "name": "こおりのつぶて", - "effect": "氷の塊を 一瞬で つくり 相手に 素早く 放つ。 必ず 先制攻撃 できる。" + "effect": "氷の塊を　一瞬で　つくり　相手に　素早く　放つ。　必ず　先制攻撃　できる。" }, "shadowClaw": { "name": "シャドークロー", - "effect": "影から つくった 鋭い ツメで 相手を 切り裂く。 急所に 当たりやすい。" + "effect": "影から　つくった　鋭い　ツメで　相手を　切り裂く。　急所に　当たりやすい。" }, "thunderFang": { "name": "かみなりのキバ", - "effect": "電気を ためた キバで かみつく。 相手を ひるませたり まひ状態に することが ある。" + "effect": "電気を　ためた　キバで　かみつく。　相手を　ひるませたり　まひ状態に　することが　ある。" }, "iceFang": { "name": "こおりのキバ", - "effect": "冷気を ひめた キバで かみつく。 相手を ひるませたり こおり状態に することが ある。" + "effect": "冷気を　ひめた　キバで　かみつく。　相手を　ひるませたり　こおり状態に　することが　ある。" }, "fireFang": { "name": "ほのおのキバ", - "effect": "炎を まとった キバで かみつく。 相手を ひるませたり やけど状態に することが ある。" + "effect": "炎を　まとった　キバで　かみつく。　相手を　ひるませたり　やけど状態に　することが　ある。" }, "shadowSneak": { "name": "かげうち", - "effect": "影を のばして 相手の 背後から 攻撃する。 必ず 先制攻撃 できる。" + "effect": "影を　のばして　相手の　背後から　攻撃する。　必ず　先制攻撃　できる。" }, "mudBomb": { "name": "どろばくだん", - "effect": "硬い 泥の 弾を 相手に 発射して 攻撃する。 命中率を さげることが ある。" + "effect": "硬い　泥の　弾を　相手に　発射して　攻撃する。　命中率を　さげることが　ある。" }, "psychoCut": { "name": "サイコカッター", - "effect": "実体化させた 心の 刃で 相手を 切り裂く。 急所に 当たりやすい。" + "effect": "実体化させた　心の　刃で　相手を　切り裂く。　急所に　当たりやすい。" }, "zenHeadbutt": { "name": "しねんのずつき", - "effect": "思念の 力を 額に 集めて 攻撃する。 相手を ひるませることが ある。" + "effect": "思念の　力を　額に　集めて　攻撃する。　相手を　ひるませることが　ある。" }, "mirrorShot": { "name": "ミラーショット", - "effect": "磨きあげられた 体から せん光の 力を 相手に 放つ。 命中率を さげることが ある。" + "effect": "磨きあげられた　体から　せん光の　力を　相手に　放つ。　命中率を　さげることが　ある。" }, "flashCannon": { "name": "ラスターカノン", - "effect": "体の 光を 一点に 集めて 力を 放つ。 相手の 特防を さげることが ある。" + "effect": "体の　光を　一点に　集めて　力を　放つ。　相手の　特防を　さげることが　ある。" }, "rockClimb": { "name": "ロッククライム", - "effect": "すごい 勢いで 相手に つっこみ 攻撃する。 相手を 混乱させることが ある。" + "effect": "すごい　勢いで　相手に　つっこみ　攻撃する。　相手を　混乱させることが　ある。" }, "defog": { "name": "きりばらい", - "effect": "強い風で 相手の リフレクターや ひかりのかべ などを はらいのける。 回避率も さげる。" + "effect": "強い風で　相手の　リフレクターや　ひかりのかべ　などを　はらいのける。　回避率も　さげる。" }, "trickRoom": { "name": "トリックルーム", - "effect": "まか不思議な 空間を つくる。 ５ターンの 間 遅い ポケモンから 行動できる。" + "effect": "まか不思議な　空間を　つくる。　５ターンの　間　遅い　ポケモンから　行動できる。" }, "dracoMeteor": { "name": "りゅうせいぐん", - "effect": "天空から 隕石を 相手に 落とす。使うと 反動で 自分の 特攻が がくっと さがる。" + "effect": "天空から　隕石を　相手に　落とす。使うと　反動で　自分の　特攻が　がくっと　さがる。" }, "discharge": { "name": "ほうでん", - "effect": "まばゆい 電撃で 自分の 周りに いるものを 攻撃する。 まひ状態に することが ある。" + "effect": "まばゆい　電撃で　自分の　周りに　いるものを　攻撃する。　まひ状態に　することが　ある。" }, "lavaPlume": { "name": "ふんえん", - "effect": "真っ赤な 炎で 自分の 周りに いるものを 攻撃する。 やけど状態に することが ある。" + "effect": "真っ赤な　炎で　自分の　周りに　いるものを　攻撃する。　やけど状態に　することが　ある。" }, "leafStorm": { "name": "リーフストーム", - "effect": "とがった はっぱで 相手に あらしを おこす。使うと 反動で 自分の 特攻が がくっと さがる。" + "effect": "とがった　はっぱで　相手に　あらしを　おこす。使うと　反動で　自分の　特攻が　がくっと　さがる。" }, "powerWhip": { "name": "パワーウィップ", - "effect": "ツタや 触手を 激しく ふるって 相手を たたきつけ 攻撃する。" + "effect": "ツタや　触手を　激しく　ふるって　相手を　たたきつけ　攻撃する。" }, "rockWrecker": { "name": "がんせきほう", - "effect": "巨大な 岩を 相手に 発射して 攻撃する。 次の ターンは 動けなくなる。" + "effect": "巨大な　岩を　相手に　発射して　攻撃する。　次の　ターンは　動けなくなる。" }, "crossPoison": { "name": "クロスポイズン", - "effect": "毒の 刃で 相手を 切り裂く。 毒状態に することが あり 急所にも 当たりやすい。" + "effect": "毒の　刃で　相手を　切り裂く。　毒状態に　することが　あり　急所にも　当たりやすい。" }, "gunkShot": { "name": "ダストシュート", - "effect": "汚い ゴミを 相手に ぶつけて 攻撃する。 毒状態に することが ある。" + "effect": "汚い　ゴミを　相手に　ぶつけて　攻撃する。　毒状態に　することが　ある。" }, "ironHead": { "name": "アイアンヘッド", - "effect": "鋼の ような 硬い 頭で 攻撃する。 相手を ひるませることが ある。" + "effect": "鋼の　ような　硬い　頭で　攻撃する。　相手を　ひるませることが　ある。" }, "magnetBomb": { "name": "マグネットボム", - "effect": "相手に 吸いつく 鋼の 爆弾を 発射する。 攻撃は 必ず 命中 する。" + "effect": "相手に　吸いつく　鋼の　爆弾を　発射する。　攻撃は　必ず　命中　する。" }, "stoneEdge": { "name": "ストーンエッジ", - "effect": "とがった 岩を 相手に 突き刺して 攻撃する。 急所に 当たりやすい。" + "effect": "とがった　岩を　相手に　突き刺して　攻撃する。　急所に　当たりやすい。" }, "captivate": { "name": "ゆうわく", - "effect": "♂なら♀を ♀なら♂を 誘惑して 相手の 特攻を がくっと さげる。" + "effect": "♂なら♀を　♀なら♂を　誘惑して　相手の　特攻を　がくっと　さげる。" }, "stealthRock": { "name": "ステルスロック", - "effect": "相手の 周りに 無数の 岩を 浮かべて 交代で でてきた 相手の ポケモンに ダメージを 与える。" + "effect": "相手の　周りに　無数の　岩を　浮かべて　交代で　でてきた　相手の　ポケモンに　ダメージを　与える。" }, "grassKnot": { "name": "くさむすび", - "effect": "草を からませて 相手を 転ばせる。相手が 重いほど 威力が あがる。" + "effect": "草を　からませて　相手を　転ばせる。相手が　重いほど　威力が　あがる。" }, "chatter": { "name": "おしゃべり", - "effect": "とても うるさい おしゃべりの 音波で 相手を 攻撃する。 相手を 混乱させる。" + "effect": "とても　うるさい　おしゃべりの　音波で　相手を　攻撃する。　相手を　混乱させる。" }, "judgment": { "name": "さばきのつぶて", - "effect": "無数の 光弾を 相手に 放出する。 自分の 持つ プレートに より タイプが 変わる。" + "effect": "無数の　光弾を　相手に　放出する。　自分の　持つ　プレートに　より　タイプが　変わる。" }, "bugBite": { "name": "むしくい", - "effect": "かみついて 攻撃する。 相手が きのみを 持っているとき 食べて きのみの 効果を 受けられる。" + "effect": "かみついて　攻撃する。　相手が　きのみを　持っているとき　食べて　きのみの　効果を　受けられる。" }, "chargeBeam": { "name": "チャージビーム", - "effect": "電撃の 束を 相手に 発射する。電気を ためて 自分の 特攻を あげることが ある。" + "effect": "電撃の　束を　相手に　発射する。電気を　ためて　自分の　特攻を　あげることが　ある。" }, "woodHammer": { "name": "ウッドハンマー", - "effect": "硬い 胴体を 相手に たたきつけて 攻撃する。 自分も かなり ダメージを 受ける。" + "effect": "硬い　胴体を　相手に　たたきつけて　攻撃する。　自分も　かなり　ダメージを　受ける。" }, "aquaJet": { "name": "アクアジェット", - "effect": "目にも 留まらぬ ものすごい 速さで 相手に つっこむ。 必ず 先制攻撃 できる。" + "effect": "目にも　留まらぬ　ものすごい　速さで　相手に　つっこむ。　必ず　先制攻撃　できる。" }, "attackOrder": { "name": "こうげきしれい", - "effect": "しもべを 呼びだして 相手に むかって 攻撃させる。 急所に 当たりやすい。" + "effect": "しもべを　呼びだして　相手に　むかって　攻撃させる。　急所に　当たりやすい。" }, "defendOrder": { "name": "ぼうぎょしれい", - "effect": "しもべを 呼びだして 自分の 体に おおい つかせる。防御と 特防を あげることが できる。" + "effect": "しもべを　呼びだして　自分の　体に　おおい　つかせる。防御と　特防を　あげることが　できる。" }, "healOrder": { "name": "かいふくしれい", - "effect": "しもべを 呼びだして きずを 治す。 最大ＨＰの 半分 自分の ＨＰを 回復する。" + "effect": "しもべを　呼びだして　きずを　治す。　最大ＨＰの　半分　自分の　ＨＰを　回復する。" }, "headSmash": { "name": "もろはのずつき", - "effect": "命を 懸けて こん身の 力で 相手に ずつきを する。 自分も ものすごい ダメージを 受ける。" + "effect": "命を　懸けて　こん身の　力で　相手に　ずつきを　する。　自分も　ものすごい　ダメージを　受ける。" }, "doubleHit": { "name": "ダブルアタック", - "effect": "しっぽなどを 使い 相手を たたいて 攻撃する。 ２回連続で ダメージを 与える。" + "effect": "しっぽなどを　使い　相手を　たたいて　攻撃する。　２回連続で　ダメージを　与える。" }, "roarOfTime": { "name": "ときのほうこう", - "effect": "時間が ゆがむほどの 力を うちだして 相手を 攻撃する。 次の ターンは 動けなくなる。" + "effect": "時間が　ゆがむほどの　力を　うちだして　相手を　攻撃する。　次の　ターンは　動けなくなる。" }, "spacialRend": { "name": "あくうせつだん", - "effect": "周りの 空間ごと 相手を 引き裂き ダメージを 与える。 急所に 当たりやすい。" + "effect": "周りの　空間ごと　相手を　引き裂き　ダメージを　与える。　急所に　当たりやすい。" }, "lunarDance": { "name": "みかづきのまい", - "effect": "自分は ひんしに なるが 控えから でてくる ポケモンの すべての 状態を 回復する。" + "effect": "自分は　ひんしに　なるが　控えから　でてくる　ポケモンの　すべての　状態を　回復する。" }, "crushGrip": { "name": "にぎりつぶす", - "effect": "すさまじい 力で 相手を にぎりつぶす。 相手の ＨＰが 残っているほど 威力が あがる。" + "effect": "すさまじい　力で　相手を　にぎりつぶす。　相手の　ＨＰが　残っているほど　威力が　あがる。" }, "magmaStorm": { "name": "マグマストーム", - "effect": "激しく 燃えたぎる 炎の なかに ４ー５ターンの 間 相手を 閉じこめて 攻撃する。" + "effect": "激しく　燃えたぎる　炎の　なかに　４ー５ターンの　間　相手を　閉じこめて　攻撃する。" }, "darkVoid": { "name": "ダークホール", - "effect": "暗黒の 世界に ひきずり 落として 相手を 眠り状態に する。" + "effect": "暗黒の　世界に　ひきずり　落として　相手を　眠り状態に　する。" }, "seedFlare": { "name": "シードフレア", - "effect": "体の 中から 衝撃波を 発生させる。相手の 特防を がくっと さげることが ある。" + "effect": "体の　中から　衝撃波を　発生させる。相手の　特防を　がくっと　さげることが　ある。" }, "ominousWind": { "name": "あやしいかぜ", - "effect": "みのけも よだつ 突風で 相手を 攻撃する。自分の すべての 能力が あがることが ある。" + "effect": "みのけも　よだつ　突風で　相手を　攻撃する。自分の　すべての　能力が　あがることが　ある。" }, "shadowForce": { "name": "シャドーダイブ", - "effect": "１ターン目で 姿を 消して ２ターン目に 相手を 攻撃する。 守っていても 攻撃は 当たる。" + "effect": "１ターン目で　姿を　消して　２ターン目に　相手を　攻撃する。　守っていても　攻撃は　当たる。" }, "honeClaws": { "name": "つめとぎ", - "effect": "ツメを 磨いて 鋭く する。 自分の 攻撃と 命中率を あげる。" + "effect": "ツメを　磨いて　鋭く　する。　自分の　攻撃と　命中率を　あげる。" }, "wideGuard": { "name": "ワイドガード", - "effect": "味方全員に 当たる 攻撃を １ターンの 間 防ぐ。" + "effect": "味方全員に　当たる　攻撃を　１ターンの　間　防ぐ。" }, "guardSplit": { "name": "ガードシェア", - "effect": "超能力で 自分と 相手の 防御と 特防を たして 半分に わける。" + "effect": "超能力で　自分と　相手の　防御と　特防を　たして　半分に　わける。" }, "powerSplit": { "name": "パワーシェア", - "effect": "超能力で 自分と 相手の 攻撃と 特攻を たして 半分に わける。" + "effect": "超能力で　自分と　相手の　攻撃と　特攻を　たして　半分に　わける。" }, "wonderRoom": { "name": "ワンダールーム", - "effect": "まか不思議な 空間を つくる。 ５ターンのあいだ すべてのポケモンの 防御と 特防が 入れ替わる。" + "effect": "まか不思議な　空間を　つくる。　５ターンのあいだ　すべてのポケモンの　防御と　特防が　入れ替わる。" }, "psyshock": { "name": "サイコショック", - "effect": "不思議な 念波を 実体化して 相手を 攻撃する。 物理的な ダメージを 与える。" + "effect": "不思議な　念波を　実体化して　相手を　攻撃する。　物理的な　ダメージを　与える。" }, "venoshock": { "name": "ベノムショック", - "effect": "特殊な 毒液を 浴びせかける。 毒状態の 相手には 威力が ２倍に なる。" + "effect": "特殊な　毒液を　浴びせかける。　毒状態の　相手には　威力が　２倍に　なる。" }, "autotomize": { "name": "ボディパージ", - "effect": "体の ムダな 部分を 削る。 自分の 素早さを ぐーんと あげて 体重も 軽くなる。" + "effect": "体の　ムダな　部分を　削る。　自分の　素早さを　ぐーんと　あげて　体重も　軽くなる。" }, "ragePowder": { "name": "いかりのこな", - "effect": "イライラさせる 粉を 自分に ふりかけて 注意を ひく。 相手の 攻撃を すべて 自分に むける。" + "effect": "イライラさせる　粉を　自分に　ふりかけて　注意を　ひく。　相手の　攻撃を　すべて　自分に　むける。" }, "telekinesis": { "name": "テレキネシス", - "effect": "超能力で 相手を 浮かせる。 ３ターンの 間 攻撃が 相手に 当たりやすく なる。" + "effect": "超能力で　相手を　浮かせる。　３ターンの　間　攻撃が　相手に　当たりやすく　なる。" }, "magicRoom": { "name": "マジックルーム", - "effect": "まか不思議な 空間を つくる。 ５ターンの間 すべてのポケモンの 道具の 効果が なくなる。" + "effect": "まか不思議な　空間を　つくる。　５ターンの間　すべてのポケモンの　道具の　効果が　なくなる。" }, "smackDown": { "name": "うちおとす", - "effect": "石や 弾を 投げて 飛んでいる 相手を 攻撃する。 相手は うち落とされて 地面に 落ちる。" + "effect": "石や　弾を　投げて　飛んでいる　相手を　攻撃する。　相手は　うち落とされて　地面に　落ちる。" }, "stormThrow": { "name": "やまあらし", - "effect": "強烈な 一撃を 相手に くりだす。攻撃は 必ず 急所に 当たる。" + "effect": "強烈な　一撃を　相手に　くりだす。攻撃は　必ず　急所に　当たる。" }, "flameBurst": { "name": "はじけるほのお", - "effect": "当たると はじける 炎で 相手を 攻撃する。はじけた 炎は 隣の 相手にも ふりかかる。" + "effect": "当たると　はじける　炎で　相手を　攻撃する。はじけた　炎は　隣の　相手にも　ふりかかる。" }, "sludgeWave": { "name": "ヘドロウェーブ", - "effect": "ヘドロの 波で 自分の 周りに いるものを 攻撃する。 毒状態に することが ある。" + "effect": "ヘドロの　波で　自分の　周りに　いるものを　攻撃する。　毒状態に　することが　ある。" }, "quiverDance": { "name": "ちょうのまい", - "effect": "神秘的で 美しい 舞を 軽やかに おどる。 自分の 特攻と 特防と 素早さを あげる。" + "effect": "神秘的で　美しい　舞を　軽やかに　おどる。　自分の　特攻と　特防と　素早さを　あげる。" }, "heavySlam": { "name": "ヘビーボンバー", - "effect": "重たい 体で 相手に ぶつかって 攻撃する。 自分が 相手より 重いほど 威力が あがる。" + "effect": "重たい　体で　相手に　ぶつかって　攻撃する。　自分が　相手より　重いほど　威力が　あがる。" }, "synchronoise": { "name": "シンクロノイズ", - "effect": "不思議な 電波で 周りに いる 自分と 同じ タイプの ポケモンに ダメージを 与える。" + "effect": "不思議な　電波で　周りに　いる　自分と　同じ　タイプの　ポケモンに　ダメージを　与える。" }, "electroBall": { "name": "エレキボール", - "effect": "電気の 塊を 相手に ぶつける。相手より 素早さが 速いほど 威力が あがる。" + "effect": "電気の　塊を　相手に　ぶつける。相手より　素早さが　速いほど　威力が　あがる。" }, "soak": { "name": "みずびたし", - "effect": "たくさんの 水を 浴びせかけて 相手を みずタイプに する。" + "effect": "たくさんの　水を　浴びせかけて　相手を　みずタイプに　する。" }, "flameCharge": { "name": "ニトロチャージ", - "effect": "炎を まとい 相手を 攻撃する。 力を ためて 自分の 素早さを あげる。" + "effect": "炎を　まとい　相手を　攻撃する。　力を　ためて　自分の　素早さを　あげる。" }, "coil": { "name": "とぐろをまく", - "effect": "とぐろを まいて 集中する。 自分の 攻撃と 防御と 命中率を あげる。" + "effect": "とぐろを　まいて　集中する。　自分の　攻撃と　防御と　命中率を　あげる。" }, "lowSweep": { "name": "ローキック", - "effect": "素早い 動きで 相手の 足を ねらって 攻撃する。 相手の 素早さを さげる。" + "effect": "素早い　動きで　相手の　足を　ねらって　攻撃する。　相手の　素早さを　さげる。" }, "acidSpray": { "name": "アシッドボム", - "effect": "相手を とかす 液体を 吐きだして 攻撃する。 相手の 特防を がくっと さげる。" + "effect": "相手を　とかす　液体を　吐きだして　攻撃する。　相手の　特防を　がくっと　さげる。" }, "foulPlay": { "name": "イカサマ", - "effect": "相手の 力を 利用する。 戦っている 相手の 攻撃が 高いほど ダメージが あがる。" + "effect": "相手の　力を　利用する。　戦っている　相手の　攻撃が　高いほど　ダメージが　あがる。" }, "simpleBeam": { "name": "シンプルビーム", - "effect": "なぞの 念波を 相手に 送る。 念波を 受けとった 相手は 特性が たんじゅんに なる。" + "effect": "なぞの　念波を　相手に　送る。　念波を　受けとった　相手は　特性が　たんじゅんに　なる。" }, "entrainment": { "name": "なかまづくり", - "effect": "不思議な リズムで おどる。 動きを まねさせて 自分と 相手の 特性を 同じに する。" + "effect": "不思議な　リズムで　おどる。　動きを　まねさせて　自分と　相手の　特性を　同じに　する。" }, "afterYou": { "name": "おさきにどうぞ", - "effect": "相手の 行動を サポートして 自分の 行動の あとに 続けて 動けるように する。" + "effect": "相手の　行動を　サポートして　自分の　行動の　あとに　続けて　動けるように　する。" }, "round": { "name": "りんしょう", - "effect": "歌で 相手を 攻撃する。 みんなで 輪唱すると 続けて だすことが でき 威力も あがる。" + "effect": "歌で　相手を　攻撃する。　みんなで　輪唱すると　続けて　だすことが　でき　威力も　あがる。" }, "echoedVoice": { "name": "エコーボイス", - "effect": "響く 声で 相手を 攻撃する。 毎ターン だれかが 技を 使い続けると 威力が あがる。" + "effect": "響く　声で　相手を　攻撃する。　毎ターン　だれかが　技を　使い続けると　威力が　あがる。" }, "chipAway": { "name": "なしくずし", - "effect": "すきを みて 堅実に 攻撃する。 相手の 能力変化に 関係なく ダメージを 与える。" + "effect": "すきを　みて　堅実に　攻撃する。　相手の　能力変化に　関係なく　ダメージを　与える。" }, "clearSmog": { "name": "クリアスモッグ", - "effect": "特殊な 泥の 塊を 相手に 投げつけて 攻撃する。 能力変化を もとに もどす。" + "effect": "特殊な　泥の　塊を　相手に　投げつけて　攻撃する。　能力変化を　もとに　もどす。" }, "storedPower": { "name": "アシストパワー", - "effect": "蓄積された パワーで 相手を 攻撃する。自分の 能力が あがっているほど 威力が あがる。" + "effect": "蓄積された　パワーで　相手を　攻撃する。自分の　能力が　あがっているほど　威力が　あがる。" }, "quickGuard": { "name": "ファストガード", - "effect": "自分と 味方を 相手の 先制攻撃から 守る。" + "effect": "自分と　味方を　相手の　先制攻撃から　守る。" }, "allySwitch": { "name": "サイドチェンジ", - "effect": "不思議な 力で テレポートして 自分と 味方の 居場所を 入れ替える。" + "effect": "不思議な　力で　テレポートして　自分と　味方の　居場所を　入れ替える。" }, "scald": { "name": "ねっとう", - "effect": "熱く 煮えたぎる 水を 相手に 発射して 攻撃する。 やけど状態に することが ある。" + "effect": "熱く　煮えたぎる　水を　相手に　発射して　攻撃する。　やけど状態に　することが　ある。" }, "shellSmash": { "name": "からをやぶる", - "effect": "殻を やぶって 自分の 防御 特防を さげるが 攻撃 特攻 素早さを ぐーんと あげる。" + "effect": "殻を　やぶって　自分の　防御　特防を　さげるが　攻撃　特攻　素早さを　ぐーんと　あげる。" }, "healPulse": { "name": "いやしのはどう", - "effect": "いやしのはどうを とばして 最大ＨＰの 半分 相手の ＨＰを 回復する。" + "effect": "いやしのはどうを　とばして　最大ＨＰの　半分　相手の　ＨＰを　回復する。" }, "hex": { "name": "たたりめ", - "effect": "たたみかける ように 攻撃する。 状態異常の 相手に 大きな ダメージを 与える。" + "effect": "たたみかける　ように　攻撃する。　状態異常の　相手に　大きな　ダメージを　与える。" }, "skyDrop": { "name": "フリーフォール", - "effect": "１ターン目で 相手を 空へ 連れさり ２ターン目に 落として 攻撃する。 連れさられた 相手は 動けない。" + "effect": "１ターン目で　相手を　空へ　連れさり　２ターン目に　落として　攻撃する。　連れさられた　相手は　動けない。" }, "shiftGear": { "name": "ギアチェンジ", - "effect": "歯車を 回して 自分の 攻撃を あげる だけでなく 素早さも ぐーんと あげる。" + "effect": "歯車を　回して　自分の　攻撃を　あげる　だけでなく　素早さも　ぐーんと　あげる。" }, "circleThrow": { "name": "ともえなげ", - "effect": "相手を 投げとばして 控えの ポケモンを ひきずりだす。 野生の 場合は 戦闘が 終わる。" + "effect": "相手を　投げとばして　控えの　ポケモンを　ひきずりだす。　野生の　場合は　戦闘が　終わる。" }, "incinerate": { "name": "やきつくす", - "effect": "炎で 相手を 攻撃する。 相手が きのみなどを 持っているとき 燃やして 使えなくする。" + "effect": "炎で　相手を　攻撃する。　相手が　きのみなどを　持っているとき　燃やして　使えなくする。" }, "quash": { "name": "さきおくり", - "effect": "相手を おさえつけて 行動の 順番を 最後に する。" + "effect": "相手を　おさえつけて　行動の　順番を　最後に　する。" }, "acrobatics": { "name": "アクロバット", - "effect": "軽やかに 相手を 攻撃する。 自分が 道具を 持っていないとき 大きな ダメージを 与える。" + "effect": "軽やかに　相手を　攻撃する。　自分が　道具を　持っていないとき　大きな　ダメージを　与える。" }, "reflectType": { "name": "ミラータイプ", - "effect": "相手の タイプを 反射して 自分も 同じ タイプに なる。" + "effect": "相手の　タイプを　反射して　自分も　同じ　タイプに　なる。" }, "retaliate": { "name": "かたきうち", - "effect": "倒れた 味方の かたきを 討つ。 前の ターンに 味方が 倒されていると 威力が あがる。" + "effect": "倒れた　味方の　かたきを　討つ。　前の　ターンに　味方が　倒されていると　威力が　あがる。" }, "finalGambit": { "name": "いのちがけ", - "effect": "命懸けで 相手を 攻撃する。 自分は ひんしに なるが 相手に ＨＰ分の ダメージを 与える。" + "effect": "命懸けで　相手を　攻撃する。　自分は　ひんしに　なるが　相手に　ＨＰ分の　ダメージを　与える。" }, "bestow": { "name": "ギフトパス", - "effect": "相手が 道具を 持っていないとき 自分が 持っている 道具を 相手に わたす。" + "effect": "相手が　道具を　持っていないとき　自分が　持っている　道具を　相手に　わたす。" }, "inferno": { "name": "れんごく", - "effect": "激しい 炎で 相手を 包みこみ 攻撃する。 やけど状態に する。" + "effect": "激しい　炎で　相手を　包みこみ　攻撃する。　やけど状態に　する。" }, "waterPledge": { "name": "みずのちかい", - "effect": "水の柱で 攻撃する。 ほのおと 組みあわせると 威力が あがって 空に にじが かかる。" + "effect": "水の柱で　攻撃する。　ほのおと　組みあわせると　威力が　あがって　空に　にじが　かかる。" }, "firePledge": { "name": "ほのおのちかい", - "effect": "炎の柱で 攻撃する。 くさと 組みあわせると 威力が あがって 周りが 火の海に なる。" + "effect": "炎の柱で　攻撃する。　くさと　組みあわせると　威力が　あがって　周りが　火の海に　なる。" }, "grassPledge": { "name": "くさのちかい", - "effect": "草の柱で 攻撃する。 みずと 組みあわせると 威力が あがって あたりが 湿原に なる。" + "effect": "草の柱で　攻撃する。　みずと　組みあわせると　威力が　あがって　あたりが　湿原に　なる。" }, "voltSwitch": { "name": "ボルトチェンジ", - "effect": "攻撃したあと ものすごい スピードで もどってきて 控えの ポケモンと 入れ替わる。" + "effect": "攻撃したあと　ものすごい　スピードで　もどってきて　控えの　ポケモンと　入れ替わる。" }, "struggleBug": { "name": "むしのていこう", - "effect": "抵抗して 相手を 攻撃する。 相手の 特攻を さげる。" + "effect": "抵抗して　相手を　攻撃する。　相手の　特攻を　さげる。" }, "bulldoze": { "name": "じならし", - "effect": "地面を 踏みならして 自分の 周りに いるものを 攻撃する。 相手の 素早さを さげる。" + "effect": "地面を　踏みならして　自分の　周りに　いるものを　攻撃する。　相手の　素早さを　さげる。" }, "frostBreath": { "name": "こおりのいぶき", - "effect": "冷たい 息を 相手に 吹きつけて 攻撃する。 必ず 急所に 当たる。" + "effect": "冷たい　息を　相手に　吹きつけて　攻撃する。　必ず　急所に　当たる。" }, "dragonTail": { "name": "ドラゴンテール", - "effect": "相手を はじきとばして 控えの ポケモンを ひきずりだす。 野生の 場合は 戦闘が 終わる。" + "effect": "相手を　はじきとばして　控えの　ポケモンを　ひきずりだす。　野生の　場合は　戦闘が　終わる。" }, "workUp": { "name": "ふるいたてる", - "effect": "自分を 奮いたてて 攻撃と 特攻を あげる。" + "effect": "自分を　奮いたてて　攻撃と　特攻を　あげる。" }, "electroweb": { "name": "エレキネット", - "effect": "電気の ネットで 相手を 捕まえて 攻撃する。 相手の 素早さを さげる。" + "effect": "電気の　ネットで　相手を　捕まえて　攻撃する。　相手の　素早さを　さげる。" }, "wildCharge": { "name": "ワイルドボルト", - "effect": "電気を まとって 相手に ぶつかって 攻撃する。 自分も 少し ダメージを 受ける。" + "effect": "電気を　まとって　相手に　ぶつかって　攻撃する。　自分も　少し　ダメージを　受ける。" }, "drillRun": { "name": "ドリルライナー", - "effect": "ドリルのように 体を 回転しながら 相手に 体当たりする。 急所に 当たりやすい。" + "effect": "ドリルのように　体を　回転しながら　相手に　体当たりする。　急所に　当たりやすい。" }, "dualChop": { "name": "ダブルチョップ", - "effect": "体の 硬い部分で 相手を たたいて 攻撃する。 ２回連続で ダメージを 与える。" + "effect": "体の　硬い部分で　相手を　たたいて　攻撃する。　２回連続で　ダメージを　与える。" }, "heartStamp": { "name": "ハートスタンプ", - "effect": "かわいい しぐさで 油断させて 強烈な 一撃を 浴びせる。 相手を ひるませることが ある。" + "effect": "かわいい　しぐさで　油断させて　強烈な　一撃を　浴びせる。　相手を　ひるませることが　ある。" }, "hornLeech": { "name": "ウッドホーン", - "effect": "つのを 突き刺して 相手の 養分を 吸い取る。 与えた ダメージの 半分の ＨＰを 回復できる。" + "effect": "つのを　突き刺して　相手の　養分を　吸い取る。　与えた　ダメージの　半分の　ＨＰを　回復できる。" }, "sacredSword": { "name": "せいなるつるぎ", - "effect": "長い つので 切りつけ 攻撃する。 相手の 能力変化に 関係なく ダメージを 与える。" + "effect": "長い　つので　切りつけ　攻撃する。　相手の　能力変化に　関係なく　ダメージを　与える。" }, "razorShell": { "name": "シェルブレード", - "effect": "鋭い 貝殻で 切りつけて 攻撃する。 相手の 防御を さげることが ある。" + "effect": "鋭い　貝殻で　切りつけて　攻撃する。　相手の　防御を　さげることが　ある。" }, "heatCrash": { "name": "ヒートスタンプ", - "effect": "燃える 体で 相手に ぶつかって 攻撃する。 自分が 相手より 重いほど 威力が あがる。" + "effect": "燃える　体で　相手に　ぶつかって　攻撃する。　自分が　相手より　重いほど　威力が　あがる。" }, "leafTornado": { "name": "グラスミキサー", - "effect": "鋭い はっぱで 相手を 包みこんで 攻撃する。 命中率を さげることが ある。" + "effect": "鋭い　はっぱで　相手を　包みこんで　攻撃する。　命中率を　さげることが　ある。" }, "steamroller": { "name": "ハードローラー", - "effect": "まるめた 体で 回転して 相手を おしつぶす。 相手を ひるませることが ある。" + "effect": "まるめた　体で　回転して　相手を　おしつぶす。　相手を　ひるませることが　ある。" }, "cottonGuard": { "name": "コットンガード", - "effect": "フワフワの 綿毛で 自分の 体を 包みこんで 守る。 防御を ぐぐーんと あげる。" + "effect": "フワフワの　綿毛で　自分の　体を　包みこんで　守る。　防御を　ぐぐーんと　あげる。" }, "nightDaze": { "name": "ナイトバースト", - "effect": "暗黒の 衝撃波を とばして 相手を 攻撃する。 命中率を さげることが ある。" + "effect": "暗黒の　衝撃波を　とばして　相手を　攻撃する。　命中率を　さげることが　ある。" }, "psystrike": { "name": "サイコブレイク", - "effect": "不思議な 念波を 実体化して 相手を 攻撃する。 物理的な ダメージを 与える。" + "effect": "不思議な　念波を　実体化して　相手を　攻撃する。　物理的な　ダメージを　与える。" }, "tailSlap": { "name": "スイープビンタ", - "effect": "硬い しっぽで 相手を たたいて 攻撃する。 ２ー５回の 間 連続で だす。" + "effect": "硬い　しっぽで　相手を　たたいて　攻撃する。　２ー５回の　間　連続で　だす。" }, "hurricane": { "name": "ぼうふう", - "effect": "強烈な 風で 相手を 包みこんで 攻撃する。 相手を 混乱させることが ある。" + "effect": "強烈な　風で　相手を　包みこんで　攻撃する。　相手を　混乱させることが　ある。" }, "headCharge": { "name": "アフロブレイク", - "effect": "すごい アフロの 頭で 相手に 突進して 攻撃する。 自分も 少し ダメージを 受ける。" + "effect": "すごい　アフロの　頭で　相手に　突進して　攻撃する。　自分も　少し　ダメージを　受ける。" }, "gearGrind": { "name": "ギアソーサー", - "effect": "鋼鉄の ギアを 相手に 投げつけて 攻撃する。 ２回連続で ダメージを 与える。" + "effect": "鋼鉄の　ギアを　相手に　投げつけて　攻撃する。　２回連続で　ダメージを　与える。" }, "searingShot": { "name": "かえんだん", - "effect": "真っ赤な 炎で 自分の 周りに いるものを 攻撃する。 やけど状態に することが ある。" + "effect": "真っ赤な　炎で　自分の　周りに　いるものを　攻撃する。　やけど状態に　することが　ある。" }, "technoBlast": { "name": "テクノバスター", - "effect": "光弾を 相手に 放出する。 自分の 持つ カセットにより タイプが 変わる。" + "effect": "光弾を　相手に　放出する。　自分の　持つ　カセットにより　タイプが　変わる。" }, "relicSong": { "name": "いにしえのうた", - "effect": "いにしえのうたを 相手に 聞かせて 心に うったえて 攻撃する。 眠り状態に することが ある。" + "effect": "いにしえのうたを　相手に　聞かせて　心に　うったえて　攻撃する。　眠り状態に　することが　ある。" }, "secretSword": { "name": "しんぴのつるぎ", - "effect": "長い つので 切りつけ 攻撃する。 つのが まとった 不思議な 力は 物理的な ダメージを 与える。" + "effect": "長い　つので　切りつけ　攻撃する。　つのが　まとった　不思議な　力は　物理的な　ダメージを　与える。" }, "glaciate": { "name": "こごえるせかい", - "effect": "凍えるような 冷気を 相手に 吹きつけて 攻撃する。 相手の 素早さを さげる。" + "effect": "凍えるような　冷気を　相手に　吹きつけて　攻撃する。　相手の　素早さを　さげる。" }, "boltStrike": { "name": "らいげき", - "effect": "ぼうだいな 電気を 身に まとって 相手に 突進して 攻撃する。 まひ状態に することが ある。" + "effect": "ぼうだいな　電気を　身に　まとって　相手に　突進して　攻撃する。　まひ状態に　することが　ある。" }, "blueFlare": { "name": "あおいほのお", - "effect": "美しくも 激しい 青い炎で 相手を 包みこんで 攻撃する。 やけど状態に することが ある。" + "effect": "美しくも　激しい　青い炎で　相手を　包みこんで　攻撃する。　やけど状態に　することが　ある。" }, "fieryDance": { "name": "ほのおのまい", - "effect": "炎を まとい はばたいて 相手を 攻撃する。自分の 特攻が あがることが ある。" + "effect": "炎を　まとい　はばたいて　相手を　攻撃する。自分の　特攻が　あがることが　ある。" }, "freezeShock": { "name": "フリーズボルト", - "effect": "電気を まとった 氷の 塊で ２ターン目に 相手を たたきつける。 まひ状態に することが ある。" + "effect": "電気を　まとった　氷の　塊で　２ターン目に　相手を　たたきつける。　まひ状態に　することが　ある。" }, "iceBurn": { "name": "コールドフレア", - "effect": "すべてを 凍らせる 激しい 冷気で ２ターン目に 相手を 包みこむ。 やけど状態に することが ある。" + "effect": "すべてを　凍らせる　激しい　冷気で　２ターン目に　相手を　包みこむ。　やけど状態に　することが　ある。" }, "snarl": { "name": "バークアウト", - "effect": "まくしたてる ように 怒鳴りつけて 相手の 特攻を さげる。" + "effect": "まくしたてる　ように　怒鳴りつけて　相手の　特攻を　さげる。" }, "icicleCrash": { "name": "つららおとし", - "effect": "大きな 氷柱を 激しく ぶつけて 攻撃する。 相手を ひるませることが ある。" + "effect": "大きな　氷柱を　激しく　ぶつけて　攻撃する。　相手を　ひるませることが　ある。" }, "vCreate": { "name": "Ｖジェネレート", - "effect": "灼熱の 炎を 額から 発生させて 捨て身の 体当たり。 防御 特防 素早さが さがる。" + "effect": "灼熱の　炎を　額から　発生させて　捨て身の　体当たり。　防御　特防　素早さが　さがる。" }, "fusionFlare": { "name": "クロスフレイム", - "effect": "巨大な 炎を たたきつける。 巨大な 雷の 影響を受け 技の 威力が あがる。" + "effect": "巨大な　炎を　たたきつける。　巨大な　雷の　影響を受け　技の　威力が　あがる。" }, "fusionBolt": { "name": "クロスサンダー", - "effect": "巨大な 雷を たたきつける。 巨大な 炎の 影響を受け 技の 威力が あがる。" + "effect": "巨大な　雷を　たたきつける。　巨大な　炎の　影響を受け　技の　威力が　あがる。" }, "flyingPress": { "name": "フライングプレス", - "effect": "空中から 相手に ダイブする。 この技は かくとうタイプと 同時に ひこうタイプでも ある。" + "effect": "空中から　相手に　ダイブする。　この技は　かくとうタイプと　同時に　ひこうタイプでも　ある。" }, "matBlock": { "name": "たたみがえし", - "effect": "かえした タタミを 盾にして 自分や 味方への 技の ダメージを 防ぐ。 変化技は 防ぐことが できない。" + "effect": "かえした　タタミを　盾にして　自分や　味方への　技の　ダメージを　防ぐ。　変化技は　防ぐことが　できない。" }, "belch": { "name": "ゲップ", - "effect": "相手に 向かって ゲップを 浴びせて ダメージを 与える。 きのみを 食べないと だせない。" + "effect": "相手に　向かって　ゲップを　浴びせて　ダメージを　与える。　きのみを　食べないと　だせない。" }, "rototiller": { "name": "たがやす", - "effect": "地面を 耕して 草木が 育ちやすいようにする。 くさタイプの 攻撃と 特攻が あがる。" + "effect": "地面を　耕して　草木が　育ちやすいようにする。　くさタイプの　攻撃と　特攻が　あがる。" }, "stickyWeb": { "name": "ねばねばネット", - "effect": "相手の 周りに ねばねばした ネットを はりめぐらせ 交代で でてきた 相手の 素早さを さげる。" + "effect": "相手の　周りに　ねばねばした　ネットを　はりめぐらせ　交代で　でてきた　相手の　素早さを　さげる。" }, "fellStinger": { "name": "とどめばり", - "effect": "この 技を 使って 相手を 倒すと 攻撃が ぐぐーんと あがる。" + "effect": "この　技を　使って　相手を　倒すと　攻撃が　ぐぐーんと　あがる。" }, "phantomForce": { "name": "ゴーストダイブ", - "effect": "１ターンめで どこかに 消えて ２ターンめに 相手を 攻撃する。 守りを 無視して 攻撃できる。" + "effect": "１ターンめで　どこかに　消えて　２ターンめに　相手を　攻撃する。　守りを　無視して　攻撃できる。" }, "trickOrTreat": { "name": "ハロウィン", - "effect": "相手を ハロウィンに 誘う。 相手の タイプに ゴーストタイプが 追加される。" + "effect": "相手を　ハロウィンに　誘う。　相手の　タイプに　ゴーストタイプが　追加される。" }, "nobleRoar": { "name": "おたけび", - "effect": "おたけびを あげて 相手を 威嚇し 相手の 攻撃と 特攻を さげる。" + "effect": "おたけびを　あげて　相手を　威嚇し　相手の　攻撃と　特攻を　さげる。" }, "ionDeluge": { "name": "プラズマシャワー", - "effect": "電気を 帯びた 粒子を 拡散し ノーマルタイプの 技を でんきタイプに してしまう。" + "effect": "電気を　帯びた　粒子を　拡散し　ノーマルタイプの　技を　でんきタイプに　してしまう。" }, "parabolicCharge": { "name": "パラボラチャージ", - "effect": "周りにいる ポケモン 全員に ダメージ。 与えた ダメージの 半分を 自分が 回復する。" + "effect": "周りにいる　ポケモン　全員に　ダメージ。　与えた　ダメージの　半分を　自分が　回復する。" }, "forestsCurse": { "name": "もりののろい", - "effect": "相手に 森ののろいを かける。 のろいを かけられた 相手は タイプに くさタイプが 追加される。" + "effect": "相手に　森ののろいを　かける。　のろいを　かけられた　相手は　タイプに　くさタイプが　追加される。" }, "petalBlizzard": { "name": "はなふぶき", - "effect": "激しい 花吹雪を 起こし 周りに いるものに 攻撃して ダメージを 与える。" + "effect": "激しい　花吹雪を　起こし　周りに　いるものに　攻撃して　ダメージを　与える。" }, "freezeDry": { "name": "フリーズドライ", - "effect": "相手を 急激に 冷やして こおり 状態に することが ある。 みずタイプにも 効果バツグンになる。" + "effect": "相手を　急激に　冷やして　こおり　状態に　することが　ある。　みずタイプにも　効果バツグンになる。" }, "disarmingVoice": { "name": "チャームボイス", - "effect": "魅惑の 鳴き声を だして 相手に 精神的な ダメージを 与える。 攻撃は 必ず 命中 する。" + "effect": "魅惑の　鳴き声を　だして　相手に　精神的な　ダメージを　与える。　攻撃は　必ず　命中　する。" }, "partingShot": { "name": "すてゼリフ", - "effect": "すてゼリフで 相手を いかくし 攻撃と 特攻を さげたのち 控えの ポケモンと 入れ替わる。" + "effect": "すてゼリフで　相手を　いかくし　攻撃と　特攻を　さげたのち　控えの　ポケモンと　入れ替わる。" }, "topsyTurvy": { "name": "ひっくりかえす", - "effect": "相手に かかっている すべての 能力変化を ひっくり返して 逆にする。" + "effect": "相手に　かかっている　すべての　能力変化を　ひっくり返して　逆にする。" }, "drainingKiss": { "name": "ドレインキッス", - "effect": "キッスによって 相手から ＨＰを 吸い取る。 与えた ダメージの 半分以上 ＨＰを 回復する。" + "effect": "キッスによって　相手から　ＨＰを　吸い取る。　与えた　ダメージの　半分以上　ＨＰを　回復する。" }, "craftyShield": { "name": "トリックガード", - "effect": "不思議な 力を 使って 味方への 変化技を 防ぐ。 ダメージ技は 受けてしまう。" + "effect": "不思議な　力を　使って　味方への　変化技を　防ぐ。　ダメージ技は　受けてしまう。" }, "flowerShield": { "name": "フラワーガード", - "effect": "不思議な 力を 使って 場にいる くさタイプの ポケモン 全員の 防御を あげる。" + "effect": "不思議な　力を　使って　場にいる　くさタイプの　ポケモン　全員の　防御を　あげる。" }, "grassyTerrain": { "name": "グラスフィールド", - "effect": "５ターンの 間 グラスフィールドにする。 地面にいると 毎ターン 回復する。 くさタイプの 威力が あがる。" + "effect": "５ターンの　間　グラスフィールドにする。　地面にいると　毎ターン　回復する。　くさタイプの　威力が　あがる。" }, "mistyTerrain": { "name": "ミストフィールド", - "effect": "５ターンの 間 地面にいると 状態異常に ならず ドラゴン技の ダメージも 半分になる。" + "effect": "５ターンの　間　地面にいると　状態異常に　ならず　ドラゴン技の　ダメージも　半分になる。" }, "electrify": { "name": "そうでん", - "effect": "相手が 技を だす前に そうでん すると そのターン 相手の 技は でんきタイプになる。" + "effect": "相手が　技を　だす前に　そうでん　すると　そのターン　相手の　技は　でんきタイプになる。" }, "playRough": { "name": "じゃれつく", - "effect": "相手に じゃれついて 攻撃する。 相手の 攻撃を さげる ことがある。" + "effect": "相手に　じゃれついて　攻撃する。　相手の　攻撃を　さげる　ことがある。" }, "fairyWind": { "name": "ようせいのかぜ", - "effect": "ようせいのかぜを 起こし 相手に 吹きつけて 攻撃する。" + "effect": "ようせいのかぜを　起こし　相手に　吹きつけて　攻撃する。" }, "moonblast": { "name": "ムーンフォース", - "effect": "月の パワーを かりて 相手を 攻撃する。 相手の 特攻を さげる ことがある。" + "effect": "月の　パワーを　かりて　相手を　攻撃する。　相手の　特攻を　さげる　ことがある。" }, "boomburst": { "name": "ばくおんぱ", - "effect": "すさまじい 爆音の 破壊力に よって 周りに いるものを 攻撃する。" + "effect": "すさまじい　爆音の　破壊力に　よって　周りに　いるものを　攻撃する。" }, "fairyLock": { "name": "フェアリーロック", - "effect": "ロックを かけることによって 次のターン すべての ポケモンを 逃げられなくする。" + "effect": "ロックを　かけることによって　次のターン　すべての　ポケモンを　逃げられなくする。" }, "kingsShield": { "name": "キングシールド", - "effect": "相手の 攻撃を 防ぐと 同時に 防御態勢になる。 触れた 相手の 攻撃を さげる。" + "effect": "相手の　攻撃を　防ぐと　同時に　防御態勢になる。　触れた　相手の　攻撃を　さげる。" }, "playNice": { "name": "なかよくする", - "effect": "相手と なかよくなって 戦う 気力を 失わせ 相手の 攻撃を さげる。" + "effect": "相手と　なかよくなって　戦う　気力を　失わせ　相手の　攻撃を　さげる。" }, "confide": { "name": "ないしょばなし", - "effect": "ないしょばなしを することで 相手の 集中力を 失わせ 相手の 特攻を さげる。" + "effect": "ないしょばなしを　することで　相手の　集中力を　失わせ　相手の　特攻を　さげる。" }, "diamondStorm": { "name": "ダイヤストーム", - "effect": "ダイヤの 嵐を 巻き起こし ダメージを 与える。 自分の 防御を ぐーんと あげることが ある。" + "effect": "ダイヤの　嵐を　巻き起こし　ダメージを　与える。　自分の　防御を　ぐーんと　あげることが　ある。" }, "steamEruption": { "name": "スチームバースト", - "effect": "ものすごく 熱い 蒸気を 相手に 浴びせる。 相手は やけどする ことがある。" + "effect": "ものすごく　熱い　蒸気を　相手に　浴びせる。　相手は　やけどする　ことがある。" }, "hyperspaceHole": { "name": "いじげんホール", - "effect": "異次元ホールで 突然 相手の 真横に 現れ 攻撃する。 まもるや みきり なども 無視 できる。" + "effect": "異次元ホールで　突然　相手の　真横に　現れ　攻撃する。　まもるや　みきり　なども　無視　できる。" }, "waterShuriken": { "name": "みずしゅりけん", - "effect": "粘液で できた 手裏剣を ２ー５回の 間 連続で だす。 必ず 先制攻撃 できる。" + "effect": "粘液で　できた　手裏剣を　２ー５回の　間　連続で　だす。　必ず　先制攻撃　できる。" }, "mysticalFire": { "name": "マジカルフレイム", - "effect": "口から 吐きだす 特別 熱い 炎で 攻撃する。 相手の 特攻を さげる。" + "effect": "口から　吐きだす　特別　熱い　炎で　攻撃する。　相手の　特攻を　さげる。" }, "spikyShield": { "name": "ニードルガード", - "effect": "相手の 攻撃を 防ぐと 同時に 触れた 相手の 体力を 削って しまう。" + "effect": "相手の　攻撃を　防ぐと　同時に　触れた　相手の　体力を　削って　しまう。" }, "aromaticMist": { "name": "アロマミスト", - "effect": "不思議な アロマの 香りによって 味方の 特防を あげる。" + "effect": "不思議な　アロマの　香りによって　味方の　特防を　あげる。" }, "eerieImpulse": { "name": "かいでんぱ", - "effect": "体から かいでんぱを 放ち 相手に 浴びせる ことによって 特攻を がくっと さげる。" + "effect": "体から　かいでんぱを　放ち　相手に　浴びせる　ことによって　特攻を　がくっと　さげる。" }, "venomDrench": { "name": "ベノムトラップ", - "effect": "特殊な 毒液を 浴びせかける。 毒状態の 相手は 攻撃 特攻 素早さが さがる。" + "effect": "特殊な　毒液を　浴びせかける。　毒状態の　相手は　攻撃　特攻　素早さが　さがる。" }, "powder": { "name": "ふんじん", - "effect": "ふんじんを 浴びせた 相手が ほのお技を 使うと 爆発して ダメージを 与える。" + "effect": "ふんじんを　浴びせた　相手が　ほのお技を　使うと　爆発して　ダメージを　与える。" }, "geomancy": { "name": "ジオコントロール", - "effect": "１ターン目で エネルギーを 吸収し ２ターン目に 特攻 特防 素早さを ぐーんと あげる。" + "effect": "１ターン目で　エネルギーを　吸収し　２ターン目に　特攻　特防　素早さを　ぐーんと　あげる。" }, "magneticFlux": { "name": "じばそうさ", - "effect": "磁場を 操作 することによって 特性 プラスと マイナスの 防御 特防が あがる。" + "effect": "磁場を　操作　することによって　特性　プラスと　マイナスの　防御　特防が　あがる。" }, "happyHour": { "name": "ハッピータイム", - "effect": "ハッピータイムの 技を 使うと 戦闘の あとで もらえる お金が 倍になる。" + "effect": "ハッピータイムの　技を　使うと　戦闘の　あとで　もらえる　お金が　倍になる。" }, "electricTerrain": { "name": "エレキフィールド", - "effect": "５ターンの 間 エレキフィールドにする。 地面にいる ポケモンは 眠らない。 でんきタイプの 威力が あがる。" + "effect": "５ターンの　間　エレキフィールドにする。　地面にいる　ポケモンは　眠らない。　でんきタイプの　威力が　あがる。" }, "dazzlingGleam": { "name": "マジカルシャイン", - "effect": "強力な 光を 放ち 相手に ダメージを 与える。" + "effect": "強力な　光を　放ち　相手に　ダメージを　与える。" }, "celebrate": { "name": "おいわい", - "effect": "ポケモンが とっても ハッピーな あなたのことを お祝い してくれる。" + "effect": "ポケモンが　とっても　ハッピーな　あなたのことを　お祝い　してくれる。" }, "holdHands": { "name": "てをつなぐ", - "effect": "味方の ポケモン 同士が 手をつなぐ。 とっても 幸せな 気持ちに なれる。" + "effect": "味方の　ポケモン　同士が　手をつなぐ。　とっても　幸せな　気持ちに　なれる。" }, "babyDollEyes": { "name": "つぶらなひとみ", - "effect": "つぶらなひとみで 相手を みつめて 攻撃を さげる。 必ず 先制攻撃 できる。" + "effect": "つぶらなひとみで　相手を　みつめて　攻撃を　さげる。　必ず　先制攻撃　できる。" }, "nuzzle": { "name": "ほっぺすりすり", - "effect": "電気を 帯びた ほっぺを すりつけて 攻撃。 相手を まひ状態に する。" + "effect": "電気を　帯びた　ほっぺを　すりつけて　攻撃。　相手を　まひ状態に　する。" }, "holdBack": { "name": "てかげん", - "effect": "手加減 した 攻撃で 相手の ＨＰを 必ず １だけ 残す。" + "effect": "手加減　した　攻撃で　相手の　ＨＰを　必ず　１だけ　残す。" }, "infestation": { "name": "まとわりつく", - "effect": "４ー５ターンの 間 相手に まとわりついて 攻撃する。 そのあいだ 相手は 逃げられない。" + "effect": "４ー５ターンの　間　相手に　まとわりついて　攻撃する。　そのあいだ　相手は　逃げられない。" }, "powerUpPunch": { "name": "グロウパンチ", - "effect": "繰り返し 打つことで だんだん こぶしが 固くなる。 相手に 当てると 攻撃が あがる。" + "effect": "繰り返し　打つことで　だんだん　こぶしが　固くなる。　相手に　当てると　攻撃が　あがる。" }, "oblivionWing": { "name": "デスウイング", - "effect": "ねらいを 定めた 相手から ＨＰを 吸い取る。 与えた ダメージの 半分以上 ＨＰを 回復する。" + "effect": "ねらいを　定めた　相手から　ＨＰを　吸い取る。　与えた　ダメージの　半分以上　ＨＰを　回復する。" }, "thousandArrows": { "name": "サウザンアロー", - "effect": "浮いている ポケモンにも 当たる。 浮いていた 相手は 撃ち落とされて 地面に 落ちる。" + "effect": "浮いている　ポケモンにも　当たる。　浮いていた　相手は　撃ち落とされて　地面に　落ちる。" }, "thousandWaves": { "name": "サウザンウェーブ", - "effect": "地をはう 波によって 攻撃。 波に 巻き込まれた 相手は 戦闘から 逃げられなくなる。" + "effect": "地をはう　波によって　攻撃。　波に　巻き込まれた　相手は　戦闘から　逃げられなくなる。" }, "landsWrath": { "name": "グランドフォース", - "effect": "大地の パワーを 集め 力を 相手に 集中させて ダメージを 与える。" + "effect": "大地の　パワーを　集め　力を　相手に　集中させて　ダメージを　与える。" }, "lightOfRuin": { "name": "はめつのひかり", - "effect": "永遠の花 の パワーを かりて 強力な 光線を 撃ちだす。 自分も かなりの ダメージを 受ける。" + "effect": "永遠の花　の　パワーを　かりて　強力な　光線を　撃ちだす。　自分も　かなりの　ダメージを　受ける。" }, "originPulse": { "name": "こんげんのはどう", - "effect": "青白く 輝く 無数の 光線で 相手を 攻撃する。" + "effect": "青白く　輝く　無数の　光線で　相手を　攻撃する。" }, "precipiceBlades": { "name": "だんがいのつるぎ", - "effect": "大地の 力を 刃に 変えて 相手を 攻撃する。" + "effect": "大地の　力を　刃に　変えて　相手を　攻撃する。" }, "dragonAscent": { "name": "ガリョウテンセイ", - "effect": "大空から 急速落下 して 相手を 攻撃する。 自分の 防御と 特防が さがる。" + "effect": "大空から　急速落下　して　相手を　攻撃する。　自分の　防御と　特防が　さがる。" }, "hyperspaceFury": { "name": "いじげんラッシュ", - "effect": "たくさんの 腕で まもるや みきり などを 無視した 連続攻撃。 自分の 防御が さがる。" + "effect": "たくさんの　腕で　まもるや　みきり　などを　無視した　連続攻撃。　自分の　防御が　さがる。" }, "breakneckBlitzPhysical": { "name": "ウルトラダッシュアタック", - "effect": "Ｚパワーで 勢いを つけて 全力で 相手に ぶつかる。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　勢いを　つけて　全力で　相手に　ぶつかる。　元になった　技で　威力が　変わる。" }, "breakneckBlitzSpecial": { "name": "ウルトラダッシュアタック", @@ -2493,7 +2493,7 @@ }, "allOutPummelingPhysical": { "name": "ぜんりょくむそうげきれつけん", - "effect": "Ｚパワーで 作った エネルギーの 弾を 全力で 相手に ぶつける。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　作った　エネルギーの　弾を　全力で　相手に　ぶつける。　元になった　技で　威力が　変わる。" }, "allOutPummelingSpecial": { "name": "ぜんりょくむそうげきれつけん", @@ -2501,7 +2501,7 @@ }, "supersonicSkystrikePhysical": { "name": "ファイナルダイブクラッシュ", - "effect": "Ｚパワーで 勢いよく 飛びあがり 相手に 向かって 全力で 落下。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　勢いよく　飛びあがり　相手に　向かって　全力で　落下。　元になった　技で　威力が　変わる。" }, "supersonicSkystrikeSpecial": { "name": "ファイナルダイブクラッシュ", @@ -2509,7 +2509,7 @@ }, "acidDownpourPhysical": { "name": "アシッドポイズンデリート", - "effect": "Ｚパワーで 毒の 沼を 湧きあがらせ 全力で 相手を 沈める。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　毒の　沼を　湧きあがらせ　全力で　相手を　沈める。　元になった　技で　威力が　変わる。" }, "acidDownpourSpecial": { "name": "アシッドポイズンデリート", @@ -2517,7 +2517,7 @@ }, "tectonicRagePhysical": { "name": "ライジングランドオーバー", - "effect": "Ｚパワーで 地面の 奥深くに 潜り 全力で 相手に ぶつかる。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　地面の　奥深くに　潜り　全力で　相手に　ぶつかる。　元になった　技で　威力が　変わる。" }, "tectonicRageSpecial": { "name": "ライジングランドオーバー", @@ -2525,7 +2525,7 @@ }, "continentalCrushPhysical": { "name": "ワールズエンドフォール", - "effect": "Ｚパワーで 大きな 岩山を 呼びだし 全力で 相手に ぶつける。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　大きな　岩山を　呼びだし　全力で　相手に　ぶつける。　元になった　技で　威力が　変わる。" }, "continentalCrushSpecial": { "name": "ワールズエンドフォール", @@ -2533,7 +2533,7 @@ }, "savageSpinOutPhysical": { "name": "ぜったいほしょくかいてんざん", - "effect": "Ｚパワーで 吐きだした 糸が 全力で 相手を 縛りつける。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　吐きだした　糸が　全力で　相手を　縛りつける。　元になった　技で　威力が　変わる。" }, "savageSpinOutSpecial": { "name": "ぜったいほしょくかいてんざん", @@ -2541,7 +2541,7 @@ }, "neverEndingNightmarePhysical": { "name": "むげんあんやへのいざない", - "effect": "Ｚパワーで 呼びよせた 強い 怨念が 全力で 相手に 降りかかる。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　呼びよせた　強い　怨念が　全力で　相手に　降りかかる。　元になった　技で　威力が　変わる。" }, "neverEndingNightmareSpecial": { "name": "むげんあんやへのいざない", @@ -2549,7 +2549,7 @@ }, "corkscrewCrashPhysical": { "name": "ちょうぜつらせんれんげき", - "effect": "Ｚパワーで 高速回転を おこない 全力で 相手に ぶつかる。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　高速回転を　おこない　全力で　相手に　ぶつかる。　元になった　技で　威力が　変わる。" }, "corkscrewCrashSpecial": { "name": "ちょうぜつらせんれんげき", @@ -2557,7 +2557,7 @@ }, "infernoOverdrivePhysical": { "name": "ダイナミックフルフレイム", - "effect": "Ｚパワーで 燃えさかる 炎を 吐きだし 全力で 相手に ぶつける。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　燃えさかる　炎を　吐きだし　全力で　相手に　ぶつける。　元になった　技で　威力が　変わる。" }, "infernoOverdriveSpecial": { "name": "ダイナミックフルフレイム", @@ -2565,7 +2565,7 @@ }, "hydroVortexPhysical": { "name": "スーパーアクアトルネード", - "effect": "Ｚパワーで 大きな 渦潮を 作り 全力で 相手を 飲みこむ。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　大きな　渦潮を　作り　全力で　相手を　飲みこむ。　元になった　技で　威力が　変わる。" }, "hydroVortexSpecial": { "name": "スーパーアクアトルネード", @@ -2573,7 +2573,7 @@ }, "bloomDoomPhysical": { "name": "ブルームシャインエクストラ", - "effect": "Ｚパワーで 草花の エネルギーを 借り 全力で 相手を 攻撃する。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　草花の　エネルギーを　借り　全力で　相手を　攻撃する。　元になった　技で　威力が　変わる。" }, "bloomDoomSpecial": { "name": "ブルームシャインエクストラ", @@ -2581,7 +2581,7 @@ }, "gigavoltHavocPhysical": { "name": "スパーキングギガボルト", - "effect": "Ｚパワーで 溜めた 強い 電気を 全力で 相手に ぶつける。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　溜めた　強い　電気を　全力で　相手に　ぶつける。　元になった　技で　威力が　変わる。" }, "gigavoltHavocSpecial": { "name": "スパーキングギガボルト", @@ -2589,7 +2589,7 @@ }, "shatteredPsychePhysical": { "name": "マキシマムサイブレイカー", - "effect": "Ｚパワーで 相手を 操り 全力で 痛い 思いを させる。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　相手を　操り　全力で　痛い　思いを　させる。　元になった　技で　威力が　変わる。" }, "shatteredPsycheSpecial": { "name": "マキシマムサイブレイカー", @@ -2597,7 +2597,7 @@ }, "subzeroSlammerPhysical": { "name": "レイジングジオフリーズ", - "effect": "Ｚパワーで 気温を 急激に 下げ 全力で 相手を 凍らせる。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　気温を　急激に　下げ　全力で　相手を　凍らせる。　元になった　技で　威力が　変わる。" }, "subzeroSlammerSpecial": { "name": "レイジングジオフリーズ", @@ -2605,7 +2605,7 @@ }, "devastatingDrakePhysical": { "name": "アルティメットドラゴンバーン", - "effect": "Ｚパワーで オーラを 実体化し 全力で 相手に 襲いかかる。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　オーラを　実体化し　全力で　相手に　襲いかかる。　元になった　技で　威力が　変わる。" }, "devastatingDrakeSpecial": { "name": "アルティメットドラゴンバーン", @@ -2613,7 +2613,7 @@ }, "blackHoleEclipsePhysical": { "name": "ブラックホールイクリプス", - "effect": "Ｚパワーで 悪の エネルギーを 集め 全力で 相手を 吸いよせる。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　悪の　エネルギーを　集め　全力で　相手を　吸いよせる。　元になった　技で　威力が　変わる。" }, "blackHoleEclipseSpecial": { "name": "ブラックホールイクリプス", @@ -2621,7 +2621,7 @@ }, "twinkleTacklePhysical": { "name": "ラブリースターインパクト", - "effect": "Ｚパワーで 魅惑の 空間を 作り 全力で 相手を もてあそぶ。 元になった 技で 威力が 変わる。" + "effect": "Ｚパワーで　魅惑の　空間を　作り　全力で　相手を　もてあそぶ。　元になった　技で　威力が　変わる。" }, "twinkleTackleSpecial": { "name": "ラブリースターインパクト", @@ -2629,1182 +2629,1182 @@ }, "catastropika": { "name": "ひっさつのピカチュート", - "effect": "Ｚパワーで 最大 電力を 身に まとったピカチュウが 全力で 相手に 飛び掛る。" + "effect": "Ｚパワーで　最大　電力を　身に　まとったピカチュウが　全力で　相手に　飛び掛る。" }, "shoreUp": { "name": "すなあつめ", - "effect": "最大ＨＰの 半分 自分の ＨＰを 回復する。 すなあらしの時は 多く 回復。" + "effect": "最大ＨＰの　半分　自分の　ＨＰを　回復する。　すなあらしの時は　多く　回復。" }, "firstImpression": { "name": "であいがしら", - "effect": "威力が 高い 技 だが 戦闘に 出たら すぐに 出さないと 成功 しない。" + "effect": "威力が　高い　技　だが　戦闘に　出たら　すぐに　出さないと　成功　しない。" }, "banefulBunker": { "name": "トーチカ", - "effect": "相手の 攻撃を 防ぐと 同時に 触れた 相手に 毒を 与えてしまう。" + "effect": "相手の　攻撃を　防ぐと　同時に　触れた　相手に　毒を　与えてしまう。" }, "spiritShackle": { "name": "かげぬい", - "effect": "攻撃と 同時に 相手の 影を 縫い付けて 逃げられなくする。" + "effect": "攻撃と　同時に　相手の　影を　縫い付けて　逃げられなくする。" }, "darkestLariat": { "name": "ＤＤラリアット", - "effect": "両腕を 回し 相手に 当てる。 相手の 能力変化に 関係なく ダメージを 与える。" + "effect": "両腕を　回し　相手に　当てる。　相手の　能力変化に　関係なく　ダメージを　与える。" }, "sparklingAria": { "name": "うたかたのアリア", - "effect": "歌うことによって たくさんの バルーンを 放出する。 技を 受けると やけどが 治る。" + "effect": "歌うことによって　たくさんの　バルーンを　放出する。　技を　受けると　やけどが　治る。" }, "iceHammer": { "name": "アイスハンマー", - "effect": "強くて 重い こぶしを ふるって ダメージを 与える。 自分の 素早さが さがる。" + "effect": "強くて　重い　こぶしを　ふるって　ダメージを　与える。　自分の　素早さが　さがる。" }, "floralHealing": { "name": "フラワーヒール", - "effect": "最大ＨＰの 半分 相手の ＨＰを 回復する。 グラスフィールドの時 効果が あがる。" + "effect": "最大ＨＰの　半分　相手の　ＨＰを　回復する。　グラスフィールドの時　効果が　あがる。" }, "highHorsepower": { "name": "１０まんばりき", - "effect": "全身を 使って 相手に 猛アタックする。" + "effect": "全身を　使って　相手に　猛アタックする。" }, "strengthSap": { "name": "ちからをすいとる", - "effect": "相手の 攻撃力と 同じだけ 自分の ＨＰを 回復する。 そして 相手の 攻撃を さげる。" + "effect": "相手の　攻撃力と　同じだけ　自分の　ＨＰを　回復する。　そして　相手の　攻撃を　さげる。" }, "solarBlade": { "name": "ソーラーブレード", - "effect": "１ターン目に 光を いっぱいに 集め ２ターン目に その 力を 剣に 込めて 攻撃する。" + "effect": "１ターン目に　光を　いっぱいに　集め　２ターン目に　その　力を　剣に　込めて　攻撃する。" }, "leafage": { "name": "このは", - "effect": "はっぱを 相手に 当てて 攻撃する。" + "effect": "はっぱを　相手に　当てて　攻撃する。" }, "spotlight": { "name": "スポットライト", - "effect": "ポケモンに スポットライトを 当て そのターンに そのポケモンしか 狙えない ようにする。" + "effect": "ポケモンに　スポットライトを　当て　そのターンに　そのポケモンしか　狙えない　ようにする。" }, "toxicThread": { "name": "どくのいと", - "effect": "毒の 混じった 糸を 吹き付ける。 相手を 毒にして 素早さを さげる。" + "effect": "毒の　混じった　糸を　吹き付ける。　相手を　毒にして　素早さを　さげる。" }, "laserFocus": { "name": "とぎすます", - "effect": "精神を 集中して 次の 攻撃を 必ず 急所に 当てる。" + "effect": "精神を　集中して　次の　攻撃を　必ず　急所に　当てる。" }, "gearUp": { "name": "アシストギア", - "effect": "ギアを 入れる ことによって 特性 プラスと マイナスの 攻撃と 特攻が あがる。" + "effect": "ギアを　入れる　ことによって　特性　プラスと　マイナスの　攻撃と　特攻が　あがる。" }, "throatChop": { "name": "じごくづき", - "effect": "この 技を 受けた 相手は 地獄の 苦しみから ２ターンの間 音の 技を 出すことが できなくなる。" + "effect": "この　技を　受けた　相手は　地獄の　苦しみから　２ターンの間　音の　技を　出すことが　できなくなる。" }, "pollenPuff": { "name": "かふんだんご", - "effect": "敵には 爆発する だんごを 使って 攻撃。 味方には 回復する だんごを 与える。" + "effect": "敵には　爆発する　だんごを　使って　攻撃。　味方には　回復する　だんごを　与える。" }, "anchorShot": { "name": "アンカーショット", - "effect": "アンカーを 相手に からませて 攻撃する。 相手は 逃げることが できなくなる。" + "effect": "アンカーを　相手に　からませて　攻撃する。　相手は　逃げることが　できなくなる。" }, "psychicTerrain": { "name": "サイコフィールド", - "effect": "５ターンの間 地面にいると 先制技を 受けない。 エスパータイプの 威力が あがる。" + "effect": "５ターンの間　地面にいると　先制技を　受けない。　エスパータイプの　威力が　あがる。" }, "lunge": { "name": "とびかかる", - "effect": "全力で 相手に 飛びかかって 攻撃。 相手の 攻撃を さげる。" + "effect": "全力で　相手に　飛びかかって　攻撃。　相手の　攻撃を　さげる。" }, "fireLash": { "name": "ほのおのムチ", - "effect": "焼けたムチで 相手を 打ちつける。 攻撃を 受けた 相手は 防御が さがる。" + "effect": "焼けたムチで　相手を　打ちつける。　攻撃を　受けた　相手は　防御が　さがる。" }, "powerTrip": { "name": "つけあがる", - "effect": "自分の 強さを 鼻高々に 攻撃する。自分の 能力が あがって いるほど 威力が あがる。" + "effect": "自分の　強さを　鼻高々に　攻撃する。自分の　能力が　あがって　いるほど　威力が　あがる。" }, "burnUp": { "name": "もえつきる", - "effect": "全身の ほのおを すべて 燃やして 大ダメージを 与える。 自分の ほのおタイプが なくなる。" + "effect": "全身の　ほのおを　すべて　燃やして　大ダメージを　与える。　自分の　ほのおタイプが　なくなる。" }, "speedSwap": { "name": "スピードスワップ", - "effect": "相手の 素早さと 自分の 素早さを 入れ替えてしまう。" + "effect": "相手の　素早さと　自分の　素早さを　入れ替えてしまう。" }, "smartStrike": { "name": "スマートホーン", - "effect": "とがった つので 相手を 突き刺して 攻撃する。 攻撃は 必ず 命中する。" + "effect": "とがった　つので　相手を　突き刺して　攻撃する。　攻撃は　必ず　命中する。" }, "purify": { "name": "じょうか", - "effect": "相手の 状態異常を 治す。 治すと 自分は ＨＰを 回復 することが できる。" + "effect": "相手の　状態異常を　治す。　治すと　自分は　ＨＰを　回復　することが　できる。" }, "revelationDance": { "name": "めざめるダンス", - "effect": "全力で 踊って 攻撃する。 この 技の タイプは 自分の タイプと 同じになる。" + "effect": "全力で　踊って　攻撃する。　この　技の　タイプは　自分の　タイプと　同じになる。" }, "coreEnforcer": { "name": "コアパニッシャー", - "effect": "ダメージを 与えた 相手が すでに 行動を 終えていたら 相手の 特性を 消してしまう。" + "effect": "ダメージを　与えた　相手が　すでに　行動を　終えていたら　相手の　特性を　消してしまう。" }, "tropKick": { "name": "トロピカルキック", - "effect": "南国 由来の 熱い キックを 相手に 浴びせる。 相手の 攻撃を さげる。" + "effect": "南国　由来の　熱い　キックを　相手に　浴びせる。　相手の　攻撃を　さげる。" }, "instruct": { "name": "さいはい", - "effect": "相手が 出した 技を 指示して もう一度 出させることが できる。" + "effect": "相手が　出した　技を　指示して　もう一度　出させることが　できる。" }, "beakBlast": { "name": "くちばしキャノン", - "effect": "最初に クチバシを 加熱してから 攻撃を くりだす。 加熱中に さわると やけどする。" + "effect": "最初に　クチバシを　加熱してから　攻撃を　くりだす。　加熱中に　さわると　やけどする。" }, "clangingScales": { "name": "スケイルノイズ", - "effect": "全身の うろこを こすり 大きな 音を 出して 攻撃する。 攻撃後 自分の 防御が さがる。" + "effect": "全身の　うろこを　こすり　大きな　音を　出して　攻撃する。　攻撃後　自分の　防御が　さがる。" }, "dragonHammer": { "name": "ドラゴンハンマー", - "effect": "体を ハンマーのように 使って 相手に 襲いかかり ダメージを 与える。" + "effect": "体を　ハンマーのように　使って　相手に　襲いかかり　ダメージを　与える。" }, "brutalSwing": { "name": "ぶんまわす", - "effect": "自分の 体を ぶんまわして 相手に ダメージを 与える。" + "effect": "自分の　体を　ぶんまわして　相手に　ダメージを　与える。" }, "auroraVeil": { "name": "オーロラベール", - "effect": "5ターンの 間 物理と 特殊の ダメージを 弱める。 ゆきの 時しか 出すことが できない。" + "effect": "5ターンの　間　物理と　特殊の　ダメージを　弱める。　ゆきの　時しか　出すことが　できない。" }, "sinisterArrowRaid": { "name": "シャドーアローズストライク", - "effect": "Ｚパワーで 無数の 矢を 作りだした ジュナイパーが 全力で 相手を 射抜く 攻撃。" + "effect": "Ｚパワーで　無数の　矢を　作りだした　ジュナイパーが　全力で　相手を　射抜く　攻撃。" }, "maliciousMoonsault": { "name": "ハイパーダーククラッシャー", - "effect": "Ｚパワーで タフな 肉体を 得た ガオガエンが 全力で 相手に ぶつかって 攻撃する。" + "effect": "Ｚパワーで　タフな　肉体を　得た　ガオガエンが　全力で　相手に　ぶつかって　攻撃する。" }, "oceanicOperetta": { "name": "わだつみのシンフォニア", - "effect": "Ｚパワーで 大量の 水を 呼んだ アシレーヌが 全力で 相手を 攻撃する。" + "effect": "Ｚパワーで　大量の　水を　呼んだ　アシレーヌが　全力で　相手を　攻撃する。" }, "guardianOfAlola": { "name": "ガーディアン・デ・アローラ", - "effect": "Ｚパワーで アローラの 力を 得た とちがみポケモン 全力の 攻撃。 相手の 残りＨＰを たくさん 減らす。" + "effect": "Ｚパワーで　アローラの　力を　得た　とちがみポケモン　全力の　攻撃。　相手の　残りＨＰを　たくさん　減らす。" }, "soulStealing7StarStrike": { "name": "しちせいだっこんたい", - "effect": "Ｚパワーを 得た マーシャドーが パンチと キックの 連続技を 全力で 相手に 叩き込む。" + "effect": "Ｚパワーを　得た　マーシャドーが　パンチと　キックの　連続技を　全力で　相手に　叩き込む。" }, "stokedSparksurfer": { "name": "ライトニングサーフライド", - "effect": "Ｚパワーを 得た アローラ地方の ライチュウが 全力で 攻撃する。 相手を まひ 状態に する。" + "effect": "Ｚパワーを　得た　アローラ地方の　ライチュウが　全力で　攻撃する。　相手を　まひ　状態に　する。" }, "pulverizingPancake": { - "name": "ほんきをだす こうげき", - "effect": "Ｚパワーで 本気を 出した カビゴンが 巨体を 躍動させて 全力で 相手に 襲いかかる。" + "name": "ほんきをだす　こうげき", + "effect": "Ｚパワーで　本気を　出した　カビゴンが　巨体を　躍動させて　全力で　相手に　襲いかかる。" }, "extremeEvoboost": { "name": "ナインエボルブースト", - "effect": "Ｚパワーを 得た イーブイが 進化した 仲間たちの 力を 借りて 能力を ぐーんと 上げる。" + "effect": "Ｚパワーを　得た　イーブイが　進化した　仲間たちの　力を　借りて　能力を　ぐーんと　上げる。" }, "genesisSupernova": { "name": "オリジンズスーパーノヴァ", - "effect": "Ｚパワーを 得た ミュウが 全力で 相手を 攻撃する。 足元が サイコフィールドになる。" + "effect": "Ｚパワーを　得た　ミュウが　全力で　相手を　攻撃する。　足元が　サイコフィールドになる。" }, "shellTrap": { "name": "トラップシェル", - "effect": "こうらの トラップを しかける。 相手が 物理技を 出すと 爆発して ダメージを 与える。" + "effect": "こうらの　トラップを　しかける。　相手が　物理技を　出すと　爆発して　ダメージを　与える。" }, "fleurCannon": { "name": "フルールカノン", - "effect": "強力な ビームを 放ったあと 自分の 特攻が がくっと さがる。" + "effect": "強力な　ビームを　放ったあと　自分の　特攻が　がくっと　さがる。" }, "psychicFangs": { "name": "サイコファング", - "effect": "サイコパワーで かみついて 相手を 攻撃する。 ひかりのかべや リフレクター なども 破壊できる。" + "effect": "サイコパワーで　かみついて　相手を　攻撃する。　ひかりのかべや　リフレクター　なども　破壊できる。" }, "stompingTantrum": { "name": "じだんだ", - "effect": "悔しさを バネにして 攻撃する。 前の ターンに 技を 外していると 威力が 倍に なる。" + "effect": "悔しさを　バネにして　攻撃する。　前の　ターンに　技を　外していると　威力が　倍に　なる。" }, "shadowBone": { "name": "シャドーボーン", - "effect": "魂の 宿った ホネで 相手を なぐりつけて 攻撃する。 相手の 防御を さげる ことがある。" + "effect": "魂の　宿った　ホネで　相手を　なぐりつけて　攻撃する。　相手の　防御を　さげる　ことがある。" }, "accelerock": { "name": "アクセルロック", - "effect": "素早い スピードで 相手に ぶつかって 攻撃する。 必ず 先制攻撃 できる。" + "effect": "素早い　スピードで　相手に　ぶつかって　攻撃する。　必ず　先制攻撃　できる。" }, "liquidation": { "name": "アクアブレイク", - "effect": "水の 力で 相手に ぶつかって 攻撃する。 相手の 防御を さげる ことがある。" + "effect": "水の　力で　相手に　ぶつかって　攻撃する。　相手の　防御を　さげる　ことがある。" }, "prismaticLaser": { "name": "プリズムレーザー", - "effect": "プリズムの 力で 強力な 光線を 発射する。 次の ターンは 動けなくなる。" + "effect": "プリズムの　力で　強力な　光線を　発射する。　次の　ターンは　動けなくなる。" }, "spectralThief": { "name": "シャドースチール", - "effect": "相手の 影に 潜り込み 相手の 能力アップを 奪って 攻撃する。" + "effect": "相手の　影に　潜り込み　相手の　能力アップを　奪って　攻撃する。" }, "sunsteelStrike": { "name": "メテオドライブ", - "effect": "流星の ような 勢いで 突進する。 相手の 特性を 無視して 攻撃 することが できる。" + "effect": "流星の　ような　勢いで　突進する。　相手の　特性を　無視して　攻撃　することが　できる。" }, "moongeistBeam": { "name": "シャドーレイ", - "effect": "怪しい 光線を 放って 攻撃する。相手の 特性を 無視して 攻撃 することが できる。" + "effect": "怪しい　光線を　放って　攻撃する。相手の　特性を　無視して　攻撃　することが　できる。" }, "tearfulLook": { "name": "なみだめ", - "effect": "なみだめに なって 相手の 戦力を 喪失させる。 相手の 攻撃と 特攻が さがる。" + "effect": "なみだめに　なって　相手の　戦力を　喪失させる。　相手の　攻撃と　特攻が　さがる。" }, "zingZap": { "name": "びりびりちくちく", - "effect": "相手に ぶつかって 強力な 電気を浴びせ びりびりちくちく させる。 相手を ひるませる ことが ある。" + "effect": "相手に　ぶつかって　強力な　電気を浴びせ　びりびりちくちく　させる。　相手を　ひるませる　ことが　ある。" }, "naturesMadness": { "name": "しぜんのいかり", - "effect": "自然の 怒りを 相手に ぶつける。 相手の ＨＰは 半分に なる。" + "effect": "自然の　怒りを　相手に　ぶつける。　相手の　ＨＰは　半分に　なる。" }, "multiAttack": { "name": "マルチアタック", - "effect": "高い エネルギーを まといつつ 相手に ぶつかって 攻撃する。 メモリに より タイプが 変わる。" + "effect": "高い　エネルギーを　まといつつ　相手に　ぶつかって　攻撃する。　メモリに　より　タイプが　変わる。" }, "tenMillionVoltThunderbolt": { "name": "１０００まんボルト", - "effect": "帽子を かぶった ピカチュウが Ｚパワーで パワーアップした 電撃を 放つ。 急所に 当たりやすい。" + "effect": "帽子を　かぶった　ピカチュウが　Ｚパワーで　パワーアップした　電撃を　放つ。　急所に　当たりやすい。" }, "mindBlown": { "name": "ビックリヘッド", - "effect": "自分の 頭を 爆発 させて 周りの すべてを 攻撃する。 自分も ダメージを 受けてしまう。" + "effect": "自分の　頭を　爆発　させて　周りの　すべてを　攻撃する。　自分も　ダメージを　受けてしまう。" }, "plasmaFists": { "name": "プラズマフィスト", - "effect": "電気を まとった こぶしで 攻撃。 ノーマルタイプの 技を でんきタイプに してしまう。" + "effect": "電気を　まとった　こぶしで　攻撃。　ノーマルタイプの　技を　でんきタイプに　してしまう。" }, "photonGeyser": { "name": "フォトンゲイザー", - "effect": "光の 柱で 攻撃する。 攻撃と 特攻を 比べて 高いほうで ダメージを 与える。" + "effect": "光の　柱で　攻撃する。　攻撃と　特攻を　比べて　高いほうで　ダメージを　与える。" }, "lightThatBurnsTheSky": { "name": "てんこがすめつぼうのひかり", - "effect": "ネクロズマが 相手の 特性の 効果を 無視して 攻撃と 特攻の 高い方で ダメージを 与える。" + "effect": "ネクロズマが　相手の　特性の　効果を　無視して　攻撃と　特攻の　高い方で　ダメージを　与える。" }, "searingSunrazeSmash": { "name": "サンシャインスマッシャー", - "effect": "Ｚパワーを 得た ソルガレオが 全力で 攻撃する。 相手の 特性の 効果を 無視できる。" + "effect": "Ｚパワーを　得た　ソルガレオが　全力で　攻撃する。　相手の　特性の　効果を　無視できる。" }, "menacingMoonrazeMaelstrom": { "name": "ムーンライトブラスター", - "effect": "Ｚパワーを 得た ルナアーラが 全力で 攻撃する。 相手の 特性の 効果を 無視できる。" + "effect": "Ｚパワーを　得た　ルナアーラが　全力で　攻撃する。　相手の　特性の　効果を　無視できる。" }, "letsSnuggleForever": { "name": "ぽかぼかフレンドタイム", - "effect": "Ｚパワーを 得た ミミッキュが 全力で ぽかぽか 攻撃。" + "effect": "Ｚパワーを　得た　ミミッキュが　全力で　ぽかぽか　攻撃。" }, "splinteredStormshards": { "name": "ラジアルエッジストーム", - "effect": "Ｚパワーを 得た ルガルガンが 全力で 攻撃する。 追加で フィールド状態を 打ち消す。" + "effect": "Ｚパワーを　得た　ルガルガンが　全力で　攻撃する。　追加で　フィールド状態を　打ち消す。" }, "clangorousSoulblaze": { "name": "ブレイジングソウルビート", - "effect": "Ｚパワーを 得た ジャラランガが 全力で 相手を 攻撃する。 追加で 自分の 能力が 上がる。" + "effect": "Ｚパワーを　得た　ジャラランガが　全力で　相手を　攻撃する。　追加で　自分の　能力が　上がる。" }, "zippyZap": { "name": "ばちばちアクセル", - "effect": "猛スピードの 電撃 アタック。 必ず 先制攻撃 できて 急所に あたる。" + "effect": "猛スピードの　電撃　アタック。　必ず　先制攻撃　できて　急所に　あたる。" }, "splishySplash": { "name": "ざぶざぶサーフ", - "effect": "大きな 波に 電気を あびせ 相手に ぶつけて 攻撃する。 まひ状態に することが ある。" + "effect": "大きな　波に　電気を　あびせ　相手に　ぶつけて　攻撃する。　まひ状態に　することが　ある。" }, "floatyFall": { "name": "ふわふわフォール", - "effect": "ふんわりと 浮かび あがり 一気に 急降下して 攻撃。 相手を ひるませることが ある。" + "effect": "ふんわりと　浮かび　あがり　一気に　急降下して　攻撃。　相手を　ひるませることが　ある。" }, "pikaPapow": { "name": "ピカピカサンダー", - "effect": "トレーナーへの 大好きな 気持ちが 強いほど 威力が あがる 電撃。 必ず 命中する。" + "effect": "トレーナーへの　大好きな　気持ちが　強いほど　威力が　あがる　電撃。　必ず　命中する。" }, "bouncyBubble": { "name": "いきいきバブル", - "effect": "水のかたまりを ぶつけて 攻撃。 水を 吸いとり ダメージの 半分の HPを 回復する。" + "effect": "水のかたまりを　ぶつけて　攻撃。　水を　吸いとり　ダメージの　半分の　HPを　回復する。" }, "buzzyBuzz": { "name": "びりびりエレキ", - "effect": "電気を 飛ばし 相手に あびせて 攻撃する。 相手を まひ状態に する。" + "effect": "電気を　飛ばし　相手に　あびせて　攻撃する。 相手を　まひ状態に　する。" }, "sizzlySlide": { "name": "めらめらバーン", - "effect": "炎を まとった 体で 勢いよく 相手に ぶつかる。 相手を やけど状態に する。" + "effect": "炎を　まとった　体で　勢いよく　相手に　ぶつかる。　相手を　やけど状態に　する。" }, "glitzyGlow": { "name": "どばどばオーラ", - "effect": "念力を これでもかと あびせる。 相手の 特殊攻撃を 弱める 不思議な かべを つくりだす。" + "effect": "念力を　これでもかと　あびせる。　相手の　特殊攻撃を　弱める　不思議な　かべを　つくりだす。" }, "baddyBad": { "name": "わるわるゾーン", - "effect": "わるさを アピールして 攻撃。 相手の 物理攻撃を 弱める 不思議な かべを つくりだす。" + "effect": "わるさを　アピールして　攻撃。　相手の　物理攻撃を　弱める　不思議な　かべを　つくりだす。" }, "sappySeed": { "name": "すくすくボンバー", - "effect": "巨大な ツルを 生やし タネを 撒きちらかして 攻撃する。 タネは 毎ターン 相手の HPを 吸いとる。" + "effect": "巨大な　ツルを　生やし　タネを　撒きちらかして　攻撃する。　タネは　毎ターン　相手の　HPを　吸いとる。" }, "freezyFrost": { "name": "こちこちフロスト", - "effect": "冷たく 凍った くろいきりの 結晶で 攻撃。 全員の 能力変化を もとに もどす。" + "effect": "冷たく　凍った　くろいきりの　結晶で　攻撃。　全員の　能力変化を　もとに　もどす。" }, "sparklySwirl": { "name": "きらきらストーム", - "effect": "むせかえる ような 香りの 竜巻で 相手を つつんで 攻撃。 味方の 状態異常を 回復する。" + "effect": "むせかえる　ような　香りの　竜巻で　相手を　つつんで　攻撃。　味方の　状態異常を　回復する。" }, "veeveeVolley": { "name": "ブイブイブレイク", - "effect": "イーブイの トレーナーへの 大好きな 気持ちが 強いほど 威力が あがる 体当たり。 必ず 命中する。" + "effect": "イーブイの　トレーナーへの　大好きな　気持ちが　強いほど　威力が　あがる　体当たり。　必ず　命中する。" }, "doubleIronBash": { "name": "ダブルパンツァー", - "effect": "胸の ナットを 軸に 回転して ２回 続けて うでを たたきつける。 相手を ひるませる ことが ある。" + "effect": "胸の　ナットを　軸に　回転して　２回　続けて　うでを　たたきつける。　相手を　ひるませる　ことが　ある。" }, "maxGuard": { "name": "ダイウォール", - "effect": "相手の 攻撃を まったく 受けない。 連続で だすと 失敗しやすい。" + "effect": "相手の　攻撃を　まったく　受けない。　連続で　だすと　失敗しやすい。" }, "dynamaxCannon": { "name": "ダイマックスほう", - "effect": "コアから ビームを 放つ。相手の レベルが 過度に 上がっている 場合は 与える ダメージが 最大 2倍に 増える。" + "effect": "コアから　ビームを　放つ。相手の　レベルが　過度に　上がっている　場合は　与える　ダメージが　最大　2倍に　増える。" }, "snipeShot": { "name": "ねらいうち", - "effect": "相手の 技を 引き受ける 特性や 技の 影響を 無視して 選んだ 相手を 攻撃 できる。" + "effect": "相手の　技を　引き受ける　特性や　技の　影響を　無視して　選んだ　相手を　攻撃　できる。" }, "jawLock": { "name": "くらいつく", - "effect": "お互い ひんしに なるまで 交代が できなくなる。 どちらかの ポケモンが いなくなると 効果は消える。" + "effect": "お互い　ひんしに　なるまで　交代が　できなくなる。　どちらかの　ポケモンが　いなくなると　効果は消える。" }, "stuffCheeks": { "name": "ほおばる", - "effect": "持っている きのみを 食べて 防御を ぐーんと あげる。" + "effect": "持っている　きのみを　食べて　防御を　ぐーんと　あげる。" }, "noRetreat": { "name": "はいすいのじん", - "effect": "自分の すべての 能力が 上がるが 交代 したり 逃げることが できなくなる。" + "effect": "自分の　すべての　能力が　上がるが　交代　したり　逃げることが　できなくなる。" }, "tarShot": { "name": "タールショット", - "effect": "ねばねばの タールを 浴びせて 相手の 素早さを 下げる。 相手は ほのおが 弱点に なる。" + "effect": "ねばねばの　タールを　浴びせて　相手の　素早さを　下げる。　相手は　ほのおが　弱点に　なる。" }, "magicPowder": { "name": "まほうのこな", - "effect": "まほうのこなを 浴びせて 相手を エスパータイプに 変化させる。" + "effect": "まほうのこなを　浴びせて　相手を　エスパータイプに　変化させる。" }, "dragonDarts": { "name": "ドラゴンアロー", - "effect": "ドラメシヤで ２回 攻撃。 相手が ２匹 いるときは それぞれに １回ずつ 攻撃する。" + "effect": "ドラメシヤで　２回　攻撃。　相手が　２匹　いるときは　それぞれに　１回ずつ　攻撃する。" }, "teatime": { "name": "おちゃかい", - "effect": "おちゃかいを ひらいて 場にいる ポケモンが それぞれ 持っている きのみを 食べる。" + "effect": "おちゃかいを　ひらいて　場にいる　ポケモンが　それぞれ　持っている　きのみを　食べる。" }, "octolock": { "name": "たこがため", - "effect": "相手を 逃げられなくする。 かためられた 相手は 毎ターン 防御と 特防が 下がる。" + "effect": "相手を　逃げられなくする。　かためられた　相手は　毎ターン　防御と　特防が　下がる。" }, "boltBeak": { "name": "でんげきくちばし", - "effect": "電気を まとった くちばしで 刺す。 相手より 先に 攻撃できると 技の 威力は ２倍に なる。" + "effect": "電気を　まとった　くちばしで　刺す。　相手より　先に　攻撃できると　技の　威力は　２倍に　なる。" }, "fishiousRend": { "name": "エラがみ", - "effect": "かたい エラで かみつく。 相手より 先に 攻撃できると 技の 威力は ２倍に なる。" + "effect": "かたい　エラで　かみつく。　相手より　先に　攻撃できると　技の　威力は　２倍に　なる。" }, "courtChange": { "name": "コートチェンジ", - "effect": "不思議な 力で お互いの 場の 効果を 入れ替える。" + "effect": "不思議な　力で　お互いの　場の　効果を　入れ替える。" }, "maxFlare": { "name": "ダイバーン", - "effect": "ダイマックスした ポケモンが 繰りだす ほのおタイプの 攻撃。 ５ターンの 間 日差しを 強くする。" + "effect": "ダイマックスした　ポケモンが　繰りだす　ほのおタイプの　攻撃。　５ターンの　間　日差しを　強くする。" }, "maxFlutterby": { "name": "ダイワーム", - "effect": "ダイマックスした ポケモンが 繰りだす むしタイプの 攻撃。 相手の 特攻を 下げる。" + "effect": "ダイマックスした　ポケモンが　繰りだす　むしタイプの　攻撃。　相手の　特攻を　下げる。" }, "maxLightning": { "name": "ダイサンダー", - "effect": "ダイマックスした ポケモンが 繰りだす でんきタイプの 攻撃。 ５ターンの 間 エレキフィールドにする。" + "effect": "ダイマックスした　ポケモンが　繰りだす　でんきタイプの　攻撃。　５ターンの　間　エレキフィールドにする。" }, "maxStrike": { "name": "ダイアタック", - "effect": "ダイマックスした ポケモンが 繰りだす ノーマルタイプの 攻撃。 相手の 素早さを 下げる。" + "effect": "ダイマックスした　ポケモンが　繰りだす　ノーマルタイプの　攻撃。　相手の　素早さを　下げる。" }, "maxKnuckle": { "name": "ダイナックル", - "effect": "ダイマックスした ポケモンが 繰りだす かくとうタイプの 攻撃。 味方の 攻撃を 上げる。" + "effect": "ダイマックスした　ポケモンが　繰りだす　かくとうタイプの　攻撃。　味方の　攻撃を　上げる。" }, "maxPhantasm": { "name": "ダイホロウ", - "effect": "ダイマックスした ポケモンが 繰りだす ゴーストタイプの 攻撃。 相手の 防御を 下げる。" + "effect": "ダイマックスした　ポケモンが　繰りだす　ゴーストタイプの　攻撃。　相手の　防御を　下げる。" }, "maxHailstorm": { "name": "ダイアイス", - "effect": "ダイマックスした ポケモンが 繰りだす こおりタイプの 攻撃。 ５ターンの 間 あられを 降らす。" + "effect": "ダイマックスした　ポケモンが　繰りだす　こおりタイプの　攻撃。　５ターンの　間　あられを　降らす。" }, "maxOoze": { "name": "ダイアシッド", - "effect": "ダイマックスした ポケモンが 繰りだす どくタイプの 攻撃。 味方の 特攻を 上げる。" + "effect": "ダイマックスした　ポケモンが　繰りだす　どくタイプの　攻撃。　味方の　特攻を　上げる。" }, "maxGeyser": { "name": "ダイストリーム", - "effect": "ダイマックスした ポケモンが 繰りだす みずタイプの 攻撃。 ５ターンの 間 雨を 降らせる。" + "effect": "ダイマックスした　ポケモンが　繰りだす　みずタイプの　攻撃。　５ターンの　間　雨を　降らせる。" }, "maxAirstream": { "name": "ダイジェット", - "effect": "ダイマックスした ポケモンが 繰りだす ひこうタイプの 攻撃。 味方の 素早さを 上げる。" + "effect": "ダイマックスした　ポケモンが　繰りだす　ひこうタイプの　攻撃。　味方の　素早さを　上げる。" }, "maxStarfall": { "name": "ダイフェアリー", - "effect": "ダイマックスした ポケモンが 繰りだす フェアリータイプの 攻撃。 ５ターンの 間 ミストフィールドにする。" + "effect": "ダイマックスした　ポケモンが　繰りだす　フェアリータイプの　攻撃。　５ターンの　間　ミストフィールドにする。" }, "maxWyrmwind": { "name": "ダイドラグーン", - "effect": "ダイマックスした ポケモンが 繰りだす ドラゴンタイプの 攻撃。 相手の 攻撃を 下げる。" + "effect": "ダイマックスした　ポケモンが　繰りだす　ドラゴンタイプの　攻撃。　相手の　攻撃を　下げる。" }, "maxMindstorm": { "name": "ダイサイコ", - "effect": "ダイマックスした ポケモンが 繰りだす エスパータイプの 攻撃。 ５ターンの 間 サイコフィールドにする。" + "effect": "ダイマックスした　ポケモンが　繰りだす　エスパータイプの　攻撃。　５ターンの　間　サイコフィールドにする。" }, "maxRockfall": { "name": "ダイロック", - "effect": "ダイマックスした ポケモンが 繰りだす いわタイプの 攻撃。 ５ターンの 間 砂あらしにする。" + "effect": "ダイマックスした　ポケモンが　繰りだす　いわタイプの　攻撃。　５ターンの　間　砂あらしにする。" }, "maxQuake": { "name": "ダイアース", - "effect": "ダイマックスした ポケモンが 繰りだす じめんタイプの 攻撃。 味方の 特防を 上げる。" + "effect": "ダイマックスした　ポケモンが　繰りだす　じめんタイプの　攻撃。　味方の　特防を　上げる。" }, "maxDarkness": { "name": "ダイアーク", - "effect": "ダイマックスした ポケモンが 繰りだす あくタイプの 攻撃。 相手の 特防を 下げる。" + "effect": "ダイマックスした　ポケモンが　繰りだす　あくタイプの　攻撃。　相手の　特防を　下げる。" }, "maxOvergrowth": { "name": "ダイソウゲン", - "effect": "ダイマックスした ポケモンが 繰りだす くさタイプの 攻撃。 ５ターンの 間 グラスフィールドにする。" + "effect": "ダイマックスした　ポケモンが　繰りだす　くさタイプの　攻撃。　５ターンの　間　グラスフィールドにする。" }, "maxSteelspike": { "name": "ダイスチル", - "effect": "ダイマックスした ポケモンが 繰りだす はがねタイプの 攻撃。 味方の 防御を 上げる。" + "effect": "ダイマックスした　ポケモンが　繰りだす　はがねタイプの　攻撃。　味方の　防御を　上げる。" }, "clangorousSoul": { "name": "ソウルビート", - "effect": "自分の ＨＰを 少し 削って すべての 能力を 上げる。" + "effect": "自分の　ＨＰを　少し　削って　すべての　能力を　上げる。" }, "bodyPress": { "name": "ボディプレス", - "effect": "体を ぶつけて 攻撃。 防御が 高いほど 与える ダメージが 増える。" + "effect": "体を　ぶつけて　攻撃。　防御が　高いほど　与える　ダメージが　増える。" }, "decorate": { "name": "デコレーション", - "effect": "かざりつけを することで 相手の 攻撃と 特攻を ぐーんと 上げる。" + "effect": "かざりつけを　することで　相手の　攻撃と　特攻を　ぐーんと　上げる。" }, "drumBeating": { "name": "ドラムアタック", - "effect": "ドラムの 根っこを ドラミングで コントロールして こうげき することで 相手の 素早さを 下げる。" + "effect": "ドラムの　根っこを　ドラミングで　コントロールして　こうげき　することで　相手の　素早さを　下げる。" }, "snapTrap": { "name": "トラバサミ", - "effect": "トラバサミで 捕らえて ４－５ターンの 間 相手を はさんで 攻撃する。" + "effect": "トラバサミで　捕らえて　４－５ターンの　間　相手を　はさんで　攻撃する。" }, "pyroBall": { "name": "かえんボール", - "effect": "小石を 燃やした 炎の ボールで 相手を 攻撃する。 やけど 状態に することが ある。" + "effect": "小石を　燃やした　炎の　ボールで　相手を　攻撃する。　やけど　状態に　することが　ある。" }, "behemothBlade": { "name": "きょじゅうざん", - "effect": "全身で 強大な剣を 振りかざし 勢いよく 切りかかって 攻撃する。" + "effect": "全身で　強大な剣を　振りかざし　勢いよく　切りかかって　攻撃する。" }, "behemothBash": { "name": "きょじゅうだん", - "effect": "全身を 強固な盾へと 変化させ 勢いよく ぶつかって 攻撃する。" + "effect": "全身を　強固な盾へと　変化させ　勢いよく　ぶつかって　攻撃する。" }, "auraWheel": { "name": "オーラぐるま", - "effect": "ほほぶくろに 溜めた エネルギーで 攻撃し 自分の 素早さを あげる。 モルペコの 姿で タイプが 変わる。" + "effect": "ほほぶくろに　溜めた　エネルギーで　攻撃し　自分の　素早さを　あげる。　モルペコの　姿で　タイプが　変わる。" }, "breakingSwipe": { "name": "ワイドブレイカー", - "effect": "きょうじんな しっぽを 激しく ふりはらって 相手を 攻撃する。 相手の 攻撃を 下げる。" + "effect": "きょうじんな　しっぽを　激しく　ふりはらって　相手を　攻撃する。　相手の　攻撃を　下げる。" }, "branchPoke": { "name": "えだづき", - "effect": "するどく とがった 枝で 相手を 突いて 攻撃する。" + "effect": "するどく　とがった　枝で　相手を　突いて　攻撃する。" }, "overdrive": { "name": "オーバードライブ", - "effect": "ギターや ベースを かきならして 激しく 響く 大きな 振動を 相手に 与えて 攻撃する。" + "effect": "ギターや　ベースを　かきならして　激しく　響く　大きな　振動を　相手に　与えて　攻撃する。" }, "appleAcid": { "name": "りんごさん", - "effect": "すっぱい りんごから つくりだした 酸性の 液体で 攻撃。 相手の 特防を 下げる。" + "effect": "すっぱい　りんごから　つくりだした　酸性の　液体で　攻撃。　相手の　特防を　下げる。" }, "gravApple": { "name": "Ｇのちから", - "effect": "高いところから りんごを 落として ダメージを 与える。 相手の 防御を 下げる。" + "effect": "高いところから　りんごを　落として　ダメージを　与える。　相手の　防御を　下げる。" }, "spiritBreak": { "name": "ソウルクラッシュ", - "effect": "食らうと くじけるほどの 勢いで 攻撃。 相手の 特攻を 下げる。" + "effect": "食らうと　くじけるほどの　勢いで　攻撃。　相手の　特攻を　下げる。" }, "strangeSteam": { "name": "ワンダースチーム", - "effect": "煙を 噴出して 相手を 攻撃。 混乱 させることが ある。" + "effect": "煙を　噴出して　相手を　攻撃。　混乱　させることが　ある。" }, "lifeDew": { "name": "いのちのしずく", - "effect": "不思議な 水を ふりまいて 自分と 場にいる 味方の ＨＰを 回復する。" + "effect": "不思議な　水を　ふりまいて　自分と　場にいる　味方の　ＨＰを　回復する。" }, "obstruct": { "name": "ブロッキング", - "effect": "相手の 攻撃を まったく 受けない。 連続で だすと 失敗しやすい。 触れると 防御が がくっと 下がる。" + "effect": "相手の　攻撃を　まったく　受けない。　連続で　だすと　失敗しやすい。　触れると　防御が　がくっと　下がる。" }, "falseSurrender": { "name": "どげざつき", - "effect": "頭を 下げる ふりを しながら 振りみだした 髪の毛を 突き刺す。 攻撃は 必ず 命中する。" + "effect": "頭を　下げる　ふりを　しながら　振りみだした　髪の毛を　突き刺す。　攻撃は　必ず　命中する。" }, "meteorAssault": { "name": "スターアサルト", - "effect": "太い クキを ふりまわして 攻撃。 ただし 自分も よろめいてしまうため 次の ターンは 動けなくなる。" + "effect": "太い　クキを　ふりまわして　攻撃。　ただし　自分も　よろめいてしまうため　次の　ターンは　動けなくなる。" }, "eternabeam": { "name": "ムゲンダイビーム", - "effect": "本来の 姿と なった ムゲンダイナ 最大の 攻撃。 次の ターンは 動けなくなる。" + "effect": "本来の　姿と　なった　ムゲンダイナ　最大の　攻撃。　次の　ターンは　動けなくなる。" }, "steelBeam": { "name": "てっていこうせん", - "effect": "全身から 集めた はがねを ビームとして 激しく 撃ちだす。 自分も ダメージを 受けてしまう。" + "effect": "全身から　集めた　はがねを　ビームとして　激しく　撃ちだす。　自分も　ダメージを　受けてしまう。" }, "expandingForce": { "name": "ワイドフォース", - "effect": "サイコパワーで 相手を 攻撃する。 サイコフィールドの時 威力が あがり すべての 相手に ダメージを 与える。" + "effect": "サイコパワーで　相手を　攻撃する。　サイコフィールドの時　威力が　あがり　すべての　相手に　ダメージを　与える。" }, "steelRoller": { "name": "アイアンローラー", - "effect": "フィールドを 破壊しながら 攻撃。 なんらかの フィールド状態に 変わっていないと 技は 失敗する。" + "effect": "フィールドを　破壊しながら　攻撃。　なんらかの　フィールド状態に　変わっていないと　技は　失敗する。" }, "scaleShot": { "name": "スケイルショット", - "effect": "ウロコを 撃ちだして 攻撃する。 ２ー５回の 間 連続で だす。 素早さが あがるが 防御が さがる。" + "effect": "ウロコを　撃ちだして　攻撃する。　２ー５回の　間　連続で　だす。　素早さが　あがるが　防御が　さがる。" }, "meteorBeam": { "name": "メテオビーム", - "effect": "１ターン目に 宇宙の 力を 集めることで 特攻が あがり ２ターン目に 相手を 攻撃する。" + "effect": "１ターン目に　宇宙の　力を　集めることで　特攻が　あがり　２ターン目に　相手を　攻撃する。" }, "shellSideArm": { "name": "シェルアームズ", - "effect": "物理か 特殊か より多く ダメージを 与えられる 能力で 攻撃する。 毒状態に することが ある。" + "effect": "物理か　特殊か　より多く　ダメージを　与えられる　能力で　攻撃する。　毒状態に　することが　ある。" }, "mistyExplosion": { "name": "ミストバースト", - "effect": "自分の 周りに いる すべてを 攻撃するが 使うと 瀕死になる。 ミストフィールドで 威力が あがる。" + "effect": "自分の　周りに　いる　すべてを　攻撃するが　使うと　瀕死になる。　ミストフィールドで　威力が　あがる。" }, "grassyGlide": { "name": "グラススライダー", - "effect": "地面を 滑るように 相手を 攻撃。 グラスフィールドの時 必ず 先制攻撃 できる。" + "effect": "地面を　滑るように　相手を　攻撃。　グラスフィールドの時　必ず　先制攻撃　できる。" }, "risingVoltage": { "name": "ライジングボルト", - "effect": "地面から 立ちのぼる 電撃で 攻撃。 相手が エレキフィールドに いる時 技の 威力が ２倍に なる。" + "effect": "地面から　立ちのぼる　電撃で　攻撃。　相手が　エレキフィールドに　いる時　技の　威力が　２倍に　なる。" }, "terrainPulse": { "name": "だいちのはどう", - "effect": "フィールドの力を 借りて 攻撃。 使った時の フィールドの状態に よって 技の タイプと 威力が 変わる。" + "effect": "フィールドの力を　借りて　攻撃。　使った時の　フィールドの状態に　よって　技の　タイプと　威力が　変わる。" }, "skitterSmack": { "name": "はいよるいちげき", - "effect": "背後から はいより 攻撃する。 相手の 特攻を さげる。" + "effect": "背後から　はいより　攻撃する。　相手の　特攻を　さげる。" }, "burningJealousy": { "name": "しっとのほのお", - "effect": "しっとの エネルギーで 相手を 攻撃。 そのターン 能力が あがった ポケモンを やけどの 状態に する。" + "effect": "しっとの　エネルギーで　相手を　攻撃。　そのターン　能力が　あがった　ポケモンを　やけどの　状態に　する。" }, "lashOut": { "name": "うっぷんばらし", - "effect": "相手への いらだちを ぶつけて 攻撃。 そのターンに 能力を さげられていると 技の 威力が ２倍に なる。" + "effect": "相手への　いらだちを　ぶつけて　攻撃。　そのターンに　能力を　さげられていると　技の　威力が　２倍に　なる。" }, "poltergeist": { "name": "ポルターガイスト", - "effect": "相手の 持ち物を あやつって 攻撃。 相手が 道具を 持っていない 場合は 失敗する。" + "effect": "相手の　持ち物を　あやつって　攻撃。　相手が　道具を　持っていない　場合は　失敗する。" }, "corrosiveGas": { "name": "ふしょくガス", - "effect": "強い 酸性の ガスで 周りに いるものを 包みこみ 持っている 道具を 溶かしてしまう。" + "effect": "強い　酸性の　ガスで　周りに　いるものを　包みこみ　持っている　道具を　溶かしてしまう。" }, "coaching": { "name": "コーチング", - "effect": "的確な 指導を おこなうことで 味方 全員の 攻撃と 防御を 上げる。" + "effect": "的確な　指導を　おこなうことで 味方　全員の　攻撃と　防御を　上げる。" }, "flipTurn": { "name": "クイックターン", - "effect": "攻撃したあと ものすごい スピードで もどってきて 控えの ポケモンと 入れ替わる。" + "effect": "攻撃したあと　ものすごい　スピードで　もどってきて　控えの　ポケモンと　入れ替わる。" }, "tripleAxel": { "name": "トリプルアクセル", - "effect": "３回連続で キックを くりだして 攻撃する。 技が 当たるたびに 威力は あがる。" + "effect": "３回連続で　キックを　くりだして　攻撃する。　技が　当たるたびに　威力は　あがる。" }, "dualWingbeat": { "name": "ダブルウイング", - "effect": "翼を 相手に ぶつけて 攻撃する。 ２回連続で ダメージを 与える。" + "effect": "翼を　相手に　ぶつけて　攻撃する。　２回連続で　ダメージを　与える。" }, "scorchingSands": { "name": "ねっさのだいち", - "effect": "熱く 焼けた 砂を 相手に ぶつけて 攻撃する。 やけど状態に することが ある。" + "effect": "熱く　焼けた　砂を　相手に　ぶつけて　攻撃する。　やけど状態に　することが　ある。" }, "jungleHealing": { "name": "ジャングルヒール", - "effect": "ジャングルと 一体化して 自分と 場にいる 味方の ＨＰと 状態を 回復する。" + "effect": "ジャングルと　一体化して　自分と　場にいる　味方の　ＨＰと　状態を　回復する。" }, "wickedBlow": { "name": "あんこくきょうだ", - "effect": "あくの型を 極めし 強烈な 一撃。 必ず 急所に 当たる。" + "effect": "あくの型を　極めし　強烈な　一撃。　必ず　急所に　当たる。" }, "surgingStrikes": { "name": "すいりゅうれんだ", - "effect": "みずの型を 極めし 流れるような ３回の 連撃。 必ず 急所に 当たる。" + "effect": "みずの型を　極めし　流れるような　３回の　連撃。　必ず　急所に　当たる。" }, "thunderCage": { "name": "サンダープリズン", - "effect": "ほとばしる 電気の おりの 中に ４ー５ターンの 間 相手を 閉じこめて 攻撃する。" + "effect": "ほとばしる　電気の　おりの　中に　４ー５ターンの　間　相手を　閉じこめて　攻撃する。" }, "dragonEnergy": { "name": "ドラゴンエナジー", - "effect": "生命力を パワーに 変え 相手を 攻撃する。 自分の ＨＰが 少ないほど 技の 威力は さがる。" + "effect": "生命力を　パワーに　変え　相手を　攻撃する。　自分の　ＨＰが　少ないほど　技の　威力は　さがる。" }, "freezingGlare": { "name": "いてつくしせん", - "effect": "両目から サイコパワーを 撃ちだして 攻撃する。 こおり状態に することが ある。" + "effect": "両目から　サイコパワーを　撃ちだして　攻撃する。　こおり状態に　することが　ある。" }, "fieryWrath": { "name": "もえあがるいかり", - "effect": "怒りを 炎の ような オーラに 変えて 攻撃する。 相手を ひるませることが ある。" + "effect": "怒りを　炎の　ような　オーラに　変えて　攻撃する。　相手を　ひるませることが　ある。" }, "thunderousKick": { "name": "らいめいげり", - "effect": "雷の ような 動きで 相手を 翻弄しながら キックする。 相手の 防御を さげる。" + "effect": "雷の　ような　動きで　相手を　翻弄しながら　キックする。　相手の　防御を　さげる。" }, "glacialLance": { "name": "ブリザードランス", - "effect": "吹雪を まとった 氷の 槍を 相手に 投げつけて 攻撃する。" + "effect": "吹雪を　まとった　氷の　槍を　相手に　投げつけて　攻撃する。" }, "astralBarrage": { "name": "アストラルビット", - "effect": "たくさんの 小さな 霊体を 相手に ぶつけて 攻撃する。" + "effect": "たくさんの　小さな　霊体を　相手に　ぶつけて　攻撃する。" }, "eerieSpell": { "name": "ぶきみなじゅもん", - "effect": "強力な サイコパワーで 攻撃。 相手が 最後に 使った技の ＰＰを ３だけ 減らす。" + "effect": "強力な　サイコパワーで　攻撃。　相手が　最後に　使った技の　ＰＰを　３だけ　減らす。" }, "direClaw": { "name": "フェイタルクロー", - "effect": "破滅的なツメで 攻撃する。 相手を どく まひ ねむりの いずれかの状態に することも ある。" + "effect": "破滅的なツメで　攻撃する。　相手を　どく　まひ　ねむりの　いずれかの状態に　することも　ある。" }, "psyshieldBash": { "name": "バリアーラッシュ", - "effect": "思念のエネルギーを まといながら 相手に ぶつかっていく。 自分の 防御を あげる。" + "effect": "思念のエネルギーを　まといながら　相手に　ぶつかっていく。　自分の　防御を　あげる。" }, "powerShift": { "name": "パワーシフト", - "effect": "自分の 攻撃と防御を 入れ替える。" + "effect": "自分の　攻撃と防御を　入れ替える。" }, "stoneAxe": { "name": "がんせきアックス", - "effect": "岩の斧で 攻撃する。 ばらまかれた 岩の破片が 相手の 周りに 浮かぶ。" + "effect": "岩の斧で　攻撃する。　ばらまかれた　岩の破片が　相手の　周りに　浮かぶ。" }, "springtideStorm": { "name": "はるのあらし", - "effect": "愛憎 入りまじった 強烈な風で 相手を 包みこんで 攻撃する。 相手の 攻撃を さげることが ある。" + "effect": "愛憎　入りまじった　強烈な風で　相手を　包みこんで　攻撃する。　相手の　攻撃を　さげることが　ある。" }, "mysticalPower": { "name": "しんぴのちから", - "effect": "不思議な力を 放出して 攻撃する。 自分の 特攻が あがる。" + "effect": "不思議な力を　放出して　攻撃する。　自分の　特攻が　あがる。" }, "ragingFury": { "name": "だいふんげき", - "effect": "2-3ターンの 間 炎を 放ちながら 暴れまわる。 暴れたあとは 混乱する。" + "effect": "2-3ターンの　間　炎を　放ちながら　暴れまわる。　暴れたあとは　混乱する。" }, "waveCrash": { "name": "ウェーブタックル", - "effect": "水を まといつつ 全身で 相手に ぶつかるが 自分も かなりの ダメージ を受ける。" + "effect": "水を　まといつつ　全身で　相手に　ぶつかるが　自分も　かなりの　ダメージ　を受ける。" }, "chloroblast": { "name": "クロロブラスト", - "effect": "自身の 葉緑素を 集約し 放出して 攻撃する。 自分も ダメージを 受けてしまう。" + "effect": "自身の　葉緑素を　集約し　放出して　攻撃する。　自分も　ダメージを　受けてしまう。" }, "mountainGale": { "name": "ひょうざんおろし", - "effect": "氷山のような 大きな 氷塊を ぶつけて 攻撃する。 相手を ひるませることが ある。" + "effect": "氷山のような　大きな　氷塊を　ぶつけて　攻撃する。　相手を　ひるませることが　ある。" }, "victoryDance": { "name": "しょうりのまい", - "effect": "勝利を 呼びこむ 舞を 激しく 踊って 自分の 攻撃と 防御と 素早さを あげる。" + "effect": "勝利を　呼びこむ　舞を　激しく　踊って　自分の　攻撃と　防御と　素早さを　あげる。" }, "headlongRush": { "name": "ぶちかまし", - "effect": "全身全霊の たいあたりを くらわせる。 自分の 防御と 特防が さがる。" + "effect": "全身全霊の　たいあたりを　くらわせる。　自分の　防御と　特防が　さがる。" }, "barbBarrage": { "name": "どくばりセンボン", - "effect": "無数の毒針で 相手を 毒状態に することもある。 相手が 毒状態だと 威力は 2倍になる。" + "effect": "無数の毒針で　相手を　毒状態に　することもある。　相手が　毒状態だと　威力は　2倍になる。" }, "esperWing": { "name": "オーラウイング", - "effect": "オーラで 強化した翼で 切り裂く。 急所に 当たりやすい。 自分の 素早さを あげる。" + "effect": "オーラで　強化した翼で　切り裂く。　急所に　当たりやすい。　自分の　素早さを　あげる。" }, "bitterMalice": { "name": "うらみつらみ", - "effect": "背筋が 凍るような 怨念で 攻撃して 相手の 攻撃を さげる。" + "effect": "背筋が　凍るような　怨念で　攻撃して　相手の　攻撃を　さげる。" }, "shelter": { "name": "たてこもる", - "effect": "皮膚を 鉄の盾のように 硬くすることで 自分の 防御を ぐーんと あげる。" + "effect": "皮膚を　鉄の盾のように　硬くすることで　自分の　防御を　ぐーんと　あげる。" }, "tripleArrows": { "name": "３ぼんのや", - "effect": "足技のあと 3本の矢を 同時に放つ。 相手の 防御を さげたり ひるませることが ある。 急所に 当たりやすい。" + "effect": "足技のあと　3本の矢を　同時に放つ。　相手の　防御を　さげたり　ひるませることが　ある。　急所に　当たりやすい。" }, "infernalParade": { "name": "ひゃっきやこう", - "effect": "無数の火の玉で 攻撃して やけど状態に することが ある。 相手が 状態異常だと 威力は 2倍。" + "effect": "無数の火の玉で　攻撃して　やけど状態に　することが　ある。　相手が　状態異常だと　威力は　2倍。" }, "ceaselessEdge": { "name": "ひけん・ちえなみ", - "effect": "貝殻の剣で 攻撃する。 ばらまかれた 貝殻の破片は 相手の 足下に まきびし となって 散らばる。" + "effect": "貝殻の剣で　攻撃する。　ばらまかれた　貝殻の破片は　相手の　足下に　まきびし　となって　散らばる。" }, "bleakwindStorm": { "name": "こがらしあらし", - "effect": "身も心も 震える 冷たく 激しい風で 攻撃する。 相手の 素早さを さげることが ある。" + "effect": "身も心も　震える　冷たく　激しい風で　攻撃する。　相手の　素早さを　さげることが　ある。" }, "wildboltStorm": { "name": "かみなりあらし", - "effect": "嵐を 起こし 雷雲を 呼びよせ 雷と風で 激しく 攻撃をする。 相手を まひ状態に することもある。" + "effect": "嵐を　起こし　雷雲を　呼びよせ　雷と風で　激しく　攻撃をする。　相手を　まひ状態に　することもある。" }, "sandsearStorm": { "name": "ねっさのあらし", - "effect": "熱く焼けた砂と 強烈な風で 包みこんで 攻撃する。 相手を やけど状態に することがある。" + "effect": "熱く焼けた砂と　強烈な風で　包みこんで　攻撃する。　相手を　やけど状態に　することがある。" }, "lunarBlessing": { "name": "みかづきのいのり", - "effect": "みかづきに いのりを ささげて 自分と 場にいる 味方の HPと 状態を 回復する。" + "effect": "みかづきに　いのりを　ささげて　自分と　場にいる　味方の　HPと　状態を　回復する。" }, "takeHeart": { "name": "ブレイブチャージ", - "effect": "心を 奮わせて 自分の 状態異常を 治し さらには 特攻と 特防を あげる。" + "effect": "心を　奮わせて　自分の　状態異常を　治し　さらには　特攻と　特防を　あげる。" }, "gMaxWildfire": { "name": "キョダイゴクエン", - "effect": "キョダイマックスした リザードンが 繰りだす ほのおタイプの 攻撃。 4ターンの 間 ダメージを 与える。" + "effect": "キョダイマックスした　リザードンが　繰りだす　ほのおタイプの　攻撃。　4ターンの　間　ダメージを　与える。" }, "gMaxBefuddle": { "name": "キョダイコワク", - "effect": "キョダイマックスした バタフリーが 繰り出す むしタイプの 攻撃。 毒・まひ・眠りの どれかに する。" + "effect": "キョダイマックスした　バタフリーが　繰り出す　むしタイプの　攻撃。　毒・まひ・眠りの　どれかに　する。" }, "gMaxVoltCrash": { "name": "キョダイバンライ", - "effect": "キョダイマックスした ピカチュウが 繰りだす でんきタイプの 攻撃。 相手を まひ状態に する。" + "effect": "キョダイマックスした　ピカチュウが　繰りだす　でんきタイプの　攻撃。　相手を　まひ状態に　する。" }, "gMaxGoldRush": { "name": "キョダイコバン", - "effect": "キョダイマックスした ニャースが 繰り出す ノーマルタイプの 攻撃。 相手を 混乱させ お金も もらえる。" + "effect": "キョダイマックスした　ニャースが　繰り出す　ノーマルタイプの　攻撃。　相手を　混乱させ　お金も　もらえる。" }, "gMaxChiStrike": { "name": "キョダイシンゲキ", - "effect": "キョダイマックスした カイリキーが 繰りだす かくとうタイプの 攻撃。 急所に 当たりやすく なる。" + "effect": "キョダイマックスした　カイリキーが　繰りだす　かくとうタイプの　攻撃。　急所に　当たりやすく　なる。" }, "gMaxTerror": { "name": "キョダイゲンエイ", - "effect": "キョダイマックスした ゲンガーが 繰りだす ゴーストタイプの 攻撃。 影を 踏み 交代 できなくする。" + "effect": "キョダイマックスした　ゲンガーが　繰りだす　ゴーストタイプの　攻撃。　影を　踏み　交代　できなくする。" }, "gMaxResonance": { "name": "キョダイセンリツ", - "effect": "キョダイマックスした ラプラスが 繰りだす こおりタイプの 攻撃。 5ターンの 間 ダメージを 弱める。" + "effect": "キョダイマックスした　ラプラスが　繰りだす　こおりタイプの　攻撃。　5ターンの　間　ダメージを　弱める。" }, "gMaxCuddle": { "name": "キョダイホーヨー", - "effect": "キョダイマックスした イーブイが 繰りだす ノーマルタイプの 攻撃。 相手を メロメロに する。" + "effect": "キョダイマックスした　イーブイが　繰りだす　ノーマルタイプの　攻撃。　相手を　メロメロに　する。" }, "gMaxReplenish": { "name": "キョダイサイセイ", - "effect": "キョダイマックスした カビゴンが 繰りだす ノーマルタイプの 攻撃。 食べた きのみを 再生する。" + "effect": "キョダイマックスした　カビゴンが　繰りだす　ノーマルタイプの　攻撃。　食べた　きのみを　再生する。" }, "gMaxMalodor": { "name": "キョダイシュウキ", - "effect": "キョダイマックスした ダストダスが 繰りだす どくタイプの 攻撃。 相手を 毒 状態に する。" + "effect": "キョダイマックスした　ダストダスが　繰りだす　どくタイプの　攻撃。　相手を　毒　状態に　する。" }, "gMaxStonesurge": { "name": "キョダイガンジン", - "effect": "キョダイマックスした カジリガメが 繰りだす みずタイプの 攻撃。 鋭い 無数の 岩を ばらまく。" + "effect": "キョダイマックスした　カジリガメが　繰りだす　みずタイプの　攻撃。　鋭い　無数の　岩を　ばらまく。" }, "gMaxWindRage": { "name": "キョダイフウゲキ", - "effect": "キョダイマックスした アーマーガアが 繰りだす ひこうタイプの 攻撃。 リフレクターや ひかりのかべを 消し去る。" + "effect": "キョダイマックスした　アーマーガアが　繰りだす　ひこうタイプの　攻撃。　リフレクターや　ひかりのかべを　消し去る。" }, "gMaxStunShock": { "name": "キョダイカンデン", - "effect": "キョダイマックスした ストリンダーが 繰り出す でんきタイプの 攻撃。 相手を 毒 か まひ どちらかにする。" + "effect": "キョダイマックスした　ストリンダーが　繰り出す　でんきタイプの　攻撃。　相手を　毒　か　まひ　どちらかにする。" }, "gMaxFinale": { "name": "キョダイダンエン", - "effect": "キョダイマックスした マホイップが 繰りだす フェアリータイプの 攻撃。 味方の HPを 回復する。" + "effect": "キョダイマックスした　マホイップが　繰りだす　フェアリータイプの　攻撃。　味方の　HPを　回復する。" }, "gMaxDepletion": { "name": "キョダイゲンスイ", - "effect": "キョダイマックスした ジュラルドンが 繰りだす ドラゴンタイプの 攻撃。 最後に 使われた わざPPを 減らす。" + "effect": "キョダイマックスした　ジュラルドンが　繰りだす　ドラゴンタイプの　攻撃。　最後に　使われた　わざPPを　減らす。" }, "gMaxGravitas": { "name": "キョダイテンドウ", - "effect": "キョダイマックスした イオルブが 繰りだす エスパータイプの 攻撃。 5ターンの 間 重力が 変わる。" + "effect": "キョダイマックスした　イオルブが　繰りだす　エスパータイプの　攻撃。　5ターンの　間　重力が　変わる。" }, "gMaxVolcalith": { "name": "キョダイフンセキ", - "effect": "キョダイマックスした セキタンザンが 繰りだす いわタイプの 攻撃。 4ターンの 間 ダメージを 与える。" + "effect": "キョダイマックスした　セキタンザンが　繰りだす　いわタイプの　攻撃。　4ターンの　間　ダメージを　与える。" }, "gMaxSandblast": { "name": "キョダイサジン", - "effect": "キョダイマックスした サダイジャが 繰りだす じめんタイプの 攻撃。 4－5ターンの間 砂が 吹き荒れる。" + "effect": "キョダイマックスした　サダイジャが　繰りだす　じめんタイプの　攻撃。　4－5ターンの間　砂が　吹き荒れる。" }, "gMaxSnooze": { "name": "キョダイスイマ", - "effect": "キョダイマックスした オーロンゲが 繰りだす あくタイプの 攻撃。 大きな あくびで 眠気を 誘う。" + "effect": "キョダイマックスした　オーロンゲが　繰りだす　あくタイプの　攻撃。　大きな　あくびで　眠気を　誘う。" }, "gMaxTartness": { "name": "キョダイサンゲキ", - "effect": "キョダイマックスした アップリューが 繰りだす くさタイプの 攻撃。 相手の 回避率を 下げる。" + "effect": "キョダイマックスした　アップリューが　繰りだす　くさタイプの　攻撃。　相手の　回避率を　下げる。" }, "gMaxSweetness": { "name": "キョダイカンロ", - "effect": "キョダイマックスした タルップルが 繰りだす くさタイプの 攻撃。 味方の 状態異常を 回復する。" + "effect": "キョダイマックスした　タルップルが　繰りだす　くさタイプの　攻撃。　味方の　状態異常を　回復する。" }, "gMaxSmite": { "name": "キョダイテンバツ", - "effect": "キョダイマックスした ブリムオンが 繰りだす フェアリータイプの 攻撃。 相手を 混乱させる。" + "effect": "キョダイマックスした　ブリムオンが　繰りだす　フェアリータイプの　攻撃。　相手を　混乱させる。" }, "gMaxSteelsurge": { "name": "キョダイコウジン", - "effect": "キョダイマックスした ダイオウドウが 繰りだす タイプの 攻撃。 鋭い 無数の とげを ばらまく。" + "effect": "キョダイマックスした　ダイオウドウが　繰りだす　タイプの　攻撃。　鋭い　無数の　とげを　ばらまく。" }, "gMaxMeltdown": { "name": "キョダイユウゲキ", - "effect": "キョダイマックスした メルメタルが 繰りだす はがねタイプの 攻撃。 同じ 技を 連続で 出せなくする。" + "effect": "キョダイマックスした　メルメタルが　繰りだす　はがねタイプの　攻撃。　同じ　技を　連続で　出せなくする。" }, "gMaxFoamBurst": { "name": "キョダイホウマツ", - "effect": "キョダイマックスした キングラーが 繰りだす みずタイプの 攻撃。 相手の 素早さを がくっと さげる。" + "effect": "キョダイマックスした　キングラーが　繰りだす　みずタイプの　攻撃。　相手の　素早さを　がくっと　さげる。" }, "gMaxCentiferno": { "name": "キョダイヒャッカ", - "effect": "キョダイマックスした マルヤクデが 繰りだす ほのおタイプの 攻撃。 4－5ターンの間 炎に 閉じこめる。" + "effect": "キョダイマックスした　マルヤクデが　繰りだす　ほのおタイプの　攻撃。　4－5ターンの間　炎に　閉じこめる。" }, "gMaxVineLash": { "name": "キョダイベンタツ", - "effect": "キョダイマックスした フシギバナが 繰りだす くさタイプの 攻撃。 4ターンの 間 ダメージを 与える。" + "effect": "キョダイマックスした　フシギバナが　繰りだす　くさタイプの　攻撃。　4ターンの　間　ダメージを　与える。" }, "gMaxCannonade": { "name": "キョダイホウゲキ", - "effect": "キョダイマックスした カメックスが 繰りだす みずタイプの 攻撃。 4ターンの 間 ダメージを 与える。" + "effect": "キョダイマックスした　カメックスが　繰りだす　みずタイプの　攻撃。　4ターンの　間　ダメージを　与える。" }, "gMaxDrumSolo": { "name": "キョダイコランダ", - "effect": "キョダイマックスした ゴリランダーが 繰りだす くさタイプの 攻撃。 相手の 特性に ジャマされない。" + "effect": "キョダイマックスした　ゴリランダーが　繰りだす　くさタイプの　攻撃。　相手の　特性に　ジャマされない。" }, "gMaxFireball": { "name": "キョダイカキュウ", - "effect": "キョダイマックスした エースバーンが 繰りだす ほのおタイプの 攻撃。 相手の 特性に ジャマされない。" + "effect": "キョダイマックスした　エースバーンが　繰りだす　ほのおタイプの　攻撃。　相手の　特性に　ジャマされない。" }, "gMaxHydrosnipe": { "name": "キョダイソゲキ", - "effect": "キョダイマックスした インテレオンが 繰りだす みずタイプの 攻撃。 相手の 特性に ジャマされない。" + "effect": "キョダイマックスした　インテレオンが　繰りだす　みずタイプの　攻撃。　相手の　特性に　ジャマされない。" }, "gMaxOneBlow": { "name": "キョダイイチゲキ", - "effect": "キョダイマックスした ウーラオスが 繰りだす あくタイプの 攻撃。 ダイウォールを 無視できる 一撃。" + "effect": "キョダイマックスした　ウーラオスが　繰りだす　あくタイプの　攻撃。　ダイウォールを　無視できる　一撃。" }, "gMaxRapidFlow": { "name": "キョダイレンゲキ", - "effect": "キョダイマックスした ウーラオスが 繰りだす みずタイプの 攻撃。 ダイウォールを 無視できる 連撃。" + "effect": "キョダイマックスした　ウーラオスが　繰りだす　みずタイプの　攻撃。　ダイウォールを　無視できる　連撃。" }, "teraBlast": { "name": "テラバースト", - "effect": "テラスタルだと テラスタイプの エネルギーを 放出して 攻撃する。 攻撃と 特攻を 比べて 高いほうで ダメージを 与える。" + "effect": "テラスタルだと　テラスタイプの　エネルギーを　放出して　攻撃する。　攻撃と　特攻を　比べて　高いほうで　ダメージを　与える。" }, "silkTrap": { "name": "スレッドトラップ", - "effect": "糸の罠を はりめぐらせる。 相手の 攻撃を 防ぐと 同時に 触れた 相手の 素早さを さげる。" + "effect": "糸の罠を　はりめぐらせる。　相手の　攻撃を　防ぐと　同時に　触れた　相手の　素早さを　さげる。" }, "axeKick": { "name": "かかとおとし", - "effect": "蹴りあげた かかとを 落として 攻撃する。 相手を 混乱させることが ある。 はずすと 自分が ダメージを 受ける。" + "effect": "蹴りあげた　かかとを　落として　攻撃する。　相手を　混乱させることが　ある。　はずすと　自分が　ダメージを　受ける。" }, "lastRespects": { "name": "おはかまいり", - "effect": "仲間の 無念を 晴らすため 攻撃する。 倒された 味方のポケモンが 多いほど 技の 威力が 増える。" + "effect": "仲間の　無念を　晴らすため　攻撃する。　倒された　味方のポケモンが　多いほど　技の　威力が　増える。" }, "luminaCrash": { "name": "ルミナコリジョン", - "effect": "精神にも 作用する 奇妙な光を 放って 攻撃する。 相手の 特防を がくっと さげる。" + "effect": "精神にも　作用する　奇妙な光を　放って　攻撃する。　相手の　特防を　がくっと　さげる。" }, "orderUp": { "name": "いっちょうあがり", - "effect": "いなせな 身のこなしで 攻撃。 口の中に シャリタツが いると そのすがたによって 能力が あがる。" + "effect": "いなせな　身のこなしで　攻撃。　口の中に　シャリタツが　いると　そのすがたによって　能力が　あがる。" }, "jetPunch": { "name": "ジェットパンチ", - "effect": "激流を こぶしに まとって 目にも 留まらぬ パンチを くりだす。 必ず 先制攻撃 できる。" + "effect": "激流を　こぶしに　まとって　目にも　留まらぬ　パンチを　くりだす。　必ず　先制攻撃　できる。" }, "spicyExtract": { "name": "ハバネロエキス", - "effect": "とんでもなく 辛いエキスを 出す。 相手の 攻撃が ぐーんと あがり 防御が がくっと さがる。" + "effect": "とんでもなく　辛いエキスを　出す。　相手の　攻撃が　ぐーんと　あがり　防御が　がくっと　さがる。" }, "spinOut": { "name": "ホイールスピン", - "effect": "足に 負荷を かけることにより 激しく 回転して ダメージを 与える。 自分の 素早さが がくっと さがる。" + "effect": "足に　負荷を　かけることにより　激しく　回転して　ダメージを　与える。　自分の　素早さが　がくっと　さがる。" }, "populationBomb": { "name": "ネズミざん", - "effect": "仲間たちが わらわらと 集まって コンビネーションで 攻撃を 与えていく。 1-10回の 間 連続で あたる。" + "effect": "仲間たちが　わらわらと　集まって　コンビネーションで　攻撃を　与えていく。　1-10回の　間　連続で　あたる。" }, "iceSpinner": { "name": "アイススピナー", - "effect": "足に 薄い氷を まとい クルクルと 回りながら ぶつかる。 回転の 動きによって フィールドを 壊す。" + "effect": "足に　薄い氷を　まとい　クルクルと　回りながら　ぶつかる。　回転の　動きによって　フィールドを　壊す。" }, "glaiveRush": { "name": "きょけんとつげき", - "effect": "体を 投げだす 無謀な突撃。 技のあと 相手からの 攻撃は 必ず 命中し ダメージが 2倍に なってしまう。" + "effect": "体を　投げだす　無謀な突撃。　技のあと　相手からの　攻撃は　必ず　命中し　ダメージが　2倍に　なってしまう。" }, "revivalBlessing": { "name": "さいきのいのり", - "effect": "慈愛の心で いのることにより 控えにいる ひんしの ポケモンを HPを 半分の状態で 復活させる。" + "effect": "慈愛の心で　いのることにより　控えにいる　ひんしの　ポケモンを　HPを　半分の状態で　復活させる。" }, "saltCure": { "name": "しおづけ", - "effect": "相手を しおづけ状態に して 毎ターン ダメージを 与える。 はがね みずタイプは より 苦しむ。" + "effect": "相手を　しおづけ状態に　して　毎ターン　ダメージを　与える。　はがね　みずタイプは　より　苦しむ。" }, "tripleDive": { "name": "トリプルダイブ", - "effect": "息のあった 飛びこみを することで 相手に 水しぶきを あてる。 3回連続で ダメージを 与える。" + "effect": "息のあった　飛びこみを　することで　相手に　水しぶきを　あてる。　3回連続で　ダメージを　与える。" }, "mortalSpin": { "name": "キラースピン", - "effect": "回転して 相手を 攻撃する。 しめつける まきつく やどりぎのタネ など 吹きとばす。 相手を 毒状態に する。" + "effect": "回転して　相手を　攻撃する。　しめつける　まきつく　やどりぎのタネ　など　吹きとばす。　相手を　毒状態に　する。" }, "doodle": { "name": "うつしえ", - "effect": "相手の本質を とらえて うつしだし 自分と 味方を 相手と 同じ 特性に 変化させる。" + "effect": "相手の本質を　とらえて　うつしだし　自分と　味方を　相手と　同じ　特性に　変化させる。" }, "filletAway": { "name": "みをけずる", - "effect": "自分の HPを けずって 自分の 攻撃と 特攻と 素早さを ぐーんと あげる。" + "effect": "自分の　HPを　けずって　自分の　攻撃と　特攻と　素早さを　ぐーんと　あげる。" }, "kowtowCleave": { "name": "ドゲザン", - "effect": "土下座して 相手を 油断させておいて 切りかかる。 攻撃は 必ず 命中する。" + "effect": "土下座して　相手を　油断させておいて　切りかかる。　攻撃は　必ず　命中する。" }, "flowerTrick": { "name": "トリックフラワー", - "effect": "細工がある 花たばを 相手に 投げて 攻撃する。 必ず 命中して 急所にも 当たる。" + "effect": "細工がある　花たばを　相手に　投げて　攻撃する。　必ず　命中して　急所にも　当たる。" }, "torchSong": { "name": "フレアソング", - "effect": "燃えたぎる 火炎を 歌うように 吹きつけて 相手を 焦がす。 自分の 特攻を あげる。" + "effect": "燃えたぎる　火炎を　歌うように　吹きつけて　相手を　焦がす。　自分の　特攻を　あげる。" }, "aquaStep": { "name": "アクアステップ", - "effect": "水もしたたる かろやかな 足どりで 相手を 翻弄し ダメージを 与える。 自分の 素早さを あげる。" + "effect": "水もしたたる　かろやかな　足どりで　相手を　翻弄し　ダメージを　与える。　自分の　素早さを　あげる。" }, "ragingBull": { "name": "レイジングブル", - "effect": "怒り狂う あばれうしの 猛烈な タックル。 フォルムで 技のタイプが 変わり ひかりのかべや リフレクターなども 破壊できる。" + "effect": "怒り狂う　あばれうしの　猛烈な　タックル。　フォルムで　技のタイプが　変わり　ひかりのかべや　リフレクターなども　破壊できる。" }, "makeItRain": { "name": "ゴールドラッシュ", - "effect": "大量のコインを ぶちまけて 攻撃。 自分の 特攻が さがる。 戦闘の あとで お金も もらえる。" + "effect": "大量のコインを　ぶちまけて　攻撃。　自分の　特攻が　さがる。　戦闘の　あとで　お金も　もらえる。" }, "psyblade": { "name": "サイコブレイド", - "effect": "実体のない刃で 相手を 切り裂く。 エレキフィールドに いるとき 技の威力が 1.5倍に なる。" + "effect": "実体のない刃で　相手を　切り裂く。　エレキフィールドに　いるとき　技の威力が　1.5倍に　なる。" }, "hydroSteam": { "name": "ハイドロスチーム", - "effect": "煮えたぎる水を 勢いよく 浴びせる。 日差しが 強いとき 技の威力が さがるどころか 1.5倍になる。" + "effect": "煮えたぎる水を　勢いよく　浴びせる。　日差しが　強いとき　技の威力が　さがるどころか　1.5倍になる。" }, "ruination": { "name": "カタストロフィ", - "effect": "破滅的な 災厄を 巻き起こし 相手の HPを 半分に する。" + "effect": "破滅的な　災厄を　巻き起こし　相手の　HPを　半分に　する。" }, "collisionCourse": { "name": "アクセルブレイク", - "effect": "変形しながら 荒々しく 落下し いにしえの 大爆発を 引き起こす。 弱点をつくと さらに 威力が 増す。" + "effect": "変形しながら　荒々しく　落下し　いにしえの　大爆発を　引き起こす。　弱点をつくと　さらに　威力が　増す。" }, "electroDrift": { "name": "イナズマドライブ", - "effect": "変形しながら 超高速で 走行し 未知なる 電撃が 相手を つらぬく。 弱点をつくと さらに 威力が 増す。" + "effect": "変形しながら　超高速で　走行し　未知なる　電撃が　相手を　つらぬく。　弱点をつくと　さらに　威力が　増す。" }, "shedTail": { "name": "しっぽきり", - "effect": "自分の HPを 削って 分身を だしたあと もどってきて 控えの ポケモンと 入れ替わる。" + "effect": "自分の　HPを　削って　分身を　だしたあと　もどってきて　控えの　ポケモンと　入れ替わる。" }, "chillyReception": { "name": "さむいギャグ", - "effect": "場を 凍らせる ギャグを 言い残し 控えの ポケモンと 入れ替わる。 5ターンの 間 ゆきを 降らす。" + "effect": "場を　凍らせる　ギャグを　言い残し　控えの　ポケモンと　入れ替わる。　5ターンの　間　ゆきを　降らす。" }, "tidyUp": { "name": "おかたづけ", - "effect": "まきびし ステルスロック ねばねばネット どくびし みがわりを すべて かたづける。 自分の 攻撃と 素早さが あがる。" + "effect": "まきびし　ステルスロック　ねばねばネット　どくびし　みがわりを　すべて　かたづける。　自分の　攻撃と　素早さが　あがる。" }, "snowscape": { "name": "ゆきげしき", - "effect": "5ターンの 間 ゆきを 降らせる。 こおりタイプの 防御が あがる。" + "effect": "5ターンの　間　ゆきを　降らせる。　こおりタイプの　防御が　あがる。" }, "pounce": { "name": "とびつく", - "effect": "相手に 飛びついて 攻撃する。 相手の 素早さを さげる。" + "effect": "相手に　飛びついて　攻撃する。　相手の　素早さを　さげる。" }, "trailblaze": { "name": "くさわけ", - "effect": "草むらから 飛びだすように 攻撃する。 軽快な 足どりに よって 自分の 素早さを あげる。" + "effect": "草むらから　飛びだすように　攻撃する。　軽快な　足どりに　よって　自分の　素早さを　あげる。" }, "chillingWater": { "name": "ひやみず", - "effect": "相手の 元気を 失わせるくらい 冷たい水を 浴びせて 攻撃する。 相手の 攻撃を さげる。" + "effect": "相手の　元気を　失わせるくらい　冷たい水を　浴びせて　攻撃する。　相手の　攻撃を　さげる。" }, "hyperDrill": { "name": "ハイパードリル", - "effect": "とがった 体の部位を 急速に 回転させ つらぬく。 まもるや みきり なども 無視 できる。" + "effect": "とがった　体の部位を　急速に　回転させ　つらぬく。　まもるや　みきり　なども　無視　できる。" }, "twinBeam": { "name": "ツインビーム", - "effect": "両目から 不可思議な 光線を 発射して 攻撃する。 2回連続で ダメージを 与える。" + "effect": "両目から　不可思議な　光線を　発射して　攻撃する。　2回連続で　ダメージを　与える。" }, "rageFist": { "name": "ふんどのこぶし", - "effect": "怒りを エネルギーに 変えて 攻撃。 受けた 攻撃の 回数が 多いほど 技の 威力が あがる。" + "effect": "怒りを　エネルギーに　変えて　攻撃。　受けた　攻撃の　回数が　多いほど　技の　威力が　あがる。" }, "armorCannon": { "name": "アーマーキャノン", - "effect": "みずからの ヨロイを 燃えたぎる 弾として 撃ち出して 攻撃する。 自分の 防御と 特防が さがる。" + "effect": "みずからの　ヨロイを　燃えたぎる　弾として　撃ち出して　攻撃する。　自分の　防御と　特防が　さがる。" }, "bitterBlade": { "name": "むねんのつるぎ", - "effect": "この世への 未練を 剣先に こめて 切りつける。 与えた ダメージの 半分の HPを 回復できる。" + "effect": "この世への　未練を　剣先に　こめて　切りつける。　与えた　ダメージの　半分の　HPを　回復できる。" }, "doubleShock": { "name": "でんこうそうげき", - "effect": "全身の でんきを すべて 放って 大ダメージを 与える。 自分の でんきタイプが なくなる。" + "effect": "全身の　でんきを　すべて　放って　大ダメージを　与える。　自分の　でんきタイプが　なくなる。" }, "gigatonHammer": { "name": "デカハンマー", - "effect": "大きな ハンマーを 体ごと ぶんまわして 攻撃する。 この技は 2回連続で だせない。" + "effect": "大きな　ハンマーを　体ごと　ぶんまわして　攻撃する。　この技は　2回連続で　だせない。" }, "comeuppance": { "name": "ほうふく", - "effect": "技を だす前に 最後に 受けた 技の ダメージを 大きくして だした 相手に 返す。" + "effect": "技を　だす前に　最後に　受けた　技の　ダメージを　大きくして　だした　相手に　返す。" }, "aquaCutter": { "name": "アクアカッター", - "effect": "加圧された 水を 刃のように 噴射して 相手を 切り裂く。 急所に 当たりやすい。" + "effect": "加圧された　水を　刃のように　噴射して　相手を　切り裂く。　急所に　当たりやすい。" }, "blazingTorque": { "name": "バーンアクセル", - "effect": "メラメラの エンジンを 吹かして 相手に ぶつかる。やけど状態に することが ある。" + "effect": "メラメラの　エンジンを　吹かして　相手に　ぶつかる。やけど状態に　することが　ある。" }, "wickedTorque": { "name": "ダークアクセル", - "effect": "悪意で エンジンを 吹かして 相手に ぶつかる。眠り状態に することが ある。" + "effect": "悪意で　エンジンを　吹かして　相手に　ぶつかる。眠り状態に　することが　ある。" }, "noxiousTorque": { "name": "ポイズンアクセル", - "effect": "有毒な エンジンを 吹かして 相手に ぶつかる。毒状態に することが ある。" + "effect": "有毒な　エンジンを　吹かして　相手に　ぶつかる。毒状態に　することが　ある。" }, "combatTorque": { "name": "ファイトアクセル", - "effect": "力いっぱい エンジンを 吹かして 相手に ぶつかる。まひ状態に することが ある。" + "effect": "力いっぱい　エンジンを　吹かして　相手に　ぶつかる。まひ状態に　することが　ある。" }, "magicalTorque": { "name": "マジカルアクセル", - "effect": "幻想的な エンジンを 吹かして 相手に ぶつかる。混乱させることが ある。" + "effect": "幻想的な　エンジンを　吹かして　相手に　ぶつかる。混乱させることが　ある。" }, "bloodMoon": { "name": "ブラッドムーン", - "effect": "血のように 赤い満月から ありったけの 気迫を 撃ちだす。 この技は 2回連続で だせない。" + "effect": "血のように　赤い満月から　ありったけの　気迫を　撃ちだす。　この技は　2回連続で　だせない。" }, "matchaGotcha": { "name": "シャカシャカほう", - "effect": "かきまぜた お茶の 大砲は 与えた ダメージの 半分を 回復して やけど状態に することも ある。" + "effect": "かきまぜた　お茶の　大砲は　与えた　ダメージの　半分を　回復して　やけど状態に　することも　ある。" }, "syrupBomb": { "name": "みずあめボム", - "effect": "ねっとりした みずあめを 爆発させ 相手を あめまみれ 状態にして 3ターンの間 素早さを さげ続ける。" + "effect": "ねっとりした　みずあめを　爆発させ　相手を　あめまみれ　状態にして　3ターンの間　素早さを　さげ続ける。" }, "ivyCudgel": { "name": "ツタこんぼう", - "effect": "ツタを まきつけた こん棒で なぐる。 かぶっている お面で タイプが 変わる。 急所に 当たりやすい。" + "effect": "ツタを　まきつけた　こん棒で　なぐる。　かぶっている　お面で　タイプが　変わる。　急所に　当たりやすい。" }, "electroShot": { "name": "エレクトロビーム", - "effect": "1ターン目に 電気を 集めて 特攻が あがり 2ターン目に 高圧の 電気を 発射する。 天気が 雨のときは すぐに 発射できる。" + "effect": "1ターン目に　電気を　集めて　特攻が　あがり　2ターン目に　高圧の　電気を　発射する。　天気が　雨のときは　すぐに　発射できる。" }, "teraStarstorm": { "name": "テラクラスター", - "effect": "結晶の力を 照射し 敵を 排除する。 テラパゴスが ステラフォルムで 放つと すべての 相手に ダメージを 与える。" + "effect": "結晶の力を　照射し　敵を　排除する。　テラパゴスが　ステラフォルムで　放つと　すべての　相手に　ダメージを　与える。" }, "fickleBeam": { "name": "きまぐレーザー", - "effect": "光線を 発射して 攻撃する。 ときどき ほかの首も 協力して レーザーを 放ち 威力が 2倍に なる。" + "effect": "光線を　発射して　攻撃する。　ときどき　ほかの首も　協力して　レーザーを　放ち　威力が　2倍に　なる。" }, "burningBulwark": { "name": "かえんのまもり", - "effect": "相手の 攻撃を 超高熱の 体毛で 防ぎ 同時に 触れた 相手に やけどを 与えてしまう。" + "effect": "相手の　攻撃を　超高熱の　体毛で　防ぎ　同時に　触れた　相手に　やけどを　与えてしまう。" }, "thunderclap": { "name": "じんらい", - "effect": "相手より 先に 電撃を 浴びせる。 相手が だす技が 攻撃技でないと 失敗する。" + "effect": "相手より　先に　電撃を　浴びせる。　相手が　だす技が　攻撃技でないと　失敗する。" }, "mightyCleave": { "name": "パワフルエッジ", - "effect": "頭部に 蓄積した 光で 切断する。 守りを 無視して 攻撃できる。" + "effect": "頭部に　蓄積した　光で　切断する。　守りを　無視して　攻撃できる。" }, "tachyonCutter": { "name": "タキオンカッター", - "effect": "粒子の刃を たて続けに 発射して 2回連続で ダメージを 与える。 攻撃は 必ず 命中する。" + "effect": "粒子の刃を　たて続けに　発射して　2回連続で　ダメージを　与える。　攻撃は　必ず　命中する。" }, "hardPress": { "name": "ハードプレス", - "effect": "腕やハサミで 相手を 圧迫する。 相手の HPが 残っているほど 威力が あがる。" + "effect": "腕やハサミで　相手を　圧迫する。　相手の　HPが　残っているほど　威力が　あがる。" }, "dragonCheer": { "name": "ドラゴンエール", - "effect": "竜の鼓舞で 士気を 上げて 味方の技が 急所に 当たりやすくなる。 ドラゴンタイプだと より 鼓舞される。" + "effect": "竜の鼓舞で　士気を　上げて　味方の技が　急所に　当たりやすくなる。　ドラゴンタイプだと　より　鼓舞される。" }, "alluringVoice": { "name": "みわくのボイス", - "effect": "天使のような 歌声で 相手を 攻撃。 そのターン 能力が あがった ポケモンを 混乱の 状態に する。" + "effect": "天使のような　歌声で　相手を　攻撃。　そのターン　能力が　あがった　ポケモンを　混乱の　状態に　する。" }, "temperFlare": { "name": "やけっぱち", - "effect": "自棄になった 勢いで 攻撃する。 前の ターンに 技を 外していると 威力が 倍に なる。" + "effect": "自棄になった　勢いで　攻撃する。　前の　ターンに　技を　外していると　威力が　倍に　なる。" }, "supercellSlam": { "name": "サンダーダイブ", - "effect": "体を 帯電させ て相手に のしかかる。 はずすと 自分が ダメージを 受ける。" + "effect": "体を　帯電させ　て相手に　のしかかる。　はずすと　自分が　ダメージを　受ける。" }, "psychicNoise": { "name": "サイコノイズ", - "effect": "不快な音波を 相手に 浴びせて 攻撃。 2ターンの間 技や 特性や 持っている 道具によって HPを 回復できなくなる。" + "effect": "不快な音波を　相手に　浴びせて　攻撃。　2ターンの間　技や　特性や　持っている　道具によって　HPを　回復できなくなる。" }, "upperHand": { "name": "はやてがえし", - "effect": "動きに 反応して 掌底を 打ちこみ 相手を ひるませる。 相手が だす技が 先制攻撃でないと 失敗する。" + "effect": "動きに　反応して　掌底を　打ちこみ　相手を　ひるませる。　相手が　だす技が　先制攻撃でないと　失敗する。" }, "malignantChain": { "name": "じゃどくのくさり", - "effect": "毒でできた鎖を 相手に 巻きつけ 毒素を 流しこんで 蝕む。 猛毒の 状態に することが ある。" + "effect": "毒でできた鎖を　相手に　巻きつけ　毒素を　流しこんで　蝕む。　猛毒の　状態に　することが　ある。" } -} \ No newline at end of file +} diff --git a/src/locales/ja/party-ui-handler.json b/src/locales/ja/party-ui-handler.json index b112653c544..096d8d5bcba 100644 --- a/src/locales/ja/party-ui-handler.json +++ b/src/locales/ja/party-ui-handler.json @@ -4,5 +4,44 @@ "CANCEL": "やめる", "RELEASE": "逃がす", "APPLY": "使う", - "TEACH": "教える" + "TEACH": "教える", + "SPLICE": "吸収合体", + "UNSPLICE": "合体を分離", + "ACTIVATE": "有効にする", + "DEACTIVATE": "無効にする", + "TRANSFER": "アイテムを移動", + "ALL": "全部", + "PASS_BATON": "バトンタッチ", + "UNPAUSE_EVOLUTION": "進化を有効にする", + "REVIVE": "復活する", + "RENAME": "名前を変える", + "choosePokemon": "ポケモンを　選んで　ください。", + "doWhatWithThisPokemon": "このポケモンを　どうする？", + "noEnergy": "{{pokemonName}}は　戦うための\n元気が　残っていません！", + "hasEnergy": "{{pokemonName}}は　まだまだ　元気だ！", + "cantBeUsed": "{{pokemonName}}は　このチャレンジで\n使えられません！", + "tooManyItems": "{{pokemonName}}は　このアイテムが\nこれ以上　持ちきれない！", + "anyEffect": "使っても　効果がないよ", + "unpausedEvolutions": "{{pokemonName}}は　また　進化できる。", + "unspliceConfirmation": "本当に　{{pokemonName}}を　{{fusionName}}から\n分離しますか？　{{fusionName}}は　なくなる。", + "wasReverted": "{{fusionName}}は　{{pokemonName}}に　回帰した。", + "releaseConfirmation": "本当に　{{pokemonName}}を　逃がしますか？", + "releaseInBattle": "戦闘中の　ポケモンを\n逃がすことは　できません！", + "selectAMove": "技を　選んでください。", + "changeQuantity": "移動する　アイテムを　選んでください。\n< と > で　数量が　変えられる。", + "selectAnotherPokemonToSplice": "もう一つの　ポケモンを　選んで　合体する。", + "cancel": "キャンセル", + "able": "可能", + "notAble": "不可能", + "learned": "覚えている", + "goodbye": "グッバイ　{{pokemonName}}!", + "byebye": "ばいばい　{{pokemonName}}!", + "farewell": "さようなら　{{pokemonName}}!", + "soLong": "じゃあね　{{pokemonName}}!", + "thisIsWhereWePart": "これでお別れだね　{{pokemonName}}!", + "illMissYou": "恋しく思うよ　{{pokemonName}}!", + "illNeverForgetYou": "一生忘れない　{{pokemonName}}!", + "untilWeMeetAgain": "また出会える日まで、{{pokemonName}}!", + "sayonara": "さらば　{{pokemonName}}!", + "smellYaLater": "そんじゃ　あばよ　{{pokemonName}}!" } diff --git a/src/locales/ja/settings.json b/src/locales/ja/settings.json index 55d39ee70a4..afb2f94a047 100644 --- a/src/locales/ja/settings.json +++ b/src/locales/ja/settings.json @@ -20,7 +20,7 @@ "normal": "普通", "fast": "早い", "faster": "とても早い", - "skip": "スキップ", + "skip": "飛ばす", "levelUpNotifications": "レベルアップ時のみ", "on": "オン", "off": "オフ", diff --git a/src/locales/ja/starter-select-ui-handler.json b/src/locales/ja/starter-select-ui-handler.json index cab5c500df6..cefc5322385 100644 --- a/src/locales/ja/starter-select-ui-handler.json +++ b/src/locales/ja/starter-select-ui-handler.json @@ -23,7 +23,7 @@ "manageNature": "性格を変える", "addToFavorites": "お気に入りにする", "removeFromFavorites": "お気に入りから除く", - "useCandies": "飴を使う", + "useCandies": "アメを使う", "selectNature": "性格を選んでください。", "selectMoveSwapOut": "入れ替えたい技を選んでください。", "selectMoveSwapWith": "他の技と交換してください。", diff --git a/src/locales/ja/tutorial.json b/src/locales/ja/tutorial.json index 21b1b4856c8..99019b03f7f 100644 --- a/src/locales/ja/tutorial.json +++ b/src/locales/ja/tutorial.json @@ -1,10 +1,10 @@ { - "intro": "PokéRogueへようこそ！ログライク要素が\n加わったバトル中心のポケモンファンゲームです。\n$このゲームは収益を上げず、Pokémonおよび使用される\n著作権資産に対する所有権を主張しません。\n$ゲームはまだ作業中ですが、完全にプレイすることができます。\nバグ報告はディスコードコミュニティをご利用ください。\n$ゲームが遅い場合は、ブラウザ設定で「ハードウェア\nアクセラレーション」がオンになっていることを確認してください", - "accessMenu": "メニューにアクセスするには、入力待ちの間にMキーまたはEscを押してください。\nメニューには設定やさまざまな機能が含まれています。", - "menu": "このメニューから設定にアクセスできます。\n$設定ではゲームスピード、ウィンドウスタイル、\nおよびその他のオプションを変更できます。\n$ここにはさまざまな他の機能もありますので、\nぜひ確認してみてください！", - "starterSelect": "この画面でZキーやSpaceを押してポケモンを選択できます。\n選んだポケモンは自分の最初のパーティーになります。\n$最大6匹のパーティーで始めることができますが\nポケモンによってポイントがあり、合計10を超えてはなりません。\n$捕まえたりふかさせたりすることで\n選択できる性別、特性、フォルムなどの幅を広げることができます。\n$個体値も徐々に累積して高くなるので、\n同じポケモンをたくさん捕まえてみてください！", - "pokerus": "毎日ランダムでスターターの\n3種類に紫色の枠が表示されます。\n$登録されたスターターの中にあれば、\nパーティに追加してつよさを確認してみましょう！", - "statChange": "ポケモンは交代しない限り、\n次のバトルでも能力変化が維持されます。\n$その代わりに、トレーナーバトルや新しいバイオームに\n入る直前に自動的にリセットされます。\n$CキーまたはShiftキーを押し続けると、\n現在のポケモンの能力変化を確認できます。\n$Vキーを押すと、\n相手が使用した技も確認できます。\n$ただし、今のバトルで相手ポケモンがすでに\n使った技のみが表示されます。", - "selectItem": "バトルが終わるたびに、\nランダムなアイテム3つの中から1つを選んで獲得します。\n$種類は消耗品、ポケモンの持ち物、\n永続的なパッシブアイテムなど様々です。\n$ほとんどの消耗しない道具は\n効果が累積されます。\n$進化用など一部のアイテムは\n使用できる場合にのみ登場します。\n$持ち物を渡す機能を使用して\nポケモン同士で道具を持たせることもできます。\n$持ち物があれば、アイテム選択画面の\n右下に渡す機能が表示されます。\n$お金で消耗品を購入することもでき、\nウェーブが進むにつれて購入可能な種類が増えます。\n$アイテムを選択すると次のウェーブに進むため、\nまず消耗品の購入を行ってください。", - "eggGacha": "この画面でポケモンのたまごクーポンを\nガチャができます。\n$卵は戦闘を繰り返すうちにふかします。\n珍しいほどもっと長くかかります。\n$ふかさせたポケモンはパーティーに追加されず、\nスターティングに登録されます。\n$卵からふかしたポケモンは一般的に\n野生で捕まえたポケモンよりも高い個体値を持ちます。\n$一部のポケモンは卵からしか手に入りません。\n$各ガチャマシンがそれぞれ異なるボーナスを持っているため、\n好きな方を使ってみてください!," -} \ No newline at end of file + "intro": "PokéRogueへ　ようこそ！　ローグライク要素が\n加わった　バトル中心の　ポケモンファンゲームです。\n$このゲームは　収益を上げず、Pokémonおよび　使用される\n著作権資産に　対する所有権を　主張しません。\n$ゲームは　まだ開発中ですが、完全に　プレイすることが　できます。\nバグ報告は　ディスコードコミュニティを　ご利用ください。\n$ゲームが　遅い場合は、ブラウザ設定で「ハードウェア\nアクセラレーション」が　オンになっている　ことを　確認してください。", + "accessMenu": "メニューを開くには　入力待ちの間に　Mキー／Escを　押してください。\nメニューには　設定や　様々な機能が　含まれています。", + "menu": "このメニューから　設定が　開けます。\n$設定では、ゲームの速さや　ウィンドウタイプなどの　オプションを　変更できます。\n$ここには　様々な機能が　ありますので、\nぜひ　確認してみてください！", + "starterSelect": "この画面では　Zキー／空白キーを押して　ポケモンが　選択できます。\n選んだポケモンは　最初の手持ちに　なります。\n$各ポケモンは　ポイントが　ある。最大6つを　選べますが\nポケモンのポイントが　合計10を超えては　いけません。\n$ポケモンを　捕まえたり　タマゴからふかしたり　することで\n選択できる　性別、特性、フォルムなどの　幅を広げられます。\n$個体値も　徐々に　累積して　高くなるので、\n同じポケモンを　たくさん　捕まえて　みてください！", + "pokerus": "毎日、無作為に　スターターの\n3種類には　紫色の枠が　表示されます。\n$登録された　スターターの 中に　いれば、\n手持ちに加えて　強さを　確認してみましょう！", + "statChange": "ポケモンを　入れ替えない限り、\n次のバトルでも　能力変化は　なくなりません。\n$その代わりに、トレーナーバトルや　新しいバイオームに\n入る直前に　自動的に　能力変化は　元に戻ります。\n$Cキー／Shiftキーを　押し続けると、\n場にいるポケモンの　能力変化を　確認できます。\n$Vキーを押すと、\n相手が出した技も　確認できます。\n$ただし、現在のバトルでの　相手ポケモンが\nすでに使った　技のみが　表示されます。", + "selectItem": "バトルが　終わるたびには、「ショップ」という\n画面で　3つのご褒美から　1つが選べます。\n$種類は　消耗品、ポケモンの持ち物や道具、\n永続的な　パッシブアイテムなど　様々です。\n$ほとんどの　消耗しない　道具は\n効果が　累積されます。\n$例えば　進化アイテムなどの　ご褒美は\n使用できる　場合にのみ　登場します。\n$持ち物や道具が\n手持ちポケモン間に　移動できる\n$持ち物や道具が　あれば、ショップ画面の\n右下に「アイテム移行」が　表示されます。\n$ショップ画面で　お金で　消耗品を　買えます。\nラウンドが　進むにつれて　買えるアイテムが　増えます。\n$ご褒美を　選択すると　次のラウンドに\n進むから、まず　消耗品を　買ってください。", + "eggGacha": "この画面では、「タマゴクーポン」で\nポケモンのタマゴを　取得できます。\n$タマゴは　ラウンドが進めるうちに　ふかします。\nタマゴのふかは　レア度によって　時間が　かかります。\n$ふかしたポケモンは　手持ちに　加えられず、\nスターターに　登録されます。\n$ふかしたポケモンは　一般的に\n野生ポケモンよりも　高い個体値があります。\n$あるポケモンは　タマゴからしか　手に入りません。\n$各ガチャマシンは　個性的なボーナスが　あるますから、\n好きな方から　引いてみてください！," +} From a88b9899398a595d1c31ed808e605c84c36d3c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ricardo?= Date: Mon, 9 Sep 2024 13:50:47 -0300 Subject: [PATCH 54/83] [Localization] [pt_BR] Updated some translations (#4131) --- src/locales/pt_BR/ability-trigger.json | 1 + src/locales/pt_BR/battle.json | 4 +++- src/locales/pt_BR/battler-tags.json | 4 +++- src/locales/pt_BR/challenges.json | 3 ++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/locales/pt_BR/ability-trigger.json b/src/locales/pt_BR/ability-trigger.json index f6a11267f9d..cd47fd8e3dc 100644 --- a/src/locales/pt_BR/ability-trigger.json +++ b/src/locales/pt_BR/ability-trigger.json @@ -12,6 +12,7 @@ "blockItemTheft": "{{abilityName}} de {{pokemonNameWithAffix}}\nprevine o roubo de itens!", "typeImmunityHeal": "{{abilityName}} de {{pokemonNameWithAffix}}\nrestaurou um pouco de PS!", "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}} evitou dano\ncom {{abilityName}}!", + "fullHpResistType": "{{pokemonNameWithAffix}} fez seu casco brilhar!\nEstá distorcendo o confronte de tipos!", "moveImmunity": "Isso não afeta {{pokemonNameWithAffix}}!", "reverseDrain": "{{pokemonNameWithAffix}} absorveu a gosma líquida!", "postDefendTypeChange": "{{abilityName}} de {{pokemonNameWithAffix}}\ntransformou-o no tipo {{typeName}}!", diff --git a/src/locales/pt_BR/battle.json b/src/locales/pt_BR/battle.json index 2b20e0062ea..08eeb99e0cd 100644 --- a/src/locales/pt_BR/battle.json +++ b/src/locales/pt_BR/battle.json @@ -44,6 +44,7 @@ "moveNotImplemented": "{{moveName}} ainda não foi implementado e não pode ser usado.", "moveNoPP": "Não há mais PP\npara esse movimento!", "moveDisabled": "Não se pode usar {{moveName}} porque foi desabilitado!", + "disableInterruptedMove": "{{moveName}} de {{pokemonNameWithAffix}}\nestá desabilitado!", "noPokeballForce": "Uma força misteriosa\nte impede de usar Poké Bolas.", "noPokeballTrainer": "Não se pode capturar\nPokémon dos outros!", "noPokeballMulti": "Não se pode lançar Poké Bolas\nquando há mais de um Pokémon!", @@ -61,6 +62,7 @@ "skipItemQuestion": "Tem certeza de que não quer escolher um item?", "itemStackFull": "O estoque de {{fullItemName}} está cheio.\nVocê receberá {{itemName}} no lugar.", "eggHatching": "Opa?", + "eggSkipPrompt": "Pular para súmario de ovos?", "ivScannerUseQuestion": "Quer usar o Scanner de IVs em {{pokemonName}}?", "wildPokemonWithAffix": "{{pokemonName}} selvagem", "foePokemonWithAffix": "{{pokemonName}} adversário", @@ -89,7 +91,7 @@ "statSeverelyFell_other": "{{stats}} de {{pokemonNameWithAffix}} diminuíram severamente!", "statWontGoAnyLower_one": "{{stats}} de {{pokemonNameWithAffix}} não vai mais diminuir!", "statWontGoAnyLower_other": "{{stats}} de {{pokemonNameWithAffix}} não vão mais diminuir!", - "transformedIntoType": "{{pokemonName}} transformed\ninto the {{type}} type!", + "transformedIntoType": "{{pokemonName}} se transformou\nno tipo {{type}}!", "ppReduced": "O PP do movimento {{moveName}} de\n{{targetName}} foi reduzido em {{reduction}}!", "retryBattle": "Você gostaria de tentar novamente desde o início da batalha?", "unlockedSomething": "{{unlockedThing}}\nfoi desbloqueado.", diff --git a/src/locales/pt_BR/battler-tags.json b/src/locales/pt_BR/battler-tags.json index e0f6538404b..9c0f4732013 100644 --- a/src/locales/pt_BR/battler-tags.json +++ b/src/locales/pt_BR/battler-tags.json @@ -67,5 +67,7 @@ "saltCuredLapse": "{{pokemonNameWithAffix}} foi ferido pelo {{moveName}}!", "cursedOnAdd": "{{pokemonNameWithAffix}} cortou seus PS pela metade e amaldiçoou {{pokemonName}}!", "cursedLapse": "{{pokemonNameWithAffix}} foi ferido pelo Curse!", - "stockpilingOnAdd": "{{pokemonNameWithAffix}} estocou {{stockpiledCount}}!" + "stockpilingOnAdd": "{{pokemonNameWithAffix}} estocou {{stockpiledCount}}!", + "disabledOnAdd": "{{moveName}} de {{pokemonNameWithAffix}}\nfoi desabilitado!", + "disabledLapse": "{{moveName}} de {{pokemonNameWithAffix}}\nnão está mais desabilitado." } diff --git a/src/locales/pt_BR/challenges.json b/src/locales/pt_BR/challenges.json index 8402ad106b6..9dc613651a6 100644 --- a/src/locales/pt_BR/challenges.json +++ b/src/locales/pt_BR/challenges.json @@ -1,6 +1,7 @@ { "title": "Desafios", "illegalEvolution": "{{pokemon}} não pode ser escolhido\nnesse desafio!", + "noneSelected": "Nada Selecionado", "singleGeneration": { "name": "Geração Única", "desc": "Você só pode user Pokémon da {{gen}} geração.", @@ -33,4 +34,4 @@ "value.0": "Desligado", "value.1": "Ligado" } -} +} \ No newline at end of file From 3c05237b2e7b0995f6d8554a55ddf7a499ae4085 Mon Sep 17 00:00:00 2001 From: "Adrian T." <68144167+torranx@users.noreply.github.com> Date: Tue, 10 Sep 2024 00:52:20 +0800 Subject: [PATCH 55/83] [Move] Fully implement Throat Chop (#4115) * fully implement throat chop * add linkcode in docs * address comments * update test --- src/data/battler-tags.ts | 51 +++++++++++++++++++++++++-- src/data/move.ts | 2 +- src/enums/battler-tag-type.ts | 1 + src/locales/en/battle.json | 2 ++ src/test/moves/throat_chop.test.ts | 55 ++++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+), 4 deletions(-) create mode 100644 src/test/moves/throat_chop.test.ts diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index c26412c776f..71385facb23 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -107,8 +107,8 @@ export interface TerrainBattlerTag { * to select restricted moves. */ export abstract class MoveRestrictionBattlerTag extends BattlerTag { - constructor(tagType: BattlerTagType, turnCount: integer, sourceMove?: Moves, sourceId?: integer) { - super(tagType, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], turnCount, sourceMove, sourceId); + constructor(tagType: BattlerTagType, lapseType: BattlerTagLapseType | BattlerTagLapseType[], turnCount: integer, sourceMove?: Moves, sourceId?: integer) { + super(tagType, lapseType, turnCount, sourceMove, sourceId); } /** @override */ @@ -158,6 +158,49 @@ export abstract class MoveRestrictionBattlerTag extends BattlerTag { abstract interruptedText(pokemon: Pokemon, move: Moves): string; } +/** + * Tag representing the "Throat Chop" effect. Pokemon with this tag cannot use sound-based moves. + * @see {@link https://bulbapedia.bulbagarden.net/wiki/Throat_Chop_(move) | Throat Chop} + * @extends MoveRestrictionBattlerTag + */ +export class ThroatChoppedTag extends MoveRestrictionBattlerTag { + constructor() { + super(BattlerTagType.THROAT_CHOPPED, [ BattlerTagLapseType.TURN_END, BattlerTagLapseType.PRE_MOVE ], 2, Moves.THROAT_CHOP); + } + + /** + * Checks if a {@linkcode Moves | move} is restricted by Throat Chop. + * @override + * @param {Moves} move the {@linkcode Moves | move} to check for sound-based restriction + * @returns true if the move is sound-based + */ + override isMoveRestricted(move: Moves): boolean { + return allMoves[move].hasFlag(MoveFlags.SOUND_BASED); + } + + /** + * Shows a message when the player attempts to select a move that is restricted by Throat Chop. + * @override + * @param {Pokemon} pokemon the {@linkcode Pokemon} that is attempting to select the restricted move + * @param {Moves} move the {@linkcode Moves | move} that is being restricted + * @returns the message to display when the player attempts to select the restricted move + */ + override selectionDeniedText(pokemon: Pokemon, move: Moves): string { + return i18next.t("battle:moveCannotBeSelected", { moveName: allMoves[move].name }); + } + + /** + * Shows a message when a move is interrupted by Throat Chop. + * @override + * @param {Pokemon} pokemon the interrupted {@linkcode Pokemon} + * @param {Moves} move the {@linkcode Moves | move} that was interrupted + * @returns the message to display when the move is interrupted + */ + override interruptedText(pokemon: Pokemon, move: Moves): string { + return i18next.t("battle:throatChopInterruptedMove", { pokemonName: getPokemonNameWithAffix(pokemon) }); + } +} + /** * Tag representing the "disabling" effect performed by {@linkcode Moves.DISABLE} and {@linkcode Abilities.CURSED_BODY}. * When the tag is added, the last-used move of the tag holder is set as the disabled move. @@ -167,7 +210,7 @@ export class DisabledTag extends MoveRestrictionBattlerTag { private moveId: Moves = Moves.NONE; constructor(sourceId: number) { - super(BattlerTagType.DISABLED, 4, Moves.DISABLE, sourceId); + super(BattlerTagType.DISABLED, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], 4, Moves.DISABLE, sourceId); } /** @override */ @@ -2158,6 +2201,8 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source return new GulpMissileTag(tagType, sourceMove); case BattlerTagType.TAR_SHOT: return new TarShotTag(); + case BattlerTagType.THROAT_CHOPPED: + return new ThroatChoppedTag(); case BattlerTagType.NONE: default: return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId); diff --git a/src/data/move.ts b/src/data/move.ts index 21b859b22ac..6ab134c1708 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -8404,7 +8404,7 @@ export function initMoves() { .target(MoveTarget.USER_AND_ALLIES) .condition((user, target, move) => !![ user, user.getAlly() ].filter(p => p?.isActive()).find(p => !![ Abilities.PLUS, Abilities.MINUS].find(a => p.hasAbility(a, false)))), new AttackMove(Moves.THROAT_CHOP, Type.DARK, MoveCategory.PHYSICAL, 80, 100, 15, 100, 0, 7) - .partial(), + .attr(AddBattlerTagAttr, BattlerTagType.THROAT_CHOPPED), new AttackMove(Moves.POLLEN_PUFF, Type.BUG, MoveCategory.SPECIAL, 90, 100, 15, -1, 0, 7) .attr(StatusCategoryOnAllyAttr) .attr(HealOnAllyAttr, 0.5, true, false) diff --git a/src/enums/battler-tag-type.ts b/src/enums/battler-tag-type.ts index 0878bd00cd5..7d559f32cb3 100644 --- a/src/enums/battler-tag-type.ts +++ b/src/enums/battler-tag-type.ts @@ -73,5 +73,6 @@ export enum BattlerTagType { SHELL_TRAP = "SHELL_TRAP", DRAGON_CHEER = "DRAGON_CHEER", NO_RETREAT = "NO_RETREAT", + THROAT_CHOPPED = "THROAT_CHOPPED", TAR_SHOT = "TAR_SHOT", } diff --git a/src/locales/en/battle.json b/src/locales/en/battle.json index 120ac749acb..0aabaacd99c 100644 --- a/src/locales/en/battle.json +++ b/src/locales/en/battle.json @@ -44,7 +44,9 @@ "moveNotImplemented": "{{moveName}} is not yet implemented and cannot be selected.", "moveNoPP": "There's no PP left for\nthis move!", "moveDisabled": "{{moveName}} is disabled!", + "moveCannotBeSelected": "{{moveName}} cannot be selected!", "disableInterruptedMove": "{{pokemonNameWithAffix}}'s {{moveName}}\nis disabled!", + "throatChopInterruptedMove": "The effects of Throat Chop prevent\n{{pokemonName}} from using certain moves!", "noPokeballForce": "An unseen force\nprevents using Poké Balls.", "noPokeballTrainer": "You can't catch\nanother trainer's Pokémon!", "noPokeballMulti": "You can only throw a Poké Ball\nwhen there is one Pokémon remaining!", diff --git a/src/test/moves/throat_chop.test.ts b/src/test/moves/throat_chop.test.ts new file mode 100644 index 00000000000..151aec58b38 --- /dev/null +++ b/src/test/moves/throat_chop.test.ts @@ -0,0 +1,55 @@ +import { BattlerIndex } from "#app/battle"; +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; +import { Stat } from "#app/enums/stat"; +import { Abilities } from "#enums/abilities"; +import GameManager from "#test/utils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; + +describe("Moves - Throat Chop", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + const TIMEOUT = 20 * 1000; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset(Array(4).fill(Moves.GROWL)) + .battleType("single") + .ability(Abilities.BALL_FETCH) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Array(4).fill(Moves.THROAT_CHOP)) + .enemySpecies(Species.MAGIKARP); + }); + + it("prevents the target from using sound-based moves for two turns", async () => { + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.GROWL); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + + // First turn, move is interrupted + await game.phaseInterceptor.to("TurnEndPhase"); + expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.ATK)).toBe(0); + + // Second turn, struggle if no valid moves + await game.toNextTurn(); + + game.move.select(Moves.GROWL); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + + await game.phaseInterceptor.to("MoveEndPhase"); + expect(game.scene.getEnemyPokemon()!.isFullHp()).toBe(false); + }, TIMEOUT); +}); From 3d01e905dfb8ce245a70688170303d137f1312fc Mon Sep 17 00:00:00 2001 From: Lugiad Date: Mon, 9 Sep 2024 18:53:22 +0200 Subject: [PATCH 56/83] [Localization][UI/UX] Clean up of unused localized images (#4110) * Delete public/images/ui/legacy/summary_moves_effect_de.png * Delete public/images/ui/legacy/summary_moves_effect_es.png * Delete public/images/ui/legacy/summary_moves_effect_fr.png * Delete public/images/ui/legacy/summary_moves_effect_it.png * Delete public/images/ui/legacy/summary_moves_effect_pt-BR.png * Delete public/images/ui/legacy/summary_moves_effect_zh-CN.png --- .../images/ui/legacy/summary_moves_effect_de.png | Bin 799 -> 0 bytes .../images/ui/legacy/summary_moves_effect_es.png | Bin 807 -> 0 bytes .../images/ui/legacy/summary_moves_effect_fr.png | Bin 1787 -> 0 bytes .../images/ui/legacy/summary_moves_effect_it.png | Bin 799 -> 0 bytes .../ui/legacy/summary_moves_effect_pt-BR.png | Bin 800 -> 0 bytes .../ui/legacy/summary_moves_effect_zh-CN.png | Bin 799 -> 0 bytes 6 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 public/images/ui/legacy/summary_moves_effect_de.png delete mode 100644 public/images/ui/legacy/summary_moves_effect_es.png delete mode 100644 public/images/ui/legacy/summary_moves_effect_fr.png delete mode 100644 public/images/ui/legacy/summary_moves_effect_it.png delete mode 100644 public/images/ui/legacy/summary_moves_effect_pt-BR.png delete mode 100644 public/images/ui/legacy/summary_moves_effect_zh-CN.png diff --git a/public/images/ui/legacy/summary_moves_effect_de.png b/public/images/ui/legacy/summary_moves_effect_de.png deleted file mode 100644 index 8d6ef024cf3bda09f70455b9400db5a1e2bb7b40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 799 zcmeAS@N?(olHy`uVBq!ia0vp^DL`z;!3-o{Y5ILWn z&^SMJqNNA3qeQFy;zca3M?{pwqFuCE0|mW17jdwubUp~(vD>h7LhRwZrrxCq+7T5d zajm^uw~1|QQmAOSaVtXeR>zwEIZT{REbMJRD~#V8er988kGx#;`qzO?pZ#)_7M(qJ zHk((UC39)3pUK^l;)_2jnpQpj+$Xj5-nUgc|IBAiKE009bk>KCnZ=(Dc^`7l{yFDS z?86B&FHSy`e#o{jCg6wTOSg&fqRVUfR-BnIxuch>y=7|&tF&lNnv8cvfW@3GIVbtg zh*_?zh}}3?kQ>jn&XaXZy7nLb?%#b{ z;5yebi(?T-oxcBFVgKXq+SyVs^wmsV7yP^V`QGjYiPHPF+q{2$;`6@#h2J>!-fpV@ zD$r){a$hU^A#=vfhR>@vrM)?DRBem>vl933OQU8shH%~Udpi5sg12l<+(++u{ho8j z*=g6TU2S`7U-)@{OPX449`^0qbIJYoO7;`>7Hy92JzW8e6s-WC5LXWeiy(&o*$m%X zIKD6Cc)wTR{XL2I|Ns9l&Q8wudfzkU`PzH;zW)bC9>Y?>+2?>1UrCT(Fi-&kFt{GL za{?&CS>O>_%)r1c48n{Iv*t(u1wVVbIEF;HzrA^zugO4w<-)D*rs@Cx$KFicC7?Sy zN|Qgu-)Xf+n$y#jJEmJt^v-|r!LCIjc$Z&Z$`84h>~a}Vo|?x5_B`LSDCnfasbo6~ zSt;*r?p^cu>)!H8iL`TTd2X2=sV@bQWO%VG-2^3 zp+=dhQ#qcjSmUDLo~p`ZsiiH5Mak8jUVJyd{dgTVVez9$%-a@Kgs;`sdb$2TH{

mdKI;Vst09W^QA^-pY diff --git a/public/images/ui/legacy/summary_moves_effect_es.png b/public/images/ui/legacy/summary_moves_effect_es.png deleted file mode 100644 index a48f90cc8f6fabe76b4964b4a9004ba92852df9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 807 zcmeAS@N?(olHy`uVBq!ia0vp^DL`z;!3-o{Y5ILWn z&^SMJqNNA3qeQFy;zca3M?{pwqFuCE0|mW17jdwubUp~(vD>h7LhRwZrrxCq+7T5d zajm^uw~1|QQmAOSaVtXeR>zwEIZT{REbMJRD~#V8er988kGx#;`qzO?pZ#)_7M(qJ zHk((UC39)3pUK^l;)_2jnpQpj+$Xj5-nUgc|IBAiKE009bk>KCnZ=(Dc^`7l{yFDS z?86B&FHSy`e#o{jCg6wTOSg&fqRVUfR-BnIxuch>y=7|&tF&lNnv8cvfW@3GIVbtg zh*_?zh}}3?kQ>jn&XaXZy7nLb?%#b{ z;5yebi(?T-oxcBFVgKXq+SyVs^wmsV7yP^V`QGjYiPHPF+q{2$;`6@#h2J>!-fpV@ zD$r){a$hU^A#=vfhR>@vrM)?DRBem>vl933OQU8shH%~Udpi5sg12l<+(++u{ho8j z*=g6TU2S`7U-)@{OPX449`^0qbIJYoO7;`>7Hy92JzW8e6s-WC5LXWeiy(&o*$m%X zIKD6Cc)wTR{XL2I|Ns9l&Q8wudfzkU`PzH;zW)bC9>Y?>+2?>1UrCT(Fi-&kFt{GL za{?&CS>O>_%)r1c48n{Iv*t(u1%G?GIEF;Hznytgs9Ax>RnvQQ?7#oz*_XUCWM?gm zs3|B)6DpWl?e>N9?qS)E%NY+o*tJLmTj|GiyxeRVp-@E(I_+MWBXMIj!Wo;vz`l0Fe=*x4W>I+=q+ zhUK)B>AC&B{Y^5W)81?lJ-R!~S@C4WvHt=E?>K*D-wEEcNMs=}7#KWV{an^LB{Ts5 DAgUg%e zd4KQk`SU){bFU}j15J(F8VQ1Eibg_7yvq3Paomr8uXn~vc-dqo2l|Oq^XNNiA)km>|7 z8imfHs$(=k_M`1?M0@U*7=O|K<1Jtl5#>Vs@%qo#d0}f5bQ_^Hk^2t7Cj+M$(!vQ)$AV@AI0fh;jF4^^mHCdP6#te!;{GPCF(sB7DI7{Dox#cDP- z^hH%`CQK_lj>D*CWka-?n$RJWgeDp@Bp4pYZg$ww=wi@-z(Pg}q5S%VCDvUggF*7C zVMUWs!R)Mq!w|4wfZ|!+O|u@F^Q3rucRrEz>|}Y7Wh>Aal9lwtMo>-=J=`5oTsShY zz+J(zB&Ly}0vxWQf(&GIEklvDB#J?lM+P>Gy>r#;qrqUpKxrk9HwL1(AVQ^-&jnHYNiD=2}VN!3g^bDD6%Mfz1^%wkZ8^Y0L^o5f%XEoj~2RJf`S`Yh!I$b(Rb^fw%Y`HY z$!?GUCE1k$WvZ%H?m0OX+Cmm$(toL$3d}@ls{jnxm%)j=TSYQ;VfY!lrRziUGaF^0 zf~y+^WsZs#&lxP?bL&ISmTH3%YIr&tcntpj*z-9&La#pFPJf&I#`0zx7OQJ-tKVwRf#>*Vip)3x`Xe z7&9{;ez!7Pcw~0w_L;LMuTuwyzt3ED{CMo!1@BwEmv{Yf^NH5glgiZ1rejOY(!t(8 zyWSiu9XN7dd*^4y`A>=PlP|p3@J!eAjg`mSRvsQtwY6T_vp2MV0JgsJ=xliNe^FeU zZohR&`eFB1ho?Ip@K0ZT|G>UIC(f_NBs=wz-mPoBhRzhU1}A{reC71-*(( A`Tzg` diff --git a/public/images/ui/legacy/summary_moves_effect_it.png b/public/images/ui/legacy/summary_moves_effect_it.png deleted file mode 100644 index 8d6ef024cf3bda09f70455b9400db5a1e2bb7b40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 799 zcmeAS@N?(olHy`uVBq!ia0vp^DL`z;!3-o{Y5ILWn z&^SMJqNNA3qeQFy;zca3M?{pwqFuCE0|mW17jdwubUp~(vD>h7LhRwZrrxCq+7T5d zajm^uw~1|QQmAOSaVtXeR>zwEIZT{REbMJRD~#V8er988kGx#;`qzO?pZ#)_7M(qJ zHk((UC39)3pUK^l;)_2jnpQpj+$Xj5-nUgc|IBAiKE009bk>KCnZ=(Dc^`7l{yFDS z?86B&FHSy`e#o{jCg6wTOSg&fqRVUfR-BnIxuch>y=7|&tF&lNnv8cvfW@3GIVbtg zh*_?zh}}3?kQ>jn&XaXZy7nLb?%#b{ z;5yebi(?T-oxcBFVgKXq+SyVs^wmsV7yP^V`QGjYiPHPF+q{2$;`6@#h2J>!-fpV@ zD$r){a$hU^A#=vfhR>@vrM)?DRBem>vl933OQU8shH%~Udpi5sg12l<+(++u{ho8j z*=g6TU2S`7U-)@{OPX449`^0qbIJYoO7;`>7Hy92JzW8e6s-WC5LXWeiy(&o*$m%X zIKD6Cc)wTR{XL2I|Ns9l&Q8wudfzkU`PzH;zW)bC9>Y?>+2?>1UrCT(Fi-&kFt{GL za{?&CS>O>_%)r1c48n{Iv*t(u1wVVbIEF;HzrA^zugO4w<-)D*rs@Cx$KFicC7?Sy zN|Qgu-)Xf+n$y#jJEmJt^v-|r!LCIjc$Z&Z$`84h>~a}Vo|?x5_B`LSDCnfasbo6~ zSt;*r?p^cu>)!H8iL`TTd2X2=sV@bQWO%VG-2^3 zp+=dhQ#qcjSmUDLo~p`ZsiiH5Mak8jUVJyd{dgTVVez9$%-a@Kgs;`sdb$2TH{
mdKI;Vst09W^QA^-pY diff --git a/public/images/ui/legacy/summary_moves_effect_pt-BR.png b/public/images/ui/legacy/summary_moves_effect_pt-BR.png deleted file mode 100644 index f5a0c2ea736e57910270f605be6950e87388e089..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 800 zcmeAS@N?(olHy`uVBq!ia0vp^DL`z;!3-o{Y5ILWn z&^SMJqNNA3qeQFy;zca3M?{pwqFuCE0|mW17jdwubUp~(vD>h7LhRwZrrxCq+7T5d zajm^uw~1|QQmAOSaVtXeR>zwEIZT{REbMJRD~#V8er988kGx#;`qzO?pZ#)_7M(qJ zHk((UC39)3pUK^l;)_2jnpQpj+$Xj5-nUgc|IBAiKE009bk>KCnZ=(Dc^`7l{yFDS z?86B&FHSy`e#o{jCg6wTOSg&fqRVUfR-BnIxuch>y=7|&tF&lNnv8cvfW@3GIVbtg zh*_?zh}}3?kQ>jn&XaXZy7nLb?%#b{ z;5yebi(?T-oxcBFVgKXq+SyVs^wmsV7yP^V`QGjYiPHPF+q{2$;`6@#h2J>!-fpV@ zD$r){a$hU^A#=vfhR>@vrM)?DRBem>vl933OQU8shH%~Udpi5sg12l<+(++u{ho8j z*=g6TU2S`7U-)@{OPX449`^0qbIJYoO7;`>7Hy92JzW8e6s-WC5LXWeiy(&o*$m%X zIKD6Cc)wTR{XL2I|Ns9l&Q8wudfzkU`PzH;zW)bC9>Y?>+2?>1UrCT(Fi-&kFt{GL za{?&CS>O>_%)r1c48n{Iv*t(u1;2Q@IEF;HzrA^zugO4wCE$(g!PEc$ue)o+?DBfq zwA0KtCvON~;*kp9yhZ=#eR7oBq;o`~>HE2-dlm(G>YtkI z?$>^7(*58^$ICZwo0J)Cr*>#((C;$Q^mB8Wn z&^SMJqNNA3qeQFy;zca3M?{pwqFuCE0|mW17jdwubUp~(vD>h7LhRwZrrxCq+7T5d zajm^uw~1|QQmAOSaVtXeR>zwEIZT{REbMJRD~#V8er988kGx#;`qzO?pZ#)_7M(qJ zHk((UC39)3pUK^l;)_2jnpQpj+$Xj5-nUgc|IBAiKE009bk>KCnZ=(Dc^`7l{yFDS z?86B&FHSy`e#o{jCg6wTOSg&fqRVUfR-BnIxuch>y=7|&tF&lNnv8cvfW@3GIVbtg zh*_?zh}}3?kQ>jn&XaXZy7nLb?%#b{ z;5yebi(?T-oxcBFVgKXq+SyVs^wmsV7yP^V`QGjYiPHPF+q{2$;`6@#h2J>!-fpV@ zD$r){a$hU^A#=vfhR>@vrM)?DRBem>vl933OQU8shH%~Udpi5sg12l<+(++u{ho8j z*=g6TU2S`7U-)@{OPX449`^0qbIJYoO7;`>7Hy92JzW8e6s-WC5LXWeiy(&o*$m%X zIKD6Cc)wTR{XL2I|Ns9l&Q8wudfzkU`PzH;zW)bC9>Y?>+2?>1UrCT(Fi-&kFt{GL za{?&CS>O>_%)r1c48n{Iv*t(u1wVVbIEF;HzrA^zugO4w<-)D*rs@Cx$KFicC7?Sy zN|Qgu-)Xf+n$y#jJEmJt^v-|r!LCIjc$Z&Z$`84h>~a}Vo|?x5_B`LSDCnfasbo6~ zSt;*r?p^cu>)!H8iL`TTd2X2=sV@bQWO%VG-2^3 zp+=dhQ#qcjSmUDLo~p`ZsiiH5Mak8jUVJyd{dgTVVez9$%-a@Kgs;`sdb$2TH{
mdKI;Vst09W^QA^-pY From 89b33466a9b6e6dbf3169bbc490c411291e23485 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Mon, 9 Sep 2024 09:53:45 -0700 Subject: [PATCH 57/83] [Test] Fix Safeguard test that relied on a now-fixed bug (#4098) --- src/test/moves/safeguard.test.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/test/moves/safeguard.test.ts b/src/test/moves/safeguard.test.ts index 94a7aa6031e..8068c475539 100644 --- a/src/test/moves/safeguard.test.ts +++ b/src/test/moves/safeguard.test.ts @@ -38,7 +38,7 @@ describe("Moves - Safeguard", () => { }); it("protects from damaging moves with additional effects", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; game.move.select(Moves.NUZZLE); @@ -49,7 +49,7 @@ describe("Moves - Safeguard", () => { }, TIMEOUT); it("protects from status moves", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.SPORE); @@ -61,7 +61,7 @@ describe("Moves - Safeguard", () => { it("protects from confusion", async () => { game.override.moveset([Moves.CONFUSE_RAY]); - await game.startBattle(); + await game.classicMode.startBattle(); const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.CONFUSE_RAY); @@ -74,7 +74,7 @@ describe("Moves - Safeguard", () => { it("protects ally from status", async () => { game.override.battleType("double"); - await game.startBattle(); + await game.classicMode.startBattle(); game.move.select(Moves.SPORE, 0, BattlerIndex.ENEMY_2); game.move.select(Moves.NUZZLE, 1, BattlerIndex.ENEMY_2); @@ -90,7 +90,7 @@ describe("Moves - Safeguard", () => { }, TIMEOUT); it("protects from Yawn", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.YAWN); @@ -101,7 +101,7 @@ describe("Moves - Safeguard", () => { }, TIMEOUT); it("doesn't protect from already existing Yawn", async () => { - await game.startBattle(); + await game.classicMode.startBattle(); const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.YAWN); @@ -116,12 +116,13 @@ describe("Moves - Safeguard", () => { it("doesn't protect from self-inflicted via Rest or Flame Orb", async () => { game.override.enemyHeldItems([{name: "FLAME_ORB"}]); - await game.startBattle(); + await game.classicMode.startBattle(); const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.SPLASH); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); + enemyPokemon.damageAndUpdate(1); expect(enemyPokemon.status?.effect).toEqual(StatusEffect.BURN); @@ -135,7 +136,7 @@ describe("Moves - Safeguard", () => { it("protects from ability-inflicted status", async () => { game.override.ability(Abilities.STATIC); vi.spyOn(allAbilities[Abilities.STATIC].getAttrs(PostDefendContactApplyStatusEffectAbAttr)[0], "chance", "get").mockReturnValue(100); - await game.startBattle(); + await game.classicMode.startBattle(); const enemyPokemon = game.scene.getEnemyPokemon()!; game.move.select(Moves.SPLASH); From 80e347840df421780cb9fc4647ce6f20a76ba165 Mon Sep 17 00:00:00 2001 From: Leo Kim <47556641+KimJeongSun@users.noreply.github.com> Date: Tue, 10 Sep 2024 01:54:17 +0900 Subject: [PATCH 58/83] [Bug] Fix line spacing in level up stats and move info in Japanese (#4095) --- src/ui/battle-message-ui-handler.ts | 3 +++ src/ui/move-info-overlay.ts | 1 + 2 files changed, 4 insertions(+) diff --git a/src/ui/battle-message-ui-handler.ts b/src/ui/battle-message-ui-handler.ts index 3bea0f21433..9a694d50b29 100644 --- a/src/ui/battle-message-ui-handler.ts +++ b/src/ui/battle-message-ui-handler.ts @@ -97,6 +97,7 @@ export default class BattleMessageUiHandler extends MessageUiHandler { this.levelUpStatsContainer = levelUpStatsContainer; const levelUpStatsLabelsContent = addTextObject(this.scene, (this.scene.game.canvas.width / 6) - 73, -94, "", TextStyle.WINDOW, { maxLines: 6 }); + levelUpStatsLabelsContent.setLineSpacing(i18next.resolvedLanguage === "ja" ? 25 : 5); let levelUpStatsLabelText = ""; for (const s of PERMANENT_STATS) { @@ -112,11 +113,13 @@ export default class BattleMessageUiHandler extends MessageUiHandler { levelUpStatsContainer.add(levelUpStatsLabelsContent); const levelUpStatsIncrContent = addTextObject(this.scene, (this.scene.game.canvas.width / 6) - 50, -94, "+\n+\n+\n+\n+\n+", TextStyle.WINDOW, { maxLines: 6 }); + levelUpStatsIncrContent.setLineSpacing(i18next.resolvedLanguage === "ja" ? 25 : 5); levelUpStatsContainer.add(levelUpStatsIncrContent); this.levelUpStatsIncrContent = levelUpStatsIncrContent; const levelUpStatsValuesContent = addBBCodeTextObject(this.scene, (this.scene.game.canvas.width / 6) - 7, -94, "", TextStyle.WINDOW, { maxLines: 6, lineSpacing: 5}); + levelUpStatsValuesContent.setLineSpacing(i18next.resolvedLanguage === "ja" ? 25 : 5); levelUpStatsValuesContent.setOrigin(1, 0); levelUpStatsValuesContent.setAlign("right"); levelUpStatsContainer.add(levelUpStatsValuesContent); diff --git a/src/ui/move-info-overlay.ts b/src/ui/move-info-overlay.ts index 859e95a39b6..77010f84528 100644 --- a/src/ui/move-info-overlay.ts +++ b/src/ui/move-info-overlay.ts @@ -58,6 +58,7 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem // set up the description; wordWrap uses true pixels, unaffected by any scaling, while other values are affected this.desc = addTextObject(scene, (options?.onSide && !options?.right ? EFF_WIDTH : 0) + BORDER, (options?.top ? EFF_HEIGHT : 0) + BORDER - 2, "", TextStyle.BATTLE_INFO, { wordWrap: { width: (width - (BORDER - 2) * 2 - (options?.onSide ? EFF_WIDTH : 0)) * GLOBAL_SCALE } }); + this.desc.setLineSpacing(i18next.resolvedLanguage === "ja" ? 25 : 5); // limit the text rendering, required for scrolling later on const maskPointOrigin = { From c59f6edf36dd0fa2176128c49fadd0acb357d1d0 Mon Sep 17 00:00:00 2001 From: "Adrian T." <68144167+torranx@users.noreply.github.com> Date: Tue, 10 Sep 2024 00:54:31 +0800 Subject: [PATCH 59/83] [Move] Implement Power Shift (#4083) * fully implement power shift * cleanup --- src/data/move.ts | 64 ++++++++++++++++++++++++++++-- src/locales/en/move-trigger.json | 1 + src/test/moves/power_shift.test.ts | 64 ++++++++++++++++++++++++++++++ 3 files changed, 125 insertions(+), 4 deletions(-) create mode 100644 src/test/moves/power_shift.test.ts diff --git a/src/data/move.ts b/src/data/move.ts index 6ab134c1708..d9e385fdd0e 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -5987,9 +5987,8 @@ export class SwapStatAttr extends MoveEffectAttr { } /** - * Takes the average of the user's and target's corresponding current - * {@linkcode stat} values and sets that stat to the average for both - * temporarily. + * Swaps the user's and target's corresponding current + * {@linkcode EffectiveStat | stat} values * @param user the {@linkcode Pokemon} that used the move * @param target the {@linkcode Pokemon} that the move was used on * @param move N/A @@ -6013,6 +6012,62 @@ export class SwapStatAttr extends MoveEffectAttr { } } +/** + * Attribute used to switch the user's own stats. + * Used by Power Shift. + * @extends MoveEffectAttr + */ +export class ShiftStatAttr extends MoveEffectAttr { + private statToSwitch: EffectiveStat; + private statToSwitchWith: EffectiveStat; + + constructor(statToSwitch: EffectiveStat, statToSwitchWith: EffectiveStat) { + super(); + + this.statToSwitch = statToSwitch; + this.statToSwitchWith = statToSwitchWith; + } + + /** + * Switches the user's stats based on the {@linkcode statToSwitch} and {@linkcode statToSwitchWith} attributes. + * @param {Pokemon} user the {@linkcode Pokemon} that used the move + * @param target n/a + * @param move n/a + * @param args n/a + * @returns whether the effect was applied + */ + override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean { + if (!super.apply(user, target, move, args)) { + return false; + } + + const firstStat = user.getStat(this.statToSwitch, false); + const secondStat = user.getStat(this.statToSwitchWith, false); + + user.setStat(this.statToSwitch, secondStat, false); + user.setStat(this.statToSwitchWith, firstStat, false); + + user.scene.queueMessage(i18next.t("moveTriggers:shiftedStats", { + pokemonName: getPokemonNameWithAffix(user), + statToSwitch: i18next.t(getStatKey(this.statToSwitch)), + statToSwitchWith: i18next.t(getStatKey(this.statToSwitchWith)) + })); + + return true; + } + + /** + * Encourages the user to use the move if the stat to switch with is greater than the stat to switch. + * @param {Pokemon} user the {@linkcode Pokemon} that used the move + * @param target n/a + * @param move n/a + * @returns number of points to add to the user's benefit score + */ + override getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer { + return user.getStat(this.statToSwitchWith, false) > user.getStat(this.statToSwitch, false) ? 10 : 0; + } +} + /** * Attribute used for status moves, namely Power Split and Guard Split, * that take the average of a user's and target's corresponding @@ -8894,7 +8949,8 @@ export function initMoves() { new AttackMove(Moves.PSYSHIELD_BASH, Type.PSYCHIC, MoveCategory.PHYSICAL, 70, 90, 10, 100, 0, 8) .attr(StatStageChangeAttr, [ Stat.DEF ], 1, true), new SelfStatusMove(Moves.POWER_SHIFT, Type.NORMAL, -1, 10, -1, 0, 8) - .unimplemented(), + .target(MoveTarget.USER) + .attr(ShiftStatAttr, Stat.ATK, Stat.DEF), new AttackMove(Moves.STONE_AXE, Type.ROCK, MoveCategory.PHYSICAL, 65, 90, 15, 100, 0, 8) .attr(AddArenaTrapTagHitAttr, ArenaTagType.STEALTH_ROCK) .slicingMove(), diff --git a/src/locales/en/move-trigger.json b/src/locales/en/move-trigger.json index e70fb9dcfb7..867905c5a9f 100644 --- a/src/locales/en/move-trigger.json +++ b/src/locales/en/move-trigger.json @@ -7,6 +7,7 @@ "switchedStat": "{{pokemonName}} switched {{stat}} with its target!", "sharedGuard": "{{pokemonName}} shared its guard with the target!", "sharedPower": "{{pokemonName}} shared its power with the target!", + "shiftedStats": "{{pokemonName}} switched its {{statToSwitch}} and {{statToSwitchWith}}!", "goingAllOutForAttack": "{{pokemonName}} is going all out for this attack!", "regainedHealth": "{{pokemonName}} regained\nhealth!", "keptGoingAndCrashed": "{{pokemonName}} kept going\nand crashed!", diff --git a/src/test/moves/power_shift.test.ts b/src/test/moves/power_shift.test.ts new file mode 100644 index 00000000000..350041d9e4e --- /dev/null +++ b/src/test/moves/power_shift.test.ts @@ -0,0 +1,64 @@ +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; +import { Stat } from "#app/enums/stat"; +import { Abilities } from "#enums/abilities"; +import GameManager from "#test/utils/gameManager"; +import { SPLASH_ONLY } from "#test/utils/testUtils"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Moves - Power Shift", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + const TIMEOUT = 20 * 1000; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .moveset([Moves.POWER_SHIFT, Moves.BULK_UP]) + .battleType("single") + .ability(Abilities.BALL_FETCH) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(SPLASH_ONLY); + }); + + it("switches the user's raw Attack stat with its raw Defense stat", async () => { + await game.classicMode.startBattle([Species.MAGIKARP]); + + const playerPokemon = game.scene.getPlayerPokemon()!; + + playerPokemon.setStat(Stat.ATK, 10, false); + playerPokemon.setStat(Stat.DEF, 20, false); + + game.move.select(Moves.BULK_UP); + + await game.phaseInterceptor.to("TurnEndPhase"); + + // Stat stages are increased by 1 + expect(playerPokemon.getStatStageMultiplier(Stat.ATK)).toBe(1.5); + expect(playerPokemon.getStatStageMultiplier(Stat.DEF)).toBe(1.5); + + await game.toNextTurn(); + + game.move.select(Moves.POWER_SHIFT); + + await game.phaseInterceptor.to("TurnEndPhase"); + + // Effective stats are calculated correctly + expect(playerPokemon.getEffectiveStat(Stat.ATK)).toBe(30); + expect(playerPokemon.getEffectiveStat(Stat.DEF)).toBe(15); + // Raw stats are swapped + expect(playerPokemon.getStat(Stat.ATK, false)).toBe(20); + expect(playerPokemon.getStat(Stat.DEF, false)).toBe(10); + }, TIMEOUT); +}); From 11d912bad8f2ec36b36d7151afa5e3e649e2b834 Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Mon, 9 Sep 2024 09:55:11 -0700 Subject: [PATCH 60/83] [Dev] Make `OPP_MOVESET_OVERRIDE` fully override the enemy's moveset (#4062) * Make `OPP_MOVESET_OVERRIDE` fully override the enemy's moveset * Update tests with new override behavior * Fix tests * Fix another test * Move overrides no longer required to be arrays * Remove `SPLASH_ONLY` test utility variable * Update moveset override helper functions * Missed some tests --- src/field/pokemon.ts | 10 ++- src/overrides.ts | 4 +- src/test/abilities/aura_break.test.ts | 3 +- src/test/abilities/battery.test.ts | 3 +- src/test/abilities/beast_boost.test.ts | 5 +- src/test/abilities/contrary.test.ts | 8 +- src/test/abilities/costar.test.ts | 3 +- src/test/abilities/dancer.test.ts | 2 +- src/test/abilities/disguise.test.ts | 7 +- src/test/abilities/dry_skin.test.ts | 80 ++++++++----------- src/test/abilities/flash_fire.test.ts | 13 ++- src/test/abilities/flower_gift.test.ts | 7 +- src/test/abilities/forecast.test.ts | 7 +- src/test/abilities/galvanize.test.ts | 3 +- src/test/abilities/gulp_missile.test.ts | 19 +++-- src/test/abilities/heatproof.test.ts | 3 +- src/test/abilities/hustle.test.ts | 3 +- src/test/abilities/hyper_cutter.test.ts | 3 +- src/test/abilities/imposter.test.ts | 7 +- src/test/abilities/intimidate.test.ts | 5 +- src/test/abilities/libero.test.ts | 3 +- src/test/abilities/magic_guard.test.ts | 3 +- src/test/abilities/moody.test.ts | 5 +- src/test/abilities/moxie.test.ts | 3 +- src/test/abilities/parental_bond.test.ts | 7 +- src/test/abilities/pastel_veil.test.ts | 3 +- src/test/abilities/power_spot.test.ts | 3 +- src/test/abilities/protean.test.ts | 3 +- src/test/abilities/quick_draw.test.ts | 4 +- src/test/abilities/sand_spit.test.ts | 4 +- src/test/abilities/sap_sipper.test.ts | 11 ++- src/test/abilities/simple.test.ts | 8 +- src/test/abilities/steely_spirit.test.ts | 3 +- src/test/abilities/sweet_veil.test.ts | 5 +- src/test/abilities/tera_shell.test.ts | 8 +- src/test/abilities/wind_power.test.ts | 3 +- src/test/abilities/wind_rider.test.ts | 3 +- src/test/abilities/wonder_skin.test.ts | 3 +- src/test/abilities/zero_to_hero.test.ts | 5 +- src/test/arena/arena_gravity.test.ts | 3 +- src/test/arena/weather_fog.test.ts | 2 +- src/test/arena/weather_hail.test.ts | 5 +- src/test/arena/weather_sandstorm.test.ts | 5 +- src/test/battle/battle.test.ts | 3 +- src/test/battle/damage_calculation.test.ts | 3 +- src/test/battle/double_battle.test.ts | 3 +- src/test/battle/inverse_battle.test.ts | 3 +- src/test/boss-pokemon.test.ts | 3 +- src/test/evolution.test.ts | 5 +- src/test/final_boss.test.ts | 3 +- src/test/items/dire_hit.test.ts | 3 +- .../double_battle_chance_booster.test.ts | 3 +- src/test/items/grip_claw.test.ts | 3 +- src/test/items/scope_lens.test.ts | 3 +- .../items/temp_stat_stage_booster.test.ts | 3 +- src/test/moves/alluring_voice.test.ts | 2 +- src/test/moves/baton_pass.test.ts | 10 ++- src/test/moves/beak_blast.test.ts | 6 +- src/test/moves/beat_up.test.ts | 2 +- src/test/moves/belly_drum.test.ts | 3 +- src/test/moves/burning_jealousy.test.ts | 7 +- src/test/moves/clangorous_soul.test.ts | 3 +- src/test/moves/crafty_shield.test.ts | 6 +- src/test/moves/disable.test.ts | 7 +- src/test/moves/dragon_cheer.test.ts | 3 +- src/test/moves/dragon_rage.test.ts | 3 +- src/test/moves/dragon_tail.test.ts | 7 +- src/test/moves/fake_out.test.ts | 3 +- src/test/moves/fillet_away.test.ts | 3 +- src/test/moves/fissure.test.ts | 3 +- src/test/moves/flame_burst.test.ts | 2 +- src/test/moves/flower_shield.test.ts | 3 +- src/test/moves/focus_punch.test.ts | 7 +- src/test/moves/foresight.test.ts | 5 +- src/test/moves/freeze_dry.test.ts | 5 +- src/test/moves/freezy_frost.test.ts | 3 +- src/test/moves/gastro_acid.test.ts | 3 +- src/test/moves/gigaton_hammer.test.ts | 3 +- src/test/moves/glaive_rush.test.ts | 10 +-- src/test/moves/growth.test.ts | 3 +- src/test/moves/guard_split.test.ts | 5 +- src/test/moves/guard_swap.test.ts | 2 +- src/test/moves/hard_press.test.ts | 3 +- src/test/moves/haze.test.ts | 3 +- src/test/moves/hyper_beam.test.ts | 2 +- src/test/moves/jaw_lock.test.ts | 5 +- src/test/moves/lash_out.test.ts | 2 +- src/test/moves/lucky_chant.test.ts | 4 +- src/test/moves/lunar_blessing.test.ts | 3 +- src/test/moves/make_it_rain.test.ts | 3 +- src/test/moves/mat_block.test.ts | 4 +- src/test/moves/miracle_eye.test.ts | 3 +- src/test/moves/multi_target.test.ts | 3 +- src/test/moves/octolock.test.ts | 3 +- src/test/moves/parting_shot.test.ts | 5 +- src/test/moves/power_split.test.ts | 5 +- src/test/moves/power_swap.test.ts | 2 +- src/test/moves/protect.test.ts | 10 +-- src/test/moves/quick_guard.test.ts | 8 +- src/test/moves/rollout.test.ts | 3 +- src/test/moves/safeguard.test.ts | 10 ++- src/test/moves/shell_trap.test.ts | 9 +-- src/test/moves/speed_swap.test.ts | 3 +- src/test/moves/spikes.test.ts | 3 +- src/test/moves/spit_up.test.ts | 3 +- src/test/moves/stockpile.test.ts | 3 +- src/test/moves/swallow.test.ts | 3 +- src/test/moves/tail_whip.test.ts | 3 +- src/test/moves/tailwind.test.ts | 3 +- src/test/moves/tera_blast.test.ts | 3 +- src/test/moves/thunder_wave.test.ts | 3 +- src/test/moves/tidy_up.test.ts | 3 +- src/test/moves/transform.test.ts | 5 +- src/test/moves/u_turn.test.ts | 3 +- src/test/moves/wide_guard.test.ts | 8 +- src/test/reload.test.ts | 3 +- src/test/ui/type-hints.test.ts | 5 +- src/test/utils/helpers/overridesHelper.ts | 10 ++- src/test/utils/testUtils.ts | 4 - 119 files changed, 260 insertions(+), 352 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 01d728d6de0..4bc4aca448c 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -984,10 +984,16 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { : this.moveset; // Overrides moveset based on arrays specified in overrides.ts - const overrideArray: Array = this.isPlayer() ? Overrides.MOVESET_OVERRIDE : Overrides.OPP_MOVESET_OVERRIDE; + let overrideArray: Moves | Array = this.isPlayer() ? Overrides.MOVESET_OVERRIDE : Overrides.OPP_MOVESET_OVERRIDE; + if (!Array.isArray(overrideArray)) { + overrideArray = [overrideArray]; + } if (overrideArray.length > 0) { + if (!this.isPlayer()) { + this.moveset = []; + } overrideArray.forEach((move: Moves, index: number) => { - const ppUsed = this.moveset[index]?.ppUsed || 0; + const ppUsed = this.moveset[index]?.ppUsed ?? 0; this.moveset[index] = new PokemonMove(move, Math.min(ppUsed, allMoves[move].pp)); }); } diff --git a/src/overrides.ts b/src/overrides.ts index 48c118b55bc..d1597dfdee8 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -98,7 +98,7 @@ class DefaultOverrides { readonly PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE; readonly STATUS_OVERRIDE: StatusEffect = StatusEffect.NONE; readonly GENDER_OVERRIDE: Gender | null = null; - readonly MOVESET_OVERRIDE: Array = []; + readonly MOVESET_OVERRIDE: Moves | Array = []; readonly SHINY_OVERRIDE: boolean = false; readonly VARIANT_OVERRIDE: Variant = 0; @@ -111,7 +111,7 @@ class DefaultOverrides { readonly OPP_PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE; readonly OPP_STATUS_OVERRIDE: StatusEffect = StatusEffect.NONE; readonly OPP_GENDER_OVERRIDE: Gender | null = null; - readonly OPP_MOVESET_OVERRIDE: Array = []; + readonly OPP_MOVESET_OVERRIDE: Moves | Array = []; readonly OPP_SHINY_OVERRIDE: boolean = false; readonly OPP_VARIANT_OVERRIDE: Variant = 0; readonly OPP_IVS_OVERRIDE: number | number[] = []; diff --git a/src/test/abilities/aura_break.test.ts b/src/test/abilities/aura_break.test.ts index 0fb2212d817..422ac5178c1 100644 --- a/src/test/abilities/aura_break.test.ts +++ b/src/test/abilities/aura_break.test.ts @@ -3,7 +3,6 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -27,7 +26,7 @@ describe("Abilities - Aura Break", () => { game = new GameManager(phaserGame); game.override.battleType("single"); game.override.moveset([Moves.MOONBLAST, Moves.DARK_PULSE, Moves.MOONBLAST, Moves.DARK_PULSE]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemyAbility(Abilities.AURA_BREAK); game.override.enemySpecies(Species.SHUCKLE); }); diff --git a/src/test/abilities/battery.test.ts b/src/test/abilities/battery.test.ts index 020866509d6..cd02ed0c4eb 100644 --- a/src/test/abilities/battery.test.ts +++ b/src/test/abilities/battery.test.ts @@ -5,7 +5,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -31,7 +30,7 @@ describe("Abilities - Battery", () => { game.override.enemySpecies(Species.SHUCKLE); game.override.enemyAbility(Abilities.BALL_FETCH); game.override.moveset([Moves.TACKLE, Moves.BREAKING_SWIPE, Moves.SPLASH, Moves.DAZZLING_GLEAM]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); }); it("raises the power of allies' special moves by 30%", async () => { diff --git a/src/test/abilities/beast_boost.test.ts b/src/test/abilities/beast_boost.test.ts index 05645a1231d..26bae7b8838 100644 --- a/src/test/abilities/beast_boost.test.ts +++ b/src/test/abilities/beast_boost.test.ts @@ -4,7 +4,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -31,7 +30,7 @@ describe("Abilities - Beast Boost", () => { .ability(Abilities.BEAST_BOOST) .startingLevel(2000) .moveset([ Moves.FLAMETHROWER ]) - .enemyMoveset(SPLASH_ONLY); + .enemyMoveset(Moves.SPLASH); }); it("should prefer highest stat to boost its corresponding stat stage by 1 when winning a battle", async() => { @@ -51,7 +50,7 @@ describe("Abilities - Beast Boost", () => { }, 20000); it("should use in-battle overriden stats when determining the stat stage to raise by 1", async() => { - game.override.enemyMoveset(new Array(4).fill(Moves.GUARD_SPLIT)); + game.override.enemyMoveset([Moves.GUARD_SPLIT]); await game.classicMode.startBattle([Species.SLOWBRO]); diff --git a/src/test/abilities/contrary.test.ts b/src/test/abilities/contrary.test.ts index 19ecc7e0240..95a209395dc 100644 --- a/src/test/abilities/contrary.test.ts +++ b/src/test/abilities/contrary.test.ts @@ -1,10 +1,10 @@ -import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import { Moves } from "#app/enums/moves"; import { Abilities } from "#enums/abilities"; import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; +import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Abilities - Contrary", () => { let phaserGame: Phaser.Game; @@ -27,7 +27,7 @@ describe("Abilities - Contrary", () => { .enemySpecies(Species.BULBASAUR) .enemyAbility(Abilities.CONTRARY) .ability(Abilities.INTIMIDATE) - .enemyMoveset(SPLASH_ONLY); + .enemyMoveset(Moves.SPLASH); }); it("should invert stat changes when applied", async() => { diff --git a/src/test/abilities/costar.test.ts b/src/test/abilities/costar.test.ts index 96ec775f2a0..794bed0d3cf 100644 --- a/src/test/abilities/costar.test.ts +++ b/src/test/abilities/costar.test.ts @@ -5,7 +5,6 @@ import { Species } from "#app/enums/species"; import { CommandPhase } from "#app/phases/command-phase"; import { MessagePhase } from "#app/phases/message-phase"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; @@ -30,7 +29,7 @@ describe("Abilities - COSTAR", () => { game.override.battleType("double"); game.override.ability(Abilities.COSTAR); game.override.moveset([Moves.SPLASH, Moves.NASTY_PLOT]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); }); diff --git a/src/test/abilities/dancer.test.ts b/src/test/abilities/dancer.test.ts index d80f497f8b2..ec5ce53f4c3 100644 --- a/src/test/abilities/dancer.test.ts +++ b/src/test/abilities/dancer.test.ts @@ -30,7 +30,7 @@ describe("Abilities - Dancer", () => { .moveset([Moves.SWORDS_DANCE, Moves.SPLASH]) .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.DANCER) - .enemyMoveset(Array(4).fill(Moves.VICTORY_DANCE)); + .enemyMoveset([Moves.VICTORY_DANCE]); }); // Reference Link: https://bulbapedia.bulbagarden.net/wiki/Dancer_(Ability) diff --git a/src/test/abilities/disguise.test.ts b/src/test/abilities/disguise.test.ts index ef145262954..fa7f26d2716 100644 --- a/src/test/abilities/disguise.test.ts +++ b/src/test/abilities/disguise.test.ts @@ -6,7 +6,6 @@ import { StatusEffect } from "#app/data/status-effect"; import { Stat } from "#enums/stat"; import GameManager from "#test/utils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; const TIMEOUT = 20 * 1000; @@ -31,7 +30,7 @@ describe("Abilities - Disguise", () => { game.override .battleType("single") .enemySpecies(Species.MIMIKYU) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .starterSpecies(Species.REGIELEKI) .moveset([Moves.SHADOW_SNEAK, Moves.VACUUM_WAVE, Moves.TOXIC_THREAD, Moves.SPLASH]); }, TIMEOUT); @@ -108,7 +107,7 @@ describe("Abilities - Disguise", () => { }, TIMEOUT); it("persists form change when switched out", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.SHADOW_SNEAK)); + game.override.enemyMoveset([Moves.SHADOW_SNEAK]); game.override.starterSpecies(0); await game.classicMode.startBattle([ Species.MIMIKYU, Species.FURRET ]); @@ -194,7 +193,7 @@ describe("Abilities - Disguise", () => { }, TIMEOUT); it("doesn't faint twice when fainting due to Disguise break damage, nor prevent faint from Disguise break damage if using Endure", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.ENDURE)); + game.override.enemyMoveset([Moves.ENDURE]); await game.classicMode.startBattle(); const mimikyu = game.scene.getEnemyPokemon()!; diff --git a/src/test/abilities/dry_skin.test.ts b/src/test/abilities/dry_skin.test.ts index b337e4d96f7..1af8831f25b 100644 --- a/src/test/abilities/dry_skin.test.ts +++ b/src/test/abilities/dry_skin.test.ts @@ -1,9 +1,7 @@ import { Species } from "#app/enums/species"; -import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -23,63 +21,56 @@ describe("Abilities - Dry Skin", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.battleType("single"); - game.override.disableCrits(); - game.override.enemyAbility(Abilities.DRY_SKIN); - game.override.enemyMoveset(SPLASH_ONLY); - game.override.enemySpecies(Species.CHARMANDER); - game.override.ability(Abilities.UNNERVE); - game.override.starterSpecies(Species.CHANDELURE); + game.override + .battleType("single") + .disableCrits() + .enemyAbility(Abilities.DRY_SKIN) + .enemyMoveset(Moves.SPLASH) + .enemySpecies(Species.CHARMANDER) + .ability(Abilities.BALL_FETCH) + .moveset([Moves.SUNNY_DAY, Moves.RAIN_DANCE, Moves.SPLASH, Moves.WATER_GUN]) + .starterSpecies(Species.CHANDELURE); }); it("during sunlight, lose 1/8 of maximum health at the end of each turn", async () => { - game.override.moveset([Moves.SUNNY_DAY, Moves.SPLASH]); - - await game.startBattle(); + await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; - expect(enemy).not.toBe(undefined); // first turn - let previousEnemyHp = enemy.hp; game.move.select(Moves.SUNNY_DAY); - await game.phaseInterceptor.to(TurnEndPhase); - expect(enemy.hp).toBeLessThan(previousEnemyHp); + await game.phaseInterceptor.to("TurnEndPhase"); + expect(enemy.hp).toBeLessThan(enemy.getMaxHp()); // second turn - previousEnemyHp = enemy.hp; + enemy.hp = enemy.getMaxHp(); game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); - expect(enemy.hp).toBeLessThan(previousEnemyHp); + await game.phaseInterceptor.to("TurnEndPhase"); + expect(enemy.hp).toBeLessThan(enemy.getMaxHp()); }); it("during rain, gain 1/8 of maximum health at the end of each turn", async () => { - game.override.moveset([Moves.RAIN_DANCE, Moves.SPLASH]); - - await game.startBattle(); + await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; - expect(enemy).not.toBe(undefined); enemy.hp = 1; // first turn - let previousEnemyHp = enemy.hp; game.move.select(Moves.RAIN_DANCE); - await game.phaseInterceptor.to(TurnEndPhase); - expect(enemy.hp).toBeGreaterThan(previousEnemyHp); + await game.phaseInterceptor.to("TurnEndPhase"); + expect(enemy.hp).toBeGreaterThan(1); // second turn - previousEnemyHp = enemy.hp; + enemy.hp = 1; game.move.select(Moves.SPLASH); - await game.phaseInterceptor.to(TurnEndPhase); - expect(enemy.hp).toBeGreaterThan(previousEnemyHp); + await game.phaseInterceptor.to("TurnEndPhase"); + expect(enemy.hp).toBeGreaterThan(1); }); it("opposing fire attacks do 25% more damage", async () => { game.override.moveset([Moves.FLAMETHROWER]); - - await game.startBattle(); + await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; const initialHP = 1000; @@ -87,72 +78,65 @@ describe("Abilities - Dry Skin", () => { // first turn game.move.select(Moves.FLAMETHROWER); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); const fireDamageTakenWithDrySkin = initialHP - enemy.hp; - expect(enemy.hp > 0); enemy.hp = initialHP; game.override.enemyAbility(Abilities.NONE); // second turn game.move.select(Moves.FLAMETHROWER); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); const fireDamageTakenWithoutDrySkin = initialHP - enemy.hp; expect(fireDamageTakenWithDrySkin).toBeGreaterThan(fireDamageTakenWithoutDrySkin); }); it("opposing water attacks heal 1/4 of maximum health and deal no damage", async () => { - game.override.moveset([Moves.WATER_GUN]); - - await game.startBattle(); + await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; - expect(enemy).not.toBe(undefined); enemy.hp = 1; game.move.select(Moves.WATER_GUN); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); expect(enemy.hp).toBeGreaterThan(1); }); it("opposing water attacks do not heal if they were protected from", async () => { - game.override.moveset([Moves.WATER_GUN]); + game.override.enemyMoveset([Moves.PROTECT]); - await game.startBattle(); + await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; - expect(enemy).not.toBe(undefined); enemy.hp = 1; - game.override.enemyMoveset([Moves.PROTECT, Moves.PROTECT, Moves.PROTECT, Moves.PROTECT]); game.move.select(Moves.WATER_GUN); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); expect(enemy.hp).toBe(1); }); it("multi-strike water attacks only heal once", async () => { game.override.moveset([Moves.WATER_GUN, Moves.WATER_SHURIKEN]); - await game.startBattle(); + await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; - expect(enemy).not.toBe(undefined); enemy.hp = 1; // first turn game.move.select(Moves.WATER_SHURIKEN); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); const healthGainedFromWaterShuriken = enemy.hp - 1; enemy.hp = 1; // second turn game.move.select(Moves.WATER_GUN); - await game.phaseInterceptor.to(TurnEndPhase); + await game.phaseInterceptor.to("TurnEndPhase"); const healthGainedFromWaterGun = enemy.hp - 1; expect(healthGainedFromWaterShuriken).toBe(healthGainedFromWaterGun); diff --git a/src/test/abilities/flash_fire.test.ts b/src/test/abilities/flash_fire.test.ts index de40873998f..c3cf31496ea 100644 --- a/src/test/abilities/flash_fire.test.ts +++ b/src/test/abilities/flash_fire.test.ts @@ -7,7 +7,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -38,7 +37,7 @@ describe("Abilities - Flash Fire", () => { it("immune to Fire-type moves", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.EMBER)).moveset(SPLASH_ONLY); + game.override.enemyMoveset([Moves.EMBER]).moveset(Moves.SPLASH); await game.startBattle([Species.BLISSEY]); const blissey = game.scene.getPlayerPokemon()!; @@ -49,7 +48,7 @@ describe("Abilities - Flash Fire", () => { }, 20000); it("not activate if the Pokémon is protected from the Fire-type move", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.EMBER)).moveset([Moves.PROTECT]); + game.override.enemyMoveset([Moves.EMBER]).moveset([Moves.PROTECT]); await game.startBattle([Species.BLISSEY]); const blissey = game.scene.getPlayerPokemon()!; @@ -60,7 +59,7 @@ describe("Abilities - Flash Fire", () => { }, 20000); it("activated by Will-O-Wisp", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.WILL_O_WISP)).moveset(SPLASH_ONLY); + game.override.enemyMoveset([Moves.WILL_O_WISP]).moveset(Moves.SPLASH); await game.startBattle([Species.BLISSEY]); const blissey = game.scene.getPlayerPokemon()!; @@ -75,7 +74,7 @@ describe("Abilities - Flash Fire", () => { }, 20000); it("activated after being frozen", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.EMBER)).moveset(SPLASH_ONLY); + game.override.enemyMoveset([Moves.EMBER]).moveset(Moves.SPLASH); game.override.statusEffect(StatusEffect.FREEZE); await game.startBattle([Species.BLISSEY]); @@ -88,7 +87,7 @@ describe("Abilities - Flash Fire", () => { }, 20000); it("not passing with baton pass", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.EMBER)).moveset([Moves.BATON_PASS]); + game.override.enemyMoveset([Moves.EMBER]).moveset([Moves.BATON_PASS]); await game.startBattle([Species.BLISSEY, Species.CHANSEY]); // ensure use baton pass after enemy moved @@ -104,7 +103,7 @@ describe("Abilities - Flash Fire", () => { }, 20000); it("boosts Fire-type move when the ability is activated", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.FIRE_PLEDGE)).moveset([Moves.EMBER, Moves.SPLASH]); + game.override.enemyMoveset([Moves.FIRE_PLEDGE]).moveset([Moves.EMBER, Moves.SPLASH]); game.override.enemyAbility(Abilities.FLASH_FIRE).ability(Abilities.NONE); await game.startBattle([Species.BLISSEY]); const blissey = game.scene.getPlayerPokemon()!; diff --git a/src/test/abilities/flower_gift.test.ts b/src/test/abilities/flower_gift.test.ts index de07bd29478..256b61c6fea 100644 --- a/src/test/abilities/flower_gift.test.ts +++ b/src/test/abilities/flower_gift.test.ts @@ -5,7 +5,6 @@ import { WeatherType } from "#app/enums/weather-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -44,7 +43,7 @@ describe("Abilities - Flower Gift", () => { game.override .moveset([Moves.SPLASH, Moves.RAIN_DANCE, Moves.SUNNY_DAY, Moves.SKILL_SWAP]) .enemySpecies(Species.MAGIKARP) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH); }); @@ -92,7 +91,7 @@ describe("Abilities - Flower Gift", () => { }); it("reverts to Overcast Form when the Pokémon loses Flower Gift, changes form under Harsh Sunlight/Sunny when it regains it", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.SKILL_SWAP)).weather(WeatherType.HARSH_SUN); + game.override.enemyMoveset([Moves.SKILL_SWAP]).weather(WeatherType.HARSH_SUN); await game.classicMode.startBattle([Species.CHERRIM]); @@ -111,7 +110,7 @@ describe("Abilities - Flower Gift", () => { }); it("reverts to Overcast Form when the Flower Gift is suppressed, changes form under Harsh Sunlight/Sunny when it regains it", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.GASTRO_ACID)).weather(WeatherType.HARSH_SUN); + game.override.enemyMoveset([Moves.GASTRO_ACID]).weather(WeatherType.HARSH_SUN); await game.classicMode.startBattle([Species.CHERRIM, Species.MAGIKARP]); diff --git a/src/test/abilities/forecast.test.ts b/src/test/abilities/forecast.test.ts index 78453c5f4d2..c1eb3600b8b 100644 --- a/src/test/abilities/forecast.test.ts +++ b/src/test/abilities/forecast.test.ts @@ -10,7 +10,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -67,7 +66,7 @@ describe("Abilities - Forecast", () => { game.override .moveset([Moves.SPLASH, Moves.RAIN_DANCE, Moves.SUNNY_DAY, Moves.TACKLE]) .enemySpecies(Species.MAGIKARP) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH); }); @@ -229,7 +228,7 @@ describe("Abilities - Forecast", () => { }); it("reverts to Normal Form when Forecast is suppressed, changes form to match the weather when it regains it", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.GASTRO_ACID)).weather(WeatherType.RAIN); + game.override.enemyMoveset([Moves.GASTRO_ACID]).weather(WeatherType.RAIN); await game.startBattle([Species.CASTFORM, Species.PIKACHU]); const castform = game.scene.getPlayerPokemon()!; @@ -260,7 +259,7 @@ describe("Abilities - Forecast", () => { }); it("does not change Castform's form until after Stealth Rock deals damage", async () => { - game.override.weather(WeatherType.RAIN).enemyMoveset(Array(4).fill(Moves.STEALTH_ROCK)); + game.override.weather(WeatherType.RAIN).enemyMoveset([Moves.STEALTH_ROCK]); await game.startBattle([Species.PIKACHU, Species.CASTFORM]); // First turn - set up stealth rock diff --git a/src/test/abilities/galvanize.test.ts b/src/test/abilities/galvanize.test.ts index 4b0ddc14d7c..f81b854180a 100644 --- a/src/test/abilities/galvanize.test.ts +++ b/src/test/abilities/galvanize.test.ts @@ -6,7 +6,6 @@ import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { HitResult } from "#app/field/pokemon"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -36,7 +35,7 @@ describe("Abilities - Galvanize", () => { .moveset([Moves.TACKLE, Moves.REVELATION_DANCE, Moves.FURY_SWIPES]) .enemySpecies(Species.DUSCLOPS) .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemyLevel(100); }); diff --git a/src/test/abilities/gulp_missile.test.ts b/src/test/abilities/gulp_missile.test.ts index 286c3af1c56..ac0efd8e8d1 100644 --- a/src/test/abilities/gulp_missile.test.ts +++ b/src/test/abilities/gulp_missile.test.ts @@ -11,7 +11,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; import { Stat } from "#enums/stat"; describe("Abilities - Gulp Missile", () => { @@ -49,7 +48,7 @@ describe("Abilities - Gulp Missile", () => { .moveset([Moves.SURF, Moves.DIVE, Moves.SPLASH]) .enemySpecies(Species.SNORLAX) .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemyLevel(5); }); @@ -108,7 +107,7 @@ describe("Abilities - Gulp Missile", () => { }); it("deals 1/4 of the attacker's maximum HP when hit by a damaging attack", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.TACKLE)); + game.override.enemyMoveset([Moves.TACKLE]); await game.startBattle([Species.CRAMORANT]); const enemy = game.scene.getEnemyPokemon()!; @@ -121,7 +120,7 @@ describe("Abilities - Gulp Missile", () => { }); it("does not have any effect when hit by non-damaging attack", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.TAIL_WHIP)); + game.override.enemyMoveset([Moves.TAIL_WHIP]); await game.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; @@ -140,7 +139,7 @@ describe("Abilities - Gulp Missile", () => { }); it("lowers attacker's DEF stat stage by 1 when hit in Gulping form", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.TACKLE)); + game.override.enemyMoveset([Moves.TACKLE]); await game.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; @@ -164,7 +163,7 @@ describe("Abilities - Gulp Missile", () => { }); it("paralyzes the enemy when hit in Gorging form", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.TACKLE)); + game.override.enemyMoveset([Moves.TACKLE]); await game.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; @@ -188,7 +187,7 @@ describe("Abilities - Gulp Missile", () => { }); it("does not activate the ability when underwater", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.SURF)); + game.override.enemyMoveset([Moves.SURF]); await game.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; @@ -201,7 +200,7 @@ describe("Abilities - Gulp Missile", () => { }); it("prevents effect damage but inflicts secondary effect on attacker with Magic Guard", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.TACKLE)).enemyAbility(Abilities.MAGIC_GUARD); + game.override.enemyMoveset([Moves.TACKLE]).enemyAbility(Abilities.MAGIC_GUARD); await game.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; @@ -225,7 +224,7 @@ describe("Abilities - Gulp Missile", () => { }); it("cannot be suppressed", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.GASTRO_ACID)); + game.override.enemyMoveset([Moves.GASTRO_ACID]); await game.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; @@ -245,7 +244,7 @@ describe("Abilities - Gulp Missile", () => { }); it("cannot be swapped with another ability", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.SKILL_SWAP)); + game.override.enemyMoveset([Moves.SKILL_SWAP]); await game.startBattle([Species.CRAMORANT]); const cramorant = game.scene.getPlayerPokemon()!; diff --git a/src/test/abilities/heatproof.test.ts b/src/test/abilities/heatproof.test.ts index e2a558e6d99..61c406201bd 100644 --- a/src/test/abilities/heatproof.test.ts +++ b/src/test/abilities/heatproof.test.ts @@ -5,7 +5,6 @@ import { toDmgValue } from "#app/utils"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -30,7 +29,7 @@ describe("Abilities - Heatproof", () => { .disableCrits() .enemySpecies(Species.CHARMANDER) .enemyAbility(Abilities.HEATPROOF) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemyLevel(100) .starterSpecies(Species.CHANDELURE) .ability(Abilities.BALL_FETCH) diff --git a/src/test/abilities/hustle.test.ts b/src/test/abilities/hustle.test.ts index ff96b98c7ac..29cbfdc1a5d 100644 --- a/src/test/abilities/hustle.test.ts +++ b/src/test/abilities/hustle.test.ts @@ -4,7 +4,6 @@ import { Stat } from "#app/enums/stat"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -29,7 +28,7 @@ describe("Abilities - Hustle", () => { .moveset([ Moves.TACKLE, Moves.GIGA_DRAIN, Moves.FISSURE ]) .disableCrits() .battleType("single") - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemySpecies(Species.SHUCKLE) .enemyAbility(Abilities.BALL_FETCH); }); diff --git a/src/test/abilities/hyper_cutter.test.ts b/src/test/abilities/hyper_cutter.test.ts index 64e04ac2fd3..ec947add939 100644 --- a/src/test/abilities/hyper_cutter.test.ts +++ b/src/test/abilities/hyper_cutter.test.ts @@ -3,7 +3,6 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -29,7 +28,7 @@ describe("Abilities - Hyper Cutter", () => { .ability(Abilities.BALL_FETCH) .enemySpecies(Species.SHUCKLE) .enemyAbility(Abilities.HYPER_CUTTER) - .enemyMoveset(SPLASH_ONLY); + .enemyMoveset(Moves.SPLASH); }); // Reference Link: https://bulbapedia.bulbagarden.net/wiki/Hyper_Cutter_(Ability) diff --git a/src/test/abilities/imposter.test.ts b/src/test/abilities/imposter.test.ts index 2857f80632a..27673564aaa 100644 --- a/src/test/abilities/imposter.test.ts +++ b/src/test/abilities/imposter.test.ts @@ -6,7 +6,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Stat, BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat"; import { Abilities } from "#enums/abilities"; -import { SPLASH_ONLY } from "../utils/testUtils"; // TODO: Add more tests once Imposter is fully implemented describe("Abilities - Imposter", () => { @@ -31,9 +30,9 @@ describe("Abilities - Imposter", () => { .enemyLevel(200) .enemyAbility(Abilities.BEAST_BOOST) .enemyPassiveAbility(Abilities.BALL_FETCH) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .ability(Abilities.IMPOSTER) - .moveset(SPLASH_ONLY); + .moveset(Moves.SPLASH); }); it("should copy species, ability, gender, all stats except HP, all stat stages, moveset, and types of target", async () => { @@ -77,7 +76,7 @@ describe("Abilities - Imposter", () => { }, 20000); it("should copy in-battle overridden stats", async () => { - game.override.enemyMoveset(new Array(4).fill(Moves.POWER_SPLIT)); + game.override.enemyMoveset([Moves.POWER_SPLIT]); await game.startBattle([ Species.DITTO diff --git a/src/test/abilities/intimidate.test.ts b/src/test/abilities/intimidate.test.ts index f90ba6c0e1e..d4c097022df 100644 --- a/src/test/abilities/intimidate.test.ts +++ b/src/test/abilities/intimidate.test.ts @@ -7,7 +7,6 @@ import { getMovePosition } from "#test/utils/gameManagerUtils"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; describe("Abilities - Intimidate", () => { let phaserGame: Phaser.Game; @@ -31,7 +30,7 @@ describe("Abilities - Intimidate", () => { .enemyPassiveAbility(Abilities.HYDRATION) .ability(Abilities.INTIMIDATE) .startingWave(3) - .enemyMoveset(SPLASH_ONLY); + .enemyMoveset(Moves.SPLASH); }); it("should lower ATK stat stage by 1 of enemy Pokemon on entry and player switch", async () => { @@ -108,7 +107,7 @@ describe("Abilities - Intimidate", () => { it("should lower ATK stat stage by 1 for every switch", async () => { game.override.moveset([Moves.SPLASH]) - .enemyMoveset(new Array(4).fill(Moves.VOLT_SWITCH)) + .enemyMoveset([Moves.VOLT_SWITCH]) .startingWave(5); await game.classicMode.startBattle([ Species.MIGHTYENA, Species.POOCHYENA ]); diff --git a/src/test/abilities/libero.test.ts b/src/test/abilities/libero.test.ts index 7895e7de6bf..51f182d5401 100644 --- a/src/test/abilities/libero.test.ts +++ b/src/test/abilities/libero.test.ts @@ -9,7 +9,6 @@ import { Biome } from "#enums/biome"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; @@ -183,7 +182,7 @@ describe("Abilities - Libero", () => { "ability applies correctly even if the pokemon's move misses", async () => { game.override.moveset([Moves.TACKLE]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); await game.startBattle([Species.MAGIKARP]); diff --git a/src/test/abilities/magic_guard.test.ts b/src/test/abilities/magic_guard.test.ts index 64c1746c7d9..4b3fb0ba985 100644 --- a/src/test/abilities/magic_guard.test.ts +++ b/src/test/abilities/magic_guard.test.ts @@ -8,7 +8,6 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -39,7 +38,7 @@ describe("Abilities - Magic Guard", () => { /** Enemy Pokemon overrides */ game.override.enemySpecies(Species.SNORLAX); game.override.enemyAbility(Abilities.INSOMNIA); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemyLevel(100); }); diff --git a/src/test/abilities/moody.test.ts b/src/test/abilities/moody.test.ts index 5c46ea68ec5..166f69b0fe3 100644 --- a/src/test/abilities/moody.test.ts +++ b/src/test/abilities/moody.test.ts @@ -3,7 +3,6 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -29,8 +28,8 @@ describe("Abilities - Moody", () => { .enemySpecies(Species.RATTATA) .enemyAbility(Abilities.BALL_FETCH) .ability(Abilities.MOODY) - .enemyMoveset(SPLASH_ONLY) - .moveset(SPLASH_ONLY); + .enemyMoveset(Moves.SPLASH) + .moveset(Moves.SPLASH); }); it("should increase one stat stage by 2 and decrease a different stat stage by 1", diff --git a/src/test/abilities/moxie.test.ts b/src/test/abilities/moxie.test.ts index e713d78f39e..5f337fedabb 100644 --- a/src/test/abilities/moxie.test.ts +++ b/src/test/abilities/moxie.test.ts @@ -5,7 +5,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; import { BattlerIndex } from "#app/battle"; import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; import { VictoryPhase } from "#app/phases/victory-phase"; @@ -34,7 +33,7 @@ describe("Abilities - Moxie", () => { game.override.ability(Abilities.MOXIE); game.override.startingLevel(2000); game.override.moveset([ moveToUse ]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); }); it("should raise ATK stat stage by 1 when winning a battle", async() => { diff --git a/src/test/abilities/parental_bond.test.ts b/src/test/abilities/parental_bond.test.ts index 81a30524a5e..2ad3f9e3f5c 100644 --- a/src/test/abilities/parental_bond.test.ts +++ b/src/test/abilities/parental_bond.test.ts @@ -7,7 +7,6 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -34,7 +33,7 @@ describe("Abilities - Parental Bond", () => { game.override.ability(Abilities.PARENTAL_BOND); game.override.enemySpecies(Species.SNORLAX); game.override.enemyAbility(Abilities.FUR_COAT); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.startingLevel(100); game.override.enemyLevel(100); }); @@ -175,7 +174,7 @@ describe("Abilities - Parental Bond", () => { "should not apply multiplier to counter moves", async () => { game.override.moveset([Moves.COUNTER]); - game.override.enemyMoveset(Array(4).fill(Moves.TACKLE)); + game.override.enemyMoveset([Moves.TACKLE]); await game.classicMode.startBattle([Species.SHUCKLE]); @@ -465,7 +464,7 @@ describe("Abilities - Parental Bond", () => { "should not cause user to hit into King's Shield more than once", async () => { game.override.moveset([Moves.TACKLE]); - game.override.enemyMoveset(Array(4).fill(Moves.KINGS_SHIELD)); + game.override.enemyMoveset([Moves.KINGS_SHIELD]); await game.classicMode.startBattle([Species.MAGIKARP]); diff --git a/src/test/abilities/pastel_veil.test.ts b/src/test/abilities/pastel_veil.test.ts index ba90c7e3b3f..31490aab143 100644 --- a/src/test/abilities/pastel_veil.test.ts +++ b/src/test/abilities/pastel_veil.test.ts @@ -8,7 +8,6 @@ import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Abilities - Pastel Veil", () => { let phaserGame: Phaser.Game; @@ -31,7 +30,7 @@ describe("Abilities - Pastel Veil", () => { .moveset([Moves.TOXIC_THREAD, Moves.SPLASH]) .enemyAbility(Abilities.BALL_FETCH) .enemySpecies(Species.SUNKERN) - .enemyMoveset(SPLASH_ONLY); + .enemyMoveset(Moves.SPLASH); }); it("prevents the user and its allies from being afflicted by poison", async () => { diff --git a/src/test/abilities/power_spot.test.ts b/src/test/abilities/power_spot.test.ts index b83284c0bac..6d349a1a3f9 100644 --- a/src/test/abilities/power_spot.test.ts +++ b/src/test/abilities/power_spot.test.ts @@ -5,7 +5,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -29,7 +28,7 @@ describe("Abilities - Power Spot", () => { game = new GameManager(phaserGame); game.override.battleType("double"); game.override.moveset([Moves.TACKLE, Moves.BREAKING_SWIPE, Moves.SPLASH, Moves.DAZZLING_GLEAM]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemySpecies(Species.SHUCKLE); game.override.enemyAbility(Abilities.BALL_FETCH); }); diff --git a/src/test/abilities/protean.test.ts b/src/test/abilities/protean.test.ts index 6ecabbfade0..4be58a677a6 100644 --- a/src/test/abilities/protean.test.ts +++ b/src/test/abilities/protean.test.ts @@ -9,7 +9,6 @@ import { Biome } from "#enums/biome"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; @@ -183,7 +182,7 @@ describe("Abilities - Protean", () => { "ability applies correctly even if the pokemon's move misses", async () => { game.override.moveset([Moves.TACKLE]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); await game.startBattle([Species.MAGIKARP]); diff --git a/src/test/abilities/quick_draw.test.ts b/src/test/abilities/quick_draw.test.ts index 00d344ed333..a02ee5cf56a 100644 --- a/src/test/abilities/quick_draw.test.ts +++ b/src/test/abilities/quick_draw.test.ts @@ -32,7 +32,7 @@ describe("Abilities - Quick Draw", () => { game.override.enemyLevel(100); game.override.enemySpecies(Species.MAGIKARP); game.override.enemyAbility(Abilities.BALL_FETCH); - game.override.enemyMoveset(Array(4).fill(Moves.TACKLE)); + game.override.enemyMoveset([Moves.TACKLE]); vi.spyOn(allAbilities[Abilities.QUICK_DRAW].getAttrs(BypassSpeedChanceAbAttr)[0], "chance", "get").mockReturnValue(100); }); @@ -76,7 +76,7 @@ describe("Abilities - Quick Draw", () => { ); test("does not increase priority", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.EXTREME_SPEED)); + game.override.enemyMoveset([Moves.EXTREME_SPEED]); await game.startBattle(); diff --git a/src/test/abilities/sand_spit.test.ts b/src/test/abilities/sand_spit.test.ts index 041e20faf7f..add13ede296 100644 --- a/src/test/abilities/sand_spit.test.ts +++ b/src/test/abilities/sand_spit.test.ts @@ -35,7 +35,7 @@ describe("Abilities - Sand Spit", () => { }); it("should trigger when hit with damaging move", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.TACKLE)); + game.override.enemyMoveset([Moves.TACKLE]); await game.startBattle(); game.move.select(Moves.SPLASH); @@ -45,7 +45,7 @@ describe("Abilities - Sand Spit", () => { }, 20000); it("should not trigger when targetted with status moves", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.GROWL)); + game.override.enemyMoveset([Moves.GROWL]); await game.startBattle(); game.move.select(Moves.COIL); diff --git a/src/test/abilities/sap_sipper.test.ts b/src/test/abilities/sap_sipper.test.ts index 2d70ede3530..5e8cac74c95 100644 --- a/src/test/abilities/sap_sipper.test.ts +++ b/src/test/abilities/sap_sipper.test.ts @@ -9,7 +9,6 @@ import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; // See also: TypeImmunityAbAttr describe("Abilities - Sap Sipper", () => { @@ -37,7 +36,7 @@ describe("Abilities - Sap Sipper", () => { const enemyAbility = Abilities.SAP_SIPPER; game.override.moveset([ moveToUse ]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemySpecies(Species.DUSKULL); game.override.enemyAbility(enemyAbility); @@ -59,7 +58,7 @@ describe("Abilities - Sap Sipper", () => { const enemyAbility = Abilities.SAP_SIPPER; game.override.moveset([ moveToUse ]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemySpecies(Species.RATTATA); game.override.enemyAbility(enemyAbility); @@ -80,7 +79,7 @@ describe("Abilities - Sap Sipper", () => { const enemyAbility = Abilities.SAP_SIPPER; game.override.moveset([ moveToUse ]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemySpecies(Species.RATTATA); game.override.enemyAbility(enemyAbility); @@ -100,7 +99,7 @@ describe("Abilities - Sap Sipper", () => { const enemyAbility = Abilities.SAP_SIPPER; game.override.moveset([ moveToUse ]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemySpecies(Species.RATTATA); game.override.enemyAbility(enemyAbility); @@ -123,7 +122,7 @@ describe("Abilities - Sap Sipper", () => { game.override.moveset([ moveToUse ]); game.override.ability(ability); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemySpecies(Species.RATTATA); game.override.enemyAbility(Abilities.NONE); diff --git a/src/test/abilities/simple.test.ts b/src/test/abilities/simple.test.ts index 4310c5d45d1..e5ca474d7c3 100644 --- a/src/test/abilities/simple.test.ts +++ b/src/test/abilities/simple.test.ts @@ -1,10 +1,10 @@ -import { Stat } from "#enums/stat"; -import GameManager from "#test/utils/gameManager"; +import { Moves } from "#app/enums/moves"; import { Abilities } from "#enums/abilities"; import { Species } from "#enums/species"; +import { Stat } from "#enums/stat"; +import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Abilities - Simple", () => { let phaserGame: Phaser.Game; @@ -27,7 +27,7 @@ describe("Abilities - Simple", () => { .enemySpecies(Species.BULBASAUR) .enemyAbility(Abilities.SIMPLE) .ability(Abilities.INTIMIDATE) - .enemyMoveset(SPLASH_ONLY); + .enemyMoveset(Moves.SPLASH); }); it("should double stat changes when applied", async() => { diff --git a/src/test/abilities/steely_spirit.test.ts b/src/test/abilities/steely_spirit.test.ts index 7aaa0a42ae3..7b5879555be 100644 --- a/src/test/abilities/steely_spirit.test.ts +++ b/src/test/abilities/steely_spirit.test.ts @@ -4,7 +4,6 @@ import { Abilities } from "#app/enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -31,7 +30,7 @@ describe("Abilities - Steely Spirit", () => { game.override.enemySpecies(Species.SHUCKLE); game.override.enemyAbility(Abilities.BALL_FETCH); game.override.moveset([Moves.IRON_HEAD, Moves.SPLASH]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); vi.spyOn(allMoves[moveToCheck], "calculateBattlePower"); }); diff --git a/src/test/abilities/sweet_veil.test.ts b/src/test/abilities/sweet_veil.test.ts index 5de3c7285a9..c2946443245 100644 --- a/src/test/abilities/sweet_veil.test.ts +++ b/src/test/abilities/sweet_veil.test.ts @@ -6,7 +6,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -45,7 +44,7 @@ describe("Abilities - Sweet Veil", () => { }); it("causes Rest to fail when used by the user or its allies", async () => { - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); await game.startBattle([Species.SWIRLIX, Species.MAGIKARP]); game.move.select(Moves.SPLASH); @@ -72,7 +71,7 @@ describe("Abilities - Sweet Veil", () => { game.override.enemySpecies(Species.PIKACHU); game.override.enemyLevel(5); game.override.startingLevel(5); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); await game.startBattle([Species.SHUCKLE, Species.SHUCKLE, Species.SWIRLIX]); diff --git a/src/test/abilities/tera_shell.test.ts b/src/test/abilities/tera_shell.test.ts index 6a6b7bb252b..2826469f3bf 100644 --- a/src/test/abilities/tera_shell.test.ts +++ b/src/test/abilities/tera_shell.test.ts @@ -30,7 +30,7 @@ describe("Abilities - Tera Shell", () => { .moveset([Moves.SPLASH]) .enemySpecies(Species.SNORLAX) .enemyAbility(Abilities.INSOMNIA) - .enemyMoveset(Array(4).fill(Moves.MACH_PUNCH)) + .enemyMoveset([Moves.MACH_PUNCH]) .startingLevel(100) .enemyLevel(100); }); @@ -60,7 +60,7 @@ describe("Abilities - Tera Shell", () => { it( "should not override type immunities", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.SHADOW_SNEAK)); + game.override.enemyMoveset([Moves.SHADOW_SNEAK]); await game.classicMode.startBattle([Species.SNORLAX]); @@ -77,7 +77,7 @@ describe("Abilities - Tera Shell", () => { it( "should not override type multipliers less than 0.5x", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.QUICK_ATTACK)); + game.override.enemyMoveset([Moves.QUICK_ATTACK]); await game.classicMode.startBattle([Species.AGGRON]); @@ -94,7 +94,7 @@ describe("Abilities - Tera Shell", () => { it( "should not affect the effectiveness of fixed-damage moves", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.DRAGON_RAGE)); + game.override.enemyMoveset([Moves.DRAGON_RAGE]); await game.classicMode.startBattle([Species.CHARIZARD]); diff --git a/src/test/abilities/wind_power.test.ts b/src/test/abilities/wind_power.test.ts index c944e01b43a..12b8d2f2299 100644 --- a/src/test/abilities/wind_power.test.ts +++ b/src/test/abilities/wind_power.test.ts @@ -4,7 +4,6 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -28,7 +27,7 @@ describe("Abilities - Wind Power", () => { game.override.enemySpecies(Species.SHIFTRY); game.override.enemyAbility(Abilities.WIND_POWER); game.override.moveset([Moves.TAILWIND, Moves.SPLASH, Moves.PETAL_BLIZZARD, Moves.SANDSTORM]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); }); it("it becomes charged when hit by wind moves", async () => { diff --git a/src/test/abilities/wind_rider.test.ts b/src/test/abilities/wind_rider.test.ts index 7a1fee6794a..c917f56e101 100644 --- a/src/test/abilities/wind_rider.test.ts +++ b/src/test/abilities/wind_rider.test.ts @@ -3,7 +3,6 @@ import GameManager from "#test/utils/gameManager"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -28,7 +27,7 @@ describe("Abilities - Wind Rider", () => { .enemySpecies(Species.SHIFTRY) .enemyAbility(Abilities.WIND_RIDER) .moveset([Moves.TAILWIND, Moves.SPLASH, Moves.PETAL_BLIZZARD, Moves.SANDSTORM]) - .enemyMoveset(SPLASH_ONLY); + .enemyMoveset(Moves.SPLASH); }); it("takes no damage from wind moves and its ATK stat stage is raised by 1 when hit by one", async () => { diff --git a/src/test/abilities/wonder_skin.test.ts b/src/test/abilities/wonder_skin.test.ts index 0c2aedc8ce8..6ef985fbd42 100644 --- a/src/test/abilities/wonder_skin.test.ts +++ b/src/test/abilities/wonder_skin.test.ts @@ -5,7 +5,6 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -30,7 +29,7 @@ describe("Abilities - Wonder Skin", () => { game.override.ability(Abilities.BALL_FETCH); game.override.enemySpecies(Species.SHUCKLE); game.override.enemyAbility(Abilities.WONDER_SKIN); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); }); it("lowers accuracy of status moves to 50%", async () => { diff --git a/src/test/abilities/zero_to_hero.test.ts b/src/test/abilities/zero_to_hero.test.ts index 1a9697f974e..eafc32b4c79 100644 --- a/src/test/abilities/zero_to_hero.test.ts +++ b/src/test/abilities/zero_to_hero.test.ts @@ -6,7 +6,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; const TIMEOUT = 20 * 1000; @@ -30,8 +29,8 @@ describe("Abilities - ZERO TO HERO", () => { game = new GameManager(phaserGame); game.override .battleType("single") - .moveset(SPLASH_ONLY) - .enemyMoveset(SPLASH_ONLY) + .moveset(Moves.SPLASH) + .enemyMoveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH); }); diff --git a/src/test/arena/arena_gravity.test.ts b/src/test/arena/arena_gravity.test.ts index eda8c687ba1..47b8bf4cf70 100644 --- a/src/test/arena/arena_gravity.test.ts +++ b/src/test/arena/arena_gravity.test.ts @@ -8,7 +8,6 @@ import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Arena - Gravity", () => { let phaserGame: Phaser.Game; @@ -32,7 +31,7 @@ describe("Arena - Gravity", () => { .ability(Abilities.UNNERVE) .enemyAbility(Abilities.BALL_FETCH) .enemySpecies(Species.SHUCKLE) - .enemyMoveset(SPLASH_ONLY); + .enemyMoveset(Moves.SPLASH); }); // Reference: https://bulbapedia.bulbagarden.net/wiki/Gravity_(move) diff --git a/src/test/arena/weather_fog.test.ts b/src/test/arena/weather_fog.test.ts index b36b0de2e06..b47145e8dd0 100644 --- a/src/test/arena/weather_fog.test.ts +++ b/src/test/arena/weather_fog.test.ts @@ -31,7 +31,7 @@ describe("Weather - Fog", () => { game.override.ability(Abilities.BALL_FETCH); game.override.enemyAbility(Abilities.BALL_FETCH); game.override.enemySpecies(Species.MAGIKARP); - game.override.enemyMoveset(new Array(4).fill(Moves.SPLASH)); + game.override.enemyMoveset([Moves.SPLASH]); }); it("move accuracy is multiplied by 90%", async () => { diff --git a/src/test/arena/weather_hail.test.ts b/src/test/arena/weather_hail.test.ts index 75125b3448c..31d20be2ded 100644 --- a/src/test/arena/weather_hail.test.ts +++ b/src/test/arena/weather_hail.test.ts @@ -4,7 +4,6 @@ import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; import { BattlerIndex } from "#app/battle"; describe("Weather - Hail", () => { @@ -26,8 +25,8 @@ describe("Weather - Hail", () => { game.override .weather(WeatherType.HAIL) .battleType("single") - .moveset(SPLASH_ONLY) - .enemyMoveset(SPLASH_ONLY) + .moveset(Moves.SPLASH) + .enemyMoveset(Moves.SPLASH) .enemySpecies(Species.MAGIKARP); }); diff --git a/src/test/arena/weather_sandstorm.test.ts b/src/test/arena/weather_sandstorm.test.ts index 978774ba4c1..91188de6985 100644 --- a/src/test/arena/weather_sandstorm.test.ts +++ b/src/test/arena/weather_sandstorm.test.ts @@ -4,7 +4,6 @@ import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Weather - Sandstorm", () => { let phaserGame: Phaser.Game; @@ -25,8 +24,8 @@ describe("Weather - Sandstorm", () => { game.override .weather(WeatherType.SANDSTORM) .battleType("single") - .moveset(SPLASH_ONLY) - .enemyMoveset(SPLASH_ONLY) + .moveset(Moves.SPLASH) + .enemyMoveset(Moves.SPLASH) .enemySpecies(Species.MAGIKARP); }); diff --git a/src/test/battle/battle.test.ts b/src/test/battle/battle.test.ts index 25dfbc765bd..6e15bbd99d9 100644 --- a/src/test/battle/battle.test.ts +++ b/src/test/battle/battle.test.ts @@ -25,7 +25,6 @@ import { PlayerGender } from "#enums/player-gender"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Test Battle Phase", () => { let phaserGame: Phaser.Game; @@ -319,7 +318,7 @@ describe("Test Battle Phase", () => { .startingWave(1) .startingLevel(100) .moveset([moveToUse]) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .startingHeldItems([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ACC }]); await game.startBattle(); diff --git a/src/test/battle/damage_calculation.test.ts b/src/test/battle/damage_calculation.test.ts index 9c7c9dc9d3e..89f2bb4c269 100644 --- a/src/test/battle/damage_calculation.test.ts +++ b/src/test/battle/damage_calculation.test.ts @@ -5,7 +5,6 @@ import { ArenaTagType } from "#enums/arena-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -31,7 +30,7 @@ describe("Round Down and Minimun 1 test in Damage Calculation", () => { it("When the user fails to use Jump Kick with Wonder Guard ability, the damage should be 1.", async () => { game.override.enemySpecies(Species.GASTLY); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.starterSpecies(Species.SHEDINJA); game.override.moveset([Moves.JUMP_KICK]); game.override.ability(Abilities.WONDER_GUARD); diff --git a/src/test/battle/double_battle.test.ts b/src/test/battle/double_battle.test.ts index d264a29ef9b..b7a5616d642 100644 --- a/src/test/battle/double_battle.test.ts +++ b/src/test/battle/double_battle.test.ts @@ -4,7 +4,6 @@ import { TurnInitPhase } from "#app/phases/turn-init-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -29,7 +28,7 @@ describe("Double Battles", () => { // double-battle player's pokemon both fainted in same round, then revive one, and next double battle summons two player's pokemon successfully. // (There were bugs that either only summon one when can summon two, player stuck in switchPhase etc) it("3v2 edge case: player summons 2 pokemon on the next battle after being fainted and revived", async () => { - game.override.battleType("double").enemyMoveset(SPLASH_ONLY).moveset(SPLASH_ONLY); + game.override.battleType("double").enemyMoveset(Moves.SPLASH).moveset(Moves.SPLASH); await game.startBattle([ Species.BULBASAUR, Species.CHARIZARD, diff --git a/src/test/battle/inverse_battle.test.ts b/src/test/battle/inverse_battle.test.ts index 2a561a09e5e..d808f71addb 100644 --- a/src/test/battle/inverse_battle.test.ts +++ b/src/test/battle/inverse_battle.test.ts @@ -8,7 +8,6 @@ import { Species } from "#enums/species"; import { StatusEffect } from "#enums/status-effect"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; const TIMEOUT = 20 * 1000; @@ -38,7 +37,7 @@ describe("Inverse Battle", () => { .ability(Abilities.BALL_FETCH) .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset(SPLASH_ONLY); + .enemyMoveset(Moves.SPLASH); }); it("Immune types are 2x effective - Thunderbolt against Ground Type", async () => { diff --git a/src/test/boss-pokemon.test.ts b/src/test/boss-pokemon.test.ts index c6fc276551f..8a0a0e01617 100644 --- a/src/test/boss-pokemon.test.ts +++ b/src/test/boss-pokemon.test.ts @@ -2,7 +2,6 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import GameManager from "./utils/gameManager"; import { Species } from "#app/enums/species"; import { getPokemonSpecies } from "#app/data/pokemon-species"; -import { SPLASH_ONLY } from "./utils/testUtils"; import { Abilities } from "#app/enums/abilities"; import { Moves } from "#app/enums/moves"; import { EFFECTIVE_STATS } from "#app/enums/stat"; @@ -33,7 +32,7 @@ describe("Boss Pokemon / Shields", () => { .disableTrainerWaves() .disableCrits() .enemySpecies(Species.RATTATA) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemyHeldItems([]) .startingLevel(1000) .moveset([Moves.FALSE_SWIPE, Moves.SUPER_FANG, Moves.SPLASH]) diff --git a/src/test/evolution.test.ts b/src/test/evolution.test.ts index 9f0806b8e24..16922babd7c 100644 --- a/src/test/evolution.test.ts +++ b/src/test/evolution.test.ts @@ -6,7 +6,6 @@ import * as Utils from "#app/utils"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { SPLASH_ONLY } from "./utils/testUtils"; describe("Evolution", () => { let phaserGame: Phaser.Game; @@ -99,7 +98,7 @@ describe("Evolution", () => { it("should increase both HP and max HP when evolving", async () => { game.override.moveset([Moves.SURF]) .enemySpecies(Species.GOLEM) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .startingWave(21) .startingLevel(16) .enemyLevel(50); @@ -126,7 +125,7 @@ describe("Evolution", () => { it("should not fully heal HP when evolving", async () => { game.override.moveset([Moves.SURF]) .enemySpecies(Species.GOLEM) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .startingWave(21) .startingLevel(13) .enemyLevel(30); diff --git a/src/test/final_boss.test.ts b/src/test/final_boss.test.ts index 5d006998a0b..fee4dc6c8f6 100644 --- a/src/test/final_boss.test.ts +++ b/src/test/final_boss.test.ts @@ -7,7 +7,6 @@ import { GameModes } from "#app/game-mode"; import { TurnHeldItemTransferModifier } from "#app/modifier/modifier"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import GameManager from "./utils/gameManager"; -import { SPLASH_ONLY } from "./utils/testUtils"; const FinalWave = { Classic: 200, @@ -29,7 +28,7 @@ describe("Final Boss", () => { .startingWave(FinalWave.Classic) .startingBiome(Biome.END) .disableCrits() - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .moveset([ Moves.SPLASH, Moves.WILL_O_WISP, Moves.DRAGON_PULSE ]) .startingLevel(10000); }); diff --git a/src/test/items/dire_hit.test.ts b/src/test/items/dire_hit.test.ts index 4b5988294f3..601552de7f1 100644 --- a/src/test/items/dire_hit.test.ts +++ b/src/test/items/dire_hit.test.ts @@ -4,7 +4,6 @@ import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; import { BattleEndPhase } from "#app/phases/battle-end-phase"; import { TempCritBoosterModifier } from "#app/modifier/modifier"; import { Mode } from "#app/ui/ui"; @@ -34,7 +33,7 @@ describe("Items - Dire Hit", () => { game.override .enemySpecies(Species.MAGIKARP) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .moveset([ Moves.POUND ]) .startingHeldItems([{ name: "DIRE_HIT" }]) .battleType("single") diff --git a/src/test/items/double_battle_chance_booster.test.ts b/src/test/items/double_battle_chance_booster.test.ts index 808d4c7ca51..f581af7afc5 100644 --- a/src/test/items/double_battle_chance_booster.test.ts +++ b/src/test/items/double_battle_chance_booster.test.ts @@ -4,7 +4,6 @@ import { DoubleBattleChanceBoosterModifier } from "#app/modifier/modifier"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; import { ShopCursorTarget } from "#app/enums/shop-cursor-target.js"; import { Mode } from "#app/ui/ui.js"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler.js"; @@ -64,7 +63,7 @@ describe("Items - Double Battle Chance Boosters", () => { game.override .startingModifier([{ name: "LURE" }]) .itemRewards([{ name: "LURE" }]) - .moveset(SPLASH_ONLY) + .moveset(Moves.SPLASH) .startingLevel(200); await game.classicMode.startBattle([ diff --git a/src/test/items/grip_claw.test.ts b/src/test/items/grip_claw.test.ts index 09afa9aea0b..d9871616449 100644 --- a/src/test/items/grip_claw.test.ts +++ b/src/test/items/grip_claw.test.ts @@ -8,7 +8,6 @@ import { MoveEndPhase } from "#app/phases/move-end-phase"; import GameManager from "#test/utils/gameManager"; import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; const TIMEOUT = 20 * 1000; // 20 seconds @@ -38,7 +37,7 @@ describe("Items - Grip Claw", () => { ]) .enemySpecies(Species.SNORLAX) .ability(Abilities.KLUTZ) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemyHeldItems([ { name: "BERRY", type: BerryType.SITRUS, count: 2 }, { name: "BERRY", type: BerryType.LUM, count: 2 }, diff --git a/src/test/items/scope_lens.test.ts b/src/test/items/scope_lens.test.ts index c8629093ab5..e39517ceae9 100644 --- a/src/test/items/scope_lens.test.ts +++ b/src/test/items/scope_lens.test.ts @@ -4,7 +4,6 @@ import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Items - Scope Lens", () => { let phaserGame: Phaser.Game; @@ -25,7 +24,7 @@ describe("Items - Scope Lens", () => { game.override .enemySpecies(Species.MAGIKARP) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .moveset([ Moves.POUND ]) .startingHeldItems([{ name: "SCOPE_LENS" }]) .battleType("single") diff --git a/src/test/items/temp_stat_stage_booster.test.ts b/src/test/items/temp_stat_stage_booster.test.ts index 3e32fa13a04..6186799623a 100644 --- a/src/test/items/temp_stat_stage_booster.test.ts +++ b/src/test/items/temp_stat_stage_booster.test.ts @@ -5,7 +5,6 @@ import Phase from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { Moves } from "#app/enums/moves"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; -import { SPLASH_ONLY } from "../utils/testUtils"; import { Abilities } from "#app/enums/abilities"; import { TempStatStageBoosterModifier } from "#app/modifier/modifier"; import { Mode } from "#app/ui/ui"; @@ -34,7 +33,7 @@ describe("Items - Temporary Stat Stage Boosters", () => { game.override .battleType("single") .enemySpecies(Species.SHUCKLE) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH) .moveset([ Moves.TACKLE, Moves.SPLASH, Moves.HONE_CLAWS, Moves.BELLY_DRUM ]) .startingModifier([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ATK }]); diff --git a/src/test/moves/alluring_voice.test.ts b/src/test/moves/alluring_voice.test.ts index 9807d1bce85..b438d0f736a 100644 --- a/src/test/moves/alluring_voice.test.ts +++ b/src/test/moves/alluring_voice.test.ts @@ -31,7 +31,7 @@ describe("Moves - Alluring Voice", () => { .disableCrits() .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.ICE_SCALES) - .enemyMoveset(Array(4).fill(Moves.HOWL)) + .enemyMoveset([Moves.HOWL]) .startingLevel(10) .enemyLevel(10) .starterSpecies(Species.FEEBAS) diff --git a/src/test/moves/baton_pass.test.ts b/src/test/moves/baton_pass.test.ts index 1a4edafdd36..5643efceae2 100644 --- a/src/test/moves/baton_pass.test.ts +++ b/src/test/moves/baton_pass.test.ts @@ -5,7 +5,6 @@ import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -31,7 +30,7 @@ describe("Moves - Baton Pass", () => { .enemyAbility(Abilities.BALL_FETCH) .moveset([Moves.BATON_PASS, Moves.NASTY_PLOT, Moves.SPLASH]) .ability(Abilities.BALL_FETCH) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .disableCrits(); }); @@ -71,7 +70,10 @@ describe("Moves - Baton Pass", () => { // round 2 - baton pass game.scene.getEnemyPokemon()!.hp = 100; - game.override.enemyMoveset(new Array(4).fill(Moves.BATON_PASS)); + game.override.enemyMoveset([Moves.BATON_PASS]); + // Force moveset to update mid-battle + // TODO: replace with enemy ai control function when it's added + game.scene.getEnemyParty()[0].getMoveset(); game.move.select(Moves.SPLASH); await game.phaseInterceptor.to("PostSummonPhase", false); @@ -90,7 +92,7 @@ describe("Moves - Baton Pass", () => { }, 20000); it("doesn't transfer effects that aren't transferrable", async() => { - game.override.enemyMoveset(Array(4).fill(Moves.SALT_CURE)); + game.override.enemyMoveset([Moves.SALT_CURE]); await game.classicMode.startBattle([Species.PIKACHU, Species.FEEBAS]); const [player1, player2] = game.scene.getParty(); diff --git a/src/test/moves/beak_blast.test.ts b/src/test/moves/beak_blast.test.ts index 2a93dc00a54..fe748c87826 100644 --- a/src/test/moves/beak_blast.test.ts +++ b/src/test/moves/beak_blast.test.ts @@ -34,7 +34,7 @@ describe("Moves - Beak Blast", () => { .moveset([Moves.BEAK_BLAST]) .enemySpecies(Species.SNORLAX) .enemyAbility(Abilities.INSOMNIA) - .enemyMoveset(Array(4).fill(Moves.TACKLE)) + .enemyMoveset([Moves.TACKLE]) .startingLevel(100) .enemyLevel(100); }); @@ -80,7 +80,7 @@ describe("Moves - Beak Blast", () => { it( "should not burn attackers that don't make contact", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.WATER_GUN)); + game.override.enemyMoveset([Moves.WATER_GUN]); await game.startBattle([Species.BLASTOISE]); @@ -116,7 +116,7 @@ describe("Moves - Beak Blast", () => { it( "should be blocked by Protect", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.PROTECT)); + game.override.enemyMoveset([Moves.PROTECT]); await game.startBattle([Species.BLASTOISE]); diff --git a/src/test/moves/beat_up.test.ts b/src/test/moves/beat_up.test.ts index ce1598a49b4..70b33f56583 100644 --- a/src/test/moves/beat_up.test.ts +++ b/src/test/moves/beat_up.test.ts @@ -29,7 +29,7 @@ describe("Moves - Beat Up", () => { game.override.enemySpecies(Species.SNORLAX); game.override.enemyLevel(100); - game.override.enemyMoveset(Array(4).fill(Moves.SPLASH)); + game.override.enemyMoveset([Moves.SPLASH]); game.override.enemyAbility(Abilities.INSOMNIA); game.override.startingLevel(100); diff --git a/src/test/moves/belly_drum.test.ts b/src/test/moves/belly_drum.test.ts index 7024deb3f18..3d85c59a2a5 100644 --- a/src/test/moves/belly_drum.test.ts +++ b/src/test/moves/belly_drum.test.ts @@ -6,7 +6,6 @@ import { Stat } from "#enums/stat"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; import { Abilities } from "#app/enums/abilities"; const TIMEOUT = 20 * 1000; @@ -37,7 +36,7 @@ describe("Moves - BELLY DRUM", () => { .startingLevel(100) .enemyLevel(100) .moveset([Moves.BELLY_DRUM]) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH); }); diff --git a/src/test/moves/burning_jealousy.test.ts b/src/test/moves/burning_jealousy.test.ts index 2cb6a0bc52a..3f2bf453684 100644 --- a/src/test/moves/burning_jealousy.test.ts +++ b/src/test/moves/burning_jealousy.test.ts @@ -7,7 +7,6 @@ import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; const TIMEOUT = 20 * 1000; @@ -32,7 +31,7 @@ describe("Moves - Burning Jealousy", () => { .disableCrits() .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.ICE_SCALES) - .enemyMoveset(Array(4).fill(Moves.HOWL)) + .enemyMoveset([Moves.HOWL]) .startingLevel(10) .enemyLevel(10) .starterSpecies(Species.FEEBAS) @@ -73,7 +72,7 @@ describe("Moves - Burning Jealousy", () => { game.override .enemySpecies(Species.DITTO) .enemyAbility(Abilities.IMPOSTER) - .enemyMoveset(SPLASH_ONLY); + .enemyMoveset(Moves.SPLASH); await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; @@ -91,7 +90,7 @@ describe("Moves - Burning Jealousy", () => { it("should be boosted by Sheer Force even if opponent didn't raise stat stages", async () => { game.override .ability(Abilities.SHEER_FORCE) - .enemyMoveset(SPLASH_ONLY); + .enemyMoveset(Moves.SPLASH); vi.spyOn(allMoves[Moves.BURNING_JEALOUSY], "calculateBattlePower"); await game.classicMode.startBattle(); diff --git a/src/test/moves/clangorous_soul.test.ts b/src/test/moves/clangorous_soul.test.ts index 9bd3bc2379e..015b73b4dab 100644 --- a/src/test/moves/clangorous_soul.test.ts +++ b/src/test/moves/clangorous_soul.test.ts @@ -5,7 +5,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; const TIMEOUT = 20 * 1000; /** HP Cost of Move */ @@ -34,7 +33,7 @@ describe("Moves - Clangorous Soul", () => { game.override.startingLevel(100); game.override.enemyLevel(100); game.override.moveset([Moves.CLANGOROUS_SOUL]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); }); //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/Clangorous_Soul_(move) diff --git a/src/test/moves/crafty_shield.test.ts b/src/test/moves/crafty_shield.test.ts index e73a1fd256d..7b962518944 100644 --- a/src/test/moves/crafty_shield.test.ts +++ b/src/test/moves/crafty_shield.test.ts @@ -33,7 +33,7 @@ describe("Moves - Crafty Shield", () => { game.override.moveset([Moves.CRAFTY_SHIELD, Moves.SPLASH, Moves.SWORDS_DANCE]); game.override.enemySpecies(Species.SNORLAX); - game.override.enemyMoveset(Array(4).fill(Moves.GROWL)); + game.override.enemyMoveset([Moves.GROWL]); game.override.enemyAbility(Abilities.INSOMNIA); game.override.startingLevel(100); @@ -62,7 +62,7 @@ describe("Moves - Crafty Shield", () => { test( "should not protect the user and allies from attack moves", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.TACKLE)); + game.override.enemyMoveset([Moves.TACKLE]); await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); @@ -84,7 +84,7 @@ describe("Moves - Crafty Shield", () => { "should protect the user and allies from moves that ignore other protection", async () => { game.override.enemySpecies(Species.DUSCLOPS); - game.override.enemyMoveset(Array(4).fill(Moves.CURSE)); + game.override.enemyMoveset([Moves.CURSE]); await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); diff --git a/src/test/moves/disable.test.ts b/src/test/moves/disable.test.ts index 3d207035ce3..a35d294e91f 100644 --- a/src/test/moves/disable.test.ts +++ b/src/test/moves/disable.test.ts @@ -4,7 +4,6 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; describe("Moves - Disable", () => { @@ -28,7 +27,7 @@ describe("Moves - Disable", () => { .ability(Abilities.BALL_FETCH) .enemyAbility(Abilities.BALL_FETCH) .moveset([Moves.DISABLE, Moves.SPLASH]) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .starterSpecies(Species.PIKACHU) .enemySpecies(Species.SHUCKLE); }); @@ -79,7 +78,7 @@ describe("Moves - Disable", () => { }, 20000); it("cannot disable STRUGGLE", async() => { - game.override.enemyMoveset(Array(4).fill(Moves.STRUGGLE)); + game.override.enemyMoveset([Moves.STRUGGLE]); await game.classicMode.startBattle(); const playerMon = game.scene.getPlayerPokemon()!; @@ -114,7 +113,7 @@ describe("Moves - Disable", () => { }, 20000); it("disables NATURE POWER, not the move invoked by it", async() => { - game.override.enemyMoveset(Array(4).fill(Moves.NATURE_POWER)); + game.override.enemyMoveset([Moves.NATURE_POWER]); await game.classicMode.startBattle(); const enemyMon = game.scene.getEnemyPokemon()!; diff --git a/src/test/moves/dragon_cheer.test.ts b/src/test/moves/dragon_cheer.test.ts index 747d71bd000..0fc389ccfb6 100644 --- a/src/test/moves/dragon_cheer.test.ts +++ b/src/test/moves/dragon_cheer.test.ts @@ -4,7 +4,6 @@ import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { Abilities } from "#enums/abilities"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -28,7 +27,7 @@ describe("Moves - Dragon Cheer", () => { game.override .battleType("double") .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemyLevel(20) .moveset([Moves.DRAGON_CHEER, Moves.TACKLE, Moves.SPLASH]); }); diff --git a/src/test/moves/dragon_rage.test.ts b/src/test/moves/dragon_rage.test.ts index 5da6e082ce5..cab8c3f808b 100644 --- a/src/test/moves/dragon_rage.test.ts +++ b/src/test/moves/dragon_rage.test.ts @@ -8,7 +8,6 @@ import { Abilities } from "#enums/abilities"; import { BattlerTagType } from "#enums/battler-tag-type"; import { Moves } from "#enums/moves"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -42,7 +41,7 @@ describe("Moves - Dragon Rage", () => { game.override.startingLevel(100); game.override.enemySpecies(Species.SNORLAX); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemyAbility(Abilities.BALL_FETCH); game.override.enemyPassiveAbility(Abilities.BALL_FETCH); game.override.enemyLevel(100); diff --git a/src/test/moves/dragon_tail.test.ts b/src/test/moves/dragon_tail.test.ts index 362383e2fe3..e1af29b2db1 100644 --- a/src/test/moves/dragon_tail.test.ts +++ b/src/test/moves/dragon_tail.test.ts @@ -9,7 +9,6 @@ import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"; import GameManager from "../utils/gameManager"; -import { SPLASH_ONLY } from "../utils/testUtils"; const TIMEOUT = 20 * 1000; @@ -32,7 +31,7 @@ describe("Moves - Dragon Tail", () => { game.override.battleType("single") .moveset([Moves.DRAGON_TAIL, Moves.SPLASH]) .enemySpecies(Species.WAILORD) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .startingLevel(5) .enemyLevel(5); @@ -82,7 +81,7 @@ describe("Moves - Dragon Tail", () => { test( "Double battles should proceed without crashing", async () => { - game.override.battleType("double").enemyMoveset(SPLASH_ONLY); + game.override.battleType("double").enemyMoveset(Moves.SPLASH); game.override.moveset([Moves.DRAGON_TAIL, Moves.SPLASH, Moves.FLAMETHROWER]) .enemyAbility(Abilities.ROUGH_SKIN); await game.startBattle([Species.DRATINI, Species.DRATINI, Species.WAILORD, Species.WAILORD]); @@ -116,7 +115,7 @@ describe("Moves - Dragon Tail", () => { test( "Flee move redirection works", async () => { - game.override.battleType("double").enemyMoveset(SPLASH_ONLY); + game.override.battleType("double").enemyMoveset(Moves.SPLASH); game.override.moveset([Moves.DRAGON_TAIL, Moves.SPLASH, Moves.FLAMETHROWER]); game.override.enemyAbility(Abilities.ROUGH_SKIN); await game.startBattle([Species.DRATINI, Species.DRATINI, Species.WAILORD, Species.WAILORD]); diff --git a/src/test/moves/fake_out.test.ts b/src/test/moves/fake_out.test.ts index ac09917daea..04d6216b952 100644 --- a/src/test/moves/fake_out.test.ts +++ b/src/test/moves/fake_out.test.ts @@ -3,7 +3,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Moves - Fake Out", () => { let phaserGame: Phaser.Game; @@ -26,7 +25,7 @@ describe("Moves - Fake Out", () => { .enemySpecies(Species.CORVIKNIGHT) .starterSpecies(Species.FEEBAS) .moveset([Moves.FAKE_OUT, Moves.SPLASH]) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .disableCrits(); }); diff --git a/src/test/moves/fillet_away.test.ts b/src/test/moves/fillet_away.test.ts index a639a86c5c1..68ace42c2ec 100644 --- a/src/test/moves/fillet_away.test.ts +++ b/src/test/moves/fillet_away.test.ts @@ -4,7 +4,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import { Stat } from "#enums/stat"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, test } from "vitest"; @@ -35,7 +34,7 @@ describe("Moves - FILLET AWAY", () => { game.override.startingLevel(100); game.override.enemyLevel(100); game.override.moveset([Moves.FILLET_AWAY]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); }); //Bulbapedia Reference: https://bulbapedia.bulbagarden.net/wiki/fillet_away_(move) diff --git a/src/test/moves/fissure.test.ts b/src/test/moves/fissure.test.ts index 34612d1fb18..8689ce4079e 100644 --- a/src/test/moves/fissure.test.ts +++ b/src/test/moves/fissure.test.ts @@ -6,7 +6,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -38,7 +37,7 @@ describe("Moves - Fissure", () => { game.override.startingLevel(100); game.override.enemySpecies(Species.SNORLAX); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemyPassiveAbility(Abilities.BALL_FETCH); game.override.enemyLevel(100); diff --git a/src/test/moves/flame_burst.test.ts b/src/test/moves/flame_burst.test.ts index 2777b8178b8..b2858af2b24 100644 --- a/src/test/moves/flame_burst.test.ts +++ b/src/test/moves/flame_burst.test.ts @@ -42,7 +42,7 @@ describe("Moves - Flame Burst", () => { game.override.startingWave(4); game.override.enemySpecies(Species.SHUCKLE); game.override.enemyAbility(Abilities.BALL_FETCH); - game.override.enemyMoveset(new Array(4).fill(Moves.SPLASH)); + game.override.enemyMoveset([Moves.SPLASH]); }); it("inflicts damage to the target's ally equal to 1/16 of its max HP", async () => { diff --git a/src/test/moves/flower_shield.test.ts b/src/test/moves/flower_shield.test.ts index ffe8ae995d3..f5fe8d532cc 100644 --- a/src/test/moves/flower_shield.test.ts +++ b/src/test/moves/flower_shield.test.ts @@ -7,7 +7,6 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -31,7 +30,7 @@ describe("Moves - Flower Shield", () => { game.override.enemyAbility(Abilities.NONE); game.override.battleType("single"); game.override.moveset([Moves.FLOWER_SHIELD, Moves.SPLASH]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); }); it("raises DEF stat stage by 1 for all Grass-type Pokemon on the field by one stage - single battle", async () => { diff --git a/src/test/moves/focus_punch.test.ts b/src/test/moves/focus_punch.test.ts index 249647f0294..ca80c688169 100644 --- a/src/test/moves/focus_punch.test.ts +++ b/src/test/moves/focus_punch.test.ts @@ -7,7 +7,6 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -35,7 +34,7 @@ describe("Moves - Focus Punch", () => { .moveset([Moves.FOCUS_PUNCH]) .enemySpecies(Species.GROUDON) .enemyAbility(Abilities.INSOMNIA) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .startingLevel(100) .enemyLevel(100); }); @@ -68,7 +67,7 @@ describe("Moves - Focus Punch", () => { it( "should fail if the user is hit", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.TACKLE)); + game.override.enemyMoveset([Moves.TACKLE]); await game.startBattle([Species.CHARIZARD]); @@ -95,7 +94,7 @@ describe("Moves - Focus Punch", () => { it( "should be cancelled if the user falls asleep mid-turn", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.SPORE)); + game.override.enemyMoveset([Moves.SPORE]); await game.startBattle([Species.CHARIZARD]); diff --git a/src/test/moves/foresight.test.ts b/src/test/moves/foresight.test.ts index b856ec0f852..d58097691fd 100644 --- a/src/test/moves/foresight.test.ts +++ b/src/test/moves/foresight.test.ts @@ -4,7 +4,6 @@ import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Moves - Foresight", () => { let phaserGame: Phaser.Game; @@ -25,7 +24,7 @@ describe("Moves - Foresight", () => { game.override .disableCrits() .enemySpecies(Species.GASTLY) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemyLevel(5) .starterSpecies(Species.MAGIKARP) .moveset([Moves.FORESIGHT, Moves.QUICK_ATTACK, Moves.MACH_PUNCH]); @@ -55,7 +54,7 @@ describe("Moves - Foresight", () => { }); it("should ignore target's evasiveness boosts", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.MINIMIZE)); + game.override.enemyMoveset([Moves.MINIMIZE]); await game.startBattle(); const pokemon = game.scene.getPlayerPokemon()!; diff --git a/src/test/moves/freeze_dry.test.ts b/src/test/moves/freeze_dry.test.ts index 445a432a812..ff9e2f07162 100644 --- a/src/test/moves/freeze_dry.test.ts +++ b/src/test/moves/freeze_dry.test.ts @@ -3,7 +3,6 @@ import { Abilities } from "#app/enums/abilities"; import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -28,7 +27,7 @@ describe("Moves - Freeze-Dry", () => { .battleType("single") .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .starterSpecies(Species.FEEBAS) .ability(Abilities.BALL_FETCH) .moveset([Moves.FREEZE_DRY]); @@ -92,7 +91,7 @@ describe("Moves - Freeze-Dry", () => { // enable once Electrify is implemented (and the interaction is fixed, as above) it.todo("should deal 2x damage to water types under Electrify", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.ELECTRIFY)); + game.override.enemyMoveset([Moves.ELECTRIFY]); await game.classicMode.startBattle(); const enemy = game.scene.getEnemyPokemon()!; diff --git a/src/test/moves/freezy_frost.test.ts b/src/test/moves/freezy_frost.test.ts index ae42d5b6dc6..05c61aab49a 100644 --- a/src/test/moves/freezy_frost.test.ts +++ b/src/test/moves/freezy_frost.test.ts @@ -5,7 +5,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import { allMoves } from "#app/data/move"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; @@ -28,7 +27,7 @@ describe("Moves - Freezy Frost", () => { game.override.enemySpecies(Species.RATTATA); game.override.enemyLevel(100); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemyAbility(Abilities.NONE); game.override.startingLevel(100); diff --git a/src/test/moves/gastro_acid.test.ts b/src/test/moves/gastro_acid.test.ts index 67fd3464cf9..cfc458a908f 100644 --- a/src/test/moves/gastro_acid.test.ts +++ b/src/test/moves/gastro_acid.test.ts @@ -4,7 +4,6 @@ import { Moves } from "#app/enums/moves"; import { Species } from "#app/enums/species"; import { MoveResult } from "#app/field/pokemon"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; const TIMEOUT = 20 * 1000; @@ -31,7 +30,7 @@ describe("Moves - Gastro Acid", () => { game.override.ability(Abilities.NONE); game.override.moveset([Moves.GASTRO_ACID, Moves.WATER_GUN, Moves.SPLASH, Moves.CORE_ENFORCER]); game.override.enemySpecies(Species.BIDOOF); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemyAbility(Abilities.WATER_ABSORB); }); diff --git a/src/test/moves/gigaton_hammer.test.ts b/src/test/moves/gigaton_hammer.test.ts index 0162375cdb2..b0ab06fdeb5 100644 --- a/src/test/moves/gigaton_hammer.test.ts +++ b/src/test/moves/gigaton_hammer.test.ts @@ -4,7 +4,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Moves - Gigaton Hammer", () => { let phaserGame: Phaser.Game; @@ -29,7 +28,7 @@ describe("Moves - Gigaton Hammer", () => { .moveset([Moves.GIGATON_HAMMER]) .startingLevel(10) .enemyLevel(100) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .disableCrits(); }); diff --git a/src/test/moves/glaive_rush.test.ts b/src/test/moves/glaive_rush.test.ts index 5867ef751b8..9eed6868432 100644 --- a/src/test/moves/glaive_rush.test.ts +++ b/src/test/moves/glaive_rush.test.ts @@ -29,7 +29,7 @@ describe("Moves - Glaive Rush", () => { .disableCrits() .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset(Array(4).fill(Moves.GLAIVE_RUSH)) + .enemyMoveset([Moves.GLAIVE_RUSH]) .starterSpecies(Species.KLINK) .ability(Abilities.BALL_FETCH) .moveset([Moves.SHADOW_SNEAK, Moves.AVALANCHE, Moves.SPLASH, Moves.GLAIVE_RUSH]); @@ -67,7 +67,7 @@ describe("Moves - Glaive Rush", () => { it("interacts properly with multi-lens", async () => { game.override .startingHeldItems([{ name: "MULTI_LENS", count: 2 }]) - .enemyMoveset(Array(4).fill(Moves.AVALANCHE)); + .enemyMoveset([Moves.AVALANCHE]); await game.classicMode.startBattle(); const player = game.scene.getPlayerPokemon()!; @@ -88,7 +88,7 @@ describe("Moves - Glaive Rush", () => { }, TIMEOUT); it("secondary effects only last until next move", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.SHADOW_SNEAK)); + game.override.enemyMoveset([Moves.SHADOW_SNEAK]); await game.classicMode.startBattle(); const player = game.scene.getPlayerPokemon()!; @@ -115,7 +115,7 @@ describe("Moves - Glaive Rush", () => { it("secondary effects are removed upon switching", async () => { game.override - .enemyMoveset(Array(4).fill(Moves.SHADOW_SNEAK)) + .enemyMoveset([Moves.SHADOW_SNEAK]) .starterSpecies(0); await game.classicMode.startBattle([Species.KLINK, Species.FEEBAS]); @@ -152,7 +152,7 @@ describe("Moves - Glaive Rush", () => { game.move.select(Moves.SHADOW_SNEAK); await game.phaseInterceptor.to("TurnEndPhase"); - game.override.enemyMoveset(Array(4).fill(Moves.SPLASH)); + game.override.enemyMoveset([Moves.SPLASH]); const damagedHP1 = 1000 - enemy.hp; enemy.hp = 1000; diff --git a/src/test/moves/growth.test.ts b/src/test/moves/growth.test.ts index defe5e26f41..a66e4ec6719 100644 --- a/src/test/moves/growth.test.ts +++ b/src/test/moves/growth.test.ts @@ -5,7 +5,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; @@ -29,7 +28,7 @@ describe("Moves - Growth", () => { game.override.enemyAbility(Abilities.MOXIE); game.override.ability(Abilities.INSOMNIA); game.override.moveset([ Moves.GROWTH ]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); }); it("should raise SPATK stat stage by 1", async() => { diff --git a/src/test/moves/guard_split.test.ts b/src/test/moves/guard_split.test.ts index f95d09f726c..36be82ba5e4 100644 --- a/src/test/moves/guard_split.test.ts +++ b/src/test/moves/guard_split.test.ts @@ -6,7 +6,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; import { Abilities } from "#enums/abilities"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Moves - Guard Split", () => { let phaserGame: Phaser.Game; @@ -34,7 +33,7 @@ describe("Moves - Guard Split", () => { }); it("should average the user's DEF and SPDEF stats with those of the target", async () => { - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); await game.startBattle([ Species.INDEEDEE ]); @@ -56,7 +55,7 @@ describe("Moves - Guard Split", () => { }, 20000); it("should be idempotent", async () => { - game.override.enemyMoveset(new Array(4).fill(Moves.GUARD_SPLIT)); + game.override.enemyMoveset([Moves.GUARD_SPLIT]); await game.startBattle([ Species.INDEEDEE ]); diff --git a/src/test/moves/guard_swap.test.ts b/src/test/moves/guard_swap.test.ts index 407d475de09..a27afaaa7ba 100644 --- a/src/test/moves/guard_swap.test.ts +++ b/src/test/moves/guard_swap.test.ts @@ -27,7 +27,7 @@ describe("Moves - Guard Swap", () => { game.override .battleType("single") .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset(new Array(4).fill(Moves.SHELL_SMASH)) + .enemyMoveset([Moves.SHELL_SMASH]) .enemySpecies(Species.MEW) .enemyLevel(200) .moveset([ Moves.GUARD_SWAP ]) diff --git a/src/test/moves/hard_press.test.ts b/src/test/moves/hard_press.test.ts index 70c78490269..5d2e4e5b145 100644 --- a/src/test/moves/hard_press.test.ts +++ b/src/test/moves/hard_press.test.ts @@ -4,7 +4,6 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -30,7 +29,7 @@ describe("Moves - Hard Press", () => { game.override.ability(Abilities.BALL_FETCH); game.override.enemySpecies(Species.MUNCHLAX); game.override.enemyAbility(Abilities.BALL_FETCH); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.moveset([Moves.HARD_PRESS]); vi.spyOn(moveToCheck, "calculateBattlePower"); }); diff --git a/src/test/moves/haze.test.ts b/src/test/moves/haze.test.ts index 42081ce74e8..211c1a41409 100644 --- a/src/test/moves/haze.test.ts +++ b/src/test/moves/haze.test.ts @@ -5,7 +5,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; describe("Moves - Haze", () => { @@ -28,7 +27,7 @@ describe("Moves - Haze", () => { game.override.enemySpecies(Species.RATTATA); game.override.enemyLevel(100); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemyAbility(Abilities.NONE); game.override.startingLevel(100); diff --git a/src/test/moves/hyper_beam.test.ts b/src/test/moves/hyper_beam.test.ts index 1280d8b429a..7aa2dbfec2b 100644 --- a/src/test/moves/hyper_beam.test.ts +++ b/src/test/moves/hyper_beam.test.ts @@ -32,7 +32,7 @@ describe("Moves - Hyper Beam", () => { game.override.ability(Abilities.BALL_FETCH); game.override.enemySpecies(Species.SNORLAX); game.override.enemyAbility(Abilities.BALL_FETCH); - game.override.enemyMoveset(Array(4).fill(Moves.SPLASH)); + game.override.enemyMoveset([Moves.SPLASH]); game.override.enemyLevel(100); game.override.moveset([Moves.HYPER_BEAM, Moves.TACKLE]); diff --git a/src/test/moves/jaw_lock.test.ts b/src/test/moves/jaw_lock.test.ts index 42f7a244977..75fd6f0ff32 100644 --- a/src/test/moves/jaw_lock.test.ts +++ b/src/test/moves/jaw_lock.test.ts @@ -6,7 +6,6 @@ import { FaintPhase } from "#app/phases/faint-phase"; import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { TurnEndPhase } from "#app/phases/turn-end-phase"; import GameManager from "#app/test/utils/gameManager"; -import { SPLASH_ONLY } from "#app/test/utils/testUtils"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; @@ -35,7 +34,7 @@ describe("Moves - Jaw Lock", () => { .battleType("single") .enemySpecies(Species.SNORLAX) .enemyAbility(Abilities.INSOMNIA) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .moveset([Moves.JAW_LOCK, Moves.SPLASH]) .startingLevel(100) .enemyLevel(100) @@ -153,7 +152,7 @@ describe("Moves - Jaw Lock", () => { it( "should not trap either pokemon if the target is protected", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.PROTECT)); + game.override.enemyMoveset([Moves.PROTECT]); await game.startBattle([Species.BULBASAUR]); diff --git a/src/test/moves/lash_out.test.ts b/src/test/moves/lash_out.test.ts index 74d9fcd66c0..8c414832f36 100644 --- a/src/test/moves/lash_out.test.ts +++ b/src/test/moves/lash_out.test.ts @@ -30,7 +30,7 @@ describe("Moves - Lash Out", () => { .disableCrits() .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.FUR_COAT) - .enemyMoveset(Array(4).fill(Moves.GROWL)) + .enemyMoveset([Moves.GROWL]) .startingLevel(10) .enemyLevel(10) .starterSpecies(Species.FEEBAS) diff --git a/src/test/moves/lucky_chant.test.ts b/src/test/moves/lucky_chant.test.ts index 7d5bfe02476..57e5ff80f1d 100644 --- a/src/test/moves/lucky_chant.test.ts +++ b/src/test/moves/lucky_chant.test.ts @@ -31,7 +31,7 @@ describe("Moves - Lucky Chant", () => { .moveset([Moves.LUCKY_CHANT, Moves.SPLASH, Moves.FOLLOW_ME]) .enemySpecies(Species.SNORLAX) .enemyAbility(Abilities.INSOMNIA) - .enemyMoveset(Array(4).fill(Moves.FLOWER_TRICK)) + .enemyMoveset([Moves.FLOWER_TRICK]) .startingLevel(100) .enemyLevel(100); }); @@ -87,7 +87,7 @@ describe("Moves - Lucky Chant", () => { it( "should prevent critical hits from field effects", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.TACKLE)); + game.override.enemyMoveset([Moves.TACKLE]); await game.startBattle([Species.CHARIZARD]); diff --git a/src/test/moves/lunar_blessing.test.ts b/src/test/moves/lunar_blessing.test.ts index 92428c39029..6a104762f4d 100644 --- a/src/test/moves/lunar_blessing.test.ts +++ b/src/test/moves/lunar_blessing.test.ts @@ -4,7 +4,6 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -26,7 +25,7 @@ describe("Moves - Lunar Blessing", () => { game.override.battleType("double"); game.override.enemySpecies(Species.SHUCKLE); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemyAbility(Abilities.BALL_FETCH); game.override.moveset([Moves.LUNAR_BLESSING, Moves.SPLASH]); diff --git a/src/test/moves/make_it_rain.test.ts b/src/test/moves/make_it_rain.test.ts index e41472d7561..5ac35168f92 100644 --- a/src/test/moves/make_it_rain.test.ts +++ b/src/test/moves/make_it_rain.test.ts @@ -5,7 +5,6 @@ import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import { MoveEndPhase } from "#app/phases/move-end-phase"; import { StatStageChangePhase } from "#app/phases/stat-stage-change-phase"; @@ -31,7 +30,7 @@ describe("Moves - Make It Rain", () => { game.override.moveset([Moves.MAKE_IT_RAIN, Moves.SPLASH]); game.override.enemySpecies(Species.SNORLAX); game.override.enemyAbility(Abilities.INSOMNIA); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.startingLevel(100); game.override.enemyLevel(100); }); diff --git a/src/test/moves/mat_block.test.ts b/src/test/moves/mat_block.test.ts index 4a95985eb92..b759f49bf98 100644 --- a/src/test/moves/mat_block.test.ts +++ b/src/test/moves/mat_block.test.ts @@ -33,7 +33,7 @@ describe("Moves - Mat Block", () => { game.override.moveset([Moves.MAT_BLOCK, Moves.SPLASH]); game.override.enemySpecies(Species.SNORLAX); - game.override.enemyMoveset(Array(4).fill(Moves.TACKLE)); + game.override.enemyMoveset([Moves.TACKLE]); game.override.enemyAbility(Abilities.INSOMNIA); game.override.startingLevel(100); @@ -62,7 +62,7 @@ describe("Moves - Mat Block", () => { test( "should not protect the user and allies from status moves", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.GROWL)); + game.override.enemyMoveset([Moves.GROWL]); await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); diff --git a/src/test/moves/miracle_eye.test.ts b/src/test/moves/miracle_eye.test.ts index d6b21a5dc2f..0528b509c82 100644 --- a/src/test/moves/miracle_eye.test.ts +++ b/src/test/moves/miracle_eye.test.ts @@ -5,7 +5,6 @@ import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Moves - Miracle Eye", () => { let phaserGame: Phaser.Game; @@ -26,7 +25,7 @@ describe("Moves - Miracle Eye", () => { game.override .disableCrits() .enemySpecies(Species.UMBREON) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemyLevel(5) .starterSpecies(Species.MAGIKARP) .moveset([Moves.MIRACLE_EYE, Moves.CONFUSION]); diff --git a/src/test/moves/multi_target.test.ts b/src/test/moves/multi_target.test.ts index 16ccd5519b1..5e830f23fc7 100644 --- a/src/test/moves/multi_target.test.ts +++ b/src/test/moves/multi_target.test.ts @@ -4,7 +4,6 @@ import { Species } from "#app/enums/species"; import * as Utils from "#app/utils"; import { Moves } from "#enums/moves"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -32,7 +31,7 @@ describe("Multi-target damage reduction", () => { .enemyLevel(100) .startingLevel(100) .enemySpecies(Species.POLIWAG) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH) .moveset([Moves.TACKLE, Moves.DAZZLING_GLEAM, Moves.EARTHQUAKE, Moves.SPLASH]) .ability(Abilities.BALL_FETCH); diff --git a/src/test/moves/octolock.test.ts b/src/test/moves/octolock.test.ts index c86906ea240..7618b08e9fc 100644 --- a/src/test/moves/octolock.test.ts +++ b/src/test/moves/octolock.test.ts @@ -7,7 +7,6 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -30,7 +29,7 @@ describe("Moves - Octolock", () => { game.override.battleType("single") .enemySpecies(Species.RATTATA) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH) .startingLevel(2000) .moveset([ Moves.OCTOLOCK, Moves.SPLASH ]) diff --git a/src/test/moves/parting_shot.test.ts b/src/test/moves/parting_shot.test.ts index d9535ca6482..52cfaf98111 100644 --- a/src/test/moves/parting_shot.test.ts +++ b/src/test/moves/parting_shot.test.ts @@ -9,7 +9,6 @@ import { BerryPhase } from "#app/phases/berry-phase"; import { FaintPhase } from "#app/phases/faint-phase"; import { MessagePhase } from "#app/phases/message-phase"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; -import { SPLASH_ONLY } from "../utils/testUtils"; const TIMEOUT = 20 * 1000; @@ -31,7 +30,7 @@ describe("Moves - Parting Shot", () => { game = new GameManager(phaserGame); game.override.battleType("single"); game.override.moveset([Moves.PARTING_SHOT, Moves.SPLASH]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.startingLevel(5); game.override.enemyLevel(5); @@ -125,7 +124,7 @@ describe("Moves - Parting Shot", () => { game.override .enemySpecies(Species.ALTARIA) .enemyAbility(Abilities.NONE) - .enemyMoveset(Array(4).fill(Moves.MIST)); + .enemyMoveset([Moves.MIST]); await game.startBattle([Species.SNORLAX, Species.MEOWTH]); const enemyPokemon = game.scene.getEnemyPokemon()!; diff --git a/src/test/moves/power_split.test.ts b/src/test/moves/power_split.test.ts index a532a90a54d..aaf34541567 100644 --- a/src/test/moves/power_split.test.ts +++ b/src/test/moves/power_split.test.ts @@ -6,7 +6,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; import { Abilities } from "#enums/abilities"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Moves - Power Split", () => { let phaserGame: Phaser.Game; @@ -34,7 +33,7 @@ describe("Moves - Power Split", () => { }); it("should average the user's ATK and SPATK stats with those of the target", async () => { - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); await game.startBattle([ Species.INDEEDEE ]); @@ -56,7 +55,7 @@ describe("Moves - Power Split", () => { }, 20000); it("should be idempotent", async () => { - game.override.enemyMoveset(new Array(4).fill(Moves.POWER_SPLIT)); + game.override.enemyMoveset([Moves.POWER_SPLIT]); await game.startBattle([ Species.INDEEDEE ]); diff --git a/src/test/moves/power_swap.test.ts b/src/test/moves/power_swap.test.ts index f1efeaa3af3..a3d4bfca19a 100644 --- a/src/test/moves/power_swap.test.ts +++ b/src/test/moves/power_swap.test.ts @@ -27,7 +27,7 @@ describe("Moves - Power Swap", () => { game.override .battleType("single") .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset(new Array(4).fill(Moves.SHELL_SMASH)) + .enemyMoveset([Moves.SHELL_SMASH]) .enemySpecies(Species.MEW) .enemyLevel(200) .moveset([ Moves.POWER_SWAP ]) diff --git a/src/test/moves/protect.test.ts b/src/test/moves/protect.test.ts index 83cd088aa47..24bbcbb9d34 100644 --- a/src/test/moves/protect.test.ts +++ b/src/test/moves/protect.test.ts @@ -35,7 +35,7 @@ describe("Moves - Protect", () => { game.override.enemySpecies(Species.SNORLAX); game.override.enemyAbility(Abilities.INSOMNIA); - game.override.enemyMoveset(Array(4).fill(Moves.TACKLE)); + game.override.enemyMoveset([Moves.TACKLE]); game.override.startingLevel(100); game.override.enemyLevel(100); @@ -59,7 +59,7 @@ describe("Moves - Protect", () => { test( "should prevent secondary effects from the opponent's attack", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.CEASELESS_EDGE)); + game.override.enemyMoveset([Moves.CEASELESS_EDGE]); vi.spyOn(allMoves[Moves.CEASELESS_EDGE], "accuracy", "get").mockReturnValue(100); await game.classicMode.startBattle([Species.CHARIZARD]); @@ -78,7 +78,7 @@ describe("Moves - Protect", () => { test( "should protect the user from status moves", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.CHARM)); + game.override.enemyMoveset([Moves.CHARM]); await game.classicMode.startBattle([Species.CHARIZARD]); @@ -95,7 +95,7 @@ describe("Moves - Protect", () => { test( "should stop subsequent hits of a multi-hit move", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.TACHYON_CUTTER)); + game.override.enemyMoveset([Moves.TACHYON_CUTTER]); await game.classicMode.startBattle([Species.CHARIZARD]); @@ -114,7 +114,7 @@ describe("Moves - Protect", () => { test( "should fail if the user is the last to move in the turn", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.PROTECT)); + game.override.enemyMoveset([Moves.PROTECT]); await game.classicMode.startBattle([Species.CHARIZARD]); diff --git a/src/test/moves/quick_guard.test.ts b/src/test/moves/quick_guard.test.ts index 5f4af40eb71..9ab0fe1509c 100644 --- a/src/test/moves/quick_guard.test.ts +++ b/src/test/moves/quick_guard.test.ts @@ -32,7 +32,7 @@ describe("Moves - Quick Guard", () => { game.override.moveset([Moves.QUICK_GUARD, Moves.SPLASH, Moves.FOLLOW_ME]); game.override.enemySpecies(Species.SNORLAX); - game.override.enemyMoveset(Array(4).fill(Moves.QUICK_ATTACK)); + game.override.enemyMoveset([Moves.QUICK_ATTACK]); game.override.enemyAbility(Abilities.INSOMNIA); game.override.startingLevel(100); @@ -59,7 +59,7 @@ describe("Moves - Quick Guard", () => { "should protect the user and allies from Prankster-boosted moves", async () => { game.override.enemyAbility(Abilities.PRANKSTER); - game.override.enemyMoveset(Array(4).fill(Moves.GROWL)); + game.override.enemyMoveset([Moves.GROWL]); await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); @@ -77,7 +77,7 @@ describe("Moves - Quick Guard", () => { test( "should stop subsequent hits of a multi-hit priority move", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.WATER_SHURIKEN)); + game.override.enemyMoveset([Moves.WATER_SHURIKEN]); await game.classicMode.startBattle([Species.CHARIZARD, Species.BLASTOISE]); @@ -98,7 +98,7 @@ describe("Moves - Quick Guard", () => { "should fail if the user is the last to move in the turn", async () => { game.override.battleType("single"); - game.override.enemyMoveset(Array(4).fill(Moves.QUICK_GUARD)); + game.override.enemyMoveset([Moves.QUICK_GUARD]); await game.classicMode.startBattle([Species.CHARIZARD]); diff --git a/src/test/moves/rollout.test.ts b/src/test/moves/rollout.test.ts index ddb0b22e642..c08535a61df 100644 --- a/src/test/moves/rollout.test.ts +++ b/src/test/moves/rollout.test.ts @@ -4,7 +4,6 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -32,7 +31,7 @@ describe("Moves - Rollout", () => { game.override.enemyAbility(Abilities.BALL_FETCH); game.override.startingLevel(100); game.override.enemyLevel(100); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); }); it("should double it's dmg on sequential uses but reset after 5", async () => { diff --git a/src/test/moves/safeguard.test.ts b/src/test/moves/safeguard.test.ts index 8068c475539..2caf698a73a 100644 --- a/src/test/moves/safeguard.test.ts +++ b/src/test/moves/safeguard.test.ts @@ -29,7 +29,7 @@ describe("Moves - Safeguard", () => { game.override .battleType("single") .enemySpecies(Species.DRATINI) - .enemyMoveset(Array(4).fill(Moves.SAFEGUARD)) + .enemyMoveset([Moves.SAFEGUARD]) .enemyAbility(Abilities.BALL_FETCH) .enemyLevel(5) .starterSpecies(Species.DRATINI) @@ -126,8 +126,12 @@ describe("Moves - Safeguard", () => { expect(enemyPokemon.status?.effect).toEqual(StatusEffect.BURN); - game.override.enemyMoveset(Array(4).fill(Moves.REST)); + game.override.enemyMoveset([Moves.REST]); + // Force the moveset to update mid-battle + // TODO: Remove after enemy AI rework is in + enemyPokemon.getMoveset(); game.move.select(Moves.SPLASH); + enemyPokemon.damageAndUpdate(1); await game.toNextTurn(); expect(enemyPokemon.status?.effect).toEqual(StatusEffect.SLEEP); @@ -142,7 +146,7 @@ describe("Moves - Safeguard", () => { game.move.select(Moves.SPLASH); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.toNextTurn(); - game.override.enemyMoveset(Array(4).fill(Moves.TACKLE)); + game.override.enemyMoveset([Moves.TACKLE]); game.move.select(Moves.SPLASH); await game.toNextTurn(); diff --git a/src/test/moves/shell_trap.test.ts b/src/test/moves/shell_trap.test.ts index 4549a8b2b73..213b9c3fd0a 100644 --- a/src/test/moves/shell_trap.test.ts +++ b/src/test/moves/shell_trap.test.ts @@ -9,7 +9,6 @@ import { MovePhase } from "#app/phases/move-phase"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; const TIMEOUT = 20 * 1000; @@ -33,7 +32,7 @@ describe("Moves - Shell Trap", () => { .battleType("double") .moveset([Moves.SHELL_TRAP, Moves.SPLASH, Moves.BULLDOZE]) .enemySpecies(Species.SNORLAX) - .enemyMoveset(Array(4).fill(Moves.RAZOR_LEAF)) + .enemyMoveset([Moves.RAZOR_LEAF]) .startingLevel(100) .enemyLevel(100); @@ -67,7 +66,7 @@ describe("Moves - Shell Trap", () => { it( "should fail if the user is only hit by special attacks", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.SWIFT)); + game.override.enemyMoveset([Moves.SWIFT]); await game.startBattle([Species.CHARIZARD, Species.TURTONATOR]); @@ -93,7 +92,7 @@ describe("Moves - Shell Trap", () => { it( "should fail if the user isn't hit with any attack", async () => { - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); await game.startBattle([Species.CHARIZARD, Species.TURTONATOR]); @@ -119,7 +118,7 @@ describe("Moves - Shell Trap", () => { it( "should not activate from an ally's attack", async () => { - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); await game.startBattle([Species.BLASTOISE, Species.CHARIZARD]); diff --git a/src/test/moves/speed_swap.test.ts b/src/test/moves/speed_swap.test.ts index 131d506792b..179f1212394 100644 --- a/src/test/moves/speed_swap.test.ts +++ b/src/test/moves/speed_swap.test.ts @@ -6,7 +6,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Stat } from "#enums/stat"; import { Abilities } from "#enums/abilities"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Moves - Speed Swap", () => { let phaserGame: Phaser.Game; @@ -27,7 +26,7 @@ describe("Moves - Speed Swap", () => { game.override .battleType("single") .enemyAbility(Abilities.NONE) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemySpecies(Species.MEW) .enemyLevel(200) .moveset([ Moves.SPEED_SWAP ]) diff --git a/src/test/moves/spikes.test.ts b/src/test/moves/spikes.test.ts index fa2e7521152..aa59912d802 100644 --- a/src/test/moves/spikes.test.ts +++ b/src/test/moves/spikes.test.ts @@ -4,7 +4,6 @@ import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Moves - Spikes", () => { @@ -28,7 +27,7 @@ describe("Moves - Spikes", () => { .enemySpecies(Species.MAGIKARP) .enemyAbility(Abilities.BALL_FETCH) .ability(Abilities.BALL_FETCH) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .moveset([Moves.SPIKES, Moves.SPLASH, Moves.ROAR]); }); diff --git a/src/test/moves/spit_up.test.ts b/src/test/moves/spit_up.test.ts index f88791efb74..acf7f01d991 100644 --- a/src/test/moves/spit_up.test.ts +++ b/src/test/moves/spit_up.test.ts @@ -9,7 +9,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import { MovePhase } from "#app/phases/move-phase"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; @@ -33,7 +32,7 @@ describe("Moves - Spit Up", () => { game.override.battleType("single"); game.override.enemySpecies(Species.RATTATA); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemyAbility(Abilities.NONE); game.override.enemyLevel(2000); diff --git a/src/test/moves/stockpile.test.ts b/src/test/moves/stockpile.test.ts index d57768d0ffd..8e7a44d053b 100644 --- a/src/test/moves/stockpile.test.ts +++ b/src/test/moves/stockpile.test.ts @@ -7,7 +7,6 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -30,7 +29,7 @@ describe("Moves - Stockpile", () => { game.override.battleType("single"); game.override.enemySpecies(Species.RATTATA); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemyAbility(Abilities.NONE); game.override.startingLevel(2000); diff --git a/src/test/moves/swallow.test.ts b/src/test/moves/swallow.test.ts index 9cea7ae8dc9..5a0e63e6e78 100644 --- a/src/test/moves/swallow.test.ts +++ b/src/test/moves/swallow.test.ts @@ -8,7 +8,6 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -30,7 +29,7 @@ describe("Moves - Swallow", () => { game.override.battleType("single"); game.override.enemySpecies(Species.RATTATA); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.enemyAbility(Abilities.NONE); game.override.enemyLevel(2000); diff --git a/src/test/moves/tail_whip.test.ts b/src/test/moves/tail_whip.test.ts index 04730a04f7a..5c83feb8a4e 100644 --- a/src/test/moves/tail_whip.test.ts +++ b/src/test/moves/tail_whip.test.ts @@ -5,7 +5,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; import { TurnInitPhase } from "#app/phases/turn-init-phase"; @@ -33,7 +32,7 @@ describe("Moves - Tail whip", () => { game.override.ability(Abilities.INSOMNIA); game.override.startingLevel(2000); game.override.moveset([ moveToUse ]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); }); it("should lower DEF stat stage by 1", async() => { diff --git a/src/test/moves/tailwind.test.ts b/src/test/moves/tailwind.test.ts index d158a9cce86..6a08cfe802f 100644 --- a/src/test/moves/tailwind.test.ts +++ b/src/test/moves/tailwind.test.ts @@ -5,7 +5,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -27,7 +26,7 @@ describe("Moves - Tailwind", () => { game = new GameManager(phaserGame); game.override.battleType("double"); game.override.moveset([Moves.TAILWIND, Moves.SPLASH, Moves.PETAL_BLIZZARD, Moves.SANDSTORM]); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); }); it("doubles the Speed stat of the Pokemons on its side", async () => { diff --git a/src/test/moves/tera_blast.test.ts b/src/test/moves/tera_blast.test.ts index fa7a99adc14..55d61496297 100644 --- a/src/test/moves/tera_blast.test.ts +++ b/src/test/moves/tera_blast.test.ts @@ -9,7 +9,6 @@ import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Moves - Tera Blast", () => { let phaserGame: Phaser.Game; @@ -37,7 +36,7 @@ describe("Moves - Tera Blast", () => { .ability(Abilities.BALL_FETCH) .startingHeldItems([{ name: "TERA_SHARD", type: Type.FIRE }]) .enemySpecies(Species.MAGIKARP) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemyAbility(Abilities.BALL_FETCH) .enemyLevel(20); diff --git a/src/test/moves/thunder_wave.test.ts b/src/test/moves/thunder_wave.test.ts index 0c91be29714..7ad59518013 100644 --- a/src/test/moves/thunder_wave.test.ts +++ b/src/test/moves/thunder_wave.test.ts @@ -6,7 +6,6 @@ import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; const TIMEOUT = 20 * 1000; @@ -30,7 +29,7 @@ describe("Moves - Thunder Wave", () => { .battleType("single") .starterSpecies(Species.PIKACHU) .moveset([Moves.THUNDER_WAVE]) - .enemyMoveset(SPLASH_ONLY); + .enemyMoveset(Moves.SPLASH); }); // References: https://bulbapedia.bulbagarden.net/wiki/Thunder_Wave_(move) diff --git a/src/test/moves/tidy_up.test.ts b/src/test/moves/tidy_up.test.ts index 5204b06106b..255fe948447 100644 --- a/src/test/moves/tidy_up.test.ts +++ b/src/test/moves/tidy_up.test.ts @@ -6,7 +6,6 @@ import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -30,7 +29,7 @@ describe("Moves - Tidy Up", () => { game.override.battleType("single"); game.override.enemySpecies(Species.MAGIKARP); game.override.enemyAbility(Abilities.BALL_FETCH); - game.override.enemyMoveset(SPLASH_ONLY); + game.override.enemyMoveset(Moves.SPLASH); game.override.starterSpecies(Species.FEEBAS); game.override.ability(Abilities.BALL_FETCH); game.override.moveset([Moves.TIDY_UP]); diff --git a/src/test/moves/transform.test.ts b/src/test/moves/transform.test.ts index 45769447e4d..6686f1fc73b 100644 --- a/src/test/moves/transform.test.ts +++ b/src/test/moves/transform.test.ts @@ -6,7 +6,6 @@ import { TurnEndPhase } from "#app/phases/turn-end-phase"; import { Moves } from "#enums/moves"; import { Stat, BATTLE_STATS, EFFECTIVE_STATS } from "#enums/stat"; import { Abilities } from "#enums/abilities"; -import { SPLASH_ONLY } from "../utils/testUtils"; // TODO: Add more tests once Transform is fully implemented describe("Moves - Transform", () => { @@ -31,7 +30,7 @@ describe("Moves - Transform", () => { .enemyLevel(200) .enemyAbility(Abilities.BEAST_BOOST) .enemyPassiveAbility(Abilities.BALL_FETCH) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .ability(Abilities.INTIMIDATE) .moveset([ Moves.TRANSFORM ]); }); @@ -77,7 +76,7 @@ describe("Moves - Transform", () => { }, 20000); it("should copy in-battle overridden stats", async () => { - game.override.enemyMoveset(new Array(4).fill(Moves.POWER_SPLIT)); + game.override.enemyMoveset([Moves.POWER_SPLIT]); await game.startBattle([ Species.DITTO diff --git a/src/test/moves/u_turn.test.ts b/src/test/moves/u_turn.test.ts index ae55302bb42..c4b6ae2497f 100644 --- a/src/test/moves/u_turn.test.ts +++ b/src/test/moves/u_turn.test.ts @@ -7,7 +7,6 @@ import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("Moves - U-turn", () => { let phaserGame: Phaser.Game; @@ -31,7 +30,7 @@ describe("Moves - U-turn", () => { .startingLevel(90) .startingWave(97) .moveset([Moves.U_TURN]) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .disableCrits(); }); diff --git a/src/test/moves/wide_guard.test.ts b/src/test/moves/wide_guard.test.ts index 6feeff815b5..b4e6e305539 100644 --- a/src/test/moves/wide_guard.test.ts +++ b/src/test/moves/wide_guard.test.ts @@ -32,7 +32,7 @@ describe("Moves - Wide Guard", () => { game.override.moveset([Moves.WIDE_GUARD, Moves.SPLASH, Moves.SURF]); game.override.enemySpecies(Species.SNORLAX); - game.override.enemyMoveset(Array(4).fill(Moves.SWIFT)); + game.override.enemyMoveset([Moves.SWIFT]); game.override.enemyAbility(Abilities.INSOMNIA); game.override.startingLevel(100); @@ -61,7 +61,7 @@ describe("Moves - Wide Guard", () => { test( "should protect the user and allies from multi-target status moves", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.GROWL)); + game.override.enemyMoveset([Moves.GROWL]); await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); @@ -82,7 +82,7 @@ describe("Moves - Wide Guard", () => { test( "should not protect the user and allies from single-target moves", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.TACKLE)); + game.override.enemyMoveset([Moves.TACKLE]); await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); @@ -103,7 +103,7 @@ describe("Moves - Wide Guard", () => { test( "should protect the user from its ally's multi-target move", async () => { - game.override.enemyMoveset(Array(4).fill(Moves.SPLASH)); + game.override.enemyMoveset([Moves.SPLASH]); await game.startBattle([Species.CHARIZARD, Species.BLASTOISE]); diff --git a/src/test/reload.test.ts b/src/test/reload.test.ts index 0a712fcc7df..a96a525ca2d 100644 --- a/src/test/reload.test.ts +++ b/src/test/reload.test.ts @@ -2,7 +2,6 @@ import { Species } from "#app/enums/species"; import { GameModes } from "#app/game-mode"; import GameManager from "#test/utils/gameManager"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { SPLASH_ONLY } from "./utils/testUtils"; import { Moves } from "#app/enums/moves"; import { Biome } from "#app/enums/biome"; @@ -45,7 +44,7 @@ describe("Reload", () => { .enemyLevel(1000) .disableTrainerWaves() .moveset([Moves.KOWTOW_CLEAVE]) - .enemyMoveset(SPLASH_ONLY); + .enemyMoveset(Moves.SPLASH); await game.dailyMode.startBattle(); // Transition from Daily Run Wave 10 to Wave 11 in order to trigger biome switch diff --git a/src/test/ui/type-hints.test.ts b/src/test/ui/type-hints.test.ts index ccab02b82bf..726094b258a 100644 --- a/src/test/ui/type-hints.test.ts +++ b/src/test/ui/type-hints.test.ts @@ -8,7 +8,6 @@ import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import MockText from "../utils/mocks/mocksContainer/mockText"; -import { SPLASH_ONLY } from "../utils/testUtils"; describe("UI - Type Hints", () => { let phaserGame: Phaser.Game; @@ -27,7 +26,7 @@ describe("UI - Type Hints", () => { beforeEach(async () => { game = new GameManager(phaserGame); game.settings.typeHints(true); //activate type hints - game.override.battleType("single").startingLevel(100).startingWave(1).enemyMoveset(SPLASH_ONLY); + game.override.battleType("single").startingLevel(100).startingWave(1).enemyMoveset(Moves.SPLASH); }); it("check immunity color", async () => { @@ -36,7 +35,7 @@ describe("UI - Type Hints", () => { .startingLevel(100) .startingWave(1) .enemySpecies(Species.FLORGES) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .moveset([Moves.DRAGON_CLAW]); game.settings.typeHints(true); //activate type hints diff --git a/src/test/utils/helpers/overridesHelper.ts b/src/test/utils/helpers/overridesHelper.ts index 3eeeecbc5f8..a17b841b682 100644 --- a/src/test/utils/helpers/overridesHelper.ts +++ b/src/test/utils/helpers/overridesHelper.ts @@ -133,8 +133,11 @@ export class OverridesHelper extends GameManagerHelper { * @param moveset the {@linkcode Moves | moves}set to set * @returns this */ - moveset(moveset: Moves[]): this { + moveset(moveset: Moves | Moves[]): this { vi.spyOn(Overrides, "MOVESET_OVERRIDE", "get").mockReturnValue(moveset); + if (!Array.isArray(moveset)) { + moveset = [moveset]; + } const movesetStr = moveset.map((moveId) => Moves[moveId]).join(", "); this.log(`Player Pokemon moveset set to ${movesetStr} (=[${moveset.join(", ")}])!`); return this; @@ -252,8 +255,11 @@ export class OverridesHelper extends GameManagerHelper { * @param moveset the {@linkcode Moves | moves}set to set * @returns this */ - enemyMoveset(moveset: Moves[]): this { + enemyMoveset(moveset: Moves | Moves[]): this { vi.spyOn(Overrides, "OPP_MOVESET_OVERRIDE", "get").mockReturnValue(moveset); + if (!Array.isArray(moveset)) { + moveset = [moveset]; + } const movesetStr = moveset.map((moveId) => Moves[moveId]).join(", "); this.log(`Enemy Pokemon moveset set to ${movesetStr} (=[${moveset.join(", ")}])!`); return this; diff --git a/src/test/utils/testUtils.ts b/src/test/utils/testUtils.ts index 2265cf8d79c..b922fc9c61c 100644 --- a/src/test/utils/testUtils.ts +++ b/src/test/utils/testUtils.ts @@ -1,10 +1,6 @@ -import { Moves } from "#app/enums/moves"; import i18next, { type ParseKeys } from "i18next"; import { vi } from "vitest"; -/** Ready to use array of Moves.SPLASH x4 */ -export const SPLASH_ONLY = [Moves.SPLASH, Moves.SPLASH, Moves.SPLASH, Moves.SPLASH]; - /** * Sets up the i18next mock. * Includes a i18next.t mocked implementation only returning the raw key (`(key) => key`) From 8df7422e8fa520813b3549f5e53f684ad7419ec6 Mon Sep 17 00:00:00 2001 From: Taylor Le Lievre <78890517+tlelievre26@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:59:58 -0400 Subject: [PATCH 61/83] [Bug] Primal weather no longer persists if last mon dies to indirect damage (#3492) * Fixed Delta Stream remaining active when last mon dies to indirect damage * Rebasing changes * Linting fix * Combined if statements * Changed params to optional * Added unit test * Apply suggestions from code review * Fix test and remove `.js` from import --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> --- src/data/ability.ts | 14 ++++++------- src/phases/faint-phase.ts | 2 ++ src/test/arena/weather_strong_winds.test.ts | 23 +++++++++++++++++---- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index 10aba1f030e..1304f281285 100755 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -3923,7 +3923,7 @@ export class PostBattleLootAbAttr extends PostBattleAbAttr { } export class PostFaintAbAttr extends AbAttr { - applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean { + applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean { return false; } } @@ -3974,7 +3974,7 @@ export class PostFaintClearWeatherAbAttr extends PostFaintAbAttr { * @param args N/A * @returns {boolean} Returns true if the weather clears, otherwise false. */ - applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean { + applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean { const weatherType = pokemon.scene.arena.weather?.weatherType; let turnOffWeather = false; @@ -4022,8 +4022,8 @@ export class PostFaintContactDamageAbAttr extends PostFaintAbAttr { this.damageRatio = damageRatio; } - applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean { - if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)) { + applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean { + if (move !== undefined && attacker !== undefined && move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)) { //If the mon didn't die to indirect damage const cancelled = new Utils.BooleanHolder(false); pokemon.scene.getField(true).map(p => applyAbAttrs(FieldPreventExplosiveMovesAbAttr, p, cancelled, simulated)); if (cancelled.value || attacker.hasAbilityWithAttr(BlockNonDirectDamageAbAttr)) { @@ -4052,8 +4052,8 @@ export class PostFaintHPDamageAbAttr extends PostFaintAbAttr { super (); } - applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean { - if (!simulated) { + applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean { + if (move !== undefined && attacker !== undefined && !simulated) { //If the mon didn't die to indirect damage const damage = pokemon.turnData.attacksReceived[0].damage; attacker.damageAndUpdate((damage), HitResult.OTHER); attacker.turnData.damageTaken += damage; @@ -4711,7 +4711,7 @@ export function applyPostBattleAbAttrs(attrType: Constructor, } export function applyPostFaintAbAttrs(attrType: Constructor, - pokemon: Pokemon, attacker: Pokemon, move: Move, hitResult: HitResult, simulated: boolean = false, ...args: any[]): Promise { + pokemon: Pokemon, attacker?: Pokemon, move?: Move, hitResult?: HitResult, simulated: boolean = false, ...args: any[]): Promise { return applyAbAttrsInternal(attrType, pokemon, (attr, passive) => attr.applyPostFaint(pokemon, passive, simulated, attacker, move, hitResult, args), args, false, simulated); } diff --git a/src/phases/faint-phase.ts b/src/phases/faint-phase.ts index 48366afaad4..c30003b79aa 100644 --- a/src/phases/faint-phase.ts +++ b/src/phases/faint-phase.ts @@ -65,6 +65,8 @@ export class FaintPhase extends PokemonPhase { if (pokemon.turnData?.attacksReceived?.length) { const lastAttack = pokemon.turnData.attacksReceived[0]; applyPostFaintAbAttrs(PostFaintAbAttr, pokemon, this.scene.getPokemonById(lastAttack.sourceId)!, new PokemonMove(lastAttack.move).getMove(), lastAttack.result); // TODO: is this bang correct? + } else { //If killed by indirect damage, apply post-faint abilities without providing a last move + applyPostFaintAbAttrs(PostFaintAbAttr, pokemon); } const alivePlayField = this.scene.getField(true); diff --git a/src/test/arena/weather_strong_winds.test.ts b/src/test/arena/weather_strong_winds.test.ts index 8b2d3e2547e..5ce0e61e647 100644 --- a/src/test/arena/weather_strong_winds.test.ts +++ b/src/test/arena/weather_strong_winds.test.ts @@ -1,4 +1,5 @@ import { allMoves } from "#app/data/move"; +import { StatusEffect } from "#app/enums/status-effect"; import { TurnStartPhase } from "#app/phases/turn-start-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; @@ -33,7 +34,7 @@ describe("Weather - Strong Winds", () => { it("electric type move is not very effective on Rayquaza", async () => { game.override.enemySpecies(Species.RAYQUAZA); - await game.startBattle([Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU]); const pikachu = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -44,7 +45,7 @@ describe("Weather - Strong Winds", () => { }); it("electric type move is neutral for flying type pokemon", async () => { - await game.startBattle([Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU]); const pikachu = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -55,7 +56,7 @@ describe("Weather - Strong Winds", () => { }); it("ice type move is neutral for flying type pokemon", async () => { - await game.startBattle([Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU]); const pikachu = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -66,7 +67,7 @@ describe("Weather - Strong Winds", () => { }); it("rock type move is neutral for flying type pokemon", async () => { - await game.startBattle([Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU]); const pikachu = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; @@ -75,4 +76,18 @@ describe("Weather - Strong Winds", () => { await game.phaseInterceptor.to(TurnStartPhase); expect(enemy.getAttackTypeEffectiveness(allMoves[Moves.ROCK_SLIDE].type, pikachu)).toBe(1); }); + + it("weather goes away when last trainer pokemon dies to indirect damage", async () => { + game.override.enemyStatusEffect(StatusEffect.POISON); + + await game.classicMode.startBattle([Species.MAGIKARP]); + + const enemy = game.scene.getEnemyPokemon()!; + enemy.hp = 1; + + game.move.select(Moves.SPLASH); + await game.phaseInterceptor.to("TurnEndPhase"); + + expect(game.scene.arena.weather?.weatherType).toBeUndefined(); + }); }); From 401568609b86fc816b03be5d8c15bde9f0944fcb Mon Sep 17 00:00:00 2001 From: "Adrian T." <68144167+torranx@users.noreply.github.com> Date: Tue, 10 Sep 2024 01:00:26 +0800 Subject: [PATCH 62/83] [Dev] Add imports, Handle kebab-case fileName argument in test boilerplate script (#4072) * add imports, handle kebab-case fileName argument * fix spacing --- create-test-boilerplate.js | 46 +++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/create-test-boilerplate.js b/create-test-boilerplate.js index 3c53eb1125b..3e598384fee 100644 --- a/create-test-boilerplate.js +++ b/create-test-boilerplate.js @@ -20,54 +20,59 @@ const type = args[0]; // "move" or "ability" let fileName = args[1]; // The file name if (!type || !fileName) { - console.error('Please provide both a type ("move", "ability", or "item") and a file name.'); - process.exit(1); + console.error('Please provide a type ("move", "ability", or "item") and a file name.'); + process.exit(1); } -// Convert fileName from to snake_case if camelCase is given -fileName = fileName.replace(/([a-z])([A-Z])/g, '$1_$2').toLowerCase(); +// Convert fileName from kebab-case or camelCase to snake_case +fileName = fileName + .replace(/-+/g, '_') // Convert kebab-case (dashes) to underscores + .replace(/([a-z])([A-Z])/g, '$1_$2') // Convert camelCase to snake_case + .toLowerCase(); // Ensure all lowercase // Format the description for the test case const formattedName = fileName - .replace(/_/g, ' ') - .replace(/\b\w/g, char => char.toUpperCase()); + .replace(/_/g, ' ') + .replace(/\b\w/g, char => char.toUpperCase()); // Determine the directory based on the type let dir; let description; if (type === 'move') { - dir = path.join(__dirname, 'src', 'test', 'moves'); - description = `Moves - ${formattedName}`; + dir = path.join(__dirname, 'src', 'test', 'moves'); + description = `Moves - ${formattedName}`; } else if (type === 'ability') { - dir = path.join(__dirname, 'src', 'test', 'abilities'); - description = `Abilities - ${formattedName}`; + dir = path.join(__dirname, 'src', 'test', 'abilities'); + description = `Abilities - ${formattedName}`; } else if (type === "item") { - dir = path.join(__dirname, 'src', 'test', 'items'); - description = `Items - ${formattedName}`; + dir = path.join(__dirname, 'src', 'test', 'items'); + description = `Items - ${formattedName}`; } else { - console.error('Invalid type. Please use "move", "ability", or "item".'); - process.exit(1); + console.error('Invalid type. Please use "move", "ability", or "item".'); + process.exit(1); } // Ensure the directory exists if (!fs.existsSync(dir)) { - fs.mkdirSync(dir, { recursive: true }); + fs.mkdirSync(dir, { recursive: true }); } // Create the file with the given name const filePath = path.join(dir, `${fileName}.test.ts`); if (fs.existsSync(filePath)) { - console.error(`File "${fileName}.test.ts" already exists.`); - process.exit(1); + console.error(`File "${fileName}.test.ts" already exists.`); + process.exit(1); } // Define the content template const content = `import { Abilities } from "#enums/abilities"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; -import { afterEach, beforeAll, beforeEach, describe, it } from "vitest"; +import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; describe("${description}", () => { let phaserGame: Phaser.Game; @@ -87,14 +92,15 @@ describe("${description}", () => { beforeEach(() => { game = new GameManager(phaserGame); game.override + .moveset([Moves.SPLASH]) .battleType("single") .enemyAbility(Abilities.BALL_FETCH) .enemyMoveset(SPLASH_ONLY); }); it("test case", async () => { - // await game.classicMode.startBattle(); - // game.move.select(); + // await game.classicMode.startBattle([Species.MAGIKARP]); + // game.move.select(Moves.SPLASH); }, TIMEOUT); }); `; From 9afab182e9dc15c865b410ccd2555dd3b2fc5e39 Mon Sep 17 00:00:00 2001 From: "Adrian T." <68144167+torranx@users.noreply.github.com> Date: Tue, 10 Sep 2024 03:02:11 +0800 Subject: [PATCH 63/83] [Test] Remove obsolete splash_only (#4139) --- create-test-boilerplate.js | 3 +-- src/test/moves/power_shift.test.ts | 3 +-- src/test/moves/tar_shot.test.ts | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/create-test-boilerplate.js b/create-test-boilerplate.js index 3e598384fee..d9cdbd4e7cf 100644 --- a/create-test-boilerplate.js +++ b/create-test-boilerplate.js @@ -70,7 +70,6 @@ const content = `import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest"; @@ -95,7 +94,7 @@ describe("${description}", () => { .moveset([Moves.SPLASH]) .battleType("single") .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset(SPLASH_ONLY); + .enemyMoveset(Moves.SPLASH); }); it("test case", async () => { diff --git a/src/test/moves/power_shift.test.ts b/src/test/moves/power_shift.test.ts index 350041d9e4e..3fda315193e 100644 --- a/src/test/moves/power_shift.test.ts +++ b/src/test/moves/power_shift.test.ts @@ -3,7 +3,6 @@ import { Species } from "#app/enums/species"; import { Stat } from "#app/enums/stat"; import { Abilities } from "#enums/abilities"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; @@ -29,7 +28,7 @@ describe("Moves - Power Shift", () => { .battleType("single") .ability(Abilities.BALL_FETCH) .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset(SPLASH_ONLY); + .enemyMoveset(Moves.SPLASH); }); it("switches the user's raw Attack stat with its raw Defense stat", async () => { diff --git a/src/test/moves/tar_shot.test.ts b/src/test/moves/tar_shot.test.ts index 15667122a37..2963f061fc6 100644 --- a/src/test/moves/tar_shot.test.ts +++ b/src/test/moves/tar_shot.test.ts @@ -5,7 +5,6 @@ import { Species } from "#app/enums/species"; import { Stat } from "#app/enums/stat"; import { Abilities } from "#enums/abilities"; import GameManager from "#test/utils/gameManager"; -import { SPLASH_ONLY } from "#test/utils/testUtils"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; @@ -29,7 +28,7 @@ describe("Moves - Tar Shot", () => { game.override .battleType("single") .enemyAbility(Abilities.BALL_FETCH) - .enemyMoveset(SPLASH_ONLY) + .enemyMoveset(Moves.SPLASH) .enemySpecies(Species.TANGELA) .enemyLevel(1000) .moveset([Moves.TAR_SHOT, Moves.FIRE_PUNCH]) From 93170930441ef5524a438a77b188b2ca056622bf Mon Sep 17 00:00:00 2001 From: Brandon Bay Date: Mon, 9 Sep 2024 15:07:00 -0400 Subject: [PATCH 64/83] [Enhancement] [UI/UX] Add ability and passive tooltips to starter select screen (#4023) * Add ability and passive tooltips to starter select screen * Remove explicit casts to BattleScene * Increase tooltip size, reverse y when necessary, and always show passive tooltip * Add ability name to tooltip title and persist tooltips between Pokemon * Use vi function mocks --- .../mocks/mocksContainer/mockContainer.ts | 5 +- .../utils/mocks/mocksContainer/mockSprite.ts | 5 +- .../utils/mocks/mocksContainer/mockText.ts | 2 + src/ui/starter-select-ui-handler.ts | 87 ++++++++++++++++--- src/ui/ui.ts | 30 +++++-- 5 files changed, 104 insertions(+), 25 deletions(-) diff --git a/src/test/utils/mocks/mocksContainer/mockContainer.ts b/src/test/utils/mocks/mocksContainer/mockContainer.ts index d2cdd852257..94ae61a6ce4 100644 --- a/src/test/utils/mocks/mocksContainer/mockContainer.ts +++ b/src/test/utils/mocks/mocksContainer/mockContainer.ts @@ -52,9 +52,8 @@ export default class MockContainer implements MockGameObject { /// Sets the position of this Game Object to be a relative position from the source Game Object. } - setInteractive(hitArea?, callback?, dropZone?) { - /// Sets the InteractiveObject to be a drop zone for a drag and drop operation. - } + setInteractive = vi.fn(); + setOrigin(x, y) { this.x = x; this.y = y; diff --git a/src/test/utils/mocks/mocksContainer/mockSprite.ts b/src/test/utils/mocks/mocksContainer/mockSprite.ts index 35cd2d5faab..ae43df46cf5 100644 --- a/src/test/utils/mocks/mocksContainer/mockSprite.ts +++ b/src/test/utils/mocks/mocksContainer/mockSprite.ts @@ -1,5 +1,6 @@ import Phaser from "phaser"; import { MockGameObject } from "../mockGameObject"; +import { vi } from "vitest"; import Sprite = Phaser.GameObjects.Sprite; import Frame = Phaser.Textures.Frame; @@ -101,9 +102,7 @@ export default class MockSprite implements MockGameObject { return this.phaserSprite.stop(); } - setInteractive(hitArea, hitAreaCallback, dropZone) { - return null; - } + setInteractive = vi.fn(); on(event, callback, source) { return this.phaserSprite.on(event, callback, source); diff --git a/src/test/utils/mocks/mocksContainer/mockText.ts b/src/test/utils/mocks/mocksContainer/mockText.ts index 6b9ecf083fd..5a89432902b 100644 --- a/src/test/utils/mocks/mocksContainer/mockText.ts +++ b/src/test/utils/mocks/mocksContainer/mockText.ts @@ -197,6 +197,8 @@ export default class MockText implements MockGameObject { this.color = color; }); + setInteractive = vi.fn(); + setShadowColor(color) { // Sets the shadow color. // return this.phaserText.setShadowColor(color); diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index 6b75c46bd45..e1269499b10 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -266,6 +266,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { private pokemonPassiveDisabledIcon: Phaser.GameObjects.Sprite; private pokemonPassiveLockedIcon: Phaser.GameObjects.Sprite; + private activeTooltip: "ABILITY" | "PASSIVE" | "CANDY" | undefined; private instructionsContainer: Phaser.GameObjects.Container; private filterInstructionsContainer: Phaser.GameObjects.Container; private shinyIconElement: Phaser.GameObjects.Sprite; @@ -561,10 +562,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonAbilityLabelText = addTextObject(this.scene, 6, 127 + starterInfoYOffset, i18next.t("starterSelectUiHandler:ability"), TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize }); this.pokemonAbilityLabelText.setOrigin(0, 0); this.pokemonAbilityLabelText.setVisible(false); + this.starterSelectContainer.add(this.pokemonAbilityLabelText); this.pokemonAbilityText = addTextObject(this.scene, starterInfoXPos, 127 + starterInfoYOffset, "", TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize }); this.pokemonAbilityText.setOrigin(0, 0); + this.pokemonAbilityText.setInteractive(new Phaser.Geom.Rectangle(0, 0, 250, 55), Phaser.Geom.Rectangle.Contains); + this.starterSelectContainer.add(this.pokemonAbilityText); this.pokemonPassiveLabelText = addTextObject(this.scene, 6, 136 + starterInfoYOffset, i18next.t("starterSelectUiHandler:passive"), TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize }); @@ -574,6 +578,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonPassiveText = addTextObject(this.scene, starterInfoXPos, 136 + starterInfoYOffset, "", TextStyle.SUMMARY_ALT, { fontSize: starterInfoTextSize }); this.pokemonPassiveText.setOrigin(0, 0); + this.pokemonPassiveText.setInteractive(new Phaser.Geom.Rectangle(0, 0, 250, 55), Phaser.Geom.Rectangle.Contains); this.starterSelectContainer.add(this.pokemonPassiveText); this.pokemonPassiveDisabledIcon = this.scene.add.sprite(starterInfoXPos, 137 + starterInfoYOffset, "icon_stop"); @@ -1921,6 +1926,14 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } } while (newAbilityIndex !== this.abilityCursor); starterAttributes.ability = newAbilityIndex; // store the selected ability + + const { visible: tooltipVisible } = this.scene.ui.getTooltip(); + + if (tooltipVisible && this.activeTooltip === "ABILITY") { + const newAbility = allAbilities[this.lastSpecies.getAbility(newAbilityIndex)]; + this.scene.ui.editTooltip(`${newAbility.name}`, `${newAbility.description}`); + } + this.setSpeciesDetails(this.lastSpecies, undefined, undefined, undefined, undefined, newAbilityIndex, undefined); success = true; } @@ -2687,12 +2700,30 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } } + getFriendship(speciesId: number) { + let currentFriendship = this.scene.gameData.starterData[speciesId].friendship; + if (!currentFriendship || currentFriendship === undefined) { + currentFriendship = 0; + } + + const friendshipCap = getStarterValueFriendshipCap(speciesStarters[speciesId]); + + return { currentFriendship, friendshipCap }; + } + setSpecies(species: PokemonSpecies | null) { this.speciesStarterDexEntry = species ? this.scene.gameData.dexData[species.speciesId] : null; this.dexAttrCursor = species ? this.getCurrentDexProps(species.speciesId) : 0n; this.abilityCursor = species ? this.scene.gameData.getStarterSpeciesDefaultAbilityIndex(species) : 0; this.natureCursor = species ? this.scene.gameData.getSpeciesDefaultNature(species) : 0; + if (!species && this.scene.ui.getTooltip().visible) { + this.scene.ui.hideTooltip(); + } + + this.pokemonAbilityText.off("pointerover"); + this.pokemonPassiveText.off("pointerover"); + const starterAttributes : StarterAttributes | null = species ? {...this.starterPreferences[species.speciesId]} : null; if (starterAttributes?.nature) { @@ -2807,17 +2838,18 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonHatchedIcon.setVisible(true); this.pokemonHatchedCountText.setVisible(true); - let currentFriendship = this.scene.gameData.starterData[this.lastSpecies.speciesId].friendship; - if (!currentFriendship || currentFriendship === undefined) { - currentFriendship = 0; - } - - const friendshipCap = getStarterValueFriendshipCap(speciesStarters[this.lastSpecies.speciesId]); + const { currentFriendship, friendshipCap } = this.getFriendship(this.lastSpecies.speciesId); const candyCropY = 16 - (16 * (currentFriendship / friendshipCap)); if (this.pokemonCandyDarknessOverlay.visible) { - this.pokemonCandyDarknessOverlay.on("pointerover", () => (this.scene as BattleScene).ui.showTooltip("", `${currentFriendship}/${friendshipCap}`, true)); - this.pokemonCandyDarknessOverlay.on("pointerout", () => (this.scene as BattleScene).ui.hideTooltip()); + this.pokemonCandyDarknessOverlay.on("pointerover", () => { + this.scene.ui.showTooltip("", `${currentFriendship}/${friendshipCap}`, true); + this.activeTooltip = "CANDY"; + }); + this.pokemonCandyDarknessOverlay.on("pointerout", () => { + this.scene.ui.hideTooltip(); + this.activeTooltip = undefined; + }); } this.pokemonCandyDarknessOverlay.setCrop(0, 0, 16, candyCropY); @@ -2932,6 +2964,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.abilityCursor = -1; this.natureCursor = -1; + if (this.activeTooltip === "CANDY") { + const { currentFriendship, friendshipCap } = this.getFriendship(this.lastSpecies.speciesId); + this.scene.ui.editTooltip("", `${currentFriendship}/${friendshipCap}`); + } + if (species?.forms?.find(f => f.formKey === "female")) { if (female !== undefined) { formIndex = female ? 1 : 0; @@ -3081,8 +3118,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } if (dexEntry.caughtAttr) { - const ability = this.lastSpecies.getAbility(abilityIndex!); // TODO: is this bang correct? - this.pokemonAbilityText.setText(allAbilities[ability].name); + const ability = allAbilities[this.lastSpecies.getAbility(abilityIndex!)]; // TODO: is this bang correct? + this.pokemonAbilityText.setText(ability.name); const isHidden = abilityIndex === (this.lastSpecies.ability2 ? 2 : 1); this.pokemonAbilityText.setColor(this.getTextColor(!isHidden ? TextStyle.SUMMARY_ALT : TextStyle.SUMMARY_GOLD)); @@ -3091,6 +3128,21 @@ export default class StarterSelectUiHandler extends MessageUiHandler { const passiveAttr = this.scene.gameData.starterData[species.speciesId].passiveAttr; const passiveAbility = allAbilities[starterPassiveAbilities[this.lastSpecies.speciesId]]; + if (this.pokemonAbilityText.visible) { + if (this.activeTooltip === "ABILITY") { + this.scene.ui.editTooltip(`${ability.name}`, `${ability.description}`); + } + + this.pokemonAbilityText.on("pointerover", () => { + this.scene.ui.showTooltip(`${ability.name}`, `${ability.description}`, true); + this.activeTooltip = "ABILITY"; + }); + this.pokemonAbilityText.on("pointerout", () => { + this.scene.ui.hideTooltip(); + this.activeTooltip = undefined; + }); + } + if (passiveAbility) { const isUnlocked = !!(passiveAttr & PassiveAttr.UNLOCKED); const isEnabled = !!(passiveAttr & PassiveAttr.ENABLED); @@ -3107,6 +3159,21 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.pokemonPassiveText.setAlpha(textAlpha); this.pokemonPassiveText.setShadowColor(this.getTextColor(textStyle, true)); + if (this.activeTooltip === "PASSIVE") { + this.scene.ui.editTooltip(`${passiveAbility.name}`, `${passiveAbility.description}`); + } + + if (this.pokemonPassiveText.visible) { + this.pokemonPassiveText.on("pointerover", () => { + this.scene.ui.showTooltip(`${passiveAbility.name}`, `${passiveAbility.description}`, true); + this.activeTooltip = "PASSIVE"; + }); + this.pokemonPassiveText.on("pointerout", () => { + this.scene.ui.hideTooltip(); + this.activeTooltip = undefined; + }); + } + const iconPosition = { x: this.pokemonPassiveText.x + this.pokemonPassiveText.displayWidth + 1, y: this.pokemonPassiveText.y + this.pokemonPassiveText.displayHeight / 2 diff --git a/src/ui/ui.ts b/src/ui/ui.ts index a9bcbbf0cb5..50fb240aad8 100644 --- a/src/ui/ui.ts +++ b/src/ui/ui.ts @@ -244,7 +244,7 @@ export default class UI extends Phaser.GameObjects.Container { this.tooltipContent = addTextObject(this.scene, 6, 16, "", TextStyle.TOOLTIP_CONTENT); this.tooltipContent.setName("text-tooltip-content"); - this.tooltipContent.setWordWrapWidth(696); + this.tooltipContent.setWordWrapWidth(850); this.tooltipContainer.add(this.tooltipBg); this.tooltipContainer.add(this.tooltipTitle); @@ -368,14 +368,13 @@ export default class UI extends Phaser.GameObjects.Container { return false; } + getTooltip(): { visible: boolean; title: string; content: string } { + return { visible: this.tooltipContainer.visible, title: this.tooltipTitle.text, content: this.tooltipContent.text }; + } + showTooltip(title: string, content: string, overlap?: boolean): void { this.tooltipContainer.setVisible(true); - this.tooltipTitle.setText(title || ""); - const wrappedContent = this.tooltipContent.runWordWrap(content); - this.tooltipContent.setText(wrappedContent); - this.tooltipContent.y = title ? 16 : 4; - this.tooltipBg.width = Math.min(Math.max(this.tooltipTitle.displayWidth, this.tooltipContent.displayWidth) + 12, 684); - this.tooltipBg.height = (title ? 31 : 19) + 10.5 * (wrappedContent.split("\n").length - 1); + this.editTooltip(title, content); if (overlap) { (this.scene as BattleScene).uiContainer.moveAbove(this.tooltipContainer, this); } else { @@ -383,6 +382,15 @@ export default class UI extends Phaser.GameObjects.Container { } } + editTooltip(title: string, content: string): void { + this.tooltipTitle.setText(title || ""); + const wrappedContent = this.tooltipContent.runWordWrap(content); + this.tooltipContent.setText(wrappedContent); + this.tooltipContent.y = title ? 16 : 4; + this.tooltipBg.width = Math.min(Math.max(this.tooltipTitle.displayWidth, this.tooltipContent.displayWidth) + 12, 838); + this.tooltipBg.height = (title ? 31 : 19) + 10.5 * (wrappedContent.split("\n").length - 1); + } + hideTooltip(): void { this.tooltipContainer.setVisible(false); this.tooltipTitle.clearTint(); @@ -390,8 +398,12 @@ export default class UI extends Phaser.GameObjects.Container { update(): void { if (this.tooltipContainer.visible) { - const reverse = this.scene.game.input.mousePointer && this.scene.game.input.mousePointer.x >= this.scene.game.canvas.width - this.tooltipBg.width * 6 - 12; - this.tooltipContainer.setPosition(!reverse ? this.scene.game.input.mousePointer!.x / 6 + 2 : this.scene.game.input.mousePointer!.x / 6 - this.tooltipBg.width - 2, this.scene.game.input.mousePointer!.y / 6 + 2); // TODO: are these bangs correct? + const xReverse = this.scene.game.input.mousePointer && this.scene.game.input.mousePointer.x >= this.scene.game.canvas.width - this.tooltipBg.width * 6 - 12; + const yReverse = this.scene.game.input.mousePointer && this.scene.game.input.mousePointer.y >= this.scene.game.canvas.height - this.tooltipBg.height * 6 - 12; + this.tooltipContainer.setPosition( + !xReverse ? this.scene.game.input.mousePointer!.x / 6 + 2 : this.scene.game.input.mousePointer!.x / 6 - this.tooltipBg.width - 2, + !yReverse ? this.scene.game.input.mousePointer!.y / 6 + 2 : this.scene.game.input.mousePointer!.y / 6 - this.tooltipBg.height - 2, + ); } } From a82d64b5b5b4705902566484fc643f1ec2852d53 Mon Sep 17 00:00:00 2001 From: "Adrian T." <68144167+torranx@users.noreply.github.com> Date: Tue, 10 Sep 2024 03:41:53 +0800 Subject: [PATCH 65/83] [Ability] Implement Gorilla Tactics (#4051) * fully implement gorilla tactics * fix atk increase * update oversight * add showAbility param * fix postmerge * fix postmerge * update tests --- src/data/ability.ts | 40 +++++++++- src/data/battler-tags.ts | 85 +++++++++++++++++++++- src/enums/battler-tag-type.ts | 1 + src/locales/en/battle.json | 1 + src/test/abilities/gorilla_tactics.test.ts | 84 +++++++++++++++++++++ 5 files changed, 204 insertions(+), 7 deletions(-) create mode 100644 src/test/abilities/gorilla_tactics.test.ts diff --git a/src/data/ability.ts b/src/data/ability.ts index 1304f281285..6acf77cfca5 100755 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -1595,8 +1595,8 @@ export class PostAttackAbAttr extends AbAttr { private attackCondition: PokemonAttackCondition; /** The default attackCondition requires that the selected move is a damaging move */ - constructor(attackCondition: PokemonAttackCondition = (user, target, move) => (move.category !== MoveCategory.STATUS)) { - super(); + constructor(attackCondition: PokemonAttackCondition = (user, target, move) => (move.category !== MoveCategory.STATUS), showAbility: boolean = true) { + super(showAbility); this.attackCondition = attackCondition; } @@ -1624,6 +1624,40 @@ export class PostAttackAbAttr extends AbAttr { } } +/** + * Ability attribute for Gorilla Tactics + * @extends PostAttackAbAttr + */ +export class GorillaTacticsAbAttr extends PostAttackAbAttr { + constructor() { + super((user, target, move) => true, false); + } + + /** + * + * @param {Pokemon} pokemon the {@linkcode Pokemon} with this ability + * @param passive n/a + * @param simulated whether the ability is being simulated + * @param defender n/a + * @param move n/a + * @param hitResult n/a + * @param args n/a + * @returns `true` if the ability is applied + */ + applyPostAttackAfterMoveTypeCheck(pokemon: Pokemon, passive: boolean, simulated: boolean, defender: Pokemon, move: Move, hitResult: HitResult | null, args: any[]): boolean | Promise { + if (simulated) { + return simulated; + } + + if (pokemon.getTag(BattlerTagType.GORILLA_TACTICS)) { + return false; + } + + pokemon.addTag(BattlerTagType.GORILLA_TACTICS); + return true; + } +} + export class PostAttackStealHeldItemAbAttr extends PostAttackAbAttr { private stealCondition: PokemonAttackCondition | null; @@ -5597,7 +5631,7 @@ export function initAbilities() { .bypassFaint() .partial(), new Ability(Abilities.GORILLA_TACTICS, 8) - .unimplemented(), + .attr(GorillaTacticsAbAttr), new Ability(Abilities.NEUTRALIZING_GAS, 8) .attr(SuppressFieldAbilitiesAbAttr) .attr(UncopiableAbilityAbAttr) diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index 71385facb23..52e039ed874 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -119,7 +119,9 @@ export abstract class MoveRestrictionBattlerTag extends BattlerTag { const move = phase.move; if (this.isMoveRestricted(move.moveId)) { - pokemon.scene.queueMessage(this.interruptedText(pokemon, move.moveId)); + if (this.interruptedText(pokemon, move.moveId)) { + pokemon.scene.queueMessage(this.interruptedText(pokemon, move.moveId)); + } phase.cancel(); } @@ -155,7 +157,9 @@ export abstract class MoveRestrictionBattlerTag extends BattlerTag { * @param {Moves} move {@linkcode Moves} ID of the move being interrupted * @returns {string} text to display when the move is interrupted */ - abstract interruptedText(pokemon: Pokemon, move: Moves): string; + interruptedText(pokemon: Pokemon, move: Moves): string { + return ""; + } } /** @@ -221,7 +225,7 @@ export class DisabledTag extends MoveRestrictionBattlerTag { /** * @override * - * Ensures that move history exists on `pokemon` and has a valid move. If so, sets the {@link moveId} and shows a message. + * Ensures that move history exists on `pokemon` and has a valid move. If so, sets the {@linkcode moveId} and shows a message. * Otherwise the move ID will not get assigned and this tag will get removed next turn. */ override onAdd(pokemon: Pokemon): void { @@ -250,7 +254,12 @@ export class DisabledTag extends MoveRestrictionBattlerTag { return i18next.t("battle:moveDisabled", { moveName: allMoves[move].name }); } - /** @override */ + /** + * @override + * @param {Pokemon} pokemon {@linkcode Pokemon} attempting to use the restricted move + * @param {Moves} move {@linkcode Moves} ID of the move being interrupted + * @returns {string} text to display when the move is interrupted + */ override interruptedText(pokemon: Pokemon, move: Moves): string { return i18next.t("battle:disableInterruptedMove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name }); } @@ -262,6 +271,72 @@ export class DisabledTag extends MoveRestrictionBattlerTag { } } +/** + * Tag used by Gorilla Tactics to restrict the user to using only one move. + * @extends MoveRestrictionBattlerTag + */ +export class GorillaTacticsTag extends MoveRestrictionBattlerTag { + private moveId = Moves.NONE; + + constructor() { + super(BattlerTagType.GORILLA_TACTICS, BattlerTagLapseType.CUSTOM, 0); + } + + /** @override */ + override isMoveRestricted(move: Moves): boolean { + return move !== this.moveId; + } + + /** + * @override + * @param {Pokemon} pokemon the {@linkcode Pokemon} to check if the tag can be added + * @returns `true` if the pokemon has a valid move and no existing {@linkcode GorillaTacticsTag}; `false` otherwise + */ + override canAdd(pokemon: Pokemon): boolean { + return (this.getLastValidMove(pokemon) !== undefined) && !pokemon.getTag(GorillaTacticsTag); + } + + /** + * Ensures that move history exists on {@linkcode Pokemon} and has a valid move. + * If so, sets the {@linkcode moveId} and increases the user's Attack by 50%. + * @override + * @param {Pokemon} pokemon the {@linkcode Pokemon} to add the tag to + */ + override onAdd(pokemon: Pokemon): void { + const lastValidMove = this.getLastValidMove(pokemon); + + if (!lastValidMove) { + return; + } + + this.moveId = lastValidMove; + pokemon.setStat(Stat.ATK, pokemon.getStat(Stat.ATK, false) * 1.5, false); + } + + /** + * + * @override + * @param {Pokemon} pokemon n/a + * @param {Moves} move {@linkcode Moves} ID of the move being denied + * @returns {string} text to display when the move is denied + */ + override selectionDeniedText(pokemon: Pokemon, move: Moves): string { + return i18next.t("battle:canOnlyUseMove", { moveName: allMoves[this.moveId].name, pokemonName: getPokemonNameWithAffix(pokemon) }); + } + + /** + * Gets the last valid move from the pokemon's move history. + * @param {Pokemon} pokemon {@linkcode Pokemon} to get the last valid move from + * @returns {Moves | undefined} the last valid move from the pokemon's move history + */ + getLastValidMove(pokemon: Pokemon): Moves | undefined { + const move = pokemon.getLastXMoves() + .find(m => m.move !== Moves.NONE && m.move !== Moves.STRUGGLE && !m.virtual); + + return move?.move; + } +} + /** * BattlerTag that represents the "recharge" effects of moves like Hyper Beam. */ @@ -2203,6 +2278,8 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source return new TarShotTag(); case BattlerTagType.THROAT_CHOPPED: return new ThroatChoppedTag(); + case BattlerTagType.GORILLA_TACTICS: + return new GorillaTacticsTag(); case BattlerTagType.NONE: default: return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId); diff --git a/src/enums/battler-tag-type.ts b/src/enums/battler-tag-type.ts index 7d559f32cb3..cb83ebf4882 100644 --- a/src/enums/battler-tag-type.ts +++ b/src/enums/battler-tag-type.ts @@ -73,6 +73,7 @@ export enum BattlerTagType { SHELL_TRAP = "SHELL_TRAP", DRAGON_CHEER = "DRAGON_CHEER", NO_RETREAT = "NO_RETREAT", + GORILLA_TACTICS = "GORILLA_TACTICS", THROAT_CHOPPED = "THROAT_CHOPPED", TAR_SHOT = "TAR_SHOT", } diff --git a/src/locales/en/battle.json b/src/locales/en/battle.json index 0aabaacd99c..217c77422d1 100644 --- a/src/locales/en/battle.json +++ b/src/locales/en/battle.json @@ -44,6 +44,7 @@ "moveNotImplemented": "{{moveName}} is not yet implemented and cannot be selected.", "moveNoPP": "There's no PP left for\nthis move!", "moveDisabled": "{{moveName}} is disabled!", + "canOnlyUseMove": "{{pokemonName}} can only use {{moveName}}!", "moveCannotBeSelected": "{{moveName}} cannot be selected!", "disableInterruptedMove": "{{pokemonNameWithAffix}}'s {{moveName}}\nis disabled!", "throatChopInterruptedMove": "The effects of Throat Chop prevent\n{{pokemonName}} from using certain moves!", diff --git a/src/test/abilities/gorilla_tactics.test.ts b/src/test/abilities/gorilla_tactics.test.ts new file mode 100644 index 00000000000..e772088ea97 --- /dev/null +++ b/src/test/abilities/gorilla_tactics.test.ts @@ -0,0 +1,84 @@ +import { BattlerIndex } from "#app/battle"; +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; +import { Stat } from "#app/enums/stat"; +import { Abilities } from "#enums/abilities"; +import GameManager from "#test/utils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("Abilities - Gorilla Tactics", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + const TIMEOUT = 20 * 1000; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .battleType("single") + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset([Moves.SPLASH, Moves.DISABLE]) + .enemySpecies(Species.MAGIKARP) + .enemyLevel(30) + .moveset([Moves.SPLASH, Moves.TACKLE]) + .ability(Abilities.GORILLA_TACTICS); + }); + + it("boosts the Pokémon's Attack by 50%, but limits the Pokémon to using only one move", async () => { + await game.classicMode.startBattle([Species.GALAR_DARMANITAN]); + + const darmanitan = game.scene.getPlayerPokemon()!; + const initialAtkStat = darmanitan.getStat(Stat.ATK); + + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.SPLASH); + + await game.phaseInterceptor.to("TurnEndPhase"); + + expect(darmanitan.getStat(Stat.ATK, false)).toBeCloseTo(initialAtkStat * 1.5); + // Other moves should be restricted + expect(darmanitan.isMoveRestricted(Moves.TACKLE)).toBe(true); + expect(darmanitan.isMoveRestricted(Moves.SPLASH)).toBe(false); + }, TIMEOUT); + + it("should struggle if the only usable move is disabled", async () => { + await game.classicMode.startBattle([Species.GALAR_DARMANITAN]); + + const darmanitan = game.scene.getPlayerPokemon()!; + const enemy = game.scene.getEnemyPokemon()!; + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to("TurnEndPhase"); + + // Turn where Tackle is interrupted by Disable + await game.toNextTurn(); + + game.move.select(Moves.SPLASH); + await game.forceEnemyMove(Moves.DISABLE); + + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + + await game.phaseInterceptor.to("TurnEndPhase"); + expect(enemy.hp).toBe(enemy.getMaxHp()); + + // Turn where Struggle is used + await game.toNextTurn(); + + game.move.select(Moves.TACKLE); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + + await game.phaseInterceptor.to("MoveEndPhase"); + expect(darmanitan.hp).toBeLessThan(darmanitan.getMaxHp()); + }, TIMEOUT); +}); From d9a8448c6eb898cd55710aced996e12199906024 Mon Sep 17 00:00:00 2001 From: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> Date: Mon, 9 Sep 2024 21:57:07 +0200 Subject: [PATCH 66/83] [Enhancement] Added the ability to localize the tera type hover text (#4138) --- src/locales/de/fight-ui-handler.json | 3 ++- src/locales/en/fight-ui-handler.json | 3 ++- src/ui/battle-info.ts | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/locales/de/fight-ui-handler.json b/src/locales/de/fight-ui-handler.json index 6965540c703..f803375e8de 100644 --- a/src/locales/de/fight-ui-handler.json +++ b/src/locales/de/fight-ui-handler.json @@ -3,5 +3,6 @@ "power": "Stärke", "accuracy": "Genauigkeit", "abilityFlyInText": "{{passive}}{{abilityName}} von {{pokemonName}} wirkt!", - "passive": "Passive Fähigkeit " + "passive": "Passive Fähigkeit ", + "teraHover": "Tera-Typ {{type}}" } \ No newline at end of file diff --git a/src/locales/en/fight-ui-handler.json b/src/locales/en/fight-ui-handler.json index 35b7f42772a..1b8bd1f5c71 100644 --- a/src/locales/en/fight-ui-handler.json +++ b/src/locales/en/fight-ui-handler.json @@ -3,5 +3,6 @@ "power": "Power", "accuracy": "Accuracy", "abilityFlyInText": " {{pokemonName}}'s {{passive}}{{abilityName}}", - "passive": "Passive " + "passive": "Passive ", + "teraHover": "{{type}} Terastallized" } \ No newline at end of file diff --git a/src/ui/battle-info.ts b/src/ui/battle-info.ts index 05c634609f8..c7b82dc826e 100644 --- a/src/ui/battle-info.ts +++ b/src/ui/battle-info.ts @@ -323,7 +323,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container { this.teraIcon.setVisible(this.lastTeraType !== Type.UNKNOWN); this.teraIcon.on("pointerover", () => { if (this.lastTeraType !== Type.UNKNOWN) { - (this.scene as BattleScene).ui.showTooltip("", `${Utils.toReadableString(Type[this.lastTeraType])} Terastallized`); + (this.scene as BattleScene).ui.showTooltip("", i18next.t("fightUiHandler:teraHover", {type: i18next.t(`pokemonInfo:Type.${Type[this.lastTeraType]}`) })); } }); this.teraIcon.on("pointerout", () => (this.scene as BattleScene).ui.hideTooltip()); From e9595954710669526350a04ac2889d34a60016d8 Mon Sep 17 00:00:00 2001 From: "Adrian T." <68144167+torranx@users.noreply.github.com> Date: Tue, 10 Sep 2024 04:03:29 +0800 Subject: [PATCH 67/83] [Test] Fix throat chop and gorilla tactics tests (#4140) --- src/test/abilities/gorilla_tactics.test.ts | 17 ++++++++--------- src/test/moves/throat_chop.test.ts | 6 ++++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/test/abilities/gorilla_tactics.test.ts b/src/test/abilities/gorilla_tactics.test.ts index e772088ea97..df698194323 100644 --- a/src/test/abilities/gorilla_tactics.test.ts +++ b/src/test/abilities/gorilla_tactics.test.ts @@ -30,7 +30,7 @@ describe("Abilities - Gorilla Tactics", () => { .enemyMoveset([Moves.SPLASH, Moves.DISABLE]) .enemySpecies(Species.MAGIKARP) .enemyLevel(30) - .moveset([Moves.SPLASH, Moves.TACKLE]) + .moveset([Moves.SPLASH, Moves.TACKLE, Moves.GROWL]) .ability(Abilities.GORILLA_TACTICS); }); @@ -57,22 +57,21 @@ describe("Abilities - Gorilla Tactics", () => { const darmanitan = game.scene.getPlayerPokemon()!; const enemy = game.scene.getEnemyPokemon()!; - game.move.select(Moves.SPLASH); + // First turn, lock move to Growl + game.move.select(Moves.GROWL); + await game.forceEnemyMove(Moves.SPLASH); - await game.phaseInterceptor.to("TurnEndPhase"); - - // Turn where Tackle is interrupted by Disable + // Second turn, Growl is interrupted by Disable await game.toNextTurn(); - game.move.select(Moves.SPLASH); + game.move.select(Moves.GROWL); await game.forceEnemyMove(Moves.DISABLE); - await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.phaseInterceptor.to("TurnEndPhase"); - expect(enemy.hp).toBe(enemy.getMaxHp()); + expect(enemy.getStatStage(Stat.ATK)).toBe(-1); // Only the effect of the first Growl should be applied - // Turn where Struggle is used + // Third turn, Struggle is used await game.toNextTurn(); game.move.select(Moves.TACKLE); diff --git a/src/test/moves/throat_chop.test.ts b/src/test/moves/throat_chop.test.ts index 151aec58b38..cb34b4bafff 100644 --- a/src/test/moves/throat_chop.test.ts +++ b/src/test/moves/throat_chop.test.ts @@ -36,12 +36,14 @@ describe("Moves - Throat Chop", () => { it("prevents the target from using sound-based moves for two turns", async () => { await game.classicMode.startBattle([Species.MAGIKARP]); + const enemy = game.scene.getEnemyPokemon()!; + game.move.select(Moves.GROWL); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); // First turn, move is interrupted await game.phaseInterceptor.to("TurnEndPhase"); - expect(game.scene.getPlayerPokemon()?.getStatStage(Stat.ATK)).toBe(0); + expect(enemy.getStatStage(Stat.ATK)).toBe(0); // Second turn, struggle if no valid moves await game.toNextTurn(); @@ -50,6 +52,6 @@ describe("Moves - Throat Chop", () => { await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.phaseInterceptor.to("MoveEndPhase"); - expect(game.scene.getEnemyPokemon()!.isFullHp()).toBe(false); + expect(enemy.isFullHp()).toBe(false); }, TIMEOUT); }); From a919b9c0afc0ea3d49af2aff00bfb503ccc497fe Mon Sep 17 00:00:00 2001 From: Raidette <73134872+Raidette@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:35:04 +0200 Subject: [PATCH 68/83] [Move] Implement After You (#1789) * Complete after you implementation (no localization) * reset override changes * Remove hardcoded English text, add tests * Fix test * Make sure phases occur in the correct order * fix after-you issues - fix i18n interpolation ot state "target name" and not "pokemon name" as the target takes the offer, not the user - fix some tsdocs - add override to apply - update scene.findPhase to be able to use generic types. Add tsdocs * add move-trigger.afterYou for DE * fix after_you.test.ts --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- src/battle-scene.ts | 10 ++++- src/data/move.ts | 35 ++++++++++++++++- src/locales/de/move-trigger.json | 3 +- src/locales/en/move-trigger.json | 5 ++- src/test/moves/after_you.test.ts | 65 ++++++++++++++++++++++++++++++++ 5 files changed, 112 insertions(+), 6 deletions(-) create mode 100644 src/test/moves/after_you.test.ts diff --git a/src/battle-scene.ts b/src/battle-scene.ts index ff4258a13f5..72778fa8589 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -2193,8 +2193,14 @@ export default class BattleScene extends SceneBase { return true; } - findPhase(phaseFilter: (phase: Phase) => boolean): Phase | undefined { - return this.phaseQueue.find(phaseFilter); + /** + * Find a specific {@linkcode Phase} in the phase queue. + * + * @param phaseFilter filter function to use to find the wanted phase + * @returns the found phase or undefined if none found + */ + findPhase

(phaseFilter: (phase: P) => boolean): P | undefined { + return this.phaseQueue.find(phaseFilter) as P; } tryReplacePhase(phaseFilter: (phase: Phase) => boolean, phase: Phase): boolean { diff --git a/src/data/move.ts b/src/data/move.ts index d9e385fdd0e..7800d6df12a 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -6272,12 +6272,42 @@ export class VariableTargetAttr extends MoveAttr { } } +/** + * Attribute for {@linkcode Moves.AFTER_YOU} + * + * [After You - Move | Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/After_You_(move)) + */ +export class AfterYouAttr extends MoveEffectAttr { + /** + * Allows the target of this move to act right after the user. + * + * @param user {@linkcode Pokemon} that is using the move. + * @param target {@linkcode Pokemon} that will move right after this move is used. + * @param move {@linkcode Move} {@linkcode Moves.AFTER_YOU} + * @param _args N/A + * @returns true + */ + override apply(user: Pokemon, target: Pokemon, _move: Move, _args: any[]): boolean { + user.scene.queueMessage(i18next.t("moveTriggers:afterYou", {targetName: getPokemonNameWithAffix(target)})); + + //Will find next acting phase of the targeted pokémon, delete it and queue it next on successful delete. + const nextAttackPhase = target.scene.findPhase((phase) => phase.pokemon === target); + if (nextAttackPhase && target.scene.tryRemovePhase((phase: MovePhase) => phase.pokemon === target)) { + target.scene.prependToPhase(new MovePhase(target.scene, target, [...nextAttackPhase.targets], nextAttackPhase.move), MovePhase); + } + + return true; + } +} + const failOnGravityCondition: MoveConditionFunc = (user, target, move) => !user.scene.arena.getTag(ArenaTagType.GRAVITY); const failOnBossCondition: MoveConditionFunc = (user, target, move) => !target.isBossImmune(); const failOnMaxCondition: MoveConditionFunc = (user, target, move) => !target.isMax(); +const failIfSingleBattle: MoveConditionFunc = (user, target, move) => user.scene.currentBattle.double; + const failIfDampCondition: MoveConditionFunc = (user, target, move) => { const cancelled = new Utils.BooleanHolder(false); user.scene.getField(true).map(p=>applyAbAttrs(FieldPreventExplosiveMovesAbAttr, p, cancelled)); @@ -7925,7 +7955,10 @@ export function initMoves() { .attr(AbilityGiveAttr), new StatusMove(Moves.AFTER_YOU, Type.NORMAL, -1, 15, -1, 0, 5) .ignoresProtect() - .unimplemented(), + .target(MoveTarget.NEAR_OTHER) + .condition(failIfSingleBattle) + .condition((user, target, move) => !target.turnData.acted) + .attr(AfterYouAttr), new AttackMove(Moves.ROUND, Type.NORMAL, MoveCategory.SPECIAL, 60, 100, 15, -1, 0, 5) .soundBased() .partial(), diff --git a/src/locales/de/move-trigger.json b/src/locales/de/move-trigger.json index 61283c9e62e..01b22429fb3 100644 --- a/src/locales/de/move-trigger.json +++ b/src/locales/de/move-trigger.json @@ -66,5 +66,6 @@ "revivalBlessing": "{{pokemonName}} ist wieder fit und kampfbereit!", "swapArenaTags": "{{pokemonName}} hat die Effekte, die auf den beiden Seiten des Kampffeldes wirken, miteinander getauscht!", "exposedMove": "{{pokemonName}} erkennt {{targetPokemonName}}!", - "safeguard": "{{targetName}} wird durch Bodyguard geschützt!" + "safeguard": "{{targetName}} wird durch Bodyguard geschützt!", + "afterYou": "{{targetName}} lässt sich auf Galanterie ein!" } diff --git a/src/locales/en/move-trigger.json b/src/locales/en/move-trigger.json index 867905c5a9f..375ea354d33 100644 --- a/src/locales/en/move-trigger.json +++ b/src/locales/en/move-trigger.json @@ -67,5 +67,6 @@ "revivalBlessing": "{{pokemonName}} was revived!", "swapArenaTags": "{{pokemonName}} swapped the battle effects affecting each side of the field!", "exposedMove": "{{pokemonName}} identified\n{{targetPokemonName}}!", - "safeguard": "{{targetName}} is protected by Safeguard!" -} \ No newline at end of file + "safeguard": "{{targetName}} is protected by Safeguard!", + "afterYou": "{{pokemonName}} took the kind offer!" +} diff --git a/src/test/moves/after_you.test.ts b/src/test/moves/after_you.test.ts new file mode 100644 index 00000000000..efce1b28a17 --- /dev/null +++ b/src/test/moves/after_you.test.ts @@ -0,0 +1,65 @@ +import { BattlerIndex } from "#app/battle"; +import { Abilities } from "#app/enums/abilities"; +import { MoveResult } from "#app/field/pokemon"; +import { MovePhase } from "#app/phases/move-phase"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/utils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +const TIMEOUT = 20 * 1000; + +describe("Moves - After You", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .battleType("double") + .enemyLevel(5) + .enemySpecies(Species.PIKACHU) + .enemyAbility(Abilities.BALL_FETCH) + .enemyMoveset(Moves.SPLASH) + .ability(Abilities.BALL_FETCH) + .moveset([Moves.AFTER_YOU, Moves.SPLASH]); + }); + + it("makes the target move immediately after the user", async () => { + await game.classicMode.startBattle([Species.REGIELEKI, Species.SHUCKLE]); + + game.move.select(Moves.AFTER_YOU, 0, BattlerIndex.PLAYER_2); + game.move.select(Moves.SPLASH, 1); + + await game.phaseInterceptor.to("MoveEffectPhase"); + await game.phaseInterceptor.to(MovePhase, false); + const phase = game.scene.getCurrentPhase() as MovePhase; + expect(phase.pokemon).toBe(game.scene.getPlayerField()[1]); + await game.phaseInterceptor.to("MoveEndPhase"); + }, TIMEOUT); + + it("fails if target already moved", async () => { + game.override.enemySpecies(Species.SHUCKLE); + await game.classicMode.startBattle([Species.REGIELEKI, Species.PIKACHU]); + + game.move.select(Moves.SPLASH); + game.move.select(Moves.AFTER_YOU, 1, BattlerIndex.PLAYER); + + await game.phaseInterceptor.to("MoveEndPhase"); + await game.phaseInterceptor.to("MoveEndPhase"); + await game.phaseInterceptor.to(MovePhase); + + expect(game.scene.getPlayerField()[1].getLastXMoves(1)[0].result).toBe(MoveResult.FAIL); + }, TIMEOUT); +}); From ebb09dda34f0d5a369939684c36665332404baf5 Mon Sep 17 00:00:00 2001 From: "Amani H." <109637146+xsn34kzx@users.noreply.github.com> Date: Tue, 10 Sep 2024 05:37:23 -0400 Subject: [PATCH 69/83] [Hotfix] Fix Lures Refreshing on Reload (#4146) --- src/system/version-converter.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/system/version-converter.ts b/src/system/version-converter.ts index 0aa2b16b695..d54238812c8 100644 --- a/src/system/version-converter.ts +++ b/src/system/version-converter.ts @@ -31,7 +31,7 @@ export function applySessionDataPatches(data: SessionSaveData) { // From [ stat, battlesLeft ] to [ stat, maxBattles, battleCount ] m.args = [ newStat, 5, m.args[1] ]; - } else if (m.className === "DoubleBattleChanceBoosterModifier") { + } else if (m.className === "DoubleBattleChanceBoosterModifier" && m.args.length === 1) { let maxBattles: number; switch (m.typeId) { case "MAX_LURE": @@ -53,6 +53,8 @@ export function applySessionDataPatches(data: SessionSaveData) { data.enemyModifiers.forEach((m) => { if (m.className === "PokemonBaseStatModifier") { m.className = "BaseStatModifier"; + } else if (m.className === "PokemonResetNegativeStatStageModifier") { + m.className = "ResetNegativeStatStageModifier"; } }); } From 7dd18320729ff94f84e682e5a1c73d6d6238334d Mon Sep 17 00:00:00 2001 From: James Diefenbach <105332964+j-diefenbach@users.noreply.github.com> Date: Tue, 10 Sep 2024 23:23:13 +1000 Subject: [PATCH 70/83] [Hotfix] fix UI transition causing unusual freezes after egg summary shown (#4126) * console logs n stuff * fix bad ui transition for egg summary freeze bug (logs included) * cleanup egg lapse phase * touchup * add back removed whitespace * remove console logs --------- Co-authored-by: James Diefenbach --- src/phases/egg-summary-phase.ts | 6 +++--- src/ui/egg-summary-ui-handler.ts | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/phases/egg-summary-phase.ts b/src/phases/egg-summary-phase.ts index 1aa432829a1..75c6939daf1 100644 --- a/src/phases/egg-summary-phase.ts +++ b/src/phases/egg-summary-phase.ts @@ -43,9 +43,9 @@ export class EggSummaryPhase extends Phase { } end() { - this.eggHatchHandler.clear(); - this.scene.ui.setModeForceTransition(Mode.MESSAGE).then(() => {}); this.scene.time.delayedCall(250, () => this.scene.setModifiersVisible(true)); - super.end(); + this.scene.ui.setModeForceTransition(Mode.MESSAGE).then(() => { + super.end(); + }); } } diff --git a/src/ui/egg-summary-ui-handler.ts b/src/ui/egg-summary-ui-handler.ts index af82ab33438..52516196093 100644 --- a/src/ui/egg-summary-ui-handler.ts +++ b/src/ui/egg-summary-ui-handler.ts @@ -97,6 +97,7 @@ export default class EggSummaryUiHandler extends MessageUiHandler { this.pokemonIconsContainer.removeAll(true); this.eggHatchBg.setVisible(false); this.getUi().hideTooltip(); + // Note: Questions on garbage collection go to @frutescens const activeKeys = this.scene.getActiveKeys(); // Removing unnecessary sprites from animation manager @@ -117,7 +118,6 @@ export default class EggSummaryUiHandler extends MessageUiHandler { this.eggHatchData.length = 0; // Removes Pokemon icons in EggSummaryUiHandler this.iconAnimHandler.removeAll(); - console.log("Egg Summary Handler cleared"); } /** @@ -256,7 +256,6 @@ export default class EggSummaryUiHandler extends MessageUiHandler { if (phase instanceof EggSummaryPhase) { phase.end(); } - ui.revertMode(); success = true; } else { const count = this.eggHatchData.length; From 9c4c19b5fb1870911e420f692644374ed1c6fe97 Mon Sep 17 00:00:00 2001 From: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com> Date: Tue, 10 Sep 2024 16:12:17 +0200 Subject: [PATCH 71/83] [UI Bug] Fix HA icon not always showing in egg summary screen (#4150) --- src/ui/egg-summary-ui-handler.ts | 104 +++++++++++++++++-------------- src/ui/pokemon-info-container.ts | 2 +- 2 files changed, 57 insertions(+), 49 deletions(-) diff --git a/src/ui/egg-summary-ui-handler.ts b/src/ui/egg-summary-ui-handler.ts index af82ab33438..1d18e75f530 100644 --- a/src/ui/egg-summary-ui-handler.ts +++ b/src/ui/egg-summary-ui-handler.ts @@ -29,8 +29,10 @@ export default class EggSummaryUiHandler extends MessageUiHandler { private summaryContainer: Phaser.GameObjects.Container; /** container for the mini pokemon sprites */ private pokemonIconSpritesContainer: Phaser.GameObjects.Container; - /** container for the icons displayed alongside the mini icons (e.g. shiny, HA capsule) */ + /** container for the icons displayed on top of the mini pokemon sprites (e.g. shiny, HA capsule) */ private pokemonIconsContainer: Phaser.GameObjects.Container; + /** container for the elements displayed behind the mini pokemon sprites (e.g. egg rarity bg) */ + private pokemonBackgroundContainer: Phaser.GameObjects.Container; /** hatch info container that displays the current pokemon / hatch (main element on left hand side) */ private infoContainer: PokemonHatchInfoContainer; /** handles jumping animations for the pokemon sprite icons */ @@ -71,15 +73,17 @@ export default class EggSummaryUiHandler extends MessageUiHandler { this.eggHatchBg.setOrigin(0, 0); this.eggHatchContainer.add(this.eggHatchBg); - this.pokemonIconsContainer = this.scene.add.container(iconContainerX, iconContainerY); - this.pokemonIconSpritesContainer = this.scene.add.container(iconContainerX, iconContainerY); - this.summaryContainer.add(this.pokemonIconsContainer); - this.summaryContainer.add(this.pokemonIconSpritesContainer); - this.cursorObj = this.scene.add.image(0, 0, "select_cursor"); this.cursorObj.setOrigin(0, 0); this.summaryContainer.add(this.cursorObj); + this.pokemonIconSpritesContainer = this.scene.add.container(iconContainerX, iconContainerY); + this.pokemonIconsContainer = this.scene.add.container(iconContainerX, iconContainerY); + this.pokemonBackgroundContainer = this.scene.add.container(iconContainerX, iconContainerY); + this.summaryContainer.add(this.pokemonBackgroundContainer); + this.summaryContainer.add(this.pokemonIconSpritesContainer); + this.summaryContainer.add(this.pokemonIconsContainer); + this.infoContainer = new PokemonHatchInfoContainer(this.scene, this.summaryContainer); this.infoContainer.setup(); this.infoContainer.changeToEggSummaryLayout(); @@ -95,6 +99,7 @@ export default class EggSummaryUiHandler extends MessageUiHandler { this.summaryContainer.setVisible(false); this.pokemonIconSpritesContainer.removeAll(true); this.pokemonIconsContainer.removeAll(true); + this.pokemonBackgroundContainer.removeAll(true); this.eggHatchBg.setVisible(false); this.getUi().hideTooltip(); // Note: Questions on garbage collection go to @frutescens @@ -164,25 +169,25 @@ export default class EggSummaryUiHandler extends MessageUiHandler { const offset = 2; const rightSideX = 12; - const bg = this.scene.add.image(x+2, y+5, "passive_bg"); - bg.setOrigin(0, 0); - bg.setScale(0.75); - bg.setVisible(true); - this.pokemonIconsContainer.add(bg); + const rarityBg = this.scene.add.image(x + 2, y + 5, "passive_bg"); + rarityBg.setOrigin(0, 0); + rarityBg.setScale(0.75); + rarityBg.setVisible(true); + this.pokemonBackgroundContainer.add(rarityBg); // set tint for passive bg switch (getEggTierForSpecies(displayPokemon.species)) { case EggTier.COMMON: - bg.setVisible(false); + rarityBg.setVisible(false); break; case EggTier.GREAT: - bg.setTint(0xabafff); + rarityBg.setTint(0xabafff); break; case EggTier.ULTRA: - bg.setTint(0xffffaa); + rarityBg.setTint(0xffffaa); break; case EggTier.MASTER: - bg.setTint(0xdfffaf); + rarityBg.setTint(0xdfffaf); break; } const species = displayPokemon.species; @@ -192,35 +197,31 @@ export default class EggSummaryUiHandler extends MessageUiHandler { const isShiny = displayPokemon.shiny; // set pokemon icon (and replace with base sprite if there is a mismatch) - const icon = this.scene.add.sprite(x - offset, y + offset, species.getIconAtlasKey(formIndex, isShiny, variant)); - icon.setScale(0.5); - icon.setOrigin(0, 0); - icon.setFrame(species.getIconId(female, formIndex, isShiny, variant)); + const pokemonIcon = this.scene.add.sprite(x - offset, y + offset, species.getIconAtlasKey(formIndex, isShiny, variant)); + pokemonIcon.setScale(0.5); + pokemonIcon.setOrigin(0, 0); + pokemonIcon.setFrame(species.getIconId(female, formIndex, isShiny, variant)); - if (icon.frame.name !== species.getIconId(female, formIndex, isShiny, variant)) { + if (pokemonIcon.frame.name !== species.getIconId(female, formIndex, isShiny, variant)) { console.log(`${species.name}'s variant icon does not exist. Replacing with default.`); - icon.setTexture(species.getIconAtlasKey(formIndex, false, variant)); - icon.setFrame(species.getIconId(female, formIndex, false, variant)); + pokemonIcon.setTexture(species.getIconAtlasKey(formIndex, false, variant)); + pokemonIcon.setFrame(species.getIconId(female, formIndex, false, variant)); } - this.pokemonIconSpritesContainer.add(icon); - this.iconAnimHandler.addOrUpdate(icon, PokemonIconAnimMode.NONE); + this.pokemonIconSpritesContainer.add(pokemonIcon); - const shiny = this.scene.add.image(x + rightSideX, y + offset * 2, "shiny_star_small"); - shiny.setScale(0.5); - shiny.setVisible(displayPokemon.shiny); - shiny.setTint(getVariantTint(displayPokemon.variant)); - this.pokemonIconsContainer.add(shiny); + const shinyIcon = this.scene.add.image(x + rightSideX, y + offset, "shiny_star_small"); + shinyIcon.setOrigin(0, 0); + shinyIcon.setScale(0.5); + shinyIcon.setVisible(displayPokemon.shiny); + shinyIcon.setTint(getVariantTint(displayPokemon.variant)); + this.pokemonIconsContainer.add(shinyIcon); - const ha = this.scene.add.image(x + rightSideX, y + 7, "ha_capsule"); - ha.setScale(0.5); - ha.setVisible((displayPokemon.hasAbility(displayPokemon.species.abilityHidden))); - this.pokemonIconsContainer.add(ha); + const haIcon = this.scene.add.image(x + rightSideX, y + offset * 4, "ha_capsule"); + haIcon.setOrigin(0, 0); + haIcon.setScale(0.5); + haIcon.setVisible(displayPokemon.abilityIndex === 2); + this.pokemonIconsContainer.add(haIcon); - const pb = this.scene.add.image(x + rightSideX, y + offset * 7, "icon_owned"); - pb.setOrigin(0, 0); - pb.setScale(0.5); - - // add animation for new unlocks (new catch or new shiny or new form) const dexEntry = value.dexEntryBeforeUpdate; const caughtAttr = dexEntry.caughtAttr; const newShiny = BigInt(1 << (displayPokemon.shiny ? 1 : 0)); @@ -228,17 +229,24 @@ export default class EggSummaryUiHandler extends MessageUiHandler { const newShinyOrVariant = ((newShiny & caughtAttr) === BigInt(0)) || ((newVariant & caughtAttr) === BigInt(0)); const newForm = (BigInt(1 << displayPokemon.formIndex) * DexAttr.DEFAULT_FORM & caughtAttr) === BigInt(0); - pb.setVisible(!caughtAttr || newForm); - if (!caughtAttr || newShinyOrVariant || newForm) { - this.iconAnimHandler.addOrUpdate(icon, PokemonIconAnimMode.PASSIVE); - } - this.pokemonIconsContainer.add(pb); + const pokeballIcon = this.scene.add.image(x + rightSideX, y + offset * 7, "icon_owned"); + pokeballIcon.setOrigin(0, 0); + pokeballIcon.setScale(0.5); + pokeballIcon.setVisible(!caughtAttr || newForm); + this.pokemonIconsContainer.add(pokeballIcon); - const em = this.scene.add.image(x, y + offset, "icon_egg_move"); - em.setOrigin(0, 0); - em.setScale(0.5); - em.setVisible(value.eggMoveUnlocked); - this.pokemonIconsContainer.add(em); + const eggMoveIcon = this.scene.add.image(x, y + offset, "icon_egg_move"); + eggMoveIcon.setOrigin(0, 0); + eggMoveIcon.setScale(0.5); + eggMoveIcon.setVisible(value.eggMoveUnlocked); + this.pokemonIconsContainer.add(eggMoveIcon); + + // add animation to the Pokemon sprite for new unlocks (new catch, new shiny or new form) + if (!caughtAttr || newShinyOrVariant || newForm) { + this.iconAnimHandler.addOrUpdate(pokemonIcon, PokemonIconAnimMode.PASSIVE); + } else { + this.iconAnimHandler.addOrUpdate(pokemonIcon, PokemonIconAnimMode.NONE); + } }); this.setCursor(0); diff --git a/src/ui/pokemon-info-container.ts b/src/ui/pokemon-info-container.ts index 49bfd4d7293..3c54e529d43 100644 --- a/src/ui/pokemon-info-container.ts +++ b/src/ui/pokemon-info-container.ts @@ -262,7 +262,7 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { this.pokemonFormText.disableInteractive(); } - const abilityTextStyle = pokemon.abilityIndex === (pokemon.species.ability2 ? 2 : 1) ? TextStyle.MONEY : TextStyle.WINDOW; + const abilityTextStyle = pokemon.abilityIndex === 2 ? TextStyle.MONEY : TextStyle.WINDOW; this.pokemonAbilityText.setText(pokemon.getAbility(true).name); this.pokemonAbilityText.setColor(getTextColor(abilityTextStyle, false, this.scene.uiTheme)); this.pokemonAbilityText.setShadowColor(getTextColor(abilityTextStyle, true, this.scene.uiTheme)); From 4b8083211ab114c94d7f194494a168bf353647b1 Mon Sep 17 00:00:00 2001 From: Madmadness65 <59298170+Madmadness65@users.noreply.github.com> Date: Tue, 10 Sep 2024 09:13:16 -0500 Subject: [PATCH 72/83] [P3 Bug] Fix Transform SFX not playing on quiet form changes (#4144) --- src/phases/quiet-form-change-phase.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/phases/quiet-form-change-phase.ts b/src/phases/quiet-form-change-phase.ts index 6a1d31d137d..dde500e156a 100644 --- a/src/phases/quiet-form-change-phase.ts +++ b/src/phases/quiet-form-change-phase.ts @@ -65,7 +65,7 @@ export class QuietFormChangePhase extends BattlePhase { pokemonFormTintSprite.setVisible(false); pokemonFormTintSprite.setTintFill(0xFFFFFF); - this.scene.playSound("PRSFX- Transform"); + this.scene.playSound("battle_anims/PRSFX- Transform"); this.scene.tweens.add({ targets: pokemonTintSprite, From 5bf21a4f7519d2a8850e6ea5b4c7e12b9d89909d Mon Sep 17 00:00:00 2001 From: PigeonBar <56974298+PigeonBar@users.noreply.github.com> Date: Tue, 10 Sep 2024 10:15:07 -0400 Subject: [PATCH 73/83] [Bug] Fix rare egg move and species rates for Manaphy eggs (#4125) --- src/data/egg.ts | 12 ++- src/test/eggs/manaphy-egg.test.ts | 118 ++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+), 3 deletions(-) create mode 100644 src/test/eggs/manaphy-egg.test.ts diff --git a/src/data/egg.ts b/src/data/egg.ts index ce27030ebef..1cd5c65fc18 100644 --- a/src/data/egg.ts +++ b/src/data/egg.ts @@ -222,7 +222,7 @@ export class Egg { let pokemonSpecies = getPokemonSpecies(this._species); // Special condition to have Phione eggs also have a chance of generating Manaphy - if (this._species === Species.PHIONE) { + if (this._species === Species.PHIONE && this._sourceType === EggSourceType.SAME_SPECIES_EGG) { pokemonSpecies = getPokemonSpecies(Utils.randSeedInt(MANAPHY_EGG_MANAPHY_RATE) ? Species.PHIONE : Species.MANAPHY); } @@ -326,7 +326,8 @@ export class Egg { break; } - return Utils.randSeedInt(baseChance * Math.pow(2, 3 - this.tier)) ? Utils.randSeedInt(3) : 3; + const tierMultiplier = this.isManaphyEgg() ? 2 : Math.pow(2, 3 - this.tier); + return Utils.randSeedInt(baseChance * tierMultiplier) ? Utils.randSeedInt(3) : 3; } private getEggTierDefaultHatchWaves(eggTier?: EggTier): number { @@ -361,7 +362,12 @@ export class Egg { * the species that was the legendary focus at the time */ if (this.isManaphyEgg()) { - const rand = Utils.randSeedInt(MANAPHY_EGG_MANAPHY_RATE); + /** + * Adding a technicality to make unit tests easier: By making this check pass + * when Utils.randSeedInt(8) = 1, and by making the generatePlayerPokemon() species + * check pass when Utils.randSeedInt(8) = 0, we can tell them apart during tests. + */ + const rand = (Utils.randSeedInt(MANAPHY_EGG_MANAPHY_RATE) !== 1); return rand ? Species.PHIONE : Species.MANAPHY; } else if (this.tier === EggTier.MASTER && this._sourceType === EggSourceType.GACHA_LEGENDARY) { diff --git a/src/test/eggs/manaphy-egg.test.ts b/src/test/eggs/manaphy-egg.test.ts new file mode 100644 index 00000000000..257bf330bb8 --- /dev/null +++ b/src/test/eggs/manaphy-egg.test.ts @@ -0,0 +1,118 @@ +import { Egg } from "#app/data/egg"; +import { EggSourceType } from "#app/enums/egg-source-types"; +import { EggTier } from "#app/enums/egg-type"; +import { Species } from "#enums/species"; +import GameManager from "#test/utils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; + +describe("Manaphy Eggs", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + const EGG_HATCH_COUNT: integer = 48; + let rngSweepProgress: number = 0; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + game = new GameManager(phaserGame); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + vi.restoreAllMocks(); + }); + + beforeEach(async () => { + await game.importData("src/test/utils/saves/everything.prsv"); + + /** + * In our tests, we will perform an "RNG sweep" by letting rngSweepProgress + * increase uniformly from 0 to 1 in order to get a uniform sample of the + * possible RNG outcomes. This will let us quickly and consistently find + * the probability of each RNG outcome. + */ + vi.spyOn(Phaser.Math.RND, "realInRange").mockImplementation((min: number, max: number) => { + return rngSweepProgress * (max - min) + min; + }); + }); + + it("should have correct Manaphy rates and Rare Egg Move rates, from the egg gacha", () => { + const scene = game.scene; + + let manaphyCount = 0; + let phioneCount = 0; + let rareEggMoveCount = 0; + for (let i = 0; i < EGG_HATCH_COUNT; i++) { + rngSweepProgress = (2 * i + 1) / (2 * EGG_HATCH_COUNT); + + const newEgg = new Egg({ scene, tier: EggTier.COMMON, sourceType: EggSourceType.GACHA_SHINY, id: 204 }); + const newHatch = newEgg.generatePlayerPokemon(scene); + if (newHatch.species.speciesId === Species.MANAPHY) { + manaphyCount++; + } else if (newHatch.species.speciesId === Species.PHIONE) { + phioneCount++; + } + if (newEgg.eggMoveIndex === 3) { + rareEggMoveCount++; + } + } + + expect(manaphyCount + phioneCount).toBe(EGG_HATCH_COUNT); + expect(manaphyCount).toBe(1/8 * EGG_HATCH_COUNT); + expect(rareEggMoveCount).toBe(1/12 * EGG_HATCH_COUNT); + }); + + it("should have correct Manaphy rates and Rare Egg Move rates, from Phione species eggs", () => { + const scene = game.scene; + + let manaphyCount = 0; + let phioneCount = 0; + let rareEggMoveCount = 0; + for (let i = 0; i < EGG_HATCH_COUNT; i++) { + rngSweepProgress = (2 * i + 1) / (2 * EGG_HATCH_COUNT); + + const newEgg = new Egg({ scene, species: Species.PHIONE, sourceType: EggSourceType.SAME_SPECIES_EGG }); + const newHatch = newEgg.generatePlayerPokemon(scene); + if (newHatch.species.speciesId === Species.MANAPHY) { + manaphyCount++; + } else if (newHatch.species.speciesId === Species.PHIONE) { + phioneCount++; + } + if (newEgg.eggMoveIndex === 3) { + rareEggMoveCount++; + } + } + + expect(manaphyCount + phioneCount).toBe(EGG_HATCH_COUNT); + expect(manaphyCount).toBe(1/8 * EGG_HATCH_COUNT); + expect(rareEggMoveCount).toBe(1/6 * EGG_HATCH_COUNT); + }); + + it("should have correct Manaphy rates and Rare Egg Move rates, from Manaphy species eggs", () => { + const scene = game.scene; + + let manaphyCount = 0; + let phioneCount = 0; + let rareEggMoveCount = 0; + for (let i = 0; i < EGG_HATCH_COUNT; i++) { + rngSweepProgress = (2 * i + 1) / (2 * EGG_HATCH_COUNT); + + const newEgg = new Egg({ scene, species: Species.MANAPHY, sourceType: EggSourceType.SAME_SPECIES_EGG }); + const newHatch = newEgg.generatePlayerPokemon(scene); + if (newHatch.species.speciesId === Species.MANAPHY) { + manaphyCount++; + } else if (newHatch.species.speciesId === Species.PHIONE) { + phioneCount++; + } + if (newEgg.eggMoveIndex === 3) { + rareEggMoveCount++; + } + } + + expect(phioneCount).toBe(0); + expect(manaphyCount).toBe(EGG_HATCH_COUNT); + expect(rareEggMoveCount).toBe(1/6 * EGG_HATCH_COUNT); + }); +}); From bd4729b4c5f9c38addfadf662f002572b95b9fa9 Mon Sep 17 00:00:00 2001 From: "Amani H." <109637146+xsn34kzx@users.noreply.github.com> Date: Tue, 10 Sep 2024 11:53:40 -0400 Subject: [PATCH 74/83] [Hotfix] Fix Lapsing Modifiers Not Rolling (#4152) --- src/modifier/modifier.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index c1d58a7bf39..1cd8ddf57d0 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -367,6 +367,10 @@ export abstract class LapsingPersistentModifier extends PersistentModifier { return container; } + getIconStackText(_scene: BattleScene, _virtual?: boolean): Phaser.GameObjects.BitmapText | null { + return null; + } + getBattleCount(): number { return this.battleCount; } @@ -384,7 +388,8 @@ export abstract class LapsingPersistentModifier extends PersistentModifier { } getMaxStackCount(_scene: BattleScene, _forThreshold?: boolean): number { - return 1; + // Must be an abitrary number greater than 1 + return 2; } } @@ -787,7 +792,7 @@ export class TerastallizeModifier extends LapsingPokemonHeldItemModifier { /** * Modifier used for held items, specifically vitamins like Carbos, Hp Up, etc., that * increase the value of a given {@linkcode PermanentStat}. - * @extends LapsingPersistentModifier + * @extends PokemonHeldItemModifier * @see {@linkcode apply} */ export class BaseStatModifier extends PokemonHeldItemModifier { From 150ab3d1b29a7191bfef6d2107e3ffe43a38aa54 Mon Sep 17 00:00:00 2001 From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com> Date: Tue, 10 Sep 2024 11:54:23 -0400 Subject: [PATCH 75/83] [UI/UX] Make "CH-CHING!" sound when unlocking passive (#4151) * Make "CH-CHING!" sound when unlocking passive * Remove unused parameters in line above sound --- src/ui/starter-select-ui-handler.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index e1269499b10..89f1b87bcf4 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -1724,7 +1724,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } }); ui.setMode(Mode.STARTER_SELECT); - this.setSpeciesDetails(this.lastSpecies, undefined, undefined, undefined, undefined, undefined, undefined); + this.setSpeciesDetails(this.lastSpecies); + this.scene.playSound("se/buy"); // if starterContainer exists, update the passive background if (starterContainer) { From d1b058fe3e4224343283a74e44d98589d6702a20 Mon Sep 17 00:00:00 2001 From: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com> Date: Tue, 10 Sep 2024 20:00:50 +0200 Subject: [PATCH 76/83] [UI] fix candy upgrade icon not updating after purchasing eggs (#4153) --- src/ui/starter-select-ui-handler.ts | 53 +++++++++++++++++------------ 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index 89f1b87bcf4..0c3d8de61b0 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -1220,6 +1220,19 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } } + /** + * Update the display of candy upgrade icons or animations for the given StarterContainer + * @param starterContainer the container for the Pokemon to update + */ + updateCandyUpgradeDisplay(starterContainer: StarterContainer) { + if (this.isUpgradeIconEnabled() ) { + this.setUpgradeIcon(starterContainer); + } + if (this.isUpgradeAnimationEnabled()) { + this.setUpgradeAnimation(starterContainer.icon, this.lastSpecies, true); + } + } + /** * Processes an {@linkcode CandyUpgradeNotificationChangedEvent} sent when the corresponding setting changes * @param event {@linkcode Event} sent by the callback @@ -1624,7 +1637,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { } }); } - const candyCount = starterData.candyCount; + const passiveAttr = starterData.passiveAttr; if (passiveAttr & PassiveAttr.UNLOCKED) { // this is for enabling and disabling the passive if (!(passiveAttr & PassiveAttr.ENABLED)) { @@ -1705,8 +1718,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler { return true; } }); - const showUseCandies = () => { // this lets you use your candies + + // Purchases with Candy + const candyCount = starterData.candyCount; + const showUseCandies = () => { const options: any[] = []; // TODO: add proper type + + // Unlock passive option if (!(passiveAttr & PassiveAttr.UNLOCKED)) { const passiveCost = getPassiveCandyCount(speciesStarters[this.lastSpecies.speciesId]); options.push({ @@ -1727,16 +1745,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler { this.setSpeciesDetails(this.lastSpecies); this.scene.playSound("se/buy"); - // if starterContainer exists, update the passive background + // update the passive background and icon/animation for available upgrade if (starterContainer) { - // Update the candy upgrade display - if (this.isUpgradeIconEnabled() ) { - this.setUpgradeIcon(starterContainer); - } - if (this.isUpgradeAnimationEnabled()) { - this.setUpgradeAnimation(starterContainer.icon, this.lastSpecies, true); - } - + this.updateCandyUpgradeDisplay(starterContainer); starterContainer.starterPassiveBgs.setVisible(!!this.scene.gameData.starterData[this.lastSpecies.speciesId].passiveAttr); } return true; @@ -1747,6 +1758,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler { itemArgs: starterColors[this.lastSpecies.speciesId] }); } + + // Reduce cost option const valueReduction = starterData.valueReduction; if (valueReduction < valueReductionMax) { const reductionCost = getValueReductionCandyCounts(speciesStarters[this.lastSpecies.speciesId])[valueReduction]; @@ -1768,19 +1781,10 @@ export default class StarterSelectUiHandler extends MessageUiHandler { ui.setMode(Mode.STARTER_SELECT); this.scene.playSound("se/buy"); - // if starterContainer exists, update the value reduction background + // update the value label and icon/animation for available upgrade if (starterContainer) { this.updateStarterValueLabel(starterContainer); - - // If the notification setting is set to 'On', update the candy upgrade display - if (this.scene.candyUpgradeNotification === 2) { - if (this.isUpgradeIconEnabled() ) { - this.setUpgradeIcon(starterContainer); - } - if (this.isUpgradeAnimationEnabled()) { - this.setUpgradeAnimation(starterContainer.icon, this.lastSpecies, true); - } - } + this.updateCandyUpgradeDisplay(starterContainer); } return true; } @@ -1813,6 +1817,11 @@ export default class StarterSelectUiHandler extends MessageUiHandler { ui.setMode(Mode.STARTER_SELECT); this.scene.playSound("se/buy"); + // update the icon/animation for available upgrade + if (starterContainer) { + this.updateCandyUpgradeDisplay(starterContainer); + } + return true; } return false; From 14ace406344b02151ad7e1bdedcc3c77a599d04d Mon Sep 17 00:00:00 2001 From: flx-sta <50131232+flx-sta@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:34:50 -0700 Subject: [PATCH 77/83] [Misc] eslint rule to prevent `.js` imports (#4160) * add `eslint-plugin-import-x` module * add import eslint rules * remove .js extensions * rename account.spec to account.test * move fontFace.setup into `setupFiles` instead of importing it in `vitest.setup.ts` --- eslint.config.js | 7 +- package-lock.json | 200 ++++++++++++++++++ package.json | 1 + src/phases/weather-effect-phase.ts | 2 +- src/system/version-converter.ts | 2 +- src/test/{account.spec.ts => account.test.ts} | 0 .../double_battle_chance_booster.test.ts | 12 +- src/test/vitest.setup.ts | 1 - vitest.config.ts | 2 +- 9 files changed, 214 insertions(+), 13 deletions(-) rename src/test/{account.spec.ts => account.test.ts} (100%) diff --git a/eslint.config.js b/eslint.config.js index eeea38e3178..80e9e67b525 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,7 +1,7 @@ import tseslint from '@typescript-eslint/eslint-plugin'; import stylisticTs from '@stylistic/eslint-plugin-ts' import parser from '@typescript-eslint/parser'; -// import imports from 'eslint-plugin-import'; // Disabled due to not being compatible with eslint v9 +import importX from 'eslint-plugin-import-x'; export default [ { @@ -11,7 +11,7 @@ export default [ parser: parser }, plugins: { - // imports: imports.configs.recommended // Disabled due to not being compatible with eslint v9 + "import-x": importX, '@stylistic/ts': stylisticTs, '@typescript-eslint': tseslint }, @@ -39,7 +39,8 @@ export default [ }], "space-before-blocks": ["error", "always"], // Enforces a space before blocks "keyword-spacing": ["error", { "before": true, "after": true }], // Enforces spacing before and after keywords - "comma-spacing": ["error", { "before": false, "after": true }] // Enforces spacing after comma + "comma-spacing": ["error", { "before": false, "after": true }], // Enforces spacing after comma + "import-x/extensions": ["error", "never", { "json": "always" }], // Enforces no extension for imports unless json } } ] diff --git a/package-lock.json b/package-lock.json index 0605b299dab..4a447554819 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,6 +28,7 @@ "@vitest/coverage-istanbul": "^2.0.4", "dependency-cruiser": "^16.3.10", "eslint": "^9.7.0", + "eslint-plugin-import-x": "^4.2.1", "jsdom": "^24.0.0", "lefthook": "^1.6.12", "phaser3spectorjs": "^0.0.8", @@ -2505,6 +2506,19 @@ "node": ">=8" } }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -2687,6 +2701,155 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^3.2.7", + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import-x": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.2.1.tgz", + "integrity": "sha512-WWi2GedccIJa0zXxx3WDnTgouGQTtdYK1nhXMwywbqqAgB0Ov+p1pYBsWh3VaB0bvBOwLse6OfVII7jZD9xo5Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/utils": "^8.1.0", + "debug": "^4.3.4", + "doctrine": "^3.0.0", + "eslint-import-resolver-node": "^0.3.9", + "get-tsconfig": "^4.7.3", + "is-glob": "^4.0.3", + "minimatch": "^9.0.3", + "semver": "^7.6.3", + "stable-hash": "^0.0.4", + "tslib": "^2.6.3" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + } + }, + "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/scope-manager": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.5.0.tgz", + "integrity": "sha512-06JOQ9Qgj33yvBEx6tpC8ecP9o860rsR22hWMEd12WcTRrfaFgHr2RB/CA/B+7BMhHkXT4chg2MyboGdFGawYg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/visitor-keys": "8.5.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/types": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.5.0.tgz", + "integrity": "sha512-qjkormnQS5wF9pjSi6q60bKUHH44j2APxfh9TQRXK8wbYVeDYYdYJGIROL87LGZZ2gz3Rbmjc736qyL8deVtdw==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/typescript-estree": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.5.0.tgz", + "integrity": "sha512-vEG2Sf9P8BPQ+d0pxdfndw3xIXaoSjliG0/Ejk7UggByZPKXmJmw3GW5jV2gHNQNawBUyfahoSiCFVov0Ruf7Q==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/visitor-keys": "8.5.0", + "debug": "^4.3.4", + "fast-glob": "^3.3.2", + "is-glob": "^4.0.3", + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/utils": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.5.0.tgz", + "integrity": "sha512-6yyGYVL0e+VzGYp60wvkBHiqDWOpT63pdMV2CVG4LVDd5uR6q1qQN/7LafBZtAtNIn/mqXjsSeS5ggv/P0iECw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@typescript-eslint/scope-manager": "8.5.0", + "@typescript-eslint/types": "8.5.0", + "@typescript-eslint/typescript-estree": "8.5.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + } + }, + "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/visitor-keys": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.5.0.tgz", + "integrity": "sha512-yTPqMnbAZJNy2Xq2XU8AdtOW9tJIr+UQb64aXB9f3B1498Zx9JorVgFJcZpEc9UBuCCrdzKID2RGAMkYcDtZOw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "8.5.0", + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, "node_modules/eslint-scope": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz", @@ -3143,6 +3306,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/get-tsconfig": { + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.8.0.tgz", + "integrity": "sha512-Pgba6TExTZ0FJAn1qkJAjIeKoDJ3CsI2ChuLohJnZl/tTU8MVrq3b+2t5UOPfRa4RMsorClBjJALkJUMjG1PAw==", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve-pkg-maps": "^1.0.0" + }, + "funding": { + "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" + } + }, "node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -4854,6 +5030,16 @@ "node": ">=4" } }, + "node_modules/resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } + }, "node_modules/reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -5069,6 +5255,13 @@ "node": ">=0.10.0" } }, + "node_modules/stable-hash": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/stable-hash/-/stable-hash-0.0.4.tgz", + "integrity": "sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g==", + "dev": true, + "license": "MIT" + }, "node_modules/stackback": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", @@ -5460,6 +5653,13 @@ "node": ">=6" } }, + "node_modules/tslib": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "dev": true, + "license": "0BSD" + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", diff --git a/package.json b/package.json index 83e82585d1e..dddf5aedebd 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "@vitest/coverage-istanbul": "^2.0.4", "dependency-cruiser": "^16.3.10", "eslint": "^9.7.0", + "eslint-plugin-import-x": "^4.2.1", "jsdom": "^24.0.0", "lefthook": "^1.6.12", "phaser3spectorjs": "^0.0.8", diff --git a/src/phases/weather-effect-phase.ts b/src/phases/weather-effect-phase.ts index e85ef0326f6..73de44389d0 100644 --- a/src/phases/weather-effect-phase.ts +++ b/src/phases/weather-effect-phase.ts @@ -1,5 +1,5 @@ import BattleScene from "#app/battle-scene"; -import { applyPreWeatherEffectAbAttrs, SuppressWeatherEffectAbAttr, PreWeatherDamageAbAttr, applyAbAttrs, BlockNonDirectDamageAbAttr, applyPostWeatherLapseAbAttrs, PostWeatherLapseAbAttr } from "#app/data/ability.js"; +import { applyPreWeatherEffectAbAttrs, SuppressWeatherEffectAbAttr, PreWeatherDamageAbAttr, applyAbAttrs, BlockNonDirectDamageAbAttr, applyPostWeatherLapseAbAttrs, PostWeatherLapseAbAttr } from "#app/data/ability"; import { CommonAnim } from "#app/data/battle-anims"; import { Weather, getWeatherDamageMessage, getWeatherLapseMessage } from "#app/data/weather"; import { BattlerTagType } from "#app/enums/battler-tag-type"; diff --git a/src/system/version-converter.ts b/src/system/version-converter.ts index ed65fcd99b8..1a7c7b2026a 100644 --- a/src/system/version-converter.ts +++ b/src/system/version-converter.ts @@ -1,4 +1,4 @@ -import { allSpecies } from "#app/data/pokemon-species.js"; +import { allSpecies } from "#app/data/pokemon-species"; import { AbilityAttr, defaultStarterSpecies, DexAttr, SessionSaveData, SystemSaveData } from "./game-data"; import { SettingKeys } from "./settings/settings"; diff --git a/src/test/account.spec.ts b/src/test/account.test.ts similarity index 100% rename from src/test/account.spec.ts rename to src/test/account.test.ts diff --git a/src/test/items/double_battle_chance_booster.test.ts b/src/test/items/double_battle_chance_booster.test.ts index f581af7afc5..1d5051fa9e9 100644 --- a/src/test/items/double_battle_chance_booster.test.ts +++ b/src/test/items/double_battle_chance_booster.test.ts @@ -1,13 +1,13 @@ -import { Moves } from "#app/enums/moves.js"; -import { Species } from "#app/enums/species.js"; +import { Moves } from "#app/enums/moves"; +import { Species } from "#app/enums/species"; import { DoubleBattleChanceBoosterModifier } from "#app/modifier/modifier"; import GameManager from "#test/utils/gameManager"; import Phaser from "phaser"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; -import { ShopCursorTarget } from "#app/enums/shop-cursor-target.js"; -import { Mode } from "#app/ui/ui.js"; -import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler.js"; -import { Button } from "#app/enums/buttons.js"; +import { ShopCursorTarget } from "#app/enums/shop-cursor-target"; +import { Mode } from "#app/ui/ui"; +import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; +import { Button } from "#app/enums/buttons"; describe("Items - Double Battle Chance Boosters", () => { let phaserGame: Phaser.Game; diff --git a/src/test/vitest.setup.ts b/src/test/vitest.setup.ts index eaa987c1a66..bf806cd053a 100644 --- a/src/test/vitest.setup.ts +++ b/src/test/vitest.setup.ts @@ -1,4 +1,3 @@ -import "#test/fontFace.setup"; import "vitest-canvas-mock"; import { initLoggedInUser } from "#app/account"; diff --git a/vitest.config.ts b/vitest.config.ts index 9a765a89ae7..bfa380ec5fa 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -2,7 +2,7 @@ import { defineProject, UserWorkspaceConfig } from 'vitest/config'; import { defaultConfig } from './vite.config'; export const defaultProjectTestConfig: UserWorkspaceConfig["test"] = { - setupFiles: ['./src/test/vitest.setup.ts'], + setupFiles: ['./src/test/fontFace.setup.ts', './src/test/vitest.setup.ts'], server: { deps: { inline: ['vitest-canvas-mock'], From e17bf592c22a7e53d7a06e6e891d975dc0962ffe Mon Sep 17 00:00:00 2001 From: flx-sta <50131232+flx-sta@users.noreply.github.com> Date: Tue, 10 Sep 2024 14:13:42 -0700 Subject: [PATCH 78/83] [Bug] Use silent mode during tests (unless debugging!) + test workflow optimization (#4154) * add :silent to all tests but disable it if the runner is in debug mode! * fix: use `--silent` instead of `:silent` Cause the previous was npm scrpt specific (whops) * remove env and replace with logic in each call * reduce redundancy by checking out once * move pre-test into `needs` after `checkout` * use cache approach in pre-test * add node.js install step to `setup` job * WIP: setup -> pre-test -> all other tests with using cache * use matrix approach for tests * fix matrix approach for tests * fix wrong use of env var in `run-test-template.yml` * test: out-comment `run-tests` to see whats wrong * test: see if this works * let's try using matrix again... * make `node-version` input a string * remove `node-version` input for now * test: without a matrix fornow * change usage of reuseable workflow call * fix call of matrix.project * try using working-dir * try setup for pre-tests * remove `runs-on` from run-tests * fix some identations for run-tests * add pre-test as requirement for running tests * use `1` instead of `'1'` to check `runner.debug` * add `options` input. Possible fix for debug = not silent * try again... * not as an ENV but inside * move 2nd ${{ !runner.debug && '--silent' }} check into test-template * fix printing `false` instead of empty-string on runner-debug check * try a yml array approach * test running with file include path * make `project` always `main` for now * remove all extra vitest workspaces * adopt `shards` workflow in vitest * fix workflow reference in tests.yml * add missing `$` in test-shard-template.yml` * chore: fix vitest.config.ts after merge man.. cant trust these machines * make `project` a variable. try to use inputs on job names * adjust `test-shard-template` job name --- .github/workflows/test-shard-template.yml | 30 +++++++ .github/workflows/tests.yml | 98 +++++------------------ vitest.config.ts | 84 +++++++++---------- vitest.workspace.ts | 54 ------------- 4 files changed, 90 insertions(+), 176 deletions(-) create mode 100644 .github/workflows/test-shard-template.yml diff --git a/.github/workflows/test-shard-template.yml b/.github/workflows/test-shard-template.yml new file mode 100644 index 00000000000..ac89b503f0c --- /dev/null +++ b/.github/workflows/test-shard-template.yml @@ -0,0 +1,30 @@ +name: Test Template + +on: + workflow_call: + inputs: + project: + required: true + type: string + shard: + required: true + type: number + totalShards: + required: true + type: number + +jobs: + test: + name: Shard ${{ inputs.shard }} of ${{ inputs.totalShards }} + runs-on: ubuntu-latest + steps: + - name: Check out Git repository + uses: actions/checkout@v4 + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + - name: Install Node.js dependencies + run: npm ci + - name: Run tests + run: npx vitest --project ${{ inputs.project }} --shard=${{ inputs.shard }}/${{ inputs.totalShards }} ${{ !runner.debug && '--silent' || '' }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2a78ec252b8..66cc3ecc139 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,91 +15,33 @@ on: types: [checks_requested] jobs: - run-misc-tests: # Define a job named "run-tests" - name: Run misc tests # Human-readable name for the job - runs-on: ubuntu-latest # Specify the latest Ubuntu runner for the job - - steps: - - name: Check out Git repository # Step to check out the repository - uses: actions/checkout@v4 # Use the checkout action version 4 - - - name: Set up Node.js # Step to set up Node.js environment - uses: actions/setup-node@v4 # Use the setup-node action version 4 - with: - node-version: 20 # Specify Node.js version 20 - - - name: Install Node.js dependencies # Step to install Node.js dependencies - run: npm ci # Use 'npm ci' to install dependencies - - - name: pre-test # pre-test to check overrides - run: npx vitest run --project pre - - name: test misc - run: npx vitest --project misc - - run-abilities-tests: - name: Run abilities tests - runs-on: ubuntu-latest + pre-test: + name: Run Pre-test + runs-on: ubuntu-latest steps: - name: Check out Git repository uses: actions/checkout@v4 + with: + path: tests-action - name: Set up Node.js uses: actions/setup-node@v4 with: node-version: 20 - name: Install Node.js dependencies + working-directory: tests-action run: npm ci - - name: pre-test - run: npx vitest run --project pre - - name: test abilities - run: npx vitest --project abilities + - name: Run Pre-test + working-directory: tests-action + run: npx vitest run --project pre ${{ !runner.debug && '--silent' || '' }} - run-items-tests: - name: Run items tests - runs-on: ubuntu-latest - steps: - - name: Check out Git repository - uses: actions/checkout@v4 - - name: Set up Node.js - uses: actions/setup-node@v4 - with: - node-version: 20 - - name: Install Node.js dependencies - run: npm ci - - name: pre-test - run: npx vitest run --project pre - - name: test items - run: npx vitest --project items - - run-moves-tests: - name: Run moves tests - runs-on: ubuntu-latest - steps: - - name: Check out Git repository - uses: actions/checkout@v4 - - name: Set up Node.js - uses: actions/setup-node@v4 - with: - node-version: 20 - - name: Install Node.js dependencies - run: npm ci - - name: pre-test - run: npx vitest run --project pre - - name: test moves - run: npx vitest --project moves - - run-battle-tests: - name: Run battle tests - runs-on: ubuntu-latest - steps: - - name: Check out Git repository - uses: actions/checkout@v4 - - name: Set up Node.js - uses: actions/setup-node@v4 - with: - node-version: 20 - - name: Install Node.js dependencies - run: npm ci - - name: pre-test - run: npx vitest run --project pre - - name: test battle - run: npx vitest --project battle \ No newline at end of file + run-tests: + name: Run Tests + needs: [pre-test] + strategy: + matrix: + shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] + uses: ./.github/workflows/test-shard-template.yml + with: + project: main + shard: ${{ matrix.shard }} + totalShards: 10 \ No newline at end of file diff --git a/vitest.config.ts b/vitest.config.ts index bfa380ec5fa..54462675704 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -1,46 +1,42 @@ -import { defineProject, UserWorkspaceConfig } from 'vitest/config'; -import { defaultConfig } from './vite.config'; - -export const defaultProjectTestConfig: UserWorkspaceConfig["test"] = { - setupFiles: ['./src/test/fontFace.setup.ts', './src/test/vitest.setup.ts'], - server: { - deps: { - inline: ['vitest-canvas-mock'], - //@ts-ignore - optimizer: { - web: { - include: ['vitest-canvas-mock'], - } - } - } - }, - environment: 'jsdom' as const, - environmentOptions: { - jsdom: { - resources: 'usable', - }, - }, - threads: false, - trace: true, - restoreMocks: true, - watch: false, - coverage: { - provider: 'istanbul' as const, - reportsDirectory: 'coverage' as const, - reporters: ['text-summary', 'html'], - }, -} +import { defineProject } from "vitest/config"; +import { defaultConfig } from "./vite.config"; export default defineProject(({ mode }) => ({ - ...defaultConfig, - test: { - ...defaultProjectTestConfig, - name: "main", - include: ["./src/test/**/*.{test,spec}.ts"], - exclude: ["./src/test/pre.test.ts"], - }, - esbuild: { - pure: mode === 'production' ? [ 'console.log' ] : [], - keepNames: true, - }, -})) + ...defaultConfig, + test: { + setupFiles: ["./src/test/fontFace.setup.ts", "./src/test/vitest.setup.ts"], + server: { + deps: { + inline: ["vitest-canvas-mock"], + //@ts-ignore + optimizer: { + web: { + include: ["vitest-canvas-mock"], + }, + }, + }, + }, + environment: "jsdom" as const, + environmentOptions: { + jsdom: { + resources: "usable", + }, + }, + threads: false, + trace: true, + restoreMocks: true, + watch: false, + coverage: { + provider: "istanbul" as const, + reportsDirectory: "coverage" as const, + reporters: ["text-summary", "html"], + }, + name: "main", + include: ["./src/test/**/*.{test,spec}.ts"], + exclude: ["./src/test/pre.test.ts"], + }, + esbuild: { + pure: mode === "production" ? ["console.log"] : [], + keepNames: true, + }, +})); diff --git a/vitest.workspace.ts b/vitest.workspace.ts index a885b77dc9d..38121942004 100644 --- a/vitest.workspace.ts +++ b/vitest.workspace.ts @@ -1,6 +1,5 @@ import { defineWorkspace } from "vitest/config"; import { defaultConfig } from "./vite.config"; -import { defaultProjectTestConfig } from "./vitest.config"; export default defineWorkspace([ { @@ -11,58 +10,5 @@ export default defineWorkspace([ environment: "jsdom", }, }, - { - ...defaultConfig, - test: { - ...defaultProjectTestConfig, - name: "misc", - include: [ - "src/test/achievements/**/*.{test,spec}.ts", - "src/test/arena/**/*.{test,spec}.ts", - "src/test/battlerTags/**/*.{test,spec}.ts", - "src/test/eggs/**/*.{test,spec}.ts", - "src/test/field/**/*.{test,spec}.ts", - "src/test/inputs/**/*.{test,spec}.ts", - "src/test/localization/**/*.{test,spec}.ts", - "src/test/phases/**/*.{test,spec}.ts", - "src/test/settingMenu/**/*.{test,spec}.ts", - "src/test/sprites/**/*.{test,spec}.ts", - "src/test/ui/**/*.{test,spec}.ts", - "src/test/*.{test,spec}.ts", - ], - }, - }, - { - ...defaultConfig, - test: { - ...defaultProjectTestConfig, - name: "abilities", - include: ["src/test/abilities/**/*.{test,spec}.ts"], - }, - }, - { - ...defaultConfig, - test: { - ...defaultProjectTestConfig, - name: "battle", - include: ["src/test/battle/**/*.{test,spec}.ts"], - }, - }, - { - ...defaultConfig, - test: { - ...defaultProjectTestConfig, - name: "items", - include: ["src/test/items/**/*.{test,spec}.ts"], - }, - }, - { - ...defaultConfig, - test: { - ...defaultProjectTestConfig, - name: "moves", - include: ["src/test/moves/**/*.{test,spec}.ts"], - }, - }, "./vitest.config.ts", ]); From 4808c07cf9e92714e4b7c0ba77a6b5e96fbe9c34 Mon Sep 17 00:00:00 2001 From: "Amani H." <109637146+xsn34kzx@users.noreply.github.com> Date: Tue, 10 Sep 2024 18:05:48 -0400 Subject: [PATCH 79/83] [Hotfix] Fix System Data Conversion Failure 2 (#4159) --- src/system/version-converter.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/system/version-converter.ts b/src/system/version-converter.ts index d54238812c8..f7996124886 100644 --- a/src/system/version-converter.ts +++ b/src/system/version-converter.ts @@ -76,7 +76,7 @@ export function applySystemDataPatches(data: SystemSaveData) { if (data.starterData) { // Migrate ability starter data if empty for caught species Object.keys(data.starterData).forEach(sd => { - if (data.dexData[sd].caughtAttr && !data.starterData[sd].abilityAttr) { + if (data.dexData[sd]?.caughtAttr && (data.starterData[sd] && !data.starterData[sd].abilityAttr)) { data.starterData[sd].abilityAttr = 1; } }); @@ -104,9 +104,11 @@ export function applySystemDataPatches(data: SystemSaveData) { // --- PATCHES --- // Fix Starter Data - if (data.starterData) { - for (const starterId of defaultStarterSpecies) { + for (const starterId of defaultStarterSpecies) { + if (data.starterData[starterId]?.abilityAttr) { data.starterData[starterId].abilityAttr |= AbilityAttr.ABILITY_1; + } + if (data.dexData[starterId]?.caughtAttr) { data.dexData[starterId].caughtAttr |= DexAttr.FEMALE; } } From e657322294bc39f9f398b72c0f8fdcd8f4d496d5 Mon Sep 17 00:00:00 2001 From: Leo Kim <47556641+KimJeongSun@users.noreply.github.com> Date: Wed, 11 Sep 2024 12:45:53 +0900 Subject: [PATCH 80/83] [Enhancement] Update instruction for gamepad in run history UI (#4053) * update instruction for pad in run history UI * move getGamepadType function to ui.ts * Update src/ui/ui.ts Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com> --------- Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com> --- src/ui/run-info-ui-handler.ts | 23 +++++++++++++++++++---- src/ui/ui.ts | 17 +++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/ui/run-info-ui-handler.ts b/src/ui/run-info-ui-handler.ts index d6bafb8599e..f398abed6f5 100644 --- a/src/ui/run-info-ui-handler.ts +++ b/src/ui/run-info-ui-handler.ts @@ -21,6 +21,7 @@ import { getVariantTint } from "#app/data/variant"; import * as Modifier from "../modifier/modifier"; import { Species } from "#enums/species"; import { PlayerGender } from "#enums/player-gender"; +import { SettingKeyboard } from "#app/system/settings/settings-keyboard"; /** * RunInfoUiMode indicates possible overlays of RunInfoUiHandler. @@ -151,7 +152,13 @@ export default class RunInfoUiHandler extends UiHandler { const headerBgCoords = headerBg.getTopRight(); const abilityButtonContainer = this.scene.add.container(0, 0); const abilityButtonText = addTextObject(this.scene, 8, 0, i18next.t("runHistory:viewHeldItems"), TextStyle.WINDOW, {fontSize:"34px"}); - const abilityButtonElement = new Phaser.GameObjects.Sprite(this.scene, 0, 2, "keyboard", "E.png"); + const gamepadType = this.getUi().getGamepadType(); + let abilityButtonElement: Phaser.GameObjects.Sprite; + if (gamepadType === "touch") { + abilityButtonElement = new Phaser.GameObjects.Sprite(this.scene, 0, 2, "keyboard", "E.png"); + } else { + abilityButtonElement = new Phaser.GameObjects.Sprite(this.scene, 0, 2, gamepadType, this.scene.inputController?.getIconForLatestInputRecorded(SettingKeyboard.Button_Cycle_Ability)); + } abilityButtonContainer.add([abilityButtonText, abilityButtonElement]); abilityButtonContainer.setPosition(headerBgCoords.x - abilityButtonText.displayWidth - abilityButtonElement.displayWidth - 8, 10); this.runContainer.add(abilityButtonContainer); @@ -180,11 +187,19 @@ export default class RunInfoUiHandler extends UiHandler { if (this.isVictory) { const hallofFameInstructionContainer = this.scene.add.container(0, 0); const shinyButtonText = addTextObject(this.scene, 8, 0, i18next.t("runHistory:viewHallOfFame"), TextStyle.WINDOW, {fontSize:"65px"}); - const shinyButtonElement = new Phaser.GameObjects.Sprite(this.scene, 0, 4, "keyboard", "R.png"); + const formButtonText = addTextObject(this.scene, 8, 12, i18next.t("runHistory:viewEndingSplash"), TextStyle.WINDOW, {fontSize:"65px"}); + const gamepadType = this.getUi().getGamepadType(); + let shinyButtonElement: Phaser.GameObjects.Sprite; + let formButtonElement: Phaser.GameObjects.Sprite; + if (gamepadType === "touch") { + shinyButtonElement = new Phaser.GameObjects.Sprite(this.scene, 0, 4, "keyboard", "R.png"); + formButtonElement = new Phaser.GameObjects.Sprite(this.scene, 0, 16, "keyboard", "F.png"); + } else { + shinyButtonElement = new Phaser.GameObjects.Sprite(this.scene, 0, 4, gamepadType, this.scene.inputController?.getIconForLatestInputRecorded(SettingKeyboard.Button_Cycle_Shiny)); + formButtonElement = new Phaser.GameObjects.Sprite(this.scene, 0, 16, gamepadType, this.scene.inputController?.getIconForLatestInputRecorded(SettingKeyboard.Button_Cycle_Form)); + } hallofFameInstructionContainer.add([shinyButtonText, shinyButtonElement]); - const formButtonText = addTextObject(this.scene, 8, 12, i18next.t("runHistory:viewEndingSplash"), TextStyle.WINDOW, {fontSize:"65px"}); - const formButtonElement = new Phaser.GameObjects.Sprite(this.scene, 0, 16, "keyboard", "F.png"); hallofFameInstructionContainer.add([formButtonText, formButtonElement]); hallofFameInstructionContainer.setPosition(12, 25); diff --git a/src/ui/ui.ts b/src/ui/ui.ts index 50fb240aad8..82b3ee6b4fa 100644 --- a/src/ui/ui.ts +++ b/src/ui/ui.ts @@ -52,6 +52,7 @@ import RunInfoUiHandler from "./run-info-ui-handler"; import EggSummaryUiHandler from "./egg-summary-ui-handler"; import TestDialogueUiHandler from "#app/ui/test-dialogue-ui-handler"; import AutoCompleteUiHandler from "./autocomplete-ui-handler"; +import { Device } from "#enums/devices"; export enum Mode { MESSAGE, @@ -578,4 +579,20 @@ export default class UI extends Phaser.GameObjects.Container { public getModeChain(): Mode[] { return this.modeChain; } + + /** + * getGamepadType - returns the type of gamepad being used + * inputMethod could be "keyboard" or "touch" or "gamepad" + * if inputMethod is "keyboard" or "touch", then the inputMethod is returned + * if inputMethod is "gamepad", then the gamepad type is returned it could be "xbox" or "dualshock" + * @returns gamepad type + */ + public getGamepadType(): string { + const scene = this.scene as BattleScene; + if (scene.inputMethod === "gamepad") { + return scene.inputController.getConfig(scene.inputController.selectedDevice[Device.GAMEPAD]).padType; + } else { + return scene.inputMethod; + } + } } From 89dac46dfc2830491c17942174d61e2a74b8ceb8 Mon Sep 17 00:00:00 2001 From: Lugiad Date: Wed, 11 Sep 2024 22:46:26 +0200 Subject: [PATCH 81/83] [Localization] Localization batch - [Not meant to be merged until last minute] (#4127) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: sodam <66295123+sodaMelon@users.noreply.github.com> Co-authored-by: José Ricardo Co-authored-by: Chapybara-jp Co-authored-by: Asdar Co-authored-by: Niccolò <123510358+NicusPulcis@users.noreply.github.com> Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> Co-authored-by: Enoch Co-authored-by: DanStevensonx <114961842+DanStevensonx@users.noreply.github.com> Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com> Co-authored-by: SangaraSorama <100420976+SangaraSorama@users.noreply.github.com> --- src/locales/de/battler-tags.json | 3 +- src/locales/en/fight-ui-handler.json | 4 +- src/locales/es/battler-tags.json | 3 +- src/locales/es/fight-ui-handler.json | 3 +- src/locales/es/move-trigger.json | 3 +- src/locales/fr/battler-tags.json | 3 +- src/locales/fr/berry.json | 24 +- src/locales/fr/dialogue.json | 10 +- src/locales/fr/fight-ui-handler.json | 5 +- src/locales/fr/modifier-type.json | 2 +- src/locales/fr/move-trigger.json | 7 +- src/locales/fr/pokemon-info.json | 2 +- src/locales/it/battler-tags.json | 3 +- src/locales/it/fight-ui-handler.json | 7 +- src/locales/it/move-trigger.json | 5 +- src/locales/ja/battler-tags.json | 3 +- src/locales/ja/fight-ui-handler.json | 5 +- src/locales/ja/move-trigger.json | 3 +- src/locales/ko/battler-tags.json | 3 +- src/locales/ko/fight-ui-handler.json | 7 +- src/locales/ko/move-trigger.json | 3 +- src/locales/pt_BR/battler-tags.json | 3 +- src/locales/pt_BR/fight-ui-handler.json | 5 +- src/locales/pt_BR/move-trigger.json | 3 +- src/locales/zh_CN/ability.json | 4 +- src/locales/zh_CN/achv.json | 22 +- src/locales/zh_CN/battle.json | 2 +- src/locales/zh_CN/battler-tags.json | 3 +- src/locales/zh_CN/bgm-name.json | 6 +- src/locales/zh_CN/dialogue-double-battle.json | 6 +- src/locales/zh_CN/dialogue-misc.json | 2 +- src/locales/zh_CN/dialogue.json | 34 +- src/locales/zh_CN/fight-ui-handler.json | 7 +- src/locales/zh_CN/modifier-type.json | 10 +- src/locales/zh_CN/move-trigger.json | 9 +- src/locales/zh_CN/party-ui-handler.json | 4 +- src/locales/zh_CN/pokemon-form.json | 4 +- src/locales/zh_CN/splash-messages.json | 4 +- .../zh_CN/starter-select-ui-handler.json | 6 +- src/locales/zh_TW/ability-trigger.json | 55 ++- src/locales/zh_TW/ability.json | 4 +- src/locales/zh_TW/achv.json | 26 +- src/locales/zh_TW/arena-flyout.json | 44 +- src/locales/zh_TW/arena-tag.json | 48 +- src/locales/zh_TW/battle.json | 123 +++-- src/locales/zh_TW/battler-tags.json | 4 +- src/locales/zh_TW/bgm-name.json | 142 +++++- src/locales/zh_TW/challenges.json | 8 +- src/locales/zh_TW/common.json | 6 +- src/locales/zh_TW/dialogue-double-battle.json | 6 +- src/locales/zh_TW/dialogue-misc.json | 2 +- src/locales/zh_TW/dialogue.json | 457 +++++++++++++++++- src/locales/zh_TW/egg.json | 8 +- src/locales/zh_TW/fight-ui-handler.json | 7 +- src/locales/zh_TW/menu-ui-handler.json | 9 +- src/locales/zh_TW/menu.json | 22 +- .../zh_TW/modifier-select-ui-handler.json | 13 +- src/locales/zh_TW/modifier-type.json | 22 +- src/locales/zh_TW/modifier.json | 1 + src/locales/zh_TW/move-trigger.json | 9 +- src/locales/zh_TW/move.json | 4 +- src/locales/zh_TW/party-ui-handler.json | 43 +- src/locales/zh_TW/pokemon-form-battle.json | 8 +- src/locales/zh_TW/pokemon-form.json | 171 ++++++- src/locales/zh_TW/pokemon-info.json | 6 +- src/locales/zh_TW/pokemon-summary.json | 46 +- src/locales/zh_TW/settings.json | 4 +- src/locales/zh_TW/splash-messages.json | 5 +- .../zh_TW/starter-select-ui-handler.json | 9 +- src/locales/zh_TW/status-effect.json | 66 ++- src/locales/zh_TW/trainer-classes.json | 4 +- src/locales/zh_TW/trainer-names.json | 30 +- src/locales/zh_TW/trainer-titles.json | 23 +- src/locales/zh_TW/weather.json | 3 +- 74 files changed, 1419 insertions(+), 261 deletions(-) diff --git a/src/locales/de/battler-tags.json b/src/locales/de/battler-tags.json index e65e1ddfe75..1a04d3d4486 100644 --- a/src/locales/de/battler-tags.json +++ b/src/locales/de/battler-tags.json @@ -69,5 +69,6 @@ "cursedLapse": "{{pokemonNameWithAffix}} wurde durch den Fluch verletzt!", "stockpilingOnAdd": "{{pokemonNameWithAffix}} hortet {{stockpiledCount}}!", "disabledOnAdd": " {{moveName}} von {{pokemonNameWithAffix}} wurde blockiert!", - "disabledLapse": "{{moveName}} von {{pokemonNameWithAffix}} ist nicht länger blockiert!" + "disabledLapse": "{{moveName}} von {{pokemonNameWithAffix}} ist nicht länger blockiert!", + "tarShotOnAdd": "{{pokemonNameWithAffix}} ist nun schwach gegenüber Feuer-Attacken!" } diff --git a/src/locales/en/fight-ui-handler.json b/src/locales/en/fight-ui-handler.json index 1b8bd1f5c71..bd6bec878c8 100644 --- a/src/locales/en/fight-ui-handler.json +++ b/src/locales/en/fight-ui-handler.json @@ -2,7 +2,7 @@ "pp": "PP", "power": "Power", "accuracy": "Accuracy", - "abilityFlyInText": " {{pokemonName}}'s {{passive}}{{abilityName}}", + "abilityFlyInText": " {{pokemonName}}’s\n{{passive}}{{abilityName}}", "passive": "Passive ", "teraHover": "{{type}} Terastallized" -} \ No newline at end of file +} diff --git a/src/locales/es/battler-tags.json b/src/locales/es/battler-tags.json index 891fda53c5d..49efed6e8b4 100644 --- a/src/locales/es/battler-tags.json +++ b/src/locales/es/battler-tags.json @@ -69,5 +69,6 @@ "cursedLapse": "¡{{pokemonNameWithAffix}} es víctima de una maldición!", "stockpilingOnAdd": "¡{{pokemonNameWithAffix}} ha reservado energía por {{stockpiledCount}}ª vez!", "disabledOnAdd": "¡Se ha anulado el movimiento {{moveName}}\nde {{pokemonNameWithAffix}}!", - "disabledLapse": "¡El movimiento {{moveName}} de {{pokemonNameWithAffix}} \n ya no está anulado!" + "disabledLapse": "¡El movimiento {{moveName}} de {{pokemonNameWithAffix}} ya no está anulado!", + "tarShotOnAdd": "¡{{pokemonNameWithAffix}} se ha vuelto débil ante el fuego!" } diff --git a/src/locales/es/fight-ui-handler.json b/src/locales/es/fight-ui-handler.json index dc8140b61fc..fa13f2e0e77 100644 --- a/src/locales/es/fight-ui-handler.json +++ b/src/locales/es/fight-ui-handler.json @@ -3,5 +3,6 @@ "power": "Potencia", "accuracy": "Precisión", "abilityFlyInText": " {{passive}}{{pokemonName}}\n{{abilityName}}", - "passive": "Pasiva de " + "passive": "Pasiva de ", + "teraHover": "Tera-tipo {{type}}" } diff --git a/src/locales/es/move-trigger.json b/src/locales/es/move-trigger.json index f92b7950a07..2322a49056f 100644 --- a/src/locales/es/move-trigger.json +++ b/src/locales/es/move-trigger.json @@ -12,5 +12,6 @@ "stoleItem": "¡{{pokemonName}} robó el objeto\n{{itemName}} de {{targetName}}!", "statEliminated": "¡Los cambios en estadísticas fueron eliminados!", "revivalBlessing": "¡{{pokemonName}} ha revivido!", - "safeguard": "¡{{targetName}} está protegido por Velo Sagrado!" + "safeguard": "¡{{targetName}} está protegido por Velo Sagrado!", + "afterYou": "¡{{pokemonName}} ha decidido aprovechar la oportunidad!" } diff --git a/src/locales/fr/battler-tags.json b/src/locales/fr/battler-tags.json index f523eb7f07d..c4a88bb91aa 100644 --- a/src/locales/fr/battler-tags.json +++ b/src/locales/fr/battler-tags.json @@ -69,5 +69,6 @@ "cursedLapse": "{{pokemonNameWithAffix}} est touché par la malédiction !", "stockpilingOnAdd": "{{pokemonNameWithAffix}} utilise\nla capacité Stockage {{stockpiledCount}} fois !", "disabledOnAdd": "La capacité {{moveName}}\nde {{pokemonNameWithAffix}} est mise sous entrave !", - "disabledLapse": "La capacité {{moveName}}\nde {{pokemonNameWithAffix}} n’est plus sous entrave !" + "disabledLapse": "La capacité {{moveName}}\nde {{pokemonNameWithAffix}} n’est plus sous entrave !", + "tarShotOnAdd": "{{pokemonNameWithAffix}} est maintenant\nvulnérable au feu !" } diff --git a/src/locales/fr/berry.json b/src/locales/fr/berry.json index 833e1d1d8fd..17f28fb8dd0 100644 --- a/src/locales/fr/berry.json +++ b/src/locales/fr/berry.json @@ -1,46 +1,46 @@ { "SITRUS": { "name": "Baie Sitrus", - "effect": "Restaure 25% des PV s’ils sont inférieurs à 50%." + "effect": "Restaure 25% des PV du porteur s’ils sont inférieurs à 50%." }, "LUM": { "name": "Baie Prine", - "effect": "Soigne tout problème de statut permanant et la confusion." + "effect": "Soigne tout problème de statut et la confusion du porteur." }, "ENIGMA": { "name": "Baie Enigma", - "effect": "Restaure 25% des PV si touché par une capacité super efficace." + "effect": "Restaure 25% des PV du porteur s’il est touché par une capacité super efficace." }, "LIECHI": { "name": "Baie Lichii", - "effect": "Augmente l’Attaque si les PV sont inférieurs à 25%." + "effect": "Augmente l’Attaque du porteur si ses PV sont inférieurs à 25%." }, "GANLON": { "name": "Baie Lingan", - "effect": "Augmente la Défense si les PV sont inférieurs à 25%." + "effect": "Augmente la Défense du porteur si ses PV sont inférieurs à 25%." }, "PETAYA": { "name": "Baie Pitaye", - "effect": "Augmente l’Atq. Spé. si les PV sont inférieurs à 25%." + "effect": "Augmente l’Atq. Spé. du porteur si ses PV sont inférieurs à 25%." }, "APICOT": { "name": "Baie Abriko", - "effect": "Augmente la Déf. Spé. si les PV sont inférieurs à 25%." + "effect": "Augmente la Déf. Spé. du porteur si ses PV sont inférieurs à 25%." }, "SALAC": { "name": "Baie Sailak", - "effect": "Augmente la Vitesse si les PV sont inférieurs à 25%." + "effect": "Augmente la Vitesse du porteur si ses PV sont inférieurs à 25%." }, "LANSAT": { "name": "Baie Lansat", - "effect": "Augmente le taux de coups critiques si les PV sont inférieurs à 25%." + "effect": "Augmente le taux de coups critiques du porteur si ses PV sont inférieurs à 25%." }, "STARF": { "name": "Baie Frista", - "effect": "Augmente énormément une statistique au hasard si les PV sont inférieurs à 25%." + "effect": "Augmente énormément une statistique au hasard du porteur si ses PV sont inférieurs à 25%." }, "LEPPA": { "name": "Baie Mepo", - "effect": "Restaure 10 PP à une capacité dès que ses PP tombent à 0." + "effect": "Restaure 10 PP à une capacité du porteur dès que ses PP tombent à 0." } -} \ No newline at end of file +} diff --git a/src/locales/fr/dialogue.json b/src/locales/fr/dialogue.json index dddd0d8e5b7..adc58de0563 100644 --- a/src/locales/fr/dialogue.json +++ b/src/locales/fr/dialogue.json @@ -54,8 +54,8 @@ "3": "J’espère que j’aurai ma revanche un jour.", "4": "C’était super amusant ! Mais ce combat m’a épuisée…", "5": "Tu m’as appris une belle leçon ! T’es vraiment incroyable !", - "6": "Vraiment ? J’ai perdu… ? C’est des choses qui arrivent, ça me déprime mais tu es vraiment très cool.", - "6_female": "Vraiment ? J’ai perdu… ? C’est des choses qui arrivent, ça me déprime mais t’es vraiment très cool.", + "6": "Vraiment ? J’ai perdu… ? Bon, ça arrive, mais c’était cool quand même.", + "6_female": "Vraiment ? J’ai perdu… ? Bon, ça arrive, mais c’était cool quand même.", "7": "J’ai pas besoin de ce genre de souvenirs.\n*Suppression de mémoire en cours…*", "8": "Hé ! Je t’avais dit d’y aller doucement avec moi ! Mais t’es vraiment si cool quand tu te bats sérieusement…", "9": "J’en ai marre des combats Pokémon…\nJe vais chercher d’autres trucs à faire…" @@ -314,8 +314,8 @@ "3": "On est juste des gars et des meufs normaux, on voit un Pokémon on le prend !", "4": "Pourquoi tu te la joue comme ça ? C'est avec tes dents que t’vas jouer frérot.", "4_female": "Pourquoi tu te la joue comme ça ? C'est avec tes dents que t’vas jouer ma reus.", - "5": "Cousin, écoute-nous bien ! ♪\nSe taper dessus, ça sert à rien ! ♪\n$Tu t’incrustes chez nous, ça s’fait pas ! ♪\n$Mais on est sympa, on a un plan pour toi ! ♪", - "5_female": "Cousine, écoute-nous bien ! ♪\nSe taper dessus, ça sert à rien ! ♪\n$Tu t’incrustes chez nous, ça s’fait pas ! ♪\n$Mais on est sympa, on a un plan pour toi ! ♪" + "5": "Cousin, écoute-nous bien ! ♪\nSe taper dessus, ça sert à rien ! ♪\n$Tu t’incrustes chez nous, ça s’fait pas ! ♪\nMais on est sympa, on a un plan pour toi ! ♪", + "5_female": "Cousine, écoute-nous bien ! ♪\nSe taper dessus, ça sert à rien ! ♪\n$Tu t’incrustes chez nous, ça s’fait pas ! ♪\nMais on est sympa, on a un plan pour toi ! ♪" }, "victory": { "1": "Hein ? C’est déjà terminé ?", @@ -687,7 +687,7 @@ }, "rival_6": { "encounter": { - "1": "@c{smile_eclosed}Nous y revoilà.\n$@c{neutral}J’ai eu du temps pour réfléchir à tout ça.\nIl y a une raison à pourquoi tout semble étrange.\n$@c{neutral_eclosed}Ton rêve, ma volonté de te battre…\nFont partie de quelque chose de plus grand.\n$@c{serious}C’est même pas à propos de moi, ni de toi… Mais du monde, @c{serious_mhalf_fists}et te repousser dans tes limites est ma mission.\n$@c{neutral_eclosed}J’ignore si je serai capable de l’accomplir, mais je ferai tout ce qui est en mon pouvoir.\n$@c{neutral}Cet endroit est terrifiant… Et pourtant il m’a l’air familier, comme si j’y avais déjà mis les pieds.\n$@c{serious_mhalf_fists}Tu ressens la même chose, pas vrai ?\n$@c{serious}… et c’est comme si quelque chose ici me parlait.\n$Comme si c’était tout ce que ce monde avait toujours connu.\n$Ces précieux moments ensemble semblent si proches ne sont rien de plus qu’un lointain souvenir.\n$@c{neutral_eclosed}D’ailleurs, qui peut dire aujourd’hui qu’ils ont pu être réels ?\n$@c{serious_mopen_fists}Il faut que tu persévères. Si tu t’arrêtes, ça n’aura jamais de fin et t’es la seule à en être capable.\n$@c{serious_smile_fists}Difficile de comprendre le sens de tout ça, je sais juste que c’est la réalité.\n$@c{serious_mopen_fists}Si tu ne parviens pas à me battre ici et maintenant, tu n’as aucune chance." + "1": "@c{smile_eclosed}Nous y revoilà.\n$@c{neutral}J’ai eu du temps pour réfléchir à tout ça.\nIl y a une raison à pourquoi tout semble étrange.\n$@c{neutral_eclosed}Ton rêve, ma volonté de te battre…\nFont partie de quelque chose de plus grand.\n$@c{serious}C’est même pas à propos de moi, ni de toi… Mais du monde, @c{serious_mhalf_fists}et te repousser dans tes limites est ma mission.\n$@c{neutral_eclosed}J’ignore si je serai capable de l’accomplir, mais je ferai tout ce qui est en mon pouvoir.\n$@c{neutral}Cet endroit est terrifiant… Et pourtant il m’a l’air familier, comme si j’y avais déjà mis les pieds.\n$@c{serious_mhalf_fists}Tu ressens la même chose, pas vrai ?\n$@c{serious}… et c’est comme si quelque chose ici me parlait.\n$Comme si c’était tout ce que ce monde avait toujours connu.\n$Ces précieux moments ensemble qui semblent si proches ne sont rien de plus qu’un lointain souvenir.\n$@c{neutral_eclosed}D’ailleurs, qui peut dire aujourd’hui qu’ils ont pu être réels ?\n$@c{serious_mopen_fists}Il faut que tu persévères. Si tu t’arrêtes, ça n’aura jamais de fin et t’es la seule à en être capable.\n$@c{serious_smile_fists}Difficile de comprendre le sens de tout ça, je sais juste que c’est la réalité.\n$@c{serious_mopen_fists}Si tu ne parviens pas à me battre ici et maintenant, tu n’as aucune chance." }, "victory": { "1": "@c{smile_eclosed}J’ai fait ce que j’avais à faire.\n$Promets-moi juste une chose.\n@c{smile}Après avoir réparé ce monde… Rentre à la maison." diff --git a/src/locales/fr/fight-ui-handler.json b/src/locales/fr/fight-ui-handler.json index e8b41661995..bd4e6b52566 100644 --- a/src/locales/fr/fight-ui-handler.json +++ b/src/locales/fr/fight-ui-handler.json @@ -3,5 +3,6 @@ "power": "Puissance", "accuracy": "Précision", "abilityFlyInText": " {{passive}}{{abilityName}}\nde {{pokemonName}}", - "passive": "Passif " -} \ No newline at end of file + "passive": "Passif ", + "teraHover": "Téracristal {{type}}" +} diff --git a/src/locales/fr/modifier-type.json b/src/locales/fr/modifier-type.json index 78be62cd88f..4f8033b50d7 100644 --- a/src/locales/fr/modifier-type.json +++ b/src/locales/fr/modifier-type.json @@ -202,7 +202,7 @@ "GOLDEN_PUNCH": { "name": "Poing Doré", "description": "La moitié des dégâts infligés sont convertis en argent." }, "COIN_CASE": { "name": "Boite Jetons", "description": "Tous les 10 combats, recevez 10% de votre argent en intérêts." }, - "LOCK_CAPSULE": { "name": "Poké Écrin", "description": "Permet de conserver la rareté des objets si vous relancez les objets proposés." }, + "LOCK_CAPSULE": { "name": "Poké Écrin", "description": "Permet de choisir de bloquer le niveau de rareté lors d’une relance des objets gratuits proposés." }, "GRIP_CLAW": { "name": "Accro Griffe" }, "WIDE_LENS": { "name": "Loupe" }, diff --git a/src/locales/fr/move-trigger.json b/src/locales/fr/move-trigger.json index d9d800c52cc..3704bc90718 100644 --- a/src/locales/fr/move-trigger.json +++ b/src/locales/fr/move-trigger.json @@ -1,9 +1,9 @@ { "hitWithRecoil": "{{pokemonName}} est blessé par le contrecoup !", - "cutHpPowerUpMove": "{{pokemonName}} sacrifie des PV\net augmente la puissance ses capacités !", + "cutHpPowerUpMove": "{{pokemonName}} sacrifie des PV\net augmente la puissance de ses capacités !", "absorbedElectricity": "{{pokemonName}} absorbe de l’électricité !", "switchedStatChanges": "{{pokemonName}} permute\nles changements de stats avec ceux de sa cible !", - "switchedTwoStatChanges": "{{pokemonName}} permute les changements de {{firstStat} et de {{secondStat}} avec ceux de sa cible !", + "switchedTwoStatChanges": "{{pokemonName}} permute les changements de {{firstStat}} et de {{secondStat}} avec ceux de sa cible !", "switchedStat": "{{pokemonName}} et sa cible échangent leur {{stat}} !", "sharedGuard": "{{pokemonName}} additionne sa garde à celle de sa cible et redistribue le tout équitablement !", "sharedPower": "{{pokemonName}} additionne sa force à celle de sa cible et redistribue le tout équitablement !", @@ -66,5 +66,6 @@ "revivalBlessing": "{{pokemonName}} a repris connaissance\net est prêt à se battre de nouveau !", "swapArenaTags": "Les effets affectant chaque côté du terrain\nont été échangés par {{pokemonName}} !", "exposedMove": "{{targetPokemonName}} est identifié\npar {{pokemonName}} !", - "safeguard": "{{targetName}} est protégé\npar la capacité Rune Protect !" + "safeguard": "{{targetName}} est protégé\npar la capacité Rune Protect !", + "afterYou": "{{pokemonName}} accepte\navec joie !" } diff --git a/src/locales/fr/pokemon-info.json b/src/locales/fr/pokemon-info.json index a23b320ea3e..4e53a31035d 100644 --- a/src/locales/fr/pokemon-info.json +++ b/src/locales/fr/pokemon-info.json @@ -17,7 +17,7 @@ "HPStat": "PV" }, "Type": { - "UNKNOWN": "Inconnu", + "UNKNOWN": "???", "NORMAL": "Normal", "FIGHTING": "Combat", "FLYING": "Vol", diff --git a/src/locales/it/battler-tags.json b/src/locales/it/battler-tags.json index e8bda9cfd1e..bd24f380f9e 100644 --- a/src/locales/it/battler-tags.json +++ b/src/locales/it/battler-tags.json @@ -69,5 +69,6 @@ "cursedLapse": "{{pokemonNameWithAffix}} subisce la maledizione!", "stockpilingOnAdd": "{{pokemonNameWithAffix}} ha usato Accumulo per la\n{{stockpiledCount}}ª volta!", "disabledOnAdd": "La mossa {{moveName}} di\n{{pokemonNameWithAffix}} è stata bloccata!", - "disabledLapse": "La mossa {{moveName}} di\n{{pokemonNameWithAffix}} non è più bloccata!" + "disabledLapse": "La mossa {{moveName}} di\n{{pokemonNameWithAffix}} non è più bloccata!", + "tarShotOnAdd": "{{pokemonNameWithAffix}} è diventato vulnerabile\nal tipo Fuoco!" } diff --git a/src/locales/it/fight-ui-handler.json b/src/locales/it/fight-ui-handler.json index 969d8dad370..1c24112a1a7 100644 --- a/src/locales/it/fight-ui-handler.json +++ b/src/locales/it/fight-ui-handler.json @@ -2,6 +2,7 @@ "pp": "PP", "power": "Potenza", "accuracy": "Precisione", - "abilityFlyInText": "{{passive}} {{pokemonName}} {{abilityName}}", - "passive": "Passiva di " -} \ No newline at end of file + "abilityFlyInText": "{{passive}}{{pokemonName}}\n{{abilityName}}", + "passive": "Passiva di ", + "teraHover": "Teracristallizzato {{type}}" +} diff --git a/src/locales/it/move-trigger.json b/src/locales/it/move-trigger.json index 785972b90f9..c8fb390e53f 100644 --- a/src/locales/it/move-trigger.json +++ b/src/locales/it/move-trigger.json @@ -66,5 +66,6 @@ "revivalBlessing": "{{pokemonName}} torna in forze!", "swapArenaTags": "{{pokemonName}} ha invertito gli effetti attivi\nnelle due metà del campo!", "exposedMove": "{{pokemonName}} ha identificato\n{{targetPokemonName}}!", - "safeguard": "Salvaguardia protegge {{targetName}}!" -} \ No newline at end of file + "safeguard": "Salvaguardia protegge {{targetName}}!", + "afterYou": "{{pokemonName}} approfitta della cortesia!" +} diff --git a/src/locales/ja/battler-tags.json b/src/locales/ja/battler-tags.json index 2b6382a3a9f..f8c6d44c0b4 100644 --- a/src/locales/ja/battler-tags.json +++ b/src/locales/ja/battler-tags.json @@ -69,5 +69,6 @@ "cursedLapse": "{{pokemonNameWithAffix}}は　のろわれている！", "stockpilingOnAdd": "{{pokemonNameWithAffix}}は　{{stockpiledCount}}つ　たくわえた!", "disabledOnAdd": "{{pokemonNameWithAffix}}の\n{{moveName}}\nを　封じこめた！", - "disabledLapse": "{{pokemonNameWithAffix}}の\nかなしばりが　解けた！" + "disabledLapse": "{{pokemonNameWithAffix}}の\nかなしばりが　解けた！", + "tarShotOnAdd": "{{pokemonNameWithAffix}}は　ほのおに　弱くなった！" } diff --git a/src/locales/ja/fight-ui-handler.json b/src/locales/ja/fight-ui-handler.json index c0c725ccaf3..72cf32f1cd5 100644 --- a/src/locales/ja/fight-ui-handler.json +++ b/src/locales/ja/fight-ui-handler.json @@ -2,6 +2,7 @@ "pp": "PP", "power": "威力", "accuracy": "命中", - "abilityFlyInText": " {{pokemonName}}の\n{{passive}} {{abilityName}}", - "passive": "パッシブ " + "abilityFlyInText": " {{pokemonName}}の\n{{passive}}{{abilityName}}", + "passive": "パッシブ ", + "teraHover": "{{type}}テラスタル" } diff --git a/src/locales/ja/move-trigger.json b/src/locales/ja/move-trigger.json index 7449d8c6e4b..fbefe883836 100644 --- a/src/locales/ja/move-trigger.json +++ b/src/locales/ja/move-trigger.json @@ -65,5 +65,6 @@ "suppressAbilities": "{{pokemonName}}の　特性が　効かなくなった！", "revivalBlessing": "{{pokemonName}}は\n復活して　戦えるようになった！", "swapArenaTags": "{{pokemonName}}は\nお互いの　場の　効果を　入れ替えた！", - "exposedMove": "{{pokemonName}}は {{targetPokemonName}}の\n正体を　見破った！" + "exposedMove": "{{pokemonName}}は {{targetPokemonName}}の\n正体を　見破った！", + "afterYou": "{{pokemonName}}は\nお言葉に　甘えることにした！" } diff --git a/src/locales/ko/battler-tags.json b/src/locales/ko/battler-tags.json index 0993cafa04a..21e548a01a6 100644 --- a/src/locales/ko/battler-tags.json +++ b/src/locales/ko/battler-tags.json @@ -69,5 +69,6 @@ "cursedLapse": "{{pokemonNameWithAffix}}[[는]]\n저주받고 있다!", "stockpilingOnAdd": "{{pokemonNameWithAffix}}[[는]]\n{{stockpiledCount}}개 비축했다!", "disabledOnAdd": "{{pokemonNameWithAffix}}의 {{moveName}}[[는]]\n사용할 수 없다!", - "disabledLapse": "{{pokemonNameWithAffix}}의 {{moveName}}[[는]]\n이제 사용할 수 있다." + "disabledLapse": "{{pokemonNameWithAffix}}의 {{moveName}}[[는]]\n이제 사용할 수 있다.", + "tarShotOnAdd": "{{pokemonNameWithAffix}}[[는]] 불꽃에 약해졌다!" } diff --git a/src/locales/ko/fight-ui-handler.json b/src/locales/ko/fight-ui-handler.json index a5f961095e1..d950e605896 100644 --- a/src/locales/ko/fight-ui-handler.json +++ b/src/locales/ko/fight-ui-handler.json @@ -2,6 +2,7 @@ "pp": "PP", "power": "위력", "accuracy": "명중률", - "abilityFlyInText": " {{pokemonName}}의 {{passive}}{{abilityName}}", - "passive": "패시브 " -} \ No newline at end of file + "abilityFlyInText": " {{pokemonName}}의\n{{passive}}{{abilityName}}", + "passive": "패시브 ", + "teraHover": "{{type}} 테라스탈" +} diff --git a/src/locales/ko/move-trigger.json b/src/locales/ko/move-trigger.json index 2a38bb13b0a..8a3a699d628 100644 --- a/src/locales/ko/move-trigger.json +++ b/src/locales/ko/move-trigger.json @@ -66,5 +66,6 @@ "revivalBlessing": "{{pokemonName}}[[는]]\n정신을 차려 싸울 수 있게 되었다!", "swapArenaTags": "{{pokemonName}}[[는]]\n서로의 필드 효과를 교체했다!", "exposedMove": "{{pokemonName}}[[는]]\n{{targetPokemonName}}의 정체를 꿰뚫어 보았다!", - "safeguard": "{{targetName}}[[는]] 신비의 베일이 지켜 주고 있다!" + "safeguard": "{{targetName}}[[는]] 신비의 베일이 지켜 주고 있다!", + "afterYou": "{{pokemonName}}[[는]]\n배려를 받아들이기로 했다!" } diff --git a/src/locales/pt_BR/battler-tags.json b/src/locales/pt_BR/battler-tags.json index 9c0f4732013..ec6559e12e5 100644 --- a/src/locales/pt_BR/battler-tags.json +++ b/src/locales/pt_BR/battler-tags.json @@ -69,5 +69,6 @@ "cursedLapse": "{{pokemonNameWithAffix}} foi ferido pelo Curse!", "stockpilingOnAdd": "{{pokemonNameWithAffix}} estocou {{stockpiledCount}}!", "disabledOnAdd": "{{moveName}} de {{pokemonNameWithAffix}}\nfoi desabilitado!", - "disabledLapse": "{{moveName}} de {{pokemonNameWithAffix}}\nnão está mais desabilitado." + "disabledLapse": "{{moveName}} de {{pokemonNameWithAffix}}\nnão está mais desabilitado.", + "tarShotOnAdd": "{{pokemonNameWithAffix}} tornou-se mais fraco ao fogo!" } diff --git a/src/locales/pt_BR/fight-ui-handler.json b/src/locales/pt_BR/fight-ui-handler.json index f5c4379126d..8fc41f523eb 100644 --- a/src/locales/pt_BR/fight-ui-handler.json +++ b/src/locales/pt_BR/fight-ui-handler.json @@ -3,5 +3,6 @@ "power": "Poder", "accuracy": "Precisão", "abilityFlyInText": " {{passive}}{{pokemonName}}\n{{abilityName}}", - "passive": "Passiva de " -} \ No newline at end of file + "passive": "Passiva de ", + "teraHover": "Terastalizado {{type}}" +} diff --git a/src/locales/pt_BR/move-trigger.json b/src/locales/pt_BR/move-trigger.json index 9aa13dedad5..4549f83cdf1 100644 --- a/src/locales/pt_BR/move-trigger.json +++ b/src/locales/pt_BR/move-trigger.json @@ -62,5 +62,6 @@ "revivalBlessing": "{{pokemonName}} foi reanimado!", "swapArenaTags": "{{pokemonName}} trocou os efeitos de batalha que afetam cada lado do campo!", "exposedMove": "{{pokemonName}} identificou\n{{targetPokemonName}}!", - "safeguard": "{{targetName}} está protegido por Safeguard!" + "safeguard": "{{targetName}} está protegido por Safeguard!", + "afterYou": "{{pokemonName}} aceitou a gentil oferta!" } diff --git a/src/locales/zh_CN/ability.json b/src/locales/zh_CN/ability.json index 7c70c84f55c..31e3c08161d 100644 --- a/src/locales/zh_CN/ability.json +++ b/src/locales/zh_CN/ability.json @@ -469,7 +469,7 @@ }, "honeyGather": { "name": "采蜜", - "description": "The Pokémon gat\nhers Honey afte\nr a battle. The\n Honey is then \nsold for money." + "description": "战斗结束时，有时候会捡来甜甜蜜。\n甜甜蜜会转换成金钱。" }, "frisk": { "name": "察觉", @@ -1239,4 +1239,4 @@ "name": "毒傀儡", "description": "因桃歹郎的招式而陷入中毒状态的\n对手同时也会陷入混乱状态。" } -} \ No newline at end of file +} diff --git a/src/locales/zh_CN/achv.json b/src/locales/zh_CN/achv.json index 90dfda0e3c1..b93345d876b 100644 --- a/src/locales/zh_CN/achv.json +++ b/src/locales/zh_CN/achv.json @@ -23,7 +23,7 @@ }, "DamageAchv": { - "description": "在单次攻击中造成 {{damageAmount}} 点伤害" + "description": "在单次攻击中造成\n {{damageAmount}} 点伤害" }, "250_DMG": { "name": "重拳出击" @@ -39,7 +39,7 @@ }, "HealAchv": { - "description": "通过技能、能力或携带的道具一次性治疗 {{healAmount}} {{HP}}点" + "description": "通过技能、能力或携带的道具\n一次性治疗 {{healAmount}} {{HP}}点" }, "250_HEAL": { "name": "新手奶妈" @@ -88,11 +88,11 @@ "TRANSFER_MAX_STAT_STAGE": { "name": "团队协作", - "description": "在一项属性强化至最大时用接力棒传递给其他宝可梦" + "description": "在一项属性强化至最大时用\n接力棒传递给其他宝可梦" }, "MAX_FRIENDSHIP": { "name": "亲密无间", - "description": "使一只宝可梦的亲密度达到最大值" + "description": "使一只宝可梦的亲密度\n达到最大值" }, "MEGA_EVOLVE": { "name": "大变身", @@ -112,7 +112,7 @@ }, "SPLICE": { "name": "无限融合", - "description": "使用基因之楔将两只宝可梦融合在一起" + "description": "使用基因之楔将两只宝可梦\n融合在一起" }, "MINI_BLACK_HOLE": { "name": "一大洞的道具", @@ -136,7 +136,7 @@ }, "SHINY_PARTY": { "name": "呕心沥血", - "description": "拥有一支由闪光宝可梦组成的满员队伍" + "description": "拥有一支由闪光宝可梦组成\n的满员队伍" }, "HATCH_MYTHICAL": { "name": "幻兽蛋", @@ -144,7 +144,7 @@ }, "HATCH_SUB_LEGENDARY": { "name": "二级传说蛋", - "description": "从蛋中孵化出一只二级传说宝可梦" + "description": "从蛋中孵化出一只二级传说\n宝可梦" }, "HATCH_LEGENDARY": { "name": "传说蛋", @@ -156,19 +156,19 @@ }, "HIDDEN_ABILITY": { "name": "隐藏实力", - "description": "捕捉一只拥有隐藏特性的宝可梦" + "description": "捕捉一只拥有隐藏特性\n的宝可梦" }, "PERFECT_IVS": { "name": "合格证", - "description": "获得一只拥有完美个体值的宝可梦" + "description": "获得一只拥有完美个体值\n的宝可梦" }, "CLASSIC_VICTORY": { "name": "战无不胜", "description": "在经典模式中通关游戏" }, "UNEVOLVED_CLASSIC_VICTORY": { - "name": "带孩子来上班", - "description": "通关经典模式时队伍中至少有一名未进化的宝可梦" + "name": "带孩上班", + "description": "通关经典模式时队伍中至少有\n一名未进化的宝可梦" }, "MONO_GEN_ONE": { diff --git a/src/locales/zh_CN/battle.json b/src/locales/zh_CN/battle.json index 4197786b7d8..ccf0e560805 100644 --- a/src/locales/zh_CN/battle.json +++ b/src/locales/zh_CN/battle.json @@ -15,7 +15,7 @@ "moneyPickedUp": "捡到了₽{{moneyAmount}}！", "pokemonCaught": "{{pokemonName}}被抓住了！", "addedAsAStarter": "增加了{{pokemonName}}作为\n一个新的基础宝可梦！", - "partyFull": "你的队伍已满员。是否放生其他宝可梦\n为{{pokemonName}}腾出空间?", + "partyFull": "你的队伍已满员。是否放生其他宝可梦\n为{{pokemonName}}腾出空间？", "pokemon": "宝可梦", "sendOutPokemon": "上吧！\n{{pokemonName}}！", "hitResultCriticalHit": "击中了要害！", diff --git a/src/locales/zh_CN/battler-tags.json b/src/locales/zh_CN/battler-tags.json index 792551d1ab1..7a01f5dff23 100644 --- a/src/locales/zh_CN/battler-tags.json +++ b/src/locales/zh_CN/battler-tags.json @@ -69,5 +69,6 @@ "cursedLapse": "{{pokemonNameWithAffix}}\n正受到诅咒！", "stockpilingOnAdd": "{{pokemonNameWithAffix}}蓄力了{{stockpiledCount}}次！", "disabledOnAdd": "封住了{{pokemonNameWithAffix}}的\n{{moveName}}！", - "disabledLapse": "{{pokemonNameWithAffix}}的\n定身法解除了！" + "disabledLapse": "{{pokemonNameWithAffix}}的\n定身法解除了！", + "tarShotOnAdd": "{{pokemonNameWithAffix}}\n变得怕火了！" } diff --git a/src/locales/zh_CN/bgm-name.json b/src/locales/zh_CN/bgm-name.json index d0508a49661..065347e3bb6 100644 --- a/src/locales/zh_CN/bgm-name.json +++ b/src/locales/zh_CN/bgm-name.json @@ -57,7 +57,7 @@ "battle_legendary_dusk_dawn": "究极日月「战斗！日食・月食 奈克洛兹玛」", "battle_legendary_ultra_nec": "究极日月「战斗！究极奈克洛兹玛」", "battle_legendary_zac_zam": "剑盾「战斗！苍响・藏玛然特」", - "battle_legendary_glas_spec": "剑盾「战斗! 雪暴马・灵幽马」", + "battle_legendary_glas_spec": "剑盾「战斗！ 雪暴马・灵幽马」", "battle_legendary_calyrex": "剑盾「战斗！蕾冠王」", "battle_legendary_birds_galar": "剑盾「战斗！传说的鸟宝可梦」", "battle_legendary_ruinous": "朱紫「战斗！灾厄宝可梦」", @@ -117,9 +117,9 @@ "plains": "空之探险队「天空顶端（草原）」", "power_plant": "空之探险队「电气平原 深处」", "ruins": "空之探险队「封印岩地 深处」", - "sea": "Andr06 - Marine Mystique", + "sea": "Andr06 - 海洋之秘", "seabed": "Firel - 海底", - "slum": "Andr06 - Sneaky Snom", + "slum": "Andr06 - 狡猾的雪吞虫", "snowy_forest": "空之探险队「天空顶端（雪山）」", "space": "Firel - 太空", "swamp": "空之探险队「封闭之海」", diff --git a/src/locales/zh_CN/dialogue-double-battle.json b/src/locales/zh_CN/dialogue-double-battle.json index 5ab6bf49890..629de3aff3e 100644 --- a/src/locales/zh_CN/dialogue-double-battle.json +++ b/src/locales/zh_CN/dialogue-double-battle.json @@ -9,10 +9,10 @@ }, "red_blue_double": { "encounter": { - "1": "赤红: ...!$青绿： 他人狠话不多。$青绿： 但别被他耍了，\n毕竟他可是个冠军！" + "1": "赤红: ...！$青绿： 他人狠话不多。$青绿： 但别被他耍了，\n毕竟他可是个冠军！" }, "victory": { - "1": "赤红: ...!$青绿: 下次我们一定会赢你！" + "1": "赤红: ...！$青绿: 下次我们一定会赢你！" } }, "tate_liza_double": { @@ -79,4 +79,4 @@ "1": "聂梓：这首歌献给大家！$玛俐：哥哥……" } } -} \ No newline at end of file +} diff --git a/src/locales/zh_CN/dialogue-misc.json b/src/locales/zh_CN/dialogue-misc.json index 07aa336d4f6..b26a3a5f208 100644 --- a/src/locales/zh_CN/dialogue-misc.json +++ b/src/locales/zh_CN/dialogue-misc.json @@ -1,4 +1,4 @@ { "ending": "@c{shock}你回来了？@d{32} 也就是说…@d{96} 你赢了呀！？\n@c{smile_ehalf}我应该早料到了。\n$@c{smile_eclosed}当然…我一直有这种感觉\n@c{smile}一切都结束了，对么？ 你打破了循环。\n$@c{smile_ehalf}你也完成了自己的梦想，不是吗？\n你甚至一次都没失败。\n$我是唯一能够记得你所作所为的人\n@c{angry_mopen}我会努力不忘掉哒！\n$@c{smile_wave_wink}开玩笑啦，@d{64} @c{smile}我才不会忘呢。@d{32}\n你的传奇将永远留存于我们心中。\n$@c{smile_wave}不管了，@d{64} 时候不早了@d{96} ，应该吧？\n在这地方还真搞不清楚。\n$一起回家吧。 @c{smile_wave_wink}可能明天，我们再来打一场，为了重温回忆嘛~", - "ending_female": "@c{smile}哦?你赢了？@d{96} @c{smile_eclosed}我应该早猜到了\n你回来了。\n$@c{smile}结束了。@d{64} 你终结了这个循环。\n$@c{serious_smile_fists}你也完成了自己的梦想，不是吗？\n你甚至一次都没失败。\n$@c{neutral}我是唯一能够记得你所作所为的人@d{96}\n我觉得这应该也还行吧？\n$@c{serious_smile_fists}你的传奇将永远留存于我们心中。\n$@c{smile_eclosed}不管了，我真是受够这个地方了，你也一样吗？我们回家吧。\n$@c{serious_smile_fists}可能等我们回家以后，再打一场？\n要是你想的话" + "ending_female": "@c{smile}哦？你赢了？@d{96} @c{smile_eclosed}我应该早猜到了\n你回来了。\n$@c{smile}结束了。@d{64} 你终结了这个循环。\n$@c{serious_smile_fists}你也完成了自己的梦想，不是吗？\n你甚至一次都没失败。\n$@c{neutral}我是唯一能够记得你所作所为的人@d{96}\n我觉得这应该也还行吧？\n$@c{serious_smile_fists}你的传奇将永远留存于我们心中。\n$@c{smile_eclosed}不管了，我真是受够这个地方了，你也一样吗？我们回家吧。\n$@c{serious_smile_fists}可能等我们回家以后，再打一场？\n要是你想的话" } diff --git a/src/locales/zh_CN/dialogue.json b/src/locales/zh_CN/dialogue.json index 5a4615fac54..dd0fa3fb3cc 100644 --- a/src/locales/zh_CN/dialogue.json +++ b/src/locales/zh_CN/dialogue.json @@ -388,7 +388,7 @@ "victory": { "1": "大失误……", "2": "以我现在的实力，无法胜任我的任务……", - "3": "原……谅我，坂木。\n我竟被一名训练师打败了。." + "3": "原……谅我，坂木。\n我竟被一名训练师打败了。" } }, "ariana": { @@ -1230,14 +1230,14 @@ }, "crasher_wake": { "encounter": { - "1": "极限! 极限! 看好了!$极限假面…就此…登场!", - "2": "极限! 极限! 极限假面!", + "1": "极限！ 极限！ 看好了！$极限假面…就此…登场！", + "2": "极限！ 极限！ 极限假面！", "3": "我是滔滔巨浪，将你冲走！" }, "victory": { "1": "我真是笑得合不拢嘴啊！$哈哈哈！那真是太有趣了！", "2": "呼哇！结束收尾了！$我该怎么说呢……$我还想再对战！我还想再继续战斗！", - "3": "啊啊啊啊啊!?" + "3": "啊啊啊啊啊！？" }, "defeat": { "1": "耶！就是这样！", @@ -1254,7 +1254,7 @@ "victory": { "1": "明白了……我会礼貌地退场。", "2": "输了就是输了。你确实很强大。", - "3": "…行吧! 嗯, 我输了。" + "3": "…行吧！ 嗯, 我输了。" }, "defeat": { "1": "爸爸！我用你珍爱的飞行宝可梦赢了……", @@ -1576,7 +1576,7 @@ }, "clay": { "encounter": { - "1": "咳咳! 让我好等，不是吗，孩子？$好吧，是时候看看你能做到什么了！" + "1": "咳咳！ 让我好等，不是吗，孩子？$好吧，是时候看看你能做到什么了！" }, "victory": { "1": "真是的……我先说好，\n我可没有手下留情。" @@ -1802,7 +1802,7 @@ "1": "够野的！你的想法比我的还要毒！" }, "defeat": { - "1": "嘿，拜托！认真点！\n你要加把劲啊!" + "1": "嘿，拜托！认真点！\n你要加把劲啊！" } }, "olivia": { @@ -1884,7 +1884,7 @@ }, "wikstrom": { "encounter": { - "1": "年轻的挑战者，幸会！\n我乃是著名的钢铁之刃，公爵雁铠! $让我们开始战斗吧！预备！" + "1": "年轻的挑战者，幸会！\n我乃是著名的钢铁之刃，公爵雁铠！ $让我们开始战斗吧！预备！" }, "victory": { "1": "辉煌！你与你尊贵的\n宝可梦之间的信任居然胜过了我！" @@ -1921,7 +1921,7 @@ "2": "我知道你能走这么远。让我们开始吧。" }, "victory": { - "1": "被你拿下了啊。你太出色了!", + "1": "被你拿下了啊。你太出色了！", "2": "我从没想到会有另一个训练师打败我……$我很惊讶。" }, "defeat": { @@ -2025,13 +2025,13 @@ }, "red": { "encounter": { - "1": "…!" + "1": "…！" }, "victory": { - "1": "…?" + "1": "…？" }, "defeat": { - "1": "…!" + "1": "…！" } }, "jasmine": { @@ -2303,7 +2303,7 @@ }, "grant": { "encounter": { - "1": "我只期待一件事。. $通过超越彼此，\n我们找到通往更高境界的道路。" + "1": "我只期待一件事。$通过超越彼此，\n我们找到通往更高境界的道路。" }, "victory": { "1": "你是一堵我无法逾越的墙！" @@ -2413,7 +2413,7 @@ }, "marnie": { "encounter": { - "1": "事实上，言而总之… \n人家自己也想当冠军呀! $所以别认为我在针对你！" + "1": "事实上，言而总之… \n人家自己也想当冠军呀！ $所以别认为我在针对你！" }, "victory": { "1": "好吧，我还是输了……\n但是我看到了很多你和你宝可梦的优点哦" @@ -2468,13 +2468,13 @@ }, "ryme": { "encounter": { - "1": "宝贝, 一起! \n摇滚摇到骨子里!" + "1": "宝贝, 一起！ \n摇滚摇到骨子里！" }, "victory": { "1": "你好酷！我佩服！\n我的灵魂为你哭！" }, "defeat": { - "1": "再会, 宝贝!" + "1": "再会, 宝贝！" } }, "grusha": { @@ -2625,7 +2625,7 @@ }, "rival_3_female": { "encounter": { - "1": "@c{smile_wave}好久不见！还没输过，对吧。$@c{angry}我觉得你点烦了。@c{smile_wave_wink}开玩笑啦！$@c{smile_ehalf}但说真的，你现在不想家吗？\n不想…我吗?$我……我的意思是，我们真的很想你。$@c{smile_eclosed}我支持你的一切，包括你的梦想。\n但现实就是你早晚会经历失败。$@c{smile}当你失败的时候，我想像往常一样陪在你身边。$@c{angry_mopen}现在，给你看看我变得多强了吧！" + "1": "@c{smile_wave}好久不见！还没输过，对吧。$@c{angry}我觉得你点烦了。@c{smile_wave_wink}开玩笑啦！$@c{smile_ehalf}但说真的，你现在不想家吗？\n不想…我吗？$我……我的意思是，我们真的很想你。$@c{smile_eclosed}我支持你的一切，包括你的梦想。\n但现实就是你早晚会经历失败。$@c{smile}当你失败的时候，我想像往常一样陪在你身边。$@c{angry_mopen}现在，给你看看我变得多强了吧！" }, "victory": { "1": "@c{shock}都这样了……还是不够吗？$这样下去，你就永远不会回来了……" diff --git a/src/locales/zh_CN/fight-ui-handler.json b/src/locales/zh_CN/fight-ui-handler.json index 8496bf2c1ea..aa8bf4f77c5 100644 --- a/src/locales/zh_CN/fight-ui-handler.json +++ b/src/locales/zh_CN/fight-ui-handler.json @@ -2,6 +2,7 @@ "pp": "PP", "power": "威力", "accuracy": "命中", - "abilityFlyInText": " {{pokemonName}} 的 {{passive}}{{abilityName}}", - "passive": "被动 " -} \ No newline at end of file + "abilityFlyInText": " {{pokemonName}} 的\n{{passive}}{{abilityName}}", + "passive": "被动 ", + "teraHover": "{{type}} 太晶化" +} diff --git a/src/locales/zh_CN/modifier-type.json b/src/locales/zh_CN/modifier-type.json index 26e4c2dc110..981f26a1603 100644 --- a/src/locales/zh_CN/modifier-type.json +++ b/src/locales/zh_CN/modifier-type.json @@ -95,7 +95,7 @@ "description": "招式命中率增加{{accuracyAmount}}(最大100)。" }, "PokemonMultiHitModifierType": { - "description": "攻击以40/25/12.5%的伤害造成2/3/4次伤害" + "description": "攻击以60/75/82.5%的伤害造成2/3/4次伤害。" }, "TmModifierType": { "name": "招式学习器\n{{moveId}} - {{moveName}}", @@ -314,19 +314,19 @@ }, "BERRY_POUCH": { "name": "树果袋", - "description": "使用树果时有30%的几率不会消耗树果。" + "description": "使用树果时增加30%的几率不会消耗树果。" }, "FOCUS_BAND": { "name": "气势头带", - "description": "携带该道具的宝可梦有10%几率在受到攻击\n而将陷入濒死状态时，保留1点HP不陷入濒死状态。" + "description": "携带该道具的宝可梦增加10%几率在受到攻击\n而将陷入濒死状态时，保留1点HP不陷入濒死状态。" }, "QUICK_CLAW": { "name": "先制之爪", - "description": "有10%的几率无视速度优先使出招式\n(先制技能优先)。" + "description": "增加10%的几率无视速度优先使出招式\n(先制技能优先)。" }, "KINGS_ROCK": { "name": "王者之证", - "description": "使用任意原本不会造成畏缩状态的攻击，\n有10%几率使目标陷入畏缩状态。" + "description": "使用任意原本不会造成畏缩状态的攻击，\n增加10%几率使目标陷入畏缩状态。" }, "LEFTOVERS": { "name": "吃剩的东西", diff --git a/src/locales/zh_CN/move-trigger.json b/src/locales/zh_CN/move-trigger.json index 1eb4c397f45..436f1805c4e 100644 --- a/src/locales/zh_CN/move-trigger.json +++ b/src/locales/zh_CN/move-trigger.json @@ -42,12 +42,12 @@ "incineratedItem": "{{pokemonName}}烧没了\n{{targetName}}的{{itemName}}！", "knockedOffItem": "{{pokemonName}}拍落了\n{{targetName}}的{{itemName}}！", "tookMoveAttack": "{{pokemonName}}\n受到了{{moveName}}的攻击！", - "cutOwnHpAndMaximizedStat": "{{pokemonName}}\n削减了体力并释放了全部{{statName}}!", + "cutOwnHpAndMaximizedStat": "{{pokemonName}}\n削减了体力并释放了全部{{statName}}！", "copiedStatChanges": "{{pokemonName}}复制了\n{{targetName}}的能力变化！", "magnitudeMessage": "震级{{magnitude}}！", "tookAimAtTarget": "{{pokemonName}}将目标对准了\n{{targetName}}！", "transformedIntoType": "{{pokemonName}} \n变成了{{typeName}}属性！", - "copiedMove": "{{pokemonName}}\n复制了{{moveName}}!", + "copiedMove": "{{pokemonName}}\n复制了{{moveName}}！", "sketchedMove": "{{pokemonName}}\n对{{moveName}}进行了写生！", "acquiredAbility": "{{pokemonName}}的特性\n变为{{abilityName}}了！", "copiedTargetAbility": "{{pokemonName}}复制了\n{{targetName}}的{{abilityName}}！", @@ -66,5 +66,6 @@ "revivalBlessing": "{{pokemonName}}复活了！", "swapArenaTags": "{{pokemonName}}\n交换了双方的场地效果！", "exposedMove": "{{pokemonName}}识破了\n{{targetPokemonName}}的原型！", - "safeguard": "{{targetName}}\n正受到神秘之幕的保护！" -} \ No newline at end of file + "safeguard": "{{targetName}}\n正受到神秘之幕的保护！", + "afterYou": "{{pokemonName}}\n接受了对手的好意！" +} diff --git a/src/locales/zh_CN/party-ui-handler.json b/src/locales/zh_CN/party-ui-handler.json index db364d29ab2..8dff1ffb75c 100644 --- a/src/locales/zh_CN/party-ui-handler.json +++ b/src/locales/zh_CN/party-ui-handler.json @@ -23,7 +23,7 @@ "tooManyItems": "{{pokemonName}}拥有\n太多这个道具了！", "anyEffect": "即便使用也无效果哦。", "unpausedEvolutions": "{{pokemonName}}的进化停止了。", - "unspliceConfirmation": "真的要把{{fusionName}}\n从{{pokemonName}}身上分离吗? {{fusionName}}会就此消失。", + "unspliceConfirmation": "真的要把{{fusionName}}\n从{{pokemonName}}身上分离吗？{{fusionName}}会就此消失。", "wasReverted": "{{fusionName}}恢复成了{{pokemonName}}。", "releaseConfirmation": "你真要放生{{pokemonName}}吗？", "releaseInBattle": "你无法放生正在战斗中的宝可梦！", @@ -44,4 +44,4 @@ "untilWeMeetAgain": "下次再见了，{{pokemonName}}！", "sayonara": "撒由那拉，{{pokemonName}}！", "smellYaLater": "拜拜了您嘞，{{pokemonName}}！" -} \ No newline at end of file +} diff --git a/src/locales/zh_CN/pokemon-form.json b/src/locales/zh_CN/pokemon-form.json index 09ec54be804..e77f9bdb9fa 100644 --- a/src/locales/zh_CN/pokemon-form.json +++ b/src/locales/zh_CN/pokemon-form.json @@ -1,5 +1,5 @@ { - "pikachuCosplay": "服装", + "pikachuCosplay": "换装", "pikachuCoolCosplay": "摇滚巨星", "pikachuBeautyCosplay": "贵妇", "pikachuCuteCosplay": "流行偶像", @@ -167,4 +167,4 @@ "paldeaTaurosCombat": "斗战种", "paldeaTaurosBlaze": "火炽种", "paldeaTaurosAqua": "水澜种" -} \ No newline at end of file +} diff --git a/src/locales/zh_CN/splash-messages.json b/src/locales/zh_CN/splash-messages.json index f679c43cdb9..4d2d208edfd 100644 --- a/src/locales/zh_CN/splash-messages.json +++ b/src/locales/zh_CN/splash-messages.json @@ -6,7 +6,7 @@ "optionalSaveScumming": "可用SL大法！", "biomes": "35种地区！", "openSource": "开源！", - "playWithSpeed": "请五倍速游玩!", + "playWithSpeed": "请五倍速游玩！", "liveBugTesting": "随时修复BUG！", "heavyInfluence": "深受雨中冒险2影响！", "pokemonRiskAndPokemonRain": "雨中宝可梦冒险！", @@ -33,4 +33,4 @@ "eeveeExpo": "伊布博览会！", "ynoproject": "Yume Nikki 页游项目！", "breedersInSpace": "饲养员也能上太空？" -} \ No newline at end of file +} diff --git a/src/locales/zh_CN/starter-select-ui-handler.json b/src/locales/zh_CN/starter-select-ui-handler.json index d184d5f7c63..4851468ab7c 100644 --- a/src/locales/zh_CN/starter-select-ui-handler.json +++ b/src/locales/zh_CN/starter-select-ui-handler.json @@ -21,8 +21,8 @@ "toggleIVs": "显示个体", "manageMoves": "管理招式", "manageNature": "管理性格", - "addToFavorites": "Add to Favorites", - "removeFromFavorites": "Remove from Favorites", + "addToFavorites": "添加到最爱", + "removeFromFavorites": "移出最爱", "useCandies": "使用糖果", "selectNature": "选择性格", "selectMoveSwapOut": "选择要替换的招式。", @@ -42,4 +42,4 @@ "locked": "未解锁", "disabled": "已禁用", "uncaught": "未捕获" -} \ No newline at end of file +} diff --git a/src/locales/zh_TW/ability-trigger.json b/src/locales/zh_TW/ability-trigger.json index f31fb12bc35..c4b53fa5126 100644 --- a/src/locales/zh_TW/ability-trigger.json +++ b/src/locales/zh_TW/ability-trigger.json @@ -3,11 +3,62 @@ "badDreams": "{{pokemonName}} 被折磨着！", "costar": "{{pokemonName}} 複製了 {{allyName}} 的\n能力變化！", "iceFaceAvoidedDamage": "{{pokemonNameWithAffix}} 因爲 {{abilityName}}\n避免了傷害！", - "trace": "{{pokemonName}} 複製了 {{targetName}} 的\n{{abilityName}}!", - "windPowerCharged": "受 {{moveName}} 的影響， {{pokemonName}} 提升了能力！", + "perishBody": "因爲{{pokemonName}}的{{abilityName}}\n雙方將在3回合後滅亡！", + "poisonHeal": "{{pokemonName}}因{{abilityName}}\n回複了少許HP！", + "trace": "{{pokemonName}}複制了{{targetName}}的\n{{abilityName}}！", + "windPowerCharged": "受{{moveName}}的影響，{{pokemonName}}提升了能力！", + "quickDraw":"因爲速擊效果發動，\n{{pokemonName}}比平常出招更快了！", "disguiseAvoidedDamage": "{{pokemonNameWithAffix}}的畫皮脫落了！", + "blockItemTheft": "{{pokemonNameWithAffix}}的{{abilityName}}\n阻止了對方奪取道具！", + "typeImmunityHeal": "{{pokemonNameWithAffix}}因{{abilityName}}\n回複了少許HP！", + "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}}因{{abilityName}}\n避免了傷害！", "fullHpResistType": "{{pokemonNameWithAffix}}讓甲殼綻放光輝，扭曲了屬性相剋關係！", + "moveImmunity": "對{{pokemonNameWithAffix}}沒有效果！", + "reverseDrain": "{{pokemonNameWithAffix}}\n吸到了汙泥漿！", + "postDefendTypeChange": "{{pokemonNameWithAffix}}因{{abilityName}}\n變成了{{typeName}}屬性！", + "postDefendContactDamage": "{{pokemonNameWithAffix}}的{{abilityName}}\n使對方受到了傷害！", + "postDefendAbilitySwap": "{{pokemonNameWithAffix}}\n互換了各自的特性！", + "postDefendAbilityGive": "因爲{{pokemonNameWithAffix}}\n對方的特性變成了{{abilityName}}！", + "postDefendMoveDisable": "封住了{{pokemonNameWithAffix}}的\n{{moveName}}！", + "pokemonTypeChange": "{{pokemonNameWithAffix}}\n變成了{{moveType}}屬性！", + "postAttackStealHeldItem": "{{pokemonNameWithAffix}}從{{defenderName}}那裏\n奪取了{{stolenItemType}}！", + "postDefendStealHeldItem": "{{pokemonNameWithAffix}}從{{attackerName}}那裏\n奪取了{{stolenItemType}}！", + "copyFaintedAllyAbility": "繼承了{{pokemonNameWithAffix}}的\n{{abilityName}}！", + "intimidateImmunity": "{{pokemonNameWithAffix}}因{{abilityName}}沒有受到威嚇！", + "postSummonAllyHeal": "{{pokemonNameWithAffix}}喝光了\n{{pokemonName}}泡的茶！", + "postSummonClearAllyStats": "{{pokemonNameWithAffix}}的\n能力變化消失了！", + "postSummonTransform": "{{pokemonNameWithAffix}}\n變身成了{{targetName}}！", + "protectStat": "因{{pokemonNameWithAffix}}的{{abilityName}}\n{{statName}}不會降低！", + "statusEffectImmunityWithName": "{{pokemonNameWithAffix}}因{{abilityName}}\n{{statusEffectName}}沒有效果！", + "statusEffectImmunity": "{{pokemonNameWithAffix}}因{{abilityName}}\n異常狀態沒有效果！", + "battlerTagImmunity": "{{pokemonNameWithAffix}}因{{abilityName}}\n而不會{{battlerTagName}}！", + "forewarn": "{{pokemonNameWithAffix}}讀取了\n{{moveName}}！", + "frisk": "{{pokemonNameWithAffix}}察覺到了\n{{opponentName}}的{{opponentAbilityName}}！", + "postWeatherLapseHeal": "{{pokemonNameWithAffix}}因{{abilityName}}\n回複了少許HP！", + "postWeatherLapseDamage": "{{pokemonNameWithAffix}}\n因{{abilityName}}而受到了傷害！", + "postTurnLootCreateEatenBerry": "{{pokemonNameWithAffix}}\n收獲了{{berryName}}！", + "postTurnHeal": "{{pokemonNameWithAffix}}因{{abilityName}}\n回複了少許HP！", + "fetchBall": "{{pokemonNameWithAffix}}\n撿回了{{pokeballName}}！", + "healFromBerryUse": "{{pokemonNameWithAffix}}因{{abilityName}}\n回複了HP！", + "arenaTrap": "因{{pokemonNameWithAffix}}的{{abilityName}}\n而無法進行替換！", + "postBattleLoot": "{{pokemonNameWithAffix}}撿到了\n{{itemName}}！", + "postFaintContactDamage": "{{pokemonNameWithAffix}}的{{abilityName}}\n使對方受到了傷害！", + "postFaintHpDamage": "{{pokemonNameWithAffix}}的{{abilityName}}\n使對方受到了傷害！", + "postSummonPressure": "從{{pokemonNameWithAffix}}的身上\n感到了一種壓迫感！", "weatherEffectDisappeared": "天氣的影響消失了！", + "postSummonMoldBreaker": "{{pokemonNameWithAffix}}\n打破了常規！", + "postSummonAnticipation": "{{pokemonNameWithAffix}}\n發抖了！", + "postSummonTurboblaze": "{{pokemonNameWithAffix}}\n正在釋放熾焰氣場！", + "postSummonTeravolt": "{{pokemonNameWithAffix}}\n正在釋放濺射氣場！", + "postSummonDarkAura": "{{pokemonNameWithAffix}}\n正在釋放暗黑氣場！", + "postSummonFairyAura": "{{pokemonNameWithAffix}}\n正在釋放妖精氣場！", "postSummonAuraBreak": "{{pokemonNameWithAffix}}壓制了所有氣場！", + "postSummonNeutralizingGas": "周圍充滿了\n{{pokemonNameWithAffix}}的化學變化氣體！", + "postSummonAsOneGlastrier": "{{pokemonNameWithAffix}}\n同時擁有了兩種特性！", + "postSummonAsOneSpectrier": "{{pokemonNameWithAffix}}\n同時擁有了兩種特性！", + "postSummonVesselOfRuin": "{{pokemonNameWithAffix}}的災禍之鼎\n令周圍的寶可夢的{{statName}}減弱了！", + "postSummonSwordOfRuin": "{{pokemonNameWithAffix}}的災禍之劍\n令周圍的寶可夢的{{statName}}減弱了！", + "postSummonTabletsOfRuin": "{{pokemonNameWithAffix}}的災禍之簡\n令周圍的寶可夢的{{statName}}減弱了！", + "postSummonBeadsOfRuin": "{{pokemonNameWithAffix}}的災禍之玉\n令周圍的寶可夢的{{statName}}減弱了！", "preventBerryUse": "{{pokemonNameWithAffix}}因太緊張\n而無法食用樹果！" } diff --git a/src/locales/zh_TW/ability.json b/src/locales/zh_TW/ability.json index ddfe2783794..21206c5362a 100644 --- a/src/locales/zh_TW/ability.json +++ b/src/locales/zh_TW/ability.json @@ -469,7 +469,7 @@ }, "honeyGather": { "name": "採蜜", - "description": "The Pokémon gathers Honey after a battle. The Honey is then sold for money." + "description": "戰鬥結束時，有時候會撿來甜甜蜜。\n甜甜蜜會轉換成金錢。" }, "frisk": { "name": "察覺", @@ -1239,4 +1239,4 @@ "name": "毒傀儡", "description": "因為桃歹郎的招式而陷入中\n毒狀態的對手同時也會陷入\n混亂狀態。" } -} \ No newline at end of file +} diff --git a/src/locales/zh_TW/achv.json b/src/locales/zh_TW/achv.json index 9edce2e368d..804ec0c5089 100644 --- a/src/locales/zh_TW/achv.json +++ b/src/locales/zh_TW/achv.json @@ -21,7 +21,7 @@ "name": "暴發戶" }, "DamageAchv": { - "description": "在單次攻擊中造成 {{damageAmount}} 點傷害" + "description": "在單次攻擊中造成\n {{damageAmount}} 點傷害" }, "250_DMG": { "name": "重拳出擊" @@ -36,7 +36,7 @@ "name": "一拳超人" }, "HealAchv": { - "description": "通過技能、能力或攜帶的道具一次性治療 {{healAmount}} {{HP}}點" + "description": "通過技能、能力或攜帶的道具\n一次性治療 {{healAmount}} {{HP}}點" }, "250_HEAL": { "name": "新手奶媽" @@ -82,11 +82,11 @@ }, "TRANSFER_MAX_STAT_STAGE": { "name": "團隊協作", - "description": "在一項屬性強化至最大時用接力棒傳遞給其他寶可夢" + "description": "在一項屬性強化至最大時用\n接力棒傳遞給其他寶可夢" }, "MAX_FRIENDSHIP": { "name": "親密無間", - "description": "使一隻寶可夢的親密度達到最大值" + "description": "使一隻寶可夢的親密度\n達到最大值" }, "MEGA_EVOLVE": { "name": "大變身", @@ -106,7 +106,7 @@ }, "SPLICE": { "name": "無限融合", - "description": "使用基因之楔將兩隻寶可夢融合在一起" + "description": "使用基因之楔將兩隻寶可夢\n融合在一起" }, "MINI_BLACK_HOLE": { "name": "一大洞的道具", @@ -130,7 +130,7 @@ }, "SHINY_PARTY": { "name": "嘔心瀝血", - "description": "擁有一支由閃光寶可夢組成的滿員隊伍" + "description": "擁有一支由閃光寶可夢組成\n的滿員隊伍" }, "HATCH_MYTHICAL": { "name": "幻獸蛋", @@ -138,7 +138,7 @@ }, "HATCH_SUB_LEGENDARY": { "name": "二級傳說蛋", - "description": "從蛋中孵化出一隻準傳說寶可夢" + "description": "從蛋中孵化出一隻準傳說\n寶可夢" }, "HATCH_LEGENDARY": { "name": "傳說蛋", @@ -150,16 +150,20 @@ }, "HIDDEN_ABILITY": { "name": "隱藏實力", - "description": "捕捉一隻擁有隱藏特性的寶可夢" + "description": "捕捉一隻擁有隱藏特性\n的寶可夢" }, "PERFECT_IVS": { "name": "合格證", - "description": "獲得一隻擁有完美個體值的寶可夢" + "description": "獲得一隻擁有完美個體值\n的寶可夢" }, "CLASSIC_VICTORY": { "name": "戰無不勝", "description": "在經典模式中通關遊戲" }, + "UNEVOLVED_CLASSIC_VICTORY": { + "name": "帶孩上班", + "description": "通關經典模式時隊伍中至少有\n一名未進化的寶可夢" + }, "MONO_GEN_ONE": { "name": "最初的勁敵", "description": "完成僅限第一世代的挑戰." @@ -253,6 +257,10 @@ "MONO_FAIRY": { "name": "林克，醒醒！" }, + "FRESH_START": { + "name": "初次嘗試！", + "description": "完成初次嘗試挑戰" + }, "INVERSE_BATTLE": { "name": "鏡子子鏡", "description": "完成逆轉之戰挑戰\n戰挑戰之轉逆成完" diff --git a/src/locales/zh_TW/arena-flyout.json b/src/locales/zh_TW/arena-flyout.json index 9e26dfeeb6e..e201b683543 100644 --- a/src/locales/zh_TW/arena-flyout.json +++ b/src/locales/zh_TW/arena-flyout.json @@ -1 +1,43 @@ -{} \ No newline at end of file +{ + "activeBattleEffects": "當前戰鬥效果", + "player": "我方", + "neutral": "全局", + "enemy": "敵方", + + "sunny": "大晴天", + "rain": "下雨", + "sandstorm": "沙暴", + "hail": "冰雹", + "snow": "下雪", + "fog": "起霧", + "heavyRain": "大雨", + "harshSun": "大日照", + "strongWinds": "亂流", + + "misty": "薄霧場地", + "electric": "電氣場地", + "grassy": "青草場地", + "psychic": "精神場地", + + "mudSport": "玩泥巴", + "waterSport": "玩水", + "spikes": "撒菱", + "toxicSpikes": "毒菱", + "mist": "白霧", + "futureSight": "預知未來", + "doomDesire": "破滅之願", + "wish": "祈願", + "stealthRock": "隱形岩", + "stickyWeb": "黏黏網", + "trickRoom": "戲法空間", + "gravity": "重力", + "reflect": "反射壁", + "lightScreen": "光牆", + "auroraVeil": "極光幕", + "quickGuard": "快速防守", + "wideGuard": "廣域防守", + "matBlock": "掀榻榻米", + "craftyShield": "戲法防守", + "tailwind": "順風", + "happyHour": "快樂時光" +} diff --git a/src/locales/zh_TW/arena-tag.json b/src/locales/zh_TW/arena-tag.json index 78246d9c44f..a6224f300a3 100644 --- a/src/locales/zh_TW/arena-tag.json +++ b/src/locales/zh_TW/arena-tag.json @@ -1,11 +1,57 @@ { + "yourTeam": "我方隊伍", + "opposingTeam": "敵方隊伍", + "arenaOnRemove": "{{moveName}}的效果消失了！", + "arenaOnRemovePlayer": "{{moveName}}在我方的效果消失了！", + "arenaOnRemoveEnemy": "{{moveName}}在敵方的效果消失了！", + "mistOnAdd": "{{pokemonNameWithAffix}}的一方被\n白霧包圍了！", + "mistApply": "正受到白霧的保護\n能力不會被降低！", + "reflectOnAdd": "反射壁使\n物理抗性提高了！", + "reflectOnAddPlayer": "反射壁使我方的\n物理抗性提高了！", + "reflectOnAddEnemy": "反射壁使敵方的\n物理抗性提高了！", + "lightScreenOnAdd": "光牆使\n特殊抗性提高了！", + "lightScreenOnAddPlayer": "光牆使我方的\n特殊抗性提高了！", + "lightScreenOnAddEnemy": "光牆使敵方的\n特殊抗性提高了！", + "auroraVeilOnAdd": "極光幕使\n物理和特殊抗性提高了！", + "auroraVeilOnAddPlayer": "極光幕使我方的\n物理和特殊抗性提高了！", + "auroraVeilOnAddEnemy": "極光幕使敵方的\n物理和特殊抗性提高了！", + "conditionalProtectOnAdd": "{{moveName}}\n保護了！", + "conditionalProtectOnAddPlayer": "{{moveName}}\n保護了我方！", + "conditionalProtectOnAddEnemy": "{{moveName}}\n保護了敵方！", + "conditionalProtectApply": "{{moveName}}\n保護了{{pokemonNameWithAffix}}！", + "matBlockOnAdd": "{{pokemonNameWithAffix}}正在\n伺機使出掀榻榻米！", "noCritOnAddPlayer": "{{moveName}}保護了你的\n隊伍不被擊中要害！", "noCritOnAddEnemy": "{{moveName}}保護了對方的\n隊伍不被擊中要害！", "noCritOnRemove": "{{pokemonNameWithAffix}}的{{moveName}}\n效果消失了！", + "wishTagOnAdd": "{{pokemonNameWithAffix}}的\n祈願實現了！", + "mudSportOnAdd": "電氣的威力減弱了！", + "mudSportOnRemove": "玩泥巴的效果消失了！", + "waterSportOnAdd": "火焰的威力減弱了！", + "waterSportOnRemove": "玩水的效果消失了！", + "spikesOnAdd": "{{opponentDesc}}腳下\n散落著{{moveName}}！", + "spikesActivateTrap": "{{pokemonNameWithAffix}}\n受到了撒菱的傷害！", + "toxicSpikesOnAdd": "{{opponentDesc}}腳下\n散落著{{moveName}}！", + "toxicSpikesActivateTrapPoison": "{{pokemonNameWithAffix}}\n吸收了{{moveName}}！", + "stealthRockOnAdd": "{{opponentDesc}}周圍\n開始浮現出尖銳的岩石！", + "stealthRockActivateTrap": "尖銳的岩石紮進了\n{{pokemonNameWithAffix}}的體內！", + "stickyWebOnAdd": "對方的腳下\n延伸出了{{moveName}}！", + "stickyWebActivateTrap": "{{pokemonName}}\n被黏黏網粘住了！", + "trickRoomOnAdd": "{{pokemonNameWithAffix}}\n扭曲了時空！", + "trickRoomOnRemove": "扭曲的時空複原了！", + "gravityOnAdd": "重力變強了！", + "gravityOnRemove": "重力複原了！", + "tailwindOnAdd": "從身後\n吹起了順風！", + "tailwindOnAddPlayer": "從我方身後\n吹起了順風！", + "tailwindOnAddEnemy": "從敵方身後\n吹起了順風！", + "tailwindOnRemove": "順風停止了！", + "tailwindOnRemovePlayer": "我方的順風停止了！", + "tailwindOnRemoveEnemy": "敵方的順風停止了！", + "happyHourOnAdd": "大家被歡樂的\n氣氛包圍了！", + "happyHourOnRemove": "氣氛回複到平常了。", "safeguardOnAdd": "整個場地被\n神秘之幕包圍了！", "safeguardOnAddPlayer": "我方被\n神秘之幕包圍了！", "safeguardOnAddEnemy": "對手被\n神秘之幕包圍了！", "safeguardOnRemove": "包圍整個場地的\n神秘之幕消失了！", "safeguardOnRemovePlayer": "包圍我方的\n神秘之幕消失了！", "safeguardOnRemoveEnemy": "包圍對手的\n神秘之幕消失了！" -} \ No newline at end of file +} diff --git a/src/locales/zh_TW/battle.json b/src/locales/zh_TW/battle.json index 0d44688ff4a..66da1b7cace 100644 --- a/src/locales/zh_TW/battle.json +++ b/src/locales/zh_TW/battle.json @@ -1,69 +1,98 @@ { - "bossAppeared": "{{bossName}} 出現了.", + "bossAppeared": "{{bossName}} 出現了。", "trainerAppeared": "{{trainerName}}\n想要和你對戰！", "trainerAppearedDouble": "{{trainerName}}\n想要和你對戰！", - "singleWildAppeared": "一隻野生的 {{pokemonName}} 出現了！", - "multiWildAppeared": "野生的 {{pokemonName1}}\n和 {{pokemonName2}} 出現了！", - "playerComeBack": "回來吧, {{pokemonName}}！", - "trainerComeBack": "{{trainerName}} 收回了 {{pokemonName}}！", - "playerGo": "去吧！ {{pokemonName}}！", - "trainerGo": "{{trainerName}} 派出了 {{pokemonName}}！", + "trainerSendOut": "{{trainerName}}派出了\n{{pokemonName}}！", + "singleWildAppeared": "一只野生的{{pokemonName}}出現了！", + "multiWildAppeared": "野生的{{pokemonName1}}\n和{{pokemonName2}}出現了！", + "playerComeBack": "回來吧，{{pokemonName}}！", + "trainerComeBack": "{{trainerName}}收回了{{pokemonName}}！", + "playerGo": "去吧！{{pokemonName}}！", + "trainerGo": "{{trainerName}}派出了\n{{pokemonName}}！", + "trainerSendOut": "{{trainerName}}派出了\n{{pokemonName}}！", + "singleWildAppeared": "一只野生的{{pokemonName}}出現了！", + "multiWildAppeared": "野生的{{pokemonName1}}\n和{{pokemonName2}}出現了！", + "playerComeBack": "回來吧，{{pokemonName}}！", + "trainerComeBack": "{{trainerName}}收回了{{pokemonName}}！", + "playerGo": "去吧！{{pokemonName}}！", + "trainerGo": "{{trainerName}}派出了\n{{pokemonName}}！", "switchQuestion": "要更換\n{{pokemonName}}嗎？", "trainerDefeated": "你擊敗了\n{{trainerName}}！", - "moneyPickedUp": "撿到了 ₽{{moneyAmount}}！", - "pokemonCaught": "{{pokemonName}} 被抓住了！", + "moneyWon": "你贏得了\n₽{{moneyAmount}}！", + "moneyPickedUp": "撿到了₽{{moneyAmount}}！", + "pokemonCaught": "{{pokemonName}}被抓住了！", + "addedAsAStarter": "增加了{{pokemonName}}作爲\n一個新的基礎寶可夢！", + "partyFull": "你的隊伍已滿員。是否放生其他寶可夢\n爲{{pokemonName}}騰出空間？", "pokemon": "寶可夢", - "sendOutPokemon": "上吧！ {{pokemonName}}！", + "sendOutPokemon": "上吧！\n{{pokemonName}}！", "hitResultCriticalHit": "擊中了要害！", "hitResultSuperEffective": "效果拔群！", "hitResultNotVeryEffective": "收效甚微…", - "hitResultNoEffect": "對 {{pokemonName}} 沒有效果！", + "hitResultNoEffect": "對{{pokemonName}}沒有效果！", "hitResultImmune": "對于{{pokemonName}}，\n完全沒有效果！", - "hitResultOneHitKO": "一擊切殺！", + "hitResultOneHitKO": "一擊必殺！", "attackFailed": "但是失敗了！", "attackMissed": "沒有命中{{pokemonNameWithAffix}}！", - "attackHitsCount": "擊中 {{count}} 次！", - "rewardGain": "You received\n{{modifierName}}!", - "expGain": "{{pokemonName}} 獲得了 {{exp}} 經驗值！", - "levelUp": "{{pokemonName}} 升級到 Lv. {{level}}！", - "learnMove": "{{pokemonName}} 學會了{{moveName}}！", - "learnMovePrompt": "{{pokemonName}} 想要學習 {{moveName}}.", - "learnMoveLimitReached": "但是, {{pokemonName}} 已經學會了\n四個招式.", - "learnMoveReplaceQuestion": "要忘記一個招式並學習 {{moveName}} 嗎？", - "learnMoveStopTeaching": "不再嘗試學習\n{{moveName}}嗎？", - "learnMoveNotLearned": "{{pokemonName}} 沒有學會 {{moveName}}.", + "attackHitsCount": "擊中{{count}}次！", + "rewardGain": "你獲得了\n{{modifierName}}！", + "expGain": "{{pokemonName}}獲得了{{exp}} 點經驗值！", + "levelUp": "{{pokemonName}}升級到Lv.{{level}}！", + "learnMove": "{{pokemonName}}學會了{{moveName}}！", + "learnMovePrompt": "{{pokemonName}}想要學習{{moveName}}。", + "learnMoveLimitReached": "但是，{{pokemonName}}已經學會了\n四個技能", + "learnMoveReplaceQuestion": "要忘記一個技能並學習{{moveName}}嗎？", + "learnMoveStopTeaching": "不再嘗試學習{{moveName}}？", + "learnMoveNotLearned": "{{pokemonName}}沒有學會{{moveName}}。", "learnMoveForgetQuestion": "要忘記哪個技能？", - "learnMoveForgetSuccess": "{{pokemonName}} 忘記了 {{moveName}}.", - "countdownPoof": "@d{32}1, @d{15}2, 和@d{15}… @d{15}… @d{15}… @d{15}@s{se/pb_bounce_1}噗！", - "learnMoveAnd": "然後…", - "levelCapUp": "等級上限提升到 {{levelCap}}！", - "moveNotImplemented": "{{moveName}} 未實裝，無法選擇。", + "learnMoveForgetSuccess": "{{pokemonName}}忘記了\n如何使用{{moveName}}。", + "countdownPoof": "@d{32}1, @d{15}2 @d{15}… @d{15}… @d{15}@s{pb_bounce_1}空！", + "learnMoveAnd": "然後……", + "levelCapUp": "等級上限提升到{{levelCap}}！", + "moveNotImplemented": "{{moveName}}尚未實裝，無法選擇。", "moveNoPP": "這個技能的PP用完了", - "moveDisabled": "{{moveName}} 被禁用！", + "moveDisabled": "{{moveName}}被禁用！", "disableInterruptedMove": "{{pokemonNameWithAffix}}的{{moveName}}\n被無效化了！", "noPokeballForce": "一股無形的力量阻止了你使用精靈球。", "noPokeballTrainer": "你不能捕捉其他訓練家的寶可夢！", - "noPokeballMulti": "只能在剩下一隻寶可夢時才能扔出精靈球！", - "noPokeballStrong": "目標寶可夢太強了，無法捕捉！你需要先\n削弱它！", + "noPokeballMulti": "只能在剩下一只寶可夢時才能扔出精靈球！", + "noPokeballStrong": "目標寶可夢太強了，無法捕捉！\n你需要先削弱它！", "noEscapeForce": "一股無形的力量阻止你逃跑。", - "noEscapeTrainer": "你不能從訓練家對戰中逃跑！", - "noEscapePokemon": "{{pokemonName}} 的 {{moveName}} 阻止了你 {{escapeVerb}}！", - "runAwaySuccess": "你成功逃脫了！", - "runAwayCannotEscape": "你無法逃脫！", + "noEscapeTrainer": "你不能從與訓練家的戰鬥中逃跑！", + "noEscapePokemon": "{{pokemonName}}的{{moveName}}\n阻止了你{{escapeVerb}}！", + "runAwaySuccess": "成功逃走了！", + "runAwayCannotEscape": "無法逃走！", "escapeVerbSwitch": "切換", "escapeVerbFlee": "逃跑", - "ppHealBerry": "{{pokemonNameWithAffix}}用{{berryName}}\n回復了{{moveName}}的PP！", - "hpHealBerry": "{{pokemonNameWithAffix}}用{{berryName}}\n回復了體力！", - "notDisabled": "{{moveName}} 不再被禁用！", - "skipItemQuestion": "你要跳過拾取道具嗎？", - "itemStackFull": "{{fullItemName}}持有數已達到上限，\n你獲得了{{itemName}}作爲代替。", + "notDisabled": "{{moveName}}不再被禁用！", + "turnEndHpRestore": "{{pokemonName}}的體力恢複了。", + "hpIsFull": "{{pokemonName}}的體力已滿！", + "skipItemQuestion": "你確定要跳過拾取道具嗎？", + "itemStackFull": "{{fullItemName}}持有數達到上限，\n你獲得了{{itemName}}作爲替代。", "eggHatching": "咦？", - "ivScannerUseQuestion": "對 {{pokemonName}} 使用個體值掃描儀？", - "wildPokemonWithAffix": "野生的 {{pokemonName}}", - "foePokemonWithAffix": "對手 {{pokemonName}}", - "useMove": "{{pokemonNameWithAffix}} 使用了 {{moveName}}！", - "drainMessage": "{{pokemonName}} 吸取了體力！", - "regainHealth": "{{pokemonName}} 回復了體力！", - "fainted": "{{pokemonNameWithAffix}} 倒下了！", - "ppReduced": "降低了 {{targetName}} 的\n{{moveName}} 的PP{{reduction}}點！" + "stealEatBerry": "{{pokemonName}}奪取並吃掉了\n{{targetName}}的{{berryName}}！", + "ppHealBerry": "{{pokemonNameWithAffix}}用{{berryName}}\n回複了{{moveName}}的PP！", + "hpHealBerry": "{{pokemonNameWithAffix}}用{{berryName}}\n回複了體力！", + "ivScannerUseQuestion": "對{{pokemonName}}使用個體值掃描儀？", + "wildPokemonWithAffix": "野生的{{pokemonName}}", + "foePokemonWithAffix": "對手的{{pokemonName}}", + "useMove": "{{pokemonNameWithAffix}}使用了\n{{moveName}}！", + "drainMessage": "{{pokemonName}}\n吸取了體力！", + "regainHealth": "{{pokemonName}}\n回複了體力！", + "fainted": "{{pokemonNameWithAffix}}\n倒下了！", + "statsAnd": "和", + "stats": "能力", + "statRose_other": "{{pokemonNameWithAffix}}的{{stats}}提高了！", + "statSharplyRose_other": "{{pokemonNameWithAffix}}的{{stats}}大幅提高了！", + "statRoseDrastically_other": "{{pokemonNameWithAffix}}的{{stats}}極大幅提高了！", + "statWontGoAnyHigher_other": "{{pokemonNameWithAffix}}的{{stats}}已經無法再提高了！", + "statFell_other": "{{pokemonNameWithAffix}}的{{stats}}降低了！", + "statHarshlyFell_other": "{{pokemonNameWithAffix}}的{{stats}}大幅降低了！", + "statSeverelyFell_other": "{{pokemonNameWithAffix}}的{{stats}}極大幅降低了！", + "statWontGoAnyLower_other": "{{pokemonNameWithAffix}}的{{stats}}已經無法再降低了！", + "transformedIntoType": "{{pokemonName}}變成了\n{{type}}屬性！", + "ppReduced": "降低了{{targetName}}的\n{{moveName}}的PP{{reduction}}點！", + "retryBattle": "你要從對戰開始時重試麽？", + "unlockedSomething": "{{unlockedThing}}\n已解鎖。", + "congratulations": "恭喜！", + "beatModeFirstTime": "{{speciesName}}首次擊敗了{{gameMode}}！\n你獲得了{{newModifier}}！" } diff --git a/src/locales/zh_TW/battler-tags.json b/src/locales/zh_TW/battler-tags.json index b5a2760f7ac..9653db1077a 100644 --- a/src/locales/zh_TW/battler-tags.json +++ b/src/locales/zh_TW/battler-tags.json @@ -67,6 +67,8 @@ "saltCuredLapse": "{{pokemonNameWithAffix}} 受到了{{moveName}}的傷害！", "cursedOnAdd": "{{pokemonNameWithAffix}}削減了自己的體力，並詛咒了{{pokemonName}}！", "cursedLapse": "{{pokemonNameWithAffix}}正受到詛咒！", + "stockpilingOnAdd": "{{pokemonNameWithAffix}}蓄力了{{stockpiledCount}}次！", "disabledOnAdd": "封住了{{pokemonNameWithAffix}}的\n{moveName}}！", - "disabledLapse": "{{pokemonNameWithAffix}}的\n定身法解除了！" + "disabledLapse": "{{pokemonNameWithAffix}}的\n定身法解除了！", + "tarShotOnAdd": "{{pokemonNameWithAffix}}\n變得怕火了！" } diff --git a/src/locales/zh_TW/bgm-name.json b/src/locales/zh_TW/bgm-name.json index 9e26dfeeb6e..e8546750977 100644 --- a/src/locales/zh_TW/bgm-name.json +++ b/src/locales/zh_TW/bgm-name.json @@ -1 +1,141 @@ -{} \ No newline at end of file +{ + "music": "Music: ", + "missing_entries" : "{{name}}", + "battle_kanto_champion": "黑2白2「決戰！關都冠軍」", + "battle_johto_champion": "黑2白2「決戰！城都冠軍」", + "battle_hoenn_champion_g5": "黑2白2「決戰！豐緣冠軍」", + "battle_hoenn_champion_g6": "Ω紅寶石α藍寶石「決戰！豐緣冠軍」", + "battle_sinnoh_champion": "黑2白2「決戰！神奧冠軍」", + "battle_champion_alder": "黑白「決戰！合衆冠軍」", + "battle_champion_iris": "黑2白2「決戰！合衆冠軍」", + "battle_kalos_champion": "XY「決戰！卡洛斯冠軍」", + "battle_alola_champion": "究極日月「頂上決戰！」", + "battle_galar_champion": "劍盾「決戰！伽勒爾冠軍」", + "battle_champion_geeta": "朱紫「決戰！帕底亞首席也慈」", + "battle_champion_nemona": "朱紫「決戰！帕底亞冠軍妮莫」", + "battle_champion_kieran": "朱紫「決戰！藍莓學園冠軍烏栗」", + "battle_hoenn_elite": "Ω紅寶石α藍寶石 「戰鬥！豐緣四天王」", + "battle_unova_elite": "黑白 「戰鬥！合衆四天王」", + "battle_kalos_elite": "XY「戰鬥！卡洛斯四天王」", + "battle_alola_elite": "日月「戰鬥！阿羅拉四天王」", + "battle_galar_elite": "劍盾「聯盟錦標賽」", + "battle_paldea_elite": "朱紫「戰鬥！帕底亞四天王」", + "battle_bb_elite": "朱紫「戰鬥！藍之圓盤四天王」", + "battle_final_encounter": "探險隊DX 「裂空座的領域」", + "battle_final": "黑白「戰鬥！魁奇思」", + "battle_kanto_gym": "黑2白2「戰鬥！關都道館主」", + "battle_johto_gym": "黑2白2「戰鬥！城都道館主」", + "battle_hoenn_gym": "黑2白2「戰鬥！合衆道館主」", + "battle_sinnoh_gym": "黑2白2「戰鬥！神奧道館主」", + "battle_unova_gym": "黑白「戰鬥！合衆道館主」", + "battle_kalos_gym": "XY「戰鬥！卡洛斯道館主」", + "battle_galar_gym": "劍盾「戰鬥！伽勒爾道館主」", + "battle_paldea_gym": "朱紫「戰鬥！帕底亞道館主」", + "battle_legendary_kanto": "XY「戰鬥！傳說寶可夢（關都）」", + "battle_legendary_raikou": "心金魂銀「戰鬥！雷公」", + "battle_legendary_entei": "心金魂銀「戰鬥！炎帝」", + "battle_legendary_suicune": "心金魂銀「戰鬥！水君」", + "battle_legendary_lugia": "心金魂銀「戰鬥！洛奇亞」", + "battle_legendary_ho_oh": "心金魂銀「戰鬥！鳳王」", + "battle_legendary_regis_g5": "黑2白2「戰鬥！傳說中的巨人」", + "battle_legendary_regis_g6": "Ω紅寶石α藍寶石「戰鬥！傳說中的巨人」", + "battle_legendary_gro_kyo": "Ω紅寶石α藍寶石「戰鬥！原始回歸」", + "battle_legendary_rayquaza": "Ω紅寶石α藍寶石「戰鬥！超古代寶可夢」", + "battle_legendary_deoxys": "Ω紅寶石α藍寶石「戰鬥！代歐奇希斯」", + "battle_legendary_lake_trio": "Ω紅寶石α藍寶石「戰鬥！由克希・艾姆利多・亞克諾姆」", + "battle_legendary_sinnoh": "Ω紅寶石α藍寶石「戰鬥！傳說的寶可夢」", + "battle_legendary_dia_pal": "Ω紅寶石α藍寶石「戰鬥！帝牙盧卡・帕路奇亞」", + "battle_legendary_giratina": "Ω紅寶石α藍寶石「戰鬥！騎拉帝納」", + "battle_legendary_arceus": "心金魂銀「阿爾宙斯」", + "battle_legendary_unova": "黑白「戰鬥！傳說的寶可夢」", + "battle_legendary_kyurem": "黑白「戰鬥！酋雷姆」", + "battle_legendary_res_zek": "黑白「戰鬥！萊希拉姆・捷克羅姆」", + "battle_legendary_xern_yvel": "XY「戰鬥！哲爾尼亞斯・伊裴爾塔爾」", + "battle_legendary_tapu": "日月「戰鬥！卡璞」", + "battle_legendary_sol_lun": "日月「戰鬥！露奈雅拉・索爾迦雷歐」", + "battle_legendary_ub": "日月「戰鬥！究極異獸」", + "battle_legendary_dusk_dawn": "究極日月「戰鬥！日食・月食 奈克洛茲瑪」", + "battle_legendary_ultra_nec": "究極日月「戰鬥！究極奈克洛茲瑪」", + "battle_legendary_zac_zam": "劍盾「戰鬥！蒼響・藏瑪然特」", + "battle_legendary_glas_spec": "劍盾「戰鬥！ 雪暴馬・靈幽馬」", + "battle_legendary_calyrex": "劍盾「戰鬥！蕾冠王」", + "battle_legendary_birds_galar": "劍盾「戰鬥！傳說的鳥寶可夢」", + "battle_legendary_ruinous": "朱紫「戰鬥！災厄寶可夢」", + "battle_legendary_kor_mir": "朱紫「戰鬥！第零區的寶可夢2」", + "battle_legendary_loyal_three": "朱紫「戰鬥！寶伴」", + "battle_legendary_ogerpon": "朱紫「戰鬥！厄鬼椪」", + "battle_legendary_terapagos": "朱紫「戰鬥！太樂巴戈斯」", + "battle_legendary_pecharunt": "朱紫「戰鬥！桃歹郎」", + "battle_rival": "黑白「戰鬥！黑連・貝爾」", + "battle_rival_2": "黑白「戰鬥！N」", + "battle_rival_3": "黑白「決戰！N」", + "battle_trainer": "黑白「戰鬥！訓練師」", + "battle_wild": "黑白「戰鬥！野生寶可夢」", + "battle_wild_strong": "黑白「戰鬥！強大野生寶可夢」", + "end_summit": "探險隊DX 「天空之柱 頂層」", + "battle_rocket_grunt": "心金魂銀「戰鬥！火箭隊」", + "battle_aqua_magma_grunt": "Ω紅寶石α藍寶石「戰鬥！熔岩隊・海洋隊」", + "battle_galactic_grunt": "晶燦鑽石·明亮珍珠「戰鬥！銀河隊」", + "battle_plasma_grunt": "黑白「戰鬥！等離子團」", + "battle_flare_grunt": "XY「戰鬥！閃焰隊」", + "battle_rocket_boss": "究極日月「戰鬥！坂木」", + "battle_aqua_magma_boss": "Ω紅寶石α藍寶石「戰鬥！水梧桐・赤焰松」", + "battle_galactic_boss": "晶燦鑽石·明亮珍珠「戰鬥！赤日」", + "battle_plasma_boss": "黑2白2「戰鬥！魁奇思」", + "battle_flare_boss": "XY「戰鬥！弗拉達利」", + + "abyss": "空之探險隊「黑暗小丘」", + "badlands": "空之探險隊「枯竭之谷」", + "beach": "空之探險隊「潮濕岩地」", + "cave": "空之探險隊「天空頂端（洞窟）」", + "construction_site": "空之探險隊「幻影石室」", + "desert": "空之探險隊「北方沙漠」", + "dojo": "空之探險隊「嘎啦嘎啦道場」", + "end": "探險隊DX「天空之柱」", + "factory": "空之探險隊「隱藏遺迹」", + "fairy_cave": "空之探險隊「星之洞窟」", + "forest": "空之探險隊「黑暗森林」", + "grass": "空之探險隊「蘋果森林」", + "graveyard": "空之探險隊「神秘森林」", + "ice_cave": "空之探險隊「大冰山」", + "island": "空之探險隊「沿岸岩地」", + "jungle": "Lmz - 叢林", + "laboratory": "Firel - 研究所", + "lake": "空之探險隊「水晶洞窟」", + "meadow": "空之探險隊「天空頂端（森林）」", + "metropolis": "Firel - 城市", + "mountain": "空之探險隊「角山」", + "plains": "空之探險隊「天空頂端（草原）」", + "power_plant": "空之探險隊「電氣平原 深處」", + "ruins": "空之探險隊「封印岩地 深處」", + "sea": "Andr06 - 海洋之秘", + "seabed": "Firel - 海底", + "slum": "Andr06 - 狡猾的雪吞蟲", + "snowy_forest": "空之探險隊「天空頂端（雪山）」", + "space": "Firel - 太空", + "swamp": "空之探險隊「封閉之海」", + "tall_grass": "空之探險隊「濃霧森林」", + "temple": "空之探險隊「守護洞穴」", + "town": "空之探險隊「隨機迷宮3」", + "volcano": "空之探險隊「熱水洞窟」", + "wasteland": "空之探險隊「夢幻高原」", + + "encounter_ace_trainer": "黑白 「視線！精英訓練師」", + "encounter_backpacker": "黑白 「視線！背包客」", + "encounter_clerk": "黑白 「視線！上班族」", + "encounter_cyclist": "黑白 「視線！自行車手」", + "encounter_lass": "黑白 「視線！迷你裙」", + "encounter_parasol_lady": "黑白 「視線！陽傘姐姐」", + "encounter_pokefan": "黑白 「視線！寶可夢愛好者」", + "encounter_psychic": "黑白 「視線！超能力者」", + "encounter_rich": "黑白 「視線！紳士」", + "encounter_rival": "黑白「黑連」", + "encounter_roughneck": "黑白 「視線！光頭」", + "encounter_scientist": "黑白 「視線！科學家」", + "encounter_twins": "黑白 「視線！雙胞胎」", + "encounter_youngster": "黑白 「視線！短褲小子」", + + "heal": "黑白「寶可夢回複」", + "menu": "空之探險隊「歡迎來到寶可夢的世界」", + "title": "空之探險隊「主題曲」" +} diff --git a/src/locales/zh_TW/challenges.json b/src/locales/zh_TW/challenges.json index a1fc6b8f50f..f600cc24a84 100644 --- a/src/locales/zh_TW/challenges.json +++ b/src/locales/zh_TW/challenges.json @@ -20,6 +20,12 @@ "desc": "你只能使用{{type}}\n屬性的寶可夢", "desc_default": "你只能使用所選\n屬性的寶可夢" }, + "freshStart": { + "name": "初次嘗試", + "desc": "你只能使用禦三家，就像是你第一次玩寶可夢肉鴿一樣。", + "value.0": "關閉", + "value.1": "開啓" + }, "inverseBattle": { "name": "逆轉之戰", "shortName": "逆轉之戰", @@ -27,4 +33,4 @@ "value.0": "關閉", "value.1": "開啓" } -} \ No newline at end of file +} diff --git a/src/locales/zh_TW/common.json b/src/locales/zh_TW/common.json index 29ac963ebc3..8b0f91802ee 100644 --- a/src/locales/zh_TW/common.json +++ b/src/locales/zh_TW/common.json @@ -1,8 +1,8 @@ { "start": "開始", - "luckIndicator": "Luck:", - "shinyOnHover": "Shiny", + "luckIndicator": "幸運:", + "shinyOnHover": "閃光", "commonShiny": "常見", "rareShiny": "稀有", "epicShiny": "史詩" -} \ No newline at end of file +} diff --git a/src/locales/zh_TW/dialogue-double-battle.json b/src/locales/zh_TW/dialogue-double-battle.json index 684beac5eaf..612bf3d4490 100644 --- a/src/locales/zh_TW/dialogue-double-battle.json +++ b/src/locales/zh_TW/dialogue-double-battle.json @@ -9,10 +9,10 @@ }, "red_blue_double": { "encounter": { - "1": "赤紅: ...!$青綠：他人狠話不多。$青綠： 他人狠話不多。$青綠： 但別被他耍了，\n畢竟他可是個冠軍！" + "1": "赤紅: ...！$青綠：他人狠話不多。$青綠： 他人狠話不多。$青綠： 但別被他耍了，\n畢竟他可是個冠軍！" }, "victory": { - "1": "赤紅: ...!$青綠: 下次我們一定會贏你！" + "1": "赤紅: ...！$青綠: 下次我們一定會贏你！" } }, "tate_liza_double": { @@ -79,4 +79,4 @@ "1": "聶梓：這首歌獻給大家！$瑪俐：哥哥……" } } -} \ No newline at end of file +} diff --git a/src/locales/zh_TW/dialogue-misc.json b/src/locales/zh_TW/dialogue-misc.json index 408bcac546b..73771e96027 100644 --- a/src/locales/zh_TW/dialogue-misc.json +++ b/src/locales/zh_TW/dialogue-misc.json @@ -1,4 +1,4 @@ { "ending": "@c{shock}你回來了？@d{32} 也就是說…@d{96} 你贏了呀！？\n@c{smile_ehalf}我應該早料到了。\n$@c{smile_eclosed}當然…我一直有這種感覺\n@c{smile}一切都結束了，對麼？ 你打破了循環。\n$@c{smile_ehalf}你也完成了自己的夢想，不是嗎？\n你甚至一次都沒失敗。\n$我是唯一能夠記得你所作所為的人\n@c{angry_mopen}我會努力不忘掉哒！\n$@c{smile_wave_wink}開玩笑啦，@d{64} @c{smile}我才不會忘呢。@d{32}\n你的傳奇將永遠留存於我們心中。\n$@c{smile_wave}不管了，@d{64} 時候不早了@d{96} ，應該吧？\n在這地方還真搞不清楚。\n$一起回家吧。 @c{smile_wave_wink}可能明天，我們再來打一場，為了重溫回憶嘛~", - "ending_female": "@c{smile}哦?你贏了？@d{96} @c{smile_eclosed}我應該早猜到了\n你回來了。\n$@c{smile}結束了。@d{64} 你終結了這個循環。\n$@c{serious_smile_fists}你也完成了自己的夢想，不是嗎？\n你甚至一次都沒失敗。\n$@c{neutral}我是唯一能夠記得你所作所為的人@d{96}\n我覺得這應該也還行吧？\n$@c{serious_smile_fists}你的傳奇將永遠留存於我們心中。\n$@c{smile_eclosed}不管了，我真是受夠這個地方了，你也一樣嗎？我們回家吧。\n$@c{serious_smile_fists}可能等我們回家以後，再打一場？\n要是你想的話" + "ending_female": "@c{smile}哦？你贏了？@d{96} @c{smile_eclosed}我應該早猜到了\n你回來了。\n$@c{smile}結束了。@d{64} 你終結了這個循環。\n$@c{serious_smile_fists}你也完成了自己的夢想，不是嗎？\n你甚至一次都沒失敗。\n$@c{neutral}我是唯一能夠記得你所作所為的人@d{96}\n我覺得這應該也還行吧？\n$@c{serious_smile_fists}你的傳奇將永遠留存於我們心中。\n$@c{smile_eclosed}不管了，我真是受夠這個地方了，你也一樣嗎？我們回家吧。\n$@c{serious_smile_fists}可能等我們回家以後，再打一場？\n要是你想的話" } diff --git a/src/locales/zh_TW/dialogue.json b/src/locales/zh_TW/dialogue.json index 4236e239622..99427ac5f14 100644 --- a/src/locales/zh_TW/dialogue.json +++ b/src/locales/zh_TW/dialogue.json @@ -379,6 +379,414 @@ "3": "好像是我暈船了…" } }, + "archer": { + "encounter": { + "1": "在你繼續前進之前，\n讓我看看你要如何和對付火箭隊。", + "2": "我收到報告說你的實力與衆不同，\n就讓我來看看這是否屬實吧。", + "3": "我是阿波羅，火箭對的幹部。\n我不會對組織的敵人手軟。" + }, + "victory": { + "1": "大失誤……", + "2": "以我現在的實力，無法勝任我的任務……", + "3": "原……諒我，坂木。\n我竟被一名訓練師打敗了。." + } + }, + "ariana": { + "encounter": { + "1": "站住！我們可不能放過你！$這會損傷火箭對的名譽，明白嗎？", + "2": "我不知道也不想知道我的所作所爲正確與否…$我只要遵從坂木老大的指令就可以了！", + "3": "你的旅途到此爲止了，我會把你狠狠扳倒！" + }, + "victory": { + "1": "切，你好強，可惡。$如果你加入火箭隊，肯定能成爲幹部。", + "2": "好……好崩潰……", + "3": "嗯啊啊！這不可能！我使出全力還是輸了！" + } + }, + "proton": { + "encounter": { + "1": "你想幹什麽？如果你要妨礙我們的事業，我可不會手下留情。", + "2": "你在這幹什麽？別人總說我是火箭隊裏最殘忍和恐怖的人…$我強烈推薦你別來礙我們的事！", + "3": "我是蘭斯，火箭隊的幹部。就讓來掃除你對我們的阻撓。" + }, + "victory": { + "1": "我的防線崩潰了……", + "2": "你雖然這次贏了，但是這只是讓火箭隊的怒火繼續燃燒！", + "3": "我輸了…但是我不會忘記的。" + } + }, + + "petrel": { + "encounter": { + "1": "哇哈哈哈，我們一直在等你。我？你不知道我是誰？是我，坂木啊。$偉大的坂木大人本人！哇哈哈哈！…啊？我聽起來不像坂木嗎？$我連看起來都不像？怎麽會呢，我可認真的變裝了！", + "2": "我是拉姆達，火箭隊的幹部。我不會允許你幹涉我們的計劃！", + "3": "火箭隊幹部拉姆達來會會這個入侵者！" + }, + "victory": { + "1": "好好好，我會說他在哪的", + "2": "我……我什麽也做不了……坂木，請原諒我……", + "3": "不，我不能慌了神，必須通知其他人…" + } + }, + "tabitha": { + "encounter": { + "1": "呵呵呵！原來你都一路來到這裏了！但你來晚了！", + "2": "呵呵呵……你終于來了？我們小瞧你了，沒不過事！ $我比你見過的所有隊員都要厲害，我可不會拖延時間。$我會把你碾碎！", + "3": "我要讓你嘗嘗痛苦的滋味！認命吧！" + }, + "victory": { + "1": "呵呵呵！雖然你打敗了我，但你根本沒機會打敗老大！$如果你現在輸了，你就不用面對那樣嚴厲的鞭笞了！", + "2": "呵呵呵……所以，我也輸了……", + "3": "啊哈！怎麽會這樣？像我這樣的幹部\n竟然輸給了一個隨處可見的訓練師……" + } + }, + "courtney": { + "encounter": { + "1": "那個東西……你所擁有的那個東西……\n那就是……那就是我們熔岩隊所尋找的東西……", + "2": "……那麽……刪除記憶……", + "3": "……哈……分析中……啊哈♪" + }, + "victory": { + "1": "……改變……世界。", + "2": "如預期。出乎意料。目標鎖定…鎖定你……完成。$開始……實驗。材料是你…永遠…啊哈……♪", + "3": "……又來了？出乎意料……我就知道。你……很有趣！……啊哈哈！♪" + } + }, + "shelly": { + "encounter": { + "1": "啊哈哈哈哈！你要插手海洋隊的事？$你要麽是絕對無畏，要麽就是無知，或者兩者兼有！$你太可愛了，太惡心了！我要把你打倒！", + "2": "怎麽回事？這個小鬼頭是誰？", + "3": "冷靜點，耐心點。我很快就會把你擊潰。" + }, + "victory": { + "1": "啊哈哈哈哈！我們意外地被人幹擾了！我們別無選擇。$不得不撤退了，但這會不是你最後一次面對海洋隊！$我們還有其他計劃！別忘了！", + "2": "啊？！我是不是對你太溫柔了？！", + "3": "唉…難道在對戰中你也一刻不停地在變強嗎？$你真是個前途光明的小鬼……\n我和我的寶可夢已經沒有任何力量去戰鬥了……$繼續吧……准備去被水梧桐摧毀吧。" + } + }, + "matt": { + "encounter": { + "1": "嚯！哈哈哈！怎麽，你是不是腦子不正常了？\n看看你，像個幕下力士！", + "2": "“哦吼！你！你真是個有趣的孩子！", + "3": "你在這裏幹什麽？你跟蹤我們了嗎？" + }, + "victory": { + "1": "好吧，在老大有時間對付你之前，我來成爲你的對手！", + "2": "我能感覺到！我感覺到了，沒錯！你身上散發出的力量！$更多！還想要更多！但看起來我們沒時間了……", + "3": "真有趣！我就知道你會讓我盡興的！\n我期待有一天再次面對你！" + } + }, + "mars": { + "encounter": { + "1": "我是夥星，銀河隊的頂級幹部之一。", + "2": "銀河隊對未來的願景堅定不移。\n反對者將被無情地粉碎！", + "3": "“緊張嗎？你是該感到緊張了！" + }, + "victory": { + "1": "這不可能！我怎麽會輸？！", + "2": "你很有本事，我承認。", + "3": "輸了……犯了一個代價高昂的大錯。" + } + }, + "jupiter": { + "encounter": { + "1": "歲星，銀河隊幹部，爲您效勞。", + "2": "抵抗是徒勞的。銀河隊必將獲勝！", + "3": "你在發抖啊……已經害怕了嗎？" + }, + "victory": { + "1": "不會吧……我輸了？！", + "2": "厲害，你膽子真大！", + "3": "輸成這樣……真丟人。" + } + }, + "saturn": { + "encounter": { + "1": "我是鎮星，銀河隊的幹部。", + "2": "我們的使命是絕對的，任何阻礙都將被消滅！", + "3": "我從你的眼中看到的是恐懼嗎？" + }, + "victory": { + "1": "不可能……被你打敗了？！", + "2": "你證明了自己是一個值得尊敬的對手。", + "3": "失敗的苦澀……難以接受……。" + }}, + "zinzolin": { + "encounter": { + "1": "你可能會對等離子隊構成威脅，所以我們現在就消滅你！", + "2": "哦，天哪……我沒想到要在這麽冷的天氣裏戰鬥！", + "3": "能走到今天這一步，你真是個了不起的訓練師。\n但一切到此結束。" + }, + "victory": { + "1": "魁奇思大人……我讓你失望了……", + "2": "好冷，我不僅發抖，還要遭罪。", + "3": "哼。你比我想象的要聰明，但還不夠。" + } + }, + "rood": { + "encounter": { + "1": "你對等離子隊是個威脅。我們現在不能讓你離開這裏！", + "2": "哦，這寒風……我從沒想過我必須在這裏戰鬥！", + "3": "能走到今天這一步，你是一位了不起的訓練師，但這就是你的結局了。" + }, + "victory": { + "1": "魁奇思大人……我的任務失敗了", + "2": "寒風刺骨。我瑟瑟發抖。我痛苦不堪。", + "3": "嗯，你是很有才。但是要打敗等離子隊還不夠……！" + } + }, + "xerosic": { + "encounter": { + "1": "啊哈哈！我很樂意。\n來吧，小訓練師！讓我們看看你有什麽本事！", + "2": "嗯……你比看上去更強大。\n我想知道你體內有多少能量。", + "3": "我一直在等你！我需要對你做一點研究！\n來吧，我們開始吧！" + }, + "victory": { + "1": "啊，你好強大啊……嗯……確實非常強大。", + "2": "叮叮叮！你成功了！\n戰利品歸勝利者！", + "3": "太棒了！太神奇了！\n你的技巧和勇氣都無與倫比！" + } + }, + "bryony": { + "encounter": { + "1": "我是芭拉，能與你一戰是我的榮幸。\n讓我看看你的實力。", + "2": "令人印象深刻……你比你看上去的還要強大。\n讓我們看看你真正的實力。", + "3": "我預料到了你的到來。\n是時候進行一個小實驗了，我們開始吧？" + }, + "victory": { + "1": "你很強大。哦，嗯嗯！確實非常強大", + "2": "叮叮叮！你做得很好。勝利屬于你。", + "3": "太棒了！了不起！你的技巧和勇氣值得稱贊。" + } + }, + "rocket_grunt": { + "encounter": { + "1": "你要有麻煩了！", + "2": "我們要幹大事了！\n閃一邊去，小子！", + "3": "把你的寶可夢交過來，\n不然就嘗嘗火箭隊的厲害！", + "4": "你准備好感受火箭隊真正的恐怖了嗎！", + "5": "喂，小子！俺可是火箭隊滴！" + }, + "victory": { + "1": "好討厭的感覺啊！", + "2": "哎呀！不小心丟掉電梯鑰匙啦！", + "3": "我搞砸了。", + "4": "我的夥計們不會放過你……！", + "5": "你說啥？俺們火箭隊要玩完了？" + } + }, + "magma_grunt": { + "encounter": { + "1": "如果你擋在熔岩隊路上，那就別指望我們手下留情！", + "2": "你最好別妨礙我們的計劃！\n我們會讓世界變得更美好！", + "3": "少礙事！熔岩隊沒時間理你這樣的小孩！", + "4": "你有棉花糖沒？我來給你好好烤烤！", + "5": "我們會利用火山的力量！\n它馬上要…爆發了！懂嗎？嘿嘿嘿……" + }, + "victory": { + "1": "哈？我輸了？！", + "2": "我怎麽會輸！我爲了訓練飯都不吃了！", + "3": "不會吧，不就是一個小孩！", + "4": "唉啊…我得趕快逃回基地…", + "5": "你打敗我了…你覺得老大會扣我工資嗎？" + } + }, + "aqua_grunt": { + "encounter": { + "1": "即使是小孩，如果要和海洋隊作對，也別指望我們手下留情！", + "2": "嚯…你好大的膽子，敢惹我們海洋隊！", + "3": "不僅是我的水系寶可夢，整片大海即將淹沒你！", + "4": "我們海洋隊，是爲了大義！", + "5": "准備好被我的…唉…我寶可夢的海流沖走吧！" + }, + "victory": { + "1": "你在開玩笑吧？", + "2": "害，沒想到這種小屁孩也要管我的閑事！", + "3": "我輸了？看來我得自己遊回基地了。", + "4": "不是吧，怎麽會，老大要生氣了……", + "5": "你打敗了我…老大不會要讓我上跳板吧……" + } + }, + "galactic_grunt": { + "encounter": { + "1": "別惹銀河隊！", + "2": "見識下我們的科技，和我們所設想的未來！", + "3": "以銀河隊之名，我會掃清一切擋路的人！", + "4": "准備輸的一敗塗地吧！", + "5": "希望你做好被宇宙力量碾壓的准備。" + }, + "victory": { + "1": "停機了…", + "2": "從長遠來看，這次的挫折不用在意。", + "3": "小失敗不會影響我們的宏圖偉業！", + "4": "咋回事！？", + "5": "個人記錄：提升對戰水平，優先級，高……" + } + }, + "plasma_grunt": { + "encounter": { + "1": "異端不共戴天！", + "2": "要是我贏了你！就把你的寶可夢放生！", + "3": "要是敢和等離子隊作對，我來好好關照你！", + "4": "等離子隊會從你們這種自私的人手裏解放寶可夢！", + "5": "我們的發型帥的一批，而我們的戰鬥水平呢，\n馬上讓你見識一下。" + }, + "victory": { + "1": "等離子子子子子子！", + "2": "我怎麽會輸……", + "3": "…沒用的家夥！我得去偷個厲害點的寶可夢！", + "4": "偉大的事業總會被人阻撓…", + "5": "爛完了…爛爛爛爛爛！等離子隊爛了！\n說短點就是，等爛子隊！" + } + }, + "flare_grunt": { + "encounter": { + "1": "你的寶可夢無法與閃焰隊的優雅相提並論", + "2": "帶個墨鏡吧，別被我閃瞎狗眼了！", + "3": "閃焰隊將淨化這個不完美的世界！", + "4": "准備面對閃焰隊的美！", + "5": "時尚對我們來說最重要！" + }, + "victory": { + "1": "我的未來看起來並不明亮…", + "2": "這戰鬥比我想的更難搞，我得重頭訓練了。", + "3": "啊啊？我輸了？！", + "4": "就算是在失敗當中，閃焰隊依舊優雅動人！", + "5": "你雖然打敗了我，但是我輸的也這麽潇灑！" + } + }, + "rocket_boss_giovanni_1": { + "encounter": { + "1": "我不得不說，能來到這裏，你的確很不簡單！" + }, + "victory": { + "1": "什麽！這不可能！" + }, + "defeat": { + "1": "記住我的話。無法衡量自己的力量，說明你還是個孩子。" + } + }, + "rocket_boss_giovanni_2": { + "encounter": { + "1": "我的老夥計還需要我…你要擋我的路嗎？" + }, + "victory": { + "1": "這怎麽可能…？\n火箭隊的夢想…就這麽成爲泡影了…" + }, + "defeat": { + "1": "火箭隊會重生，而我會統治世界！" + } + }, + "magma_boss_maxie_1": { + "encounter": { + "1": "我會親手埋葬你，希望你能喜歡！" + }, + "victory": { + "1": "啊！你…很厲害…我落後了…一點…" + }, + "defeat": { + "1": "熔岩隊必勝！" + } + }, + "magma_boss_maxie_2": { + "encounter": { + "1": "你是我實現目標最後的障礙。\n准備好迎接我最強的一擊吧！哈哈哈哈！" + }, + "victory": { + "1": "這…這不…唉" + }, + "defeat": { + "1": "現在…我要把這個星球變成人類的理想國度！" + } + }, + "aqua_boss_archie_1": { + "encounter": { + "1": "我是海洋隊的老大，所以，你的路大概走到頭了。" + }, + "victory": { + "1": "下次再見吧。我會記住你的臉的。" + }, + "defeat": { + "1": "天才！我的隊伍不會再退縮了！" + } + }, + "aqua_boss_archie_2": { + "encounter": { + "1": "我等這一天很久了。\n這就是我的真實力量！" + }, + "victory": { + "1": "果然很強……啊！" + }, + "defeat": { + "1": "我會讓這世界上的一切回歸到最初的純淨狀態！！" + } + }, + "galactic_boss_cyrus_1": { + "encounter": { + "1": "但在這之前，讓我見識見識你那敢向銀河隊叫板的實力吧。" + }, + "victory": { + "1": "有意思，簡直太有意思了。" + }, + "defeat": { + "1": "我要創造我的新世界…" + } + }, + "galactic_boss_cyrus_2": { + "encounter": { + "1": "是啊，我和你還真是有緣呢。\n不過，這段孽緣…就讓我在此斬斷吧！" + }, + "victory": { + "1": "怎麽可能！怎麽可能！怎麽可能！" + }, + "defeat": { + "1": "永別了。" + } + }, + "plasma_boss_ghetsis_1": { + "encounter": { + "1": "無論是誰做了什麽！都無法阻止我！" + }, + "victory": { + "1": "怎麽回事？我可是建立了等離子隊的完美的人啊！\n是要改變世界的完美的統治者！" + }, + "defeat": { + "1": "我是坐擁世界的完美統治者！哇哈哈哈！" + } + }, + "plasma_boss_ghetsis_2": { + "encounter": { + "1": "來吧！讓我看看你徹底絕望時的那張臉！" + }, + "victory": { + "1": "不！我的偉大目標！我要完全支配世界啊！" + }, + "defeat": { + "1": "酋雷姆！融合吧！" + } + }, + "flare_boss_lysandre_1": { + "encounter": { + "1": "你想要阻止我？在對戰中展示給我看吧！" + }, + "victory": { + "1": "看來你的確是想要阻止我。但是，先等一下。" + }, + "defeat": { + "1": "寶可夢…不該存在。" + } + }, + "flare_boss_lysandre_2": { + "encounter": { + "1": "你我的未來…究竟哪個才正確，\n就讓我們來問問各自的寶可夢吧！" + }, + "victory": { + "1": "哇啊啊啊！" + }, + "defeat": { + "1": "沒有遠見的蠢貨會繼續玷汙這個美麗的世界。" + } + }, "brock": { "encounter": { "1": "我對岩石屬性寶可夢的專精會擊敗你！來吧！", @@ -676,14 +1084,14 @@ }, "crasher_wake": { "encounter": { - "1": "極限! 極限! 看好了!$極限假面…就此…登場!", - "2": "極限! 極限! 極限假面!", + "1": "極限！ 極限！ 看好了！$極限假面…就此…登場！", + "2": "極限！ 極限！ 極限假面！", "3": "我是滔滔巨浪，將你沖走！" }, "victory": { "1": "我真是笑得合不攏嘴啊！$哈哈哈！那真是太有趣了！", "2": "呼哇！結束收尾了！$我該怎麼說呢……$我還想再對戰！我還想再繼續戰鬥！", - "3": "啊啊啊啊啊!?" + "3": "啊啊啊啊啊！？" }, "defeat": { "1": "耶！就是這樣！", @@ -700,7 +1108,7 @@ "victory": { "1": "明白了……我會禮貌地退場。", "2": "輸了就是輸了。你確實很強大。", - "3": "…行吧! 嗯, 我輸了。" + "3": "…行吧！ 嗯, 我輸了。" }, "defeat": { "1": "爸爸！我用你珍愛的飛行寶可夢贏了……", @@ -1022,7 +1430,7 @@ }, "clay": { "encounter": { - "1": "咳咳! 讓我好等，不是嗎，孩子？$好吧，是時候看看你能做到什麼了！" + "1": "咳咳！ 讓我好等，不是嗎，孩子？$好吧，是時候看看你能做到什麼了！" }, "victory": { "1": "真是的……我先說好，\n我可沒有手下留情。" @@ -1248,7 +1656,7 @@ "1": "夠野的！你的想法比我的還要毒！" }, "defeat": { - "1": "嘿，拜託！認真點！\n你要加把勁啊!" + "1": "嘿，拜託！認真點！\n你要加把勁啊！" } }, "olivia": { @@ -1330,7 +1738,7 @@ }, "wikstrom": { "encounter": { - "1": "年輕的挑戰者，幸會！\n我乃是著名的鋼鐵之刃，公爵雁鎧! $讓我們開始戰鬥吧！預備！" + "1": "年輕的挑戰者，幸會！\n我乃是著名的鋼鐵之刃，公爵雁鎧！ $讓我們開始戰鬥吧！預備！" }, "victory": { "1": "輝煌！你與你尊貴的\n寶可夢之間的信任居然勝過了我！" @@ -1367,7 +1775,7 @@ "2": "我知道你能走這麼遠。讓我們開始吧。" }, "victory": { - "1": "被你拿下了啊。你太出色了!", + "1": "被你拿下了啊。你太出色了！", "2": "我從沒想到會有另一個訓練師打敗我……$我很驚訝。" }, "defeat": { @@ -1471,13 +1879,13 @@ }, "red": { "encounter": { - "1": "…!" + "1": "…！" }, "victory": { - "1": "…?" + "1": "…？" }, "defeat": { - "1": "…!" + "1": "…！" } }, "jasmine": { @@ -1859,7 +2267,7 @@ }, "marnie": { "encounter": { - "1": "事實上，言而總之… \n人家自己也想當冠軍呀! $所以別認為我在針對你！" + "1": "事實上，言而總之… \n人家自己也想當冠軍呀！ $所以別認為我在針對你！" }, "victory": { "1": "好吧，我還是輸了……\n但是我看到了很多你和你寶可夢的優點哦" @@ -1914,13 +2322,13 @@ }, "ryme": { "encounter": { - "1": "寶貝, 一起! \n搖滾搖到骨子裡!" + "1": "寶貝, 一起！ \n搖滾搖到骨子裡！" }, "victory": { "1": "你好酷！我佩服！\n我的靈魂為你哭！" }, "defeat": { - "1": "再會, 寶貝!" + "1": "再會, 寶貝！" } }, "grusha": { @@ -2012,18 +2420,18 @@ "1": "精彩！簡直就是天下無雙！" }, "defeat": { - "1": "戰鬥結束後，我的心像是吹過了溫和的風…\n$真是厲害！" + "1": "戰鬥結束後，我的心像是吹過了溫和的風…$真是厲害！" } }, "kieran": { "encounter": { - "1": "我的努力讓我越來越強！\n$所以我不會輸。" + "1": "我的努力讓我越來越強！$所以我不會輸。" }, "victory": { - "1": "不可能…\n$真是一場有趣又激動人心的戰鬥啊！" + "1": "不可能…$真是一場有趣又激動人心的戰鬥啊！" }, "defeat": { - "1": "哇塞，好一場戰鬥！\n$你得多練練了。" + "1": "哇塞，好一場戰鬥！$你得多練練了。" } }, "rival": { @@ -2031,7 +2439,7 @@ "1": "@c{smile}嘿，我在找你呢！我知道你急著上路，\n但至少說個再見吧…$@c{smile_eclosed}所以你終於要開始追逐夢想了？\n我幾乎不敢相信。$@c{serious_smile_fists}來都來了，來一場對戰怎麼樣？\n畢竟，我想看看你是不是準備周全了。$@c{serious_mopen_fists}不要手下留情，我想讓你全力以赴！" }, "victory": { - "1": "@c{shock}哇…你徹底擊敗了我。\n你是真初學者嗎？$@c{smile}也許是靠點運氣，但是…\n誰知道，你可能真的能一路走下去。$順便說一下，博士讓我給你這些東西。它們看起來可牛了。$@c{serious_smile_fists}祝你好运！" + "1": "@c{shock}哇…你徹底擊敗了我。\n你是真初學者嗎？$@c{smile}也許是靠點運氣，但是…\n誰知道，你可能真的能一路走下去。$順便說一下，博士讓我給你這些東西。它們看起來可牛了。$@c{serious_smile_fists}祝你好运！$@c{smile}哦！我希望你能喜歡這次的活動！" } }, "rival_female": { @@ -2039,7 +2447,7 @@ "1": "@c{smile_wave}你在這兒啊！我到處找你呢！$@c{angry_mopen}你忘了和你最好的朋友說再見了嗎？$@c{smile_ehalf}你要去追逐夢想了，對吧？\n從今天開始，是不是…$@c{smile}不管怎樣，忘了我的事就原諒你吧，\n但有個條件。@c{smile_wave_wink}你必須和我對戰！$@c{angry_mopen}全力以赴！\n你也不想讓你的冒險在開始之前就結束了，對吧？" }, "victory": { - "1": "@c{shock}你剛開始就已經這麼強了？！@d{96}$@c{angry}你是不是開了？$@c{smile_wave_wink}只是開個玩笑啦！@d{64} @c{smile_eclosed}我輸地心服口服了…\n我感覺你出去挺有天賦的。$@c{smile}順便說一下，博士想讓我給你一些東西。\n希望它們能幫上忙！$@c{smile_wave}像往常一樣盡力而為！\n我相信你！" + "1": "@c{shock}你剛開始就已經這麼強了？！@d{96}$@c{angry}你是不是開了？$@c{smile_wave_wink}只是開個玩笑啦！@d{64} @c{smile_eclosed}我輸地心服口服了…\n我感覺你出去挺有天賦的。$@c{smile}順便說一下，博士想讓我給你一些東西。\n希望它們能幫上忙！$@c{smile_wave}像往常一樣盡力而為！\n我相信你！$@c{smile}哦！我希望你能喜歡這次的活動！" } }, "rival_2": { @@ -2047,7 +2455,7 @@ "1": "@c{smile}嘿，你也在這裡嗎？$@c{smile_eclosed}一路過關斬將，是吧？$@c{serious_mopen_fists}我知道看起來好像我尾隨著你來到這裡，\n怎麼可能啦。$@c{serious_smile_fists}說真的，自從你在老家打敗我後，\n我就一直很渴望再比一場。$我自己也進行了很多訓練，\n所以這次我肯定會好好打一場。$@c{serious_mopen_fists}不要手下留情，就像以前一樣！$讓我們開始吧！" }, "victory": { - "1": "@c{neutral_eclosed}哦。我過於自信了。$@c{smile}不過沒關係。我猜到可能會這樣。$@c{serious_mopen_fists}這只意味著我下次需要更努力！$$@c{smile}呃，不是特意幫你，我正好有多餘的這個，\n我覺得你可能想要。$$@c{serious_smile_fists}不過這次之後別指望再有了！$我不能一直給我的對手優勢。$@c{smile}反正，保重！" + "1": "@c{neutral_eclosed}哦。我過於自信了。$@c{smile}不過沒關係。我猜到可能會這樣。$@c{serious_mopen_fists}這只意味著我下次需要更努力！$$@c{smile}呃，不是特意幫你，我正好有多餘的這個，\n我覺得你可能想要。$$@c{serious_smile_fists}不過這次之後別指望再有了！$我不能一直給我的對手優勢。$@c{smile}反正，保重, 要享受活動哦！" } }, "rival_2_female": { @@ -2055,7 +2463,7 @@ "1": "@c{smile_wave}哦，真巧，在這裡遇見你。\n看來你還沒輸過嘛。@c{angry_mopen}哈……好傢伙！$@c{angry_mopen}我知道你在想什麼，\n不，我才不會跟蹤你什麼呢。 @c{smile_eclosed}我只是碰巧在附近。$@c{smile_ehalf}我為你感到高興，但我只想讓你知道\n有時輸了是可以接受的。$@c{smile}我們從錯誤中學到的東西\n往往比我們一直成功時學到的還要多。$@c{angry_mopen}無論如何，我為了我們的複賽已經努力訓練了\n所以你最好全力以赴！" }, "victory": { - "1": "@c{neutral}我……沒打算會輸來著……$@c{smile}嗷……好吧。看來我要再更加努力訓練了！$@c{smile_wave}我還給你帶了個這個$@c{smile_wave_wink}不用謝我哦~.$@c{angry_mopen}不過，這是最後一個啦！\n 你可別想再從我這賺小便宜了~$@c{smile_wave}要保重哦！" + "1": "@c{neutral}我……沒打算會輸來著……$@c{smile}嗷……好吧。看來我要再更加努力訓練了！$@c{smile_wave}我還給你帶了個這個$@c{smile_wave_wink}不用謝我哦~.$@c{angry_mopen}不過，這是最後一個啦！\n 你可別想再從我這賺小便宜了~$@c{smile_wave}要保重哦，要享受活動哦！" }, "defeat": { "1": "輸了有時候也不要緊的…" @@ -2071,7 +2479,7 @@ }, "rival_3_female": { "encounter": { - "1": "@c{smile_wave}好久不見！還沒輸過，對吧。$@c{angry}我覺得你點煩了。@c{smile_wave_wink}開玩笑啦！$@c{smile_ehalf}但說真的，你現在不想家嗎？\n 不想…我嗎?$我……我的意思是，我們真的很想你。$@c{smile_eclosed}我支持你的一切，包括你的夢想。\n但現實就是你早晚會經歷失敗。$@c{smile}當你失敗的時候，我想像往常一樣陪在你身邊。$@c{angry_mopen}現在，給你看看我變得多強了吧！" + "1": "@c{smile_wave}好久不見！還沒輸過，對吧。$@c{angry}我覺得你點煩了。@c{smile_wave_wink}開玩笑啦！$@c{smile_ehalf}但說真的，你現在不想家嗎？\n 不想…我嗎？$我……我的意思是，我們真的很想你。$@c{smile_eclosed}我支持你的一切，包括你的夢想。\n但現實就是你早晚會經歷失敗。$@c{smile}當你失敗的時候，我想像往常一樣陪在你身邊。$@c{angry_mopen}現在，給你看看我變得多強了吧！" }, "victory": { "1": "@c{shock}都這樣了……還是不夠嗎？$這樣下去，你就永遠不會回來了……" @@ -2113,6 +2521,7 @@ }, "victory": { "1": "@c{neutral}…" + }, "defeat": { "1": "$@c{smile_ehalf}…" @@ -2134,4 +2543,4 @@ "1": "@c{smile_ehalf}我……\n我想我完成了我的使命……$@c{smile_eclosed}答應我……在你拯救世界之後\n……要……平安到家。$@c{smile_ehalf}……謝謝你。" } } -} \ No newline at end of file +} diff --git a/src/locales/zh_TW/egg.json b/src/locales/zh_TW/egg.json index 28e5e1b9bda..0178848a0d5 100644 --- a/src/locales/zh_TW/egg.json +++ b/src/locales/zh_TW/egg.json @@ -20,7 +20,7 @@ "hatchFromTheEgg": "{{pokemonName}} 從蛋中孵化了！", "eggMoveUnlock": "蛋招式已解鎖： {{moveName}}", "rareEggMoveUnlock": "稀有蛋招式已解鎖： {{moveName}}", - "moveUPGacha": "蛋招式UP!", - "shinyUPGacha": "闪光UP!", - "legendaryUPGacha": "UP!" -} \ No newline at end of file + "moveUPGacha": "蛋招式UP！", + "shinyUPGacha": "闪光UP！", + "legendaryUPGacha": "UP！" +} diff --git a/src/locales/zh_TW/fight-ui-handler.json b/src/locales/zh_TW/fight-ui-handler.json index 3cf1868196a..dda3e443b36 100644 --- a/src/locales/zh_TW/fight-ui-handler.json +++ b/src/locales/zh_TW/fight-ui-handler.json @@ -2,6 +2,7 @@ "pp": "PP", "power": "威力", "accuracy": "命中率", - "abilityFlyInText": " {{pokemonName}} 的 {{passive}}{{abilityName}}", - "passive": "被動能力 " -} \ No newline at end of file + "abilityFlyInText": " {{pokemonName}} 的\n{{passive}}{{abilityName}}", + "passive": "被動能力 ", + "teraHover": "{{type}} 太晶化" +} diff --git a/src/locales/zh_TW/menu-ui-handler.json b/src/locales/zh_TW/menu-ui-handler.json index 33e6b44d73d..cbb5b604d33 100644 --- a/src/locales/zh_TW/menu-ui-handler.json +++ b/src/locales/zh_TW/menu-ui-handler.json @@ -19,6 +19,11 @@ "importData": "導入數據", "exportData": "導出數據", "consentPreferences": "同意偏好", + "linkDiscord": "關聯Discord", + "unlinkDiscord": "解除關聯Discord", + "linkGoogle": "關聯Google", + "unlinkGoogle": "解除關聯Google", "cancel": "取消", - "losingProgressionWarning": "你將失去自戰鬥開始以來的所有進度。是否\n繼續？" -} \ No newline at end of file + "losingProgressionWarning": "你將失去自戰鬥開始以來的所有進度。是否\n繼續？", + "noEggs": "當前沒有任何蛋\n正在孵化中！" +} diff --git a/src/locales/zh_TW/menu.json b/src/locales/zh_TW/menu.json index b56a39bbda2..fee9b1be85d 100644 --- a/src/locales/zh_TW/menu.json +++ b/src/locales/zh_TW/menu.json @@ -6,11 +6,11 @@ "newGame": "新遊戲", "settings": "設定", "selectGameMode": "選擇遊戲模式", - "logInOrCreateAccount": "登入或註冊即可開始遊戲，無需郵箱！", + "logInOrCreateAccount": "登入或註冊即可開始遊戲，無需郵箱!", "username": "用戶名", "password": "密碼", "login": "登入", - "orUse": "Or use", + "orUse": "或使用", "register": "注冊", "emptyUsername": "用戶名不能為空", "invalidLoginUsername": "提供的用戶名無效", @@ -27,10 +27,10 @@ "failedToLoadSaveData": "讀取存檔數據失敗。請重新加載頁面。如果\n問題仍然存在，請聯繫管理員。", "sessionSuccess": "工作階段加載成功.", "failedToLoadSession": "無法加載您的工作階段數據。它可能已損壞。", - "boyOrGirl": "你是男孩還是女孩?", - "evolving": "甚麼?\n{{pokemonName}} 要進化了!", + "boyOrGirl": "你是男孩還是女孩？", + "evolving": "甚麼？\n{{pokemonName}} 要進化了!", "stoppedEvolving": "{{pokemonName}} 停止了進化。", - "pauseEvolutionsQuestion": "你確定要停止 {{pokemonName}} 的進化嗎?\n你可以在隊伍畫面中重新啟用進化。", + "pauseEvolutionsQuestion": "你確定要停止 {{pokemonName}} 的進化嗎？\n你可以在隊伍畫面中重新啟用進化。", "evolutionsPaused": "{{pokemonName}}的進化已暫停。", "evolutionDone": "恭喜!\n你的 {{pokemonName}} 進化成了 {{evolvedPokemonName}}!", "dailyRankings": "每日排名", @@ -38,9 +38,17 @@ "noRankings": "無排名", "positionIcon": "#", "loading": "加載中…", + "loadingAsset": "加載資源: {{assetName}}", "playersOnline": "在線玩家", "yes": "是", "no": "否", - "noSaves": "你沒有任何記錄檔！", - "tooManySaves": "你的記錄檔太多了！" + "disclaimer": "免責聲明", + "disclaimerDescription": "這個遊戲尚未完成; 可能存在遊戲性問題（包括潛在的丟檔風險）、\n 不經通知的調整、 未來可能會更新或完成更多內容", + "choosePokemon": "選擇一只寶可夢。", + "renamePokemon": "給寶可夢起名", + "rename": "起名", + "nickname": "昵稱", + "errorServerDown": "糟糕！訪問服務器時發生了錯誤。\n\n你可以保持頁面開啓，\n遊戲會自動重新連接。", + "noSaves": "你沒有任何記錄檔!", + "tooManySaves": "你的記錄檔太多了!" } diff --git a/src/locales/zh_TW/modifier-select-ui-handler.json b/src/locales/zh_TW/modifier-select-ui-handler.json index 9e26dfeeb6e..84ebbbfef6a 100644 --- a/src/locales/zh_TW/modifier-select-ui-handler.json +++ b/src/locales/zh_TW/modifier-select-ui-handler.json @@ -1 +1,12 @@ -{} \ No newline at end of file +{ + "transfer": "交換道具", + "reroll": "刷新商店", + "lockRarities": "鎖定稀有度", + "checkTeam": "查看隊伍", + "transferDesc": "將寶可夢攜帶的道具交換給其他寶可夢", + "rerollDesc": "花錢刷新道具", + "lockRaritiesDesc": "在刷新時鎖定道具稀有度(影響刷新費用)", + "checkTeamDesc": "檢查隊伍或使用形態改變道具", + "rerollCost": "₽{{formattedMoney}}", + "itemCost": "₽{{formattedMoney}}" +} diff --git a/src/locales/zh_TW/modifier-type.json b/src/locales/zh_TW/modifier-type.json index ec066277cda..6ff593ddba7 100644 --- a/src/locales/zh_TW/modifier-type.json +++ b/src/locales/zh_TW/modifier-type.json @@ -60,10 +60,10 @@ "description": "一隻寶可夢的{{moveType}}系招式威力提升20%。" }, "PokemonLevelIncrementModifierType": { - "description": "Increases a Pokémon's level by {{levels}}." + "description": "使一只寶可夢的等級提升{{levels}}級。" }, "AllPokemonLevelIncrementModifierType": { - "description": "Increases all party members' level by {{levels}}." + "description": "使一只寶可夢的等級提升{{levels}}級。" }, "BaseStatBoosterModifierType": { "description": "增加持有者的{{stat}}10%，個體值越高堆疊\n上限越高。" @@ -95,15 +95,15 @@ "description": "招式命中率增加{{accuracyAmount}} (最大100)。" }, "PokemonMultiHitModifierType": { - "description": "攻擊造成一次額外傷害，每次堆疊額外傷害\n分別衰減60/75/82.5%。" + "description": "攻擊以60/75/82.5%的傷害造成2/3/4次傷害。" }, "TmModifierType": { "name": "招式學習器 {{moveId}} - {{moveName}}", "description": "教會一隻寶可夢{{moveName}}。" }, "TmModifierTypeWithInfo": { - "name": "TM{{moveId}} - {{moveName}}", - "description": "教會一隻寶可夢{{moveName}}\n(Hold C or Shift for more info)。" + "name": "招式學習器{{moveId}} - {{moveName}}", + "description": "教會一隻寶可夢{{moveName}}\n(按住C或者Shift查看更多信息)" }, "EvolutionItemModifierType": { "description": "使某些寶可夢進化。" @@ -183,6 +183,10 @@ "name": "復活種子", "description": "受到技能攻擊傷害瀕死時，\n恢復該瀕死寶可夢的HP至1/2。" }, + "WHITE_HERB": { + "name": "白色香草", + "description": "當攜帶它的寶可夢能力降低時，\n僅能回到之前的狀態１次。" + }, "ETHER": { "name": "PP單項小補劑" }, @@ -310,19 +314,19 @@ }, "BERRY_POUCH": { "name": "樹果袋", - "description": "使用樹果時有30%的幾率不會消耗樹果。" + "description": "使用樹果時增加30%的幾率不會消耗樹果。" }, "FOCUS_BAND": { "name": "氣勢頭帶", - "description": "攜帶該道具的寶可夢有10%幾率在受到\n攻擊而將陷入瀕死狀態時，保留1點HP不陷入瀕死狀態。" + "description": "攜帶該道具的寶可夢增加10%幾率在受到\n攻擊而將陷入瀕死狀態時，保留1點HP不陷入瀕死狀態。" }, "QUICK_CLAW": { "name": "先制之爪", - "description": "有10%的幾率無視速度優先使出招式\n(先制技能優先)。" + "description": "增加10%的幾率無視速度優先使出招式\n(先制技能優先)。" }, "KINGS_ROCK": { "name": "王者之證", - "description": "攜帶該道具的寶可夢使用任意原本不會造成\n畏縮狀態的攻擊招式並造成傷害時，有\n10%幾率使目標陷入畏縮狀態。" + "description": "攜帶該道具的寶可夢使用任意原本不會造成\n畏縮狀態的攻擊招式並造成傷害時，增加\n10%幾率使目標陷入畏縮狀態。" }, "LEFTOVERS": { "name": "喫剩的東西", diff --git a/src/locales/zh_TW/modifier.json b/src/locales/zh_TW/modifier.json index 1c0d4760e6f..12c436c1783 100644 --- a/src/locales/zh_TW/modifier.json +++ b/src/locales/zh_TW/modifier.json @@ -3,6 +3,7 @@ "turnHealApply": "{{pokemonNameWithAffix}}用{{typeName}}\n回復了體力！", "hitHealApply": "{{pokemonNameWithAffix}}用{{typeName}}\n回復了體力！", "pokemonInstantReviveApply": "{{pokemonNameWithAffix}}用{{typeName}}\n回復了活力！", + "pokemonResetNegativeStatStageApply": "{{pokemonNameWithAffix}}降低的能力被{{typeName}}\n複原了！！", "moneyInterestApply": "用{{typeName}}\n獲得了 ₽{{moneyAmount}} 利息！", "turnHeldItemTransferApply": "{{pokemonNameWithAffix}}的{{itemName}}被\n{{pokemonName}}的{{typeName}}吸收了！", "contactHeldItemTransferApply": "{{pokemonNameWithAffix}}的{{itemName}}被\n{{pokemonName}}的{{typeName}}奪取了！", diff --git a/src/locales/zh_TW/move-trigger.json b/src/locales/zh_TW/move-trigger.json index d6d0ce659ea..db88f6df57f 100644 --- a/src/locales/zh_TW/move-trigger.json +++ b/src/locales/zh_TW/move-trigger.json @@ -42,12 +42,12 @@ "incineratedItem": "{{pokemonName}}燒掉了\n{{targetName}}的{{itemName}}！", "knockedOffItem": "{{pokemonName}}拍落了\n{{targetName}}的{{itemName}}！", "tookMoveAttack": "{{pokemonName}}\n受到了{{moveName}}的攻擊！", - "cutOwnHpAndMaximizedStat": "{{pokemonName}}\n削減體力並釋放了全部{{statName}}!", + "cutOwnHpAndMaximizedStat": "{{pokemonName}}\n削減體力並釋放了全部{{statName}}！", "copiedStatChanges": "{{pokemonName}}複製了\n{{targetName}}的能力變化！", "magnitudeMessage": "震級{{magnitude}}！", "tookAimAtTarget": "{{pokemonName}}將目標對準了\n{{targetName}}！", "transformedIntoType": "{{pokemonName}} \n變成了{{typeName}}屬性！", - "copiedMove": "{{pokemonName}}\n複製了{{moveName}}!", + "copiedMove": "{{pokemonName}}\n複製了{{moveName}}！", "sketchedMove": "{{pokemonName}}\n對{{moveName}}進行了寫生！", "acquiredAbility": "{{pokemonName}}的特性\n變为{{abilityName}}了！", "copiedTargetAbility": "{{pokemonName}}複製了\n{{targetName}}的{{abilityName}}！", @@ -66,5 +66,6 @@ "revivalBlessing": "{{pokemonName}}復活了！", "swapArenaTags": "{{pokemonName}}\n交換了雙方的場地效果！", "exposedMove": "{{pokemonName}}識破了\n{{targetPokemonName}}的原形！", - "safeguard": "{{targetName}}\n正受到神秘之幕的保護！" -} \ No newline at end of file + "safeguard": "{{targetName}}\n正受到神秘之幕的保護！", + "afterYou": "{{pokemonName}}\n接受了對手的好意！" +} diff --git a/src/locales/zh_TW/move.json b/src/locales/zh_TW/move.json index 101d6f85e5d..b8c4ec05033 100644 --- a/src/locales/zh_TW/move.json +++ b/src/locales/zh_TW/move.json @@ -2913,7 +2913,7 @@ }, "zippyZap": { "name": "電電加速", - "effect": "The user attacks the target with bursts of electricity at high speed. This move always goes first and raises the user's evasiveness." + "effect": "迅猛無比的電擊。必定能夠先制攻擊，\n並且提高自己的閃避率" }, "splishySplash": { "name": "滔滔衝浪", @@ -3807,4 +3807,4 @@ "name": "邪毒鎖鏈", "effect": "用由毒形成的鎖鏈纏住對手\n注入毒素加以侵蝕。有時會\n讓對手陷入劇毒狀態" } -} \ No newline at end of file +} diff --git a/src/locales/zh_TW/party-ui-handler.json b/src/locales/zh_TW/party-ui-handler.json index 975212bbdad..ef82d1a3ddc 100644 --- a/src/locales/zh_TW/party-ui-handler.json +++ b/src/locales/zh_TW/party-ui-handler.json @@ -4,5 +4,44 @@ "CANCEL": "取消", "RELEASE": "放生", "APPLY": "應用", - "TEACH": "教授" -} \ No newline at end of file + "TEACH": "教授", + "SPLICE": "融合", + "UNSPLICE": "分離", + "ACTIVATE": "激活", + "DEACTIVATE": "解除", + "TRANSFER": "交換", + "ALL": "全部道具", + "PASS_BATON": "接棒", + "UNPAUSE_EVOLUTION": "解除進化暫停", + "REVIVE": "複活", + "RENAME": "起名", + "choosePokemon": "選擇一只寶可夢。", + "doWhatWithThisPokemon": "要對寶可夢做什麽？", + "noEnergy": "{{pokemonName}}沒有力氣戰鬥了！", + "hasEnergy": "{{pokemonName}}仍然精神十足！", + "cantBeUsed": "{{pokemonName}}無法在此挑戰中使用！", + "tooManyItems": "{{pokemonName}}擁有\n太多這個道具了！", + "anyEffect": "即便使用也無效果哦。", + "unpausedEvolutions": "{{pokemonName}}的進化停止了。", + "unspliceConfirmation": "真的要把{{fusionName}}\n從{{pokemonName}}身上分離嗎？{{fusionName}}會就此消失。", + "wasReverted": "{{fusionName}}恢複成了{{pokemonName}}。", + "releaseConfirmation": "你真要放生{{pokemonName}}嗎？", + "releaseInBattle": "你無法放生正在戰鬥中的寶可夢！", + "selectAMove": "選擇一個招式。", + "changeQuantity": "選擇一件道具來交換。\n使用 ← 和 → 來指定數量。", + "selectAnotherPokemonToSplice": "選擇另一只寶可夢來融合。", + "cancel": "取消", + "able": "能學會！", + "notAble": "無法學習", + "learned": "已習得", + "goodbye": "再見，{{pokemonName}}！", + "byebye": "拜拜，{{pokemonName}}！", + "farewell": "再會了，{{pokemonName}}！", + "soLong": "告辭了，{{pokemonName}}！", + "thisIsWhereWePart": "就此分別吧，{{pokemonName}}！", + "illMissYou": "我會想你的，{{pokemonName}}！", + "illNeverForgetYou": "我不會忘記你的，{{pokemonName}}！", + "untilWeMeetAgain": "下次再見了，{{pokemonName}}！", + "sayonara": "撒由那拉，{{pokemonName}}！", + "smellYaLater": "拜拜了您勒，{{pokemonName}}！" +} diff --git a/src/locales/zh_TW/pokemon-form-battle.json b/src/locales/zh_TW/pokemon-form-battle.json index 75087aa0669..93a9e65f1f8 100644 --- a/src/locales/zh_TW/pokemon-form-battle.json +++ b/src/locales/zh_TW/pokemon-form-battle.json @@ -2,13 +2,13 @@ "mega": "Mega {{pokemonName}}", "mega-x": "Mega {{pokemonName}} X", "mega-y": "Mega {{pokemonName}} Y", - "primal": "Primal {{pokemonName}}", - "gigantamax": "G-Max {{pokemonName}}", - "eternamax": "E-Max {{pokemonName}}", + "primal": "原始{{pokemonName}}", + "gigantamax": "超極巨{{pokemonName}}", + "eternamax": "無極巨{{pokemonName}}", "megaChange": "{{preName}}超級進化成了\n{{pokemonName}}！", "gigantamaxChange": "{{preName}}超極巨化成了\n{{pokemonName}}！", "eternamaxChange": "{{preName}}無極巨化成了\n{{pokemonName}}！", "revertChange": "{{pokemonName}}變回了\n原本的樣子！", "formChange": "{{preName}}變為其他樣子了。", "disguiseChange": "它的畫皮被當作誘餌使用了！" -} \ No newline at end of file +} diff --git a/src/locales/zh_TW/pokemon-form.json b/src/locales/zh_TW/pokemon-form.json index b98a1e946b8..f1fb4dff599 100644 --- a/src/locales/zh_TW/pokemon-form.json +++ b/src/locales/zh_TW/pokemon-form.json @@ -1,3 +1,170 @@ { - "meloettaPirouette": "舞步形態" -} \ No newline at end of file + "pikachuCosplay": "換裝", + "pikachuCoolCosplay": "搖滾巨星", + "pikachuBeautyCosplay": "貴婦", + "pikachuCuteCosplay": "流行偶像", + "pikachuSmartCosplay": "博士", + "pikachuToughCosplay": "面罩摔跤手", + "pikachuPartner": "搭檔", + "eeveePartner": "搭檔", + "pichuSpiky": "刺刺耳", + "unownA": "A", + "unownB": "B", + "unownC": "C", + "unownD": "D", + "unownE": "E", + "unownF": "F", + "unownG": "G", + "unownH": "H", + "unownI": "I", + "unownJ": "J", + "unownK": "K", + "unownL": "L", + "unownM": "M", + "unownN": "N", + "unownO": "O", + "unownP": "P", + "unownQ": "Q", + "unownR": "R", + "unownS": "S", + "unownT": "T", + "unownU": "U", + "unownV": "V", + "unownW": "W", + "unownX": "X", + "unownY": "Y", + "unownZ": "Z", + "unownExclamation": "!", + "unownQuestion": "?", + "castformSunny": "晴天", + "castformRainy": "雨天", + "castformSnowy": "雪天", + "deoxysNormal": "普通", + "burmyPlant": "草木蓑衣", + "burmySandy": "砂土蓑衣", + "burmyTrash": "垃圾蓑衣", + "shellosEast": "東海", + "shellosWest": "西海", + "rotomHeat": "加熱", + "rotomWash": "清洗", + "rotomFrost": "結冰", + "rotomFan": "旋轉", + "rotomMow": "切割", + "giratinaAltered": "別種", + "shayminLand": "陸上", + "basculinRedStriped": "紅條紋", + "basculinBlueStriped": "藍條紋", + "basculinWhiteStriped": "白條紋", + "deerlingSpring": "春天", + "deerlingSummer": "夏天", + "deerlingAutumn": "秋天", + "deerlingWinter": "冬天", + "tornadusIncarnate": "化身", + "thundurusIncarnate": "化身", + "landorusIncarnate": "化身", + "keldeoOrdinary": "通常", + "meloettaAria": "歌聲", + "meloettaPirouette": "舞步形態", + "froakieBattleBond": "牽絆變身", + "scatterbugMeadow": "花園花紋", + "scatterbugIcySnow": "冰雪花紋", + "scatterbugPolar": "雪國花紋", + "scatterbugTundra": "雪原花紋", + "scatterbugContinental": "大陸花紋", + "scatterbugGarden": "庭園花紋", + "scatterbugElegant": "高雅花紋", + "scatterbugModern": "摩登花紋", + "scatterbugMarine": "大海花紋", + "scatterbugArchipelago": "群島花紋", + "scatterbugHighPlains": "荒野花紋", + "scatterbugSandstorm": "沙塵花紋", + "scatterbugRiver": "大河花紋", + "scatterbugMonsoon": "驟雨花紋", + "scatterbugSavanna": "熱帶草原花紋", + "scatterbugSun": "太陽花紋", + "scatterbugOcean": "大洋花紋", + "scatterbugJungle": "熱帶雨林花紋", + "scatterbugFancy": "幻彩花紋", + "scatterbugPokeBall": "球球花紋", + "flabebeRed": "紅花", + "flabebeYellow": "黃花", + "flabebeOrange": "橙花", + "flabebeBlue": "藍花", + "flabebeWhite": "白花", + "furfrouHeart": "心形造型", + "furfrouStar": "星形造型", + "furfrouDiamond": "菱形造型", + "furfrouDebutante": "淑女造型", + "furfrouMatron": "貴婦造型", + "furfrouDandy": "紳士造型", + "furfrouLaReine": "女王造型", + "furfrouKabuki": "歌舞伎造型", + "furfrouPharaoh": "國王造型", + "pumpkabooSmall": "小尺寸", + "pumpkabooLarge": "大尺寸", + "pumpkabooSuper": "特大尺寸", + "xerneasNeutral": "放松模式", + "xerneasActive": "活躍模式", + "zygarde50": "５０％形態", + "zygarde10": "１０％形態", + "zygarde50Pc": "５０％形態 群聚變形", + "zygarde10Pc": "１０％形態 群聚變形", + "zygardeComplete": "完全體形態", + "oricorioBaile": "熱辣熱辣風格", + "oricorioPompom": "啪滋啪滋風格", + "oricorioPau": "呼拉呼拉風格", + "oricorioSensu": "輕盈輕盈風格", + "rockruffOwnTempo": "特殊岩狗狗", + "miniorRedMeteor": "紅色核心", + "miniorOrangeMeteor": "橙色核心", + "miniorYellowMeteor": "黃色核心", + "miniorGreenMeteor": "綠色核心", + "miniorBlueMeteor": "淺藍色核心", + "miniorIndigoMeteor": "藍色核心", + "miniorVioletMeteor": "紫色核心", + "miniorRed": "紅色", + "miniorOrange": "橙色", + "miniorYellow": "黃色", + "miniorGreen": "綠色", + "miniorBlue": "淺藍色", + "miniorIndigo": "藍色", + "miniorViolet": "紫色", + "mimikyuDisguised": "化形", + "mimikyuBusted": "現形", + "magearnaOriginal": "500年前的顔色", + "marshadowZenith": "全力", + "sinisteaPhony": "赝品", + "sinisteaAntique": "真品", + "eiscueNoIce": "解凍頭", + "indeedeeMale": "雄性", + "indeedeeFemale": "雌性", + "morpekoFullBelly": "滿腹花紋", + "zacianHeroOfManyBattles": "百戰勇者", + "zamazentaHeroOfManyBattles": "百戰勇者", + "zarudeDada": "老爹", + "enamorusIncarnate": "化身", + "squawkabillyGreenPlumage": "綠羽毛", + "squawkabillyBluePlumage": "藍羽毛", + "squawkabillyYellowPlumage": "黃羽毛", + "squawkabillyWhitePlumage": "白羽毛", + "tatsugiriCurly": "上弓姿勢", + "tatsugiriDroopy": "下垂姿勢", + "tatsugiriStretchy": "平挺姿勢", + "gimmighoulChest": "寶箱形態", + "gimmighoulRoaming": "徒步形態", + "koraidonApexBuild": "頂尖形態", + "koraidonLimitedBuild":"限制形態", + "koraidonSprintingBuild":"沖刺形態", + "koraidonSwimmingBuild":"遊泳形態", + "koraidonGlidingBuild":"滑翔形態", + "miraidonUltimateMode":"極限模式", + "miraidonLowPowerMode":"節能模式", + "miraidonDriveMode":"駕駛模式", + "miraidonAquaticMode":"水上模式", + "miraidonGlideMode":"滑翔模式", + "poltchageistCounterfeit": "冒牌貨", + "poltchageistArtisan": "高檔貨", + "paldeaTaurosCombat": "鬥戰種", + "paldeaTaurosBlaze": "火熾種", + "paldeaTaurosAqua": "水瀾種" +} diff --git a/src/locales/zh_TW/pokemon-info.json b/src/locales/zh_TW/pokemon-info.json index 66a99857a82..f2e29875e75 100644 --- a/src/locales/zh_TW/pokemon-info.json +++ b/src/locales/zh_TW/pokemon-info.json @@ -11,7 +11,9 @@ "SPDEF": "特殊防禦", "SPDEFshortened": "特防", "SPD": "速度", - "SPDshortened": "速度" + "SPDshortened": "速度", + "ACC": "命中率", + "EVA": "回避率" }, "Type": { "UNKNOWN": "未知", @@ -35,4 +37,4 @@ "FAIRY": "妖精", "STELLAR": "星晶" } -} \ No newline at end of file +} diff --git a/src/locales/zh_TW/pokemon-summary.json b/src/locales/zh_TW/pokemon-summary.json index 9e26dfeeb6e..ddbbea63a3a 100644 --- a/src/locales/zh_TW/pokemon-summary.json +++ b/src/locales/zh_TW/pokemon-summary.json @@ -1 +1,45 @@ -{} \ No newline at end of file +{ + "pokemonInfo": "寶可夢信息", + "status": "狀態", + "powerAccuracyCategory": "威力\n命中率\n類別", + "type": "屬性", + "unknownTrainer": "未知", + "ot": "訓練師", + "nature": "性格", + "expPoints": "經驗值", + "nextLv": "下一級", + "cancel": "取消", + + "memoString": "{{natureFragment}} 性格，\n{{metFragment}}", + "metFragment": { + "normal": "met at Lv{{level}},\n{{biome}}.", + "apparently": "命中注定般地相遇于Lv.{{level}}，\n{{biome}}。" + }, + "natureFragment": { + "Hardy": "{{nature}}", + "Lonely": "{{nature}}", + "Brave": "{{nature}}", + "Adamant": "{{nature}}", + "Naughty": "{{nature}}", + "Bold": "{{nature}}", + "Docile": "{{nature}}", + "Relaxed": "{{nature}}", + "Impish": "{{nature}}", + "Lax": "{{nature}}", + "Timid": "{{nature}}", + "Hasty": "{{nature}}", + "Serious": "{{nature}}", + "Jolly": "{{nature}}", + "Naive": "{{nature}}", + "Modest": "{{nature}}", + "Mild": "{{nature}}", + "Quiet": "{{nature}}", + "Bashful": "{{nature}}", + "Rash": "{{nature}}", + "Calm": "{{nature}}", + "Gentle": "{{nature}}", + "Sassy": "{{nature}}", + "Careful": "{{nature}}", + "Quirky": "{{nature}}" + } +} diff --git a/src/locales/zh_TW/settings.json b/src/locales/zh_TW/settings.json index b077e0216a3..d9c71df3a0d 100644 --- a/src/locales/zh_TW/settings.json +++ b/src/locales/zh_TW/settings.json @@ -95,5 +95,7 @@ "mute": "靜音", "controller": "控制器", "gamepadSupport": "手柄支持", - "moveTouchControls": "移動觸控控制" + "showBgmBar": "顯示音樂名稱", + "moveTouchControls": "移動觸控控制", + "shopOverlayOpacity": "商店顯示不透明度" } diff --git a/src/locales/zh_TW/splash-messages.json b/src/locales/zh_TW/splash-messages.json index 8535a9acd84..a25e7dab97b 100644 --- a/src/locales/zh_TW/splash-messages.json +++ b/src/locales/zh_TW/splash-messages.json @@ -31,5 +31,6 @@ "alsoTryEmeraldRogue": "也試試翡翠流氓！", "alsoTryRadicalRed": "也試試激進紅！", "eeveeExpo": "伊布博覽會！", - "ynoproject": "YNO專案！" -} \ No newline at end of file + "ynoproject": "YNO專案！", + "breedersInSpace": "飼養員也能上太空？" +} diff --git a/src/locales/zh_TW/starter-select-ui-handler.json b/src/locales/zh_TW/starter-select-ui-handler.json index 2a0db7217da..ad64a8d9743 100644 --- a/src/locales/zh_TW/starter-select-ui-handler.json +++ b/src/locales/zh_TW/starter-select-ui-handler.json @@ -1,6 +1,7 @@ { - "confirmStartTeam": "使用這些寶可夢開始嗎?", - "invalidParty": "此為無效隊伍!", + "confirmStartTeam": "使用這些寶可夢開始嗎？", + "confirmExit": "確定要退出嗎？", + "invalidParty": "此為無效隊伍！", "gen1": "I", "gen2": "II", "gen3": "III", @@ -21,6 +22,8 @@ "toggleIVs": "查看個體值", "manageMoves": "管理技能", "manageNature": "管理性格", + "addToFavorites": "添加到最愛", + "removeFromFavorites": "移出最愛", "useCandies": "使用糖果", "selectNature": "選擇性格", "selectMoveSwapOut": "選擇想要替換走的招式", @@ -40,4 +43,4 @@ "locked": "未解鎖", "disabled": "已禁用", "uncaught": "未捕獲" -} \ No newline at end of file +} diff --git a/src/locales/zh_TW/status-effect.json b/src/locales/zh_TW/status-effect.json index 9e26dfeeb6e..5f634a0bddf 100644 --- a/src/locales/zh_TW/status-effect.json +++ b/src/locales/zh_TW/status-effect.json @@ -1 +1,65 @@ -{} \ No newline at end of file +{ + "none": { + "name": "無", + "description": "", + "obtain": "", + "obtainSource": "", + "activation": "", + "overlap": "", + "heal": "" + }, + "poison": { + "name": "中毒", + "description": "中毒", + "obtain": "{{pokemonNameWithAffix}}中毒了！", + "obtainSource": "{{pokemonNameWithAffix}}因{{sourceText}}中毒了！", + "activation": "{{pokemonNameWithAffix}}受到了毒的傷害！", + "overlap": "{{pokemonNameWithAffix}}已經中毒了！", + "heal": "{{pokemonNameWithAffix}}中的毒徹底清除了！" + }, + "toxic": { + "name": "劇毒", + "description": "中毒", + "obtain": "{{pokemonNameWithAffix}}中了劇毒！", + "obtainSource": "{{pokemonNameWithAffix}}因{{sourceText}}中了劇毒！", + "activation": "{{pokemonNameWithAffix}}受到了毒的傷害！", + "overlap": "{{pokemonNameWithAffix}}已經中毒了！", + "heal": "{{pokemonNameWithAffix}}中的毒徹底清除了！" + }, + "paralysis": { + "name": "麻痹", + "description": "麻痹", + "obtain": "{{pokemonNameWithAffix}}麻痹了，很難使出招式！", + "obtainSource": "{{pokemonNameWithAffix}}被{{sourceText}}麻痹了，很難使出招式！", + "activation": "{{pokemonNameWithAffix}}因身體麻痹而無法行動！", + "overlap": "{{pokemonNameWithAffix}}已經麻痹了！", + "heal": "{{pokemonNameWithAffix}}的麻痹治愈了！" + }, + "sleep": { + "name": "睡眠", + "description": "睡眠", + "obtain": "{{pokemonNameWithAffix}}睡著了！", + "obtainSource": "{{pokemonNameWithAffix}}因{{sourceText}}睡著了！", + "activation": "{{pokemonNameWithAffix}}正在呼呼大睡。", + "overlap": "{{pokemonNameWithAffix}}已經睡著了！", + "heal": "{{pokemonNameWithAffix}}醒了！" + }, + "freeze": { + "name": "冰凍", + "description": "冰凍", + "obtain": "{{pokemonNameWithAffix}}凍住了！", + "obtainSource": "{{pokemonNameWithAffix}}因{{sourceText}}凍住了！", + "activation": "{{pokemonNameWithAffix}}因凍住了而無法行動！", + "overlap": "{{pokemonNameWithAffix}}已經凍住了！", + "heal": "{{pokemonNameWithAffix}}治愈了冰凍狀態！" + }, + "burn": { + "name": "灼傷", + "description": "灼傷", + "obtain": "{{pokemonNameWithAffix}}被灼傷了！", + "obtainSource": "{{pokemonNameWithAffix}}因{{sourceText}}被灼傷了！", + "activation": "{{pokemonNameWithAffix}}受到了灼傷的傷害！", + "overlap": "{{pokemonNameWithAffix}}已經被灼傷了！", + "heal": "{{pokemonNameWithAffix}}的灼傷治愈了！" + } +} diff --git a/src/locales/zh_TW/trainer-classes.json b/src/locales/zh_TW/trainer-classes.json index d6ff7238ec1..d0b0fed7e5d 100644 --- a/src/locales/zh_TW/trainer-classes.json +++ b/src/locales/zh_TW/trainer-classes.json @@ -100,6 +100,8 @@ "worker_female": "工人", "workers": "工人組合", "youngster": "短褲小子", + "rocket_grunt": "火箭队手下", + "rocket_grunt_female": "火箭队手下", "rocket_grunts": "火箭队手下們", "magma_grunt": "熔岩队手下", "magma_grunt_female": "熔岩队手下", @@ -116,4 +118,4 @@ "flare_grunt": "闪焰队手下", "flare_grunt_female": "闪焰队手下", "flare_grunts": "闪焰队手下們" -} \ No newline at end of file +} diff --git a/src/locales/zh_TW/trainer-names.json b/src/locales/zh_TW/trainer-names.json index 64e8892e64b..04399cf19af 100644 --- a/src/locales/zh_TW/trainer-names.json +++ b/src/locales/zh_TW/trainer-names.json @@ -123,6 +123,34 @@ "kieran": "烏栗", "rival": "芬恩", "rival_female": "艾薇", + "archer": "阿波羅", + "ariana": "雅典娜", + "proton": "蘭斯", + "petrel": "拉姆達", + "tabitha": "火村", + "courtney": "火雁", + "shelly": "阿泉", + "matt": "阿潮", + "mars": "夥星", + "jupiter": "碎星", + "saturn": "鎮星", + "zinzolin": "維奧", + "rood": "羅德", + "xerosic": "庫瑟洛斯奇", + "bryony": "芭拉", + "faba": "扎奧博", + "plumeria": "布爾美麗", + "oleana": "奧利薇", + + "maxie": "赤焰松", + "archie": "水梧桐", + "cyrus": "赤日", + "ghetsis": "魁奇思", + "lysandre": "弗拉達利", + "lusamine": "露莎米奈", + "guzma": "古茲馬", + "rose": "洛茲", + "blue_red_double": "青綠 & 赤紅", "red_blue_double": "赤紅 & 青綠", "tate_liza_double": "小楓 & 小南", @@ -133,4 +161,4 @@ "iris_alder_double": "艾莉絲 & 阿戴克", "marnie_piers_double": "瑪俐 & 聶梓", "piers_marnie_double": "聶梓 & 瑪俐" -} \ No newline at end of file +} diff --git a/src/locales/zh_TW/trainer-titles.json b/src/locales/zh_TW/trainer-titles.json index 54fe48b1464..80b2807e7b5 100644 --- a/src/locales/zh_TW/trainer-titles.json +++ b/src/locales/zh_TW/trainer-titles.json @@ -9,5 +9,24 @@ "champion_double": "冠軍搭檔", "rival": "勁敵", "professor": "博士", - "frontier_brain": "開拓頭腦" -} \ No newline at end of file + "frontier_brain": "開拓頭腦", + "rocket_boss": "火箭隊老大", + "magma_boss": "熔岩隊老大", + "aqua_boss": "海洋隊老大", + "galactic_boss": "銀河隊老大", + "plasma_boss": "等離子隊老大", + "flare_boss": "閃焰隊老大", + + "rocket_admin": "火箭隊幹部", + "rocket_admin_female": "火箭隊幹部", + "magma_admin": "熔岩隊幹部", + "magma_admin_female": "熔岩隊幹部", + "aqua_admin": "海洋隊幹部", + "aqua_admin_female": "海洋隊幹部", + "galactic_commander": "銀河隊幹部", + "galactic_commander_female": "銀河隊幹部", + "plasma_sage": "等離子隊賢人", + "plasma_admin": "等離子隊幹部", + "flare_admin": "閃焰隊幹部", + "flare_admin_female": "閃焰隊幹部" +} diff --git a/src/locales/zh_TW/weather.json b/src/locales/zh_TW/weather.json index b20975374ea..b315d27625d 100644 --- a/src/locales/zh_TW/weather.json +++ b/src/locales/zh_TW/weather.json @@ -27,5 +27,6 @@ "harshSunClearMessage": "日照復原了。", "strongWindsStartMessage": "吹起了神秘的亂流！", "strongWindsLapseMessage": "神秘的亂流勢頭不減。", + "strongWindsEffectMessage": "神秘的亂流減弱了攻擊！", "strongWindsClearMessage": "神秘的亂流停止了。" -} \ No newline at end of file +} From ce9a75f074a87815850d34bff8c33e6e6b06be0a Mon Sep 17 00:00:00 2001 From: NightKev <34855794+DayKev@users.noreply.github.com> Date: Wed, 11 Sep 2024 13:54:42 -0700 Subject: [PATCH 82/83] Replace `vi.fn()` with `() => null` whenenver possible (#4182) --- src/test/utils/gameWrapper.ts | 2 +- src/test/utils/mocks/mockGameObjectCreator.ts | 5 ++--- src/test/utils/mocks/mockVideoGameObject.ts | 11 +++++------ src/test/utils/mocks/mocksContainer/mockContainer.ts | 10 ++++------ src/test/utils/mocks/mocksContainer/mockSprite.ts | 3 +-- src/test/utils/mocks/mocksContainer/mockText.ts | 11 +++++------ 6 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/test/utils/gameWrapper.ts b/src/test/utils/gameWrapper.ts index f3098fa9b71..1cf01a3a8c8 100644 --- a/src/test/utils/gameWrapper.ts +++ b/src/test/utils/gameWrapper.ts @@ -41,7 +41,7 @@ window.URL.createObjectURL = (blob: Blob) => { }); return null; }; -navigator.getGamepads = vi.fn().mockReturnValue([]); +navigator.getGamepads = () => []; global.fetch = vi.fn(MockFetch); Utils.setCookie(Utils.sessionIdKey, 'fake_token'); diff --git a/src/test/utils/mocks/mockGameObjectCreator.ts b/src/test/utils/mocks/mockGameObjectCreator.ts index 19406a46923..27860be0cec 100644 --- a/src/test/utils/mocks/mockGameObjectCreator.ts +++ b/src/test/utils/mocks/mockGameObjectCreator.ts @@ -1,4 +1,3 @@ -import { vi } from "vitest"; import MockGraphics from "./mocksContainer/mockGraphics"; import MockTextureManager from "./mockTextureManager"; @@ -16,8 +15,8 @@ export class MockGameObjectCreator { rexTransitionImagePack() { return { - transit: vi.fn(), - once: vi.fn(), + transit: () => null, + once: () => null, }; } } diff --git a/src/test/utils/mocks/mockVideoGameObject.ts b/src/test/utils/mocks/mockVideoGameObject.ts index 96f03542bbc..d8155e23b6c 100644 --- a/src/test/utils/mocks/mockVideoGameObject.ts +++ b/src/test/utils/mocks/mockVideoGameObject.ts @@ -1,13 +1,12 @@ -import { vi } from "vitest"; import { MockGameObject } from "./mockGameObject"; /** Mocks video-related stuff */ export class MockVideoGameObject implements MockGameObject { constructor() {} - public play = vi.fn(); - public stop = vi.fn(() => this); - public setOrigin = vi.fn(); - public setScale = vi.fn(); - public setVisible = vi.fn(); + public play = () => null; + public stop = () => this; + public setOrigin = () => null; + public setScale = () => null; + public setVisible = () => null; } diff --git a/src/test/utils/mocks/mocksContainer/mockContainer.ts b/src/test/utils/mocks/mocksContainer/mockContainer.ts index 94ae61a6ce4..e13cef0e43e 100644 --- a/src/test/utils/mocks/mocksContainer/mockContainer.ts +++ b/src/test/utils/mocks/mocksContainer/mockContainer.ts @@ -1,5 +1,4 @@ import MockTextureManager from "#test/utils/mocks/mockTextureManager"; -import { vi } from "vitest"; import { MockGameObject } from "../mockGameObject"; export default class MockContainer implements MockGameObject { @@ -52,7 +51,7 @@ export default class MockContainer implements MockGameObject { /// Sets the position of this Game Object to be a relative position from the source Game Object. } - setInteractive = vi.fn(); + setInteractive = () => null; setOrigin(x, y) { this.x = x; @@ -160,10 +159,9 @@ export default class MockContainer implements MockGameObject { // Moves this Game Object to be below the given Game Object in the display list. } - setName = vi.fn((name: string) => { + setName = (name: string) => { this.name = name; - // return this.phaserSprite.setName(name); - }); + }; bringToTop(obj) { // Brings this Game Object to the top of its parents display list. @@ -207,5 +205,5 @@ export default class MockContainer implements MockGameObject { return this.list; } - disableInteractive = vi.fn(); + disableInteractive = () => null; } diff --git a/src/test/utils/mocks/mocksContainer/mockSprite.ts b/src/test/utils/mocks/mocksContainer/mockSprite.ts index ae43df46cf5..83ec3951151 100644 --- a/src/test/utils/mocks/mocksContainer/mockSprite.ts +++ b/src/test/utils/mocks/mocksContainer/mockSprite.ts @@ -1,6 +1,5 @@ import Phaser from "phaser"; import { MockGameObject } from "../mockGameObject"; -import { vi } from "vitest"; import Sprite = Phaser.GameObjects.Sprite; import Frame = Phaser.Textures.Frame; @@ -102,7 +101,7 @@ export default class MockSprite implements MockGameObject { return this.phaserSprite.stop(); } - setInteractive = vi.fn(); + setInteractive = () => null; on(event, callback, source) { return this.phaserSprite.on(event, callback, source); diff --git a/src/test/utils/mocks/mocksContainer/mockText.ts b/src/test/utils/mocks/mocksContainer/mockText.ts index 5a89432902b..5462056f1e5 100644 --- a/src/test/utils/mocks/mocksContainer/mockText.ts +++ b/src/test/utils/mocks/mocksContainer/mockText.ts @@ -1,5 +1,4 @@ import UI from "#app/ui/ui"; -import { vi } from "vitest"; import { MockGameObject } from "../mockGameObject"; export default class MockText implements MockGameObject { @@ -193,11 +192,11 @@ export default class MockText implements MockGameObject { }; } - setColor = vi.fn((color: string) => { + setColor = (color: string) => { this.color = color; - }); + }; - setInteractive = vi.fn(); + setInteractive = () => null; setShadowColor(color) { // Sets the shadow color. @@ -223,9 +222,9 @@ export default class MockText implements MockGameObject { // return this.phaserText.setAlpha(alpha); } - setName = vi.fn((name: string) => { + setName = (name: string) => { this.name = name; - }); + }; setAlign(align) { // return this.phaserText.setAlign(align); From b33d86a1db18b1ec437368aa5accfd3a7e2e295d Mon Sep 17 00:00:00 2001 From: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com> Date: Wed, 11 Sep 2024 22:55:13 +0200 Subject: [PATCH 83/83] [BUG] Make Tate & Liza have seeded randomness #4175 --- src/field/trainer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/field/trainer.ts b/src/field/trainer.ts index 02827d0d69d..326ef0edefb 100644 --- a/src/field/trainer.ts +++ b/src/field/trainer.ts @@ -357,7 +357,7 @@ export default class Trainer extends Phaser.GameObjects.Container { // If useNewSpeciesPool is true, we need to generate a new species from the new species pool, otherwise we generate a random species let species = useNewSpeciesPool - ? getPokemonSpecies(newSpeciesPool[Math.floor(Math.random() * newSpeciesPool.length)]) + ? getPokemonSpecies(newSpeciesPool[Math.floor(Utils.randSeedInt(newSpeciesPool.length))]) : template.isSameSpecies(index) && index > offset ? getPokemonSpecies(battle.enemyParty[offset].species.getTrainerSpeciesForLevel(level, false, template.getStrength(offset), this.scene.currentBattle.waveIndex)) : this.genNewPartyMemberSpecies(level, strength);

GW16L@n!k&t zT@5-HTNuveUiFs*EAZ5F^r|9CgZ=cT?^MhmK17-d$pBaE`U6)Tt%h8Gt+&F0axJz1 zxsYKdBOmwgbNQ7f$%oN5!Gwg5a>wlXQ&qqMWc`@?Rb}mWNg@Ur*e#=Lrr0zoxEre^ zMh0!`z@IH9)mb4Js#9lu%*`LFv_kCX7MOL_JF1u+;cyCD20z)wgjwM53^m{P(3nxy zLXXh|XWgP7xQ_I&HYcEs2KH(v)=#cq+wxsr6Z#8PF!&5gX$@)`@x6?Mhd^iOBNJCcsB+sOz0HMh<*~gks3^-w>UU2b zFtA7}Ka>|O{Tu(+4wJn_xp%HSp2o(8il{Hf)3vsqZNJJ~lNW_P`Pt!`0X#9&l(YFq za&Ch70S_K#4E8pBBE1zI0^%W>=}rNj5uKAW?jRIMGV6HJ!(A%Oy{U3-)7btDR>Qj5 zwNRhrg+zn%;u%3^Zkf>Z?9fIDzvt~{lydD)>qcfRn=QM)MEz!5fjcN?qZq1B0q zQRq=n8%sXK9zv5EulXHrR-Oecj^v$P{^cY@bDT<9c5mVyATajX+XX&kWZB zP!I%<^(f>0+a2czeV>p~y2oFmmE0llVv}G<@tN!8=^1~?;D?JF*tK~cO*)HjNEt;> zCDcqsYU`3Ro&T3@Q71p*ax(rR8{u$z`z-|0b9rrmgjvwsTq6XRvVD4%b9wQ+l0F(* zG4?@V)k-M_v_kAW+rA0SW1J3N1{-^FA@X9Y>TG>qs?0>_J~I3}d=_$}l{07O9Q@Qi z7_jHX(cL|@(uLntLCUQW{PToBA7YW=GfMlHPB(Qf_>>x9aZxu8w{GUK_uNS%>>KmE*S!F7bGmAy;eu_I-+S1o|TZ?^tm?Z@afxw_iP+poYh` z-!K?NtPI*9B$p;-Z z4mNSKPlWd8gAg+#p+}AkE5!5ughhh{j&&_ljjpo7Bzla#&&|ixQ#Hk(A8A6;u5GC- z4o}42>?8-j71<;~NR|pa;x$FW|L Date: Fri, 6 Sep 2024 00:59:22 -0700 Subject: [PATCH 19/83] [Bug] Fix Aura Break applying without Dark/Fairy Aura present (#4057) * Fix Aura Break ignoring active Dark/Fairy Aura condition * Add conditional post-summon message --------- Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- src/data/ability.ts | 6 ++++-- src/data/move.ts | 5 ++++- src/locales/en/ability-trigger.json | 1 + src/test/abilities/aura_break.test.ts | 27 ++++++++++++++++++++------- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index 2407460b87d..10aba1f030e 100755 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -5333,8 +5333,10 @@ export function initAbilities() { .attr(FieldMoveTypePowerBoostAbAttr, Type.FAIRY, 4 / 3), new Ability(Abilities.AURA_BREAK, 6) .ignorable() - .conditionalAttr(target => target.hasAbility(Abilities.DARK_AURA), FieldMoveTypePowerBoostAbAttr, Type.DARK, 9 / 16) - .conditionalAttr(target => target.hasAbility(Abilities.FAIRY_AURA), FieldMoveTypePowerBoostAbAttr, Type.FAIRY, 9 / 16), + .conditionalAttr(pokemon => pokemon.scene.getField(true).some(p => p.hasAbility(Abilities.DARK_AURA)), FieldMoveTypePowerBoostAbAttr, Type.DARK, 9 / 16) + .conditionalAttr(pokemon => pokemon.scene.getField(true).some(p => p.hasAbility(Abilities.FAIRY_AURA)), FieldMoveTypePowerBoostAbAttr, Type.FAIRY, 9 / 16) + .conditionalAttr(pokemon => pokemon.scene.getField(true).some(p => p.hasAbility(Abilities.DARK_AURA) || p.hasAbility(Abilities.FAIRY_AURA)), + PostSummonMessageAbAttr, (pokemon: Pokemon) => i18next.t("abilityTriggers:postSummonAuraBreak", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) })), new Ability(Abilities.PRIMORDIAL_SEA, 6) .attr(PostSummonWeatherChangeAbAttr, WeatherType.HEAVY_RAIN) .attr(PostBiomeChangeWeatherChangeAbAttr, WeatherType.HEAVY_RAIN) diff --git a/src/data/move.ts b/src/data/move.ts index 96b780a8330..19014c0eb30 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -757,7 +757,10 @@ export default class Move implements Localizable { const fieldAuras = new Set( source.scene.getField(true) - .map((p) => p.getAbilityAttrs(FieldMoveTypePowerBoostAbAttr) as FieldMoveTypePowerBoostAbAttr[]) + .map((p) => p.getAbilityAttrs(FieldMoveTypePowerBoostAbAttr).filter(attr => { + const condition = attr.getCondition(); + return (!condition || condition(p)); + }) as FieldMoveTypePowerBoostAbAttr[]) .flat(), ); for (const aura of fieldAuras) { diff --git a/src/locales/en/ability-trigger.json b/src/locales/en/ability-trigger.json index 4f1d4dac766..a7383cea16b 100644 --- a/src/locales/en/ability-trigger.json +++ b/src/locales/en/ability-trigger.json @@ -52,6 +52,7 @@ "postSummonTeravolt": "{{pokemonNameWithAffix}} is radiating a bursting aura!", "postSummonDarkAura": "{{pokemonNameWithAffix}} is radiating a Dark Aura!", "postSummonFairyAura": "{{pokemonNameWithAffix}} is radiating a Fairy Aura!", + "postSummonAuraBreak": "{{pokemonNameWithAffix}} reversed all other Pokémon's auras!", "postSummonNeutralizingGas": "{{pokemonNameWithAffix}}'s Neutralizing Gas filled the area!", "postSummonAsOneGlastrier": "{{pokemonNameWithAffix}} has two Abilities!", "postSummonAsOneSpectrier": "{{pokemonNameWithAffix}} has two Abilities!", diff --git a/src/test/abilities/aura_break.test.ts b/src/test/abilities/aura_break.test.ts index 7de300c157a..0fb2212d817 100644 --- a/src/test/abilities/aura_break.test.ts +++ b/src/test/abilities/aura_break.test.ts @@ -1,5 +1,4 @@ import { allMoves } from "#app/data/move"; -import { MoveEffectPhase } from "#app/phases/move-effect-phase"; import { Abilities } from "#enums/abilities"; import { Moves } from "#enums/moves"; import { Species } from "#enums/species"; @@ -33,31 +32,45 @@ describe("Abilities - Aura Break", () => { game.override.enemySpecies(Species.SHUCKLE); }); - it("reverses the effect of fairy aura", async () => { + it("reverses the effect of Fairy Aura", async () => { const moveToCheck = allMoves[Moves.MOONBLAST]; const basePower = moveToCheck.power; game.override.ability(Abilities.FAIRY_AURA); vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.startBattle([Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU]); game.move.select(Moves.MOONBLAST); - await game.phaseInterceptor.to(MoveEffectPhase); + await game.phaseInterceptor.to("MoveEffectPhase"); expect(moveToCheck.calculateBattlePower).toHaveReturnedWith(expect.closeTo(basePower * auraBreakMultiplier)); }); - it("reverses the effect of dark aura", async () => { + it("reverses the effect of Dark Aura", async () => { const moveToCheck = allMoves[Moves.DARK_PULSE]; const basePower = moveToCheck.power; game.override.ability(Abilities.DARK_AURA); vi.spyOn(moveToCheck, "calculateBattlePower"); - await game.startBattle([Species.PIKACHU]); + await game.classicMode.startBattle([Species.PIKACHU]); game.move.select(Moves.DARK_PULSE); - await game.phaseInterceptor.to(MoveEffectPhase); + await game.phaseInterceptor.to("MoveEffectPhase"); expect(moveToCheck.calculateBattlePower).toHaveReturnedWith(expect.closeTo(basePower * auraBreakMultiplier)); }); + + it("has no effect if neither Fairy Aura nor Dark Aura are present", async () => { + const moveToCheck = allMoves[Moves.MOONBLAST]; + const basePower = moveToCheck.power; + + game.override.ability(Abilities.BALL_FETCH); + vi.spyOn(moveToCheck, "calculateBattlePower"); + + await game.classicMode.startBattle([Species.PIKACHU]); + game.move.select(Moves.MOONBLAST); + await game.phaseInterceptor.to("MoveEffectPhase"); + + expect(moveToCheck.calculateBattlePower).toHaveReturnedWith(basePower); + }); }); From d58f03528776a56e0fc1b8cfc6d1a99ae3561038 Mon Sep 17 00:00:00 2001 From: "Adrian T." <68144167+torranx@users.noreply.github.com> Date: Fri, 6 Sep 2024 17:41:48 +0800 Subject: [PATCH 20/83] [Misc] Migrate REROLL_TARGET to SHOP_CURSOR_TARGET (#4016) * migrate reroll target to shop cursor target * delete key after migrating --- src/system/game-data.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 1a47294906e..746af4d47a5 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -857,6 +857,14 @@ export class GameData { const settings = JSON.parse(localStorage.getItem("settings")!); // TODO: is this bang correct? + // TODO: Remove this block after save migration is implemented + if (settings.hasOwnProperty("REROLL_TARGET") && !settings.hasOwnProperty(SettingKeys.Shop_Cursor_Target)) { + settings[SettingKeys.Shop_Cursor_Target] = settings["REROLL_TARGET"]; + delete settings["REROLL_TARGET"]; + localStorage.setItem("settings", JSON.stringify(settings)); + } + // End of block to remove + for (const setting of Object.keys(settings)) { setSetting(this.scene, setting, settings[setting]); } From d8304421cf145f0b714ec77908a72db5fb137562 Mon Sep 17 00:00:00 2001 From: flx-sta <50131232+flx-sta@users.noreply.github.com> Date: Fri, 6 Sep 2024 10:23:19 -0700 Subject: [PATCH 21/83] fix endless end dialogue (#4069) It was only displaying `ending_endless` because the `PGM` prefix was still present --- src/phases/game-over-phase.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/phases/game-over-phase.ts b/src/phases/game-over-phase.ts index ebe58b20d3e..17805e90f0f 100644 --- a/src/phases/game-over-phase.ts +++ b/src/phases/game-over-phase.ts @@ -49,7 +49,9 @@ export class GameOverPhase extends BattlePhase { } if (this.victory && this.scene.gameMode.isEndless) { - this.scene.ui.showDialogue(i18next.t("PGMmiscDialogue:ending_endless"), i18next.t("PGMmiscDialogue:ending_name"), 0, () => this.handleGameOver()); + const genderIndex = this.scene.gameData.gender ?? PlayerGender.UNSET; + const genderStr = PlayerGender[genderIndex].toLowerCase(); + this.scene.ui.showDialogue(i18next.t("miscDialogue:ending_endless", { context: genderStr }), i18next.t("miscDialogue:ending_name"), 0, () => this.handleGameOver()); } else if (this.victory || !this.scene.enableRetries) { this.handleGameOver(); } else { From acda34c2e4d040aba44908691b23e1005dfdb1a6 Mon Sep 17 00:00:00 2001 From: "Adrian T." <68144167+torranx@users.noreply.github.com> Date: Sat, 7 Sep 2024 02:15:15 +0800 Subject: [PATCH 22/83] [P2 Bug] Underwater and underground Pokemond do not take sand/hail damage (#4047) * fix sandstorm/hail interaction with semi invulnerable state * cant fly high enough to avoid sandstorm/hail damage --- src/phases/weather-effect-phase.ts | 15 +++--- src/test/arena/weather_hail.test.ts | 62 ++++++++++++++++++++++++ src/test/arena/weather_sandstorm.test.ts | 59 ++++++++++++++++++++++ 3 files changed, 129 insertions(+), 7 deletions(-) create mode 100644 src/test/arena/weather_hail.test.ts create mode 100644 src/test/arena/weather_sandstorm.test.ts diff --git a/src/phases/weather-effect-phase.ts b/src/phases/weather-effect-phase.ts index 71ca7f9b505..ccfc9abb64f 100644 --- a/src/phases/weather-effect-phase.ts +++ b/src/phases/weather-effect-phase.ts @@ -1,10 +1,11 @@ -import BattleScene from "#app/battle-scene.js"; +import BattleScene from "#app/battle-scene"; import { applyPreWeatherEffectAbAttrs, SuppressWeatherEffectAbAttr, PreWeatherDamageAbAttr, applyAbAttrs, BlockNonDirectDamageAbAttr, applyPostWeatherLapseAbAttrs, PostWeatherLapseAbAttr } from "#app/data/ability.js"; -import { CommonAnim } from "#app/data/battle-anims.js"; -import { Weather, getWeatherDamageMessage, getWeatherLapseMessage } from "#app/data/weather.js"; -import { WeatherType } from "#app/enums/weather-type.js"; -import Pokemon, { HitResult } from "#app/field/pokemon.js"; -import * as Utils from "#app/utils.js"; +import { CommonAnim } from "#app/data/battle-anims"; +import { Weather, getWeatherDamageMessage, getWeatherLapseMessage } from "#app/data/weather"; +import { BattlerTagType } from "#app/enums/battler-tag-type.js"; +import { WeatherType } from "#app/enums/weather-type"; +import Pokemon, { HitResult } from "#app/field/pokemon"; +import * as Utils from "#app/utils"; import { CommonAnimPhase } from "./common-anim-phase"; export class WeatherEffectPhase extends CommonAnimPhase { @@ -39,7 +40,7 @@ export class WeatherEffectPhase extends CommonAnimPhase { applyPreWeatherEffectAbAttrs(PreWeatherDamageAbAttr, pokemon, this.weather, cancelled); applyAbAttrs(BlockNonDirectDamageAbAttr, pokemon, cancelled); - if (cancelled.value) { + if (cancelled.value || pokemon.getTag(BattlerTagType.UNDERGROUND) || pokemon.getTag(BattlerTagType.UNDERWATER)) { return; } diff --git a/src/test/arena/weather_hail.test.ts b/src/test/arena/weather_hail.test.ts new file mode 100644 index 00000000000..75125b3448c --- /dev/null +++ b/src/test/arena/weather_hail.test.ts @@ -0,0 +1,62 @@ +import { WeatherType } from "#app/data/weather"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/utils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; +import { SPLASH_ONLY } from "../utils/testUtils"; +import { BattlerIndex } from "#app/battle"; + +describe("Weather - Hail", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .weather(WeatherType.HAIL) + .battleType("single") + .moveset(SPLASH_ONLY) + .enemyMoveset(SPLASH_ONLY) + .enemySpecies(Species.MAGIKARP); + }); + + it("inflicts damage equal to 1/16 of Pokemon's max HP at turn end", async () => { + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.SPLASH); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + + await game.phaseInterceptor.to("TurnEndPhase"); + + game.scene.getField(true).forEach(pokemon => { + expect(pokemon.hp).toBeLessThan(pokemon.getMaxHp() - Math.floor(pokemon.getMaxHp() / 16)); + }); + }); + + it("does not inflict damage to a Pokemon that is underwater (Dive) or underground (Dig)", async () => { + game.override.moveset([Moves.DIG]); + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.DIG); + await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); + + await game.phaseInterceptor.to("TurnEndPhase"); + + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + expect(playerPokemon.hp).toBe(playerPokemon.getMaxHp()); + expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp() - Math.floor(enemyPokemon.getMaxHp() / 16)); + }); +}); diff --git a/src/test/arena/weather_sandstorm.test.ts b/src/test/arena/weather_sandstorm.test.ts new file mode 100644 index 00000000000..978774ba4c1 --- /dev/null +++ b/src/test/arena/weather_sandstorm.test.ts @@ -0,0 +1,59 @@ +import { WeatherType } from "#app/data/weather"; +import { Moves } from "#enums/moves"; +import { Species } from "#enums/species"; +import GameManager from "#test/utils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; +import { SPLASH_ONLY } from "../utils/testUtils"; + +describe("Weather - Sandstorm", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + game.override + .weather(WeatherType.SANDSTORM) + .battleType("single") + .moveset(SPLASH_ONLY) + .enemyMoveset(SPLASH_ONLY) + .enemySpecies(Species.MAGIKARP); + }); + + it("inflicts damage equal to 1/16 of Pokemon's max HP at turn end", async () => { + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.SPLASH); + + await game.phaseInterceptor.to("TurnEndPhase"); + + game.scene.getField(true).forEach(pokemon => { + expect(pokemon.hp).toBeLessThan(pokemon.getMaxHp() - Math.floor(pokemon.getMaxHp() / 16)); + }); + }); + + it("does not inflict damage to a Pokemon that is underwater (Dive) or underground (Dig)", async () => { + game.override.moveset([Moves.DIVE]); + await game.classicMode.startBattle([Species.MAGIKARP]); + + game.move.select(Moves.DIVE); + + await game.phaseInterceptor.to("TurnEndPhase"); + + const playerPokemon = game.scene.getPlayerPokemon()!; + const enemyPokemon = game.scene.getEnemyPokemon()!; + + expect(playerPokemon.hp).toBe(playerPokemon.getMaxHp()); + expect(enemyPokemon.hp).toBeLessThan(enemyPokemon.getMaxHp() - Math.floor(enemyPokemon.getMaxHp() / 16)); + }); +}); From 33cb99977493c6b7bd03a07ae20ddc574b7800bf Mon Sep 17 00:00:00 2001 From: Chapybara-jp Date: Fri, 6 Sep 2024 20:51:32 +0200 Subject: [PATCH 23/83] [Localization] [JA] Translated bgm-name.json (#4066) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Translated bgm-name.json Song titles from Bulbapedia and https://w.atwiki.jp/gamemusicbest100/ Kept mainline game abbrevs., changed PMD to ポケダン for clarity Added translations for the original songs * Update bgm-name.json * Update bgm-name.json * Update bgm-name.json --- src/locales/ja/bgm-name.json | 292 +++++++++++++++++------------------ 1 file changed, 146 insertions(+), 146 deletions(-) diff --git a/src/locales/ja/bgm-name.json b/src/locales/ja/bgm-name.json index 8838942c8a6..fc3d4c0fdd2 100644 --- a/src/locales/ja/bgm-name.json +++ b/src/locales/ja/bgm-name.json @@ -1,150 +1,150 @@ { - "music": "Music: ", + "music": "BGM: ", "missing_entries": "{{name}}", - "battle_kanto_champion": "B2W2 Kanto Champion Battle", - "battle_johto_champion": "B2W2 Johto Champion Battle", - "battle_hoenn_champion_g5": "B2W2 Hoenn Champion Battle", - "battle_hoenn_champion_g6": "ORAS Hoenn Champion Battle", - "battle_sinnoh_champion": "B2W2 Sinnoh Champion Battle", - "battle_champion_alder": "BW Unova Champion Battle", - "battle_champion_iris": "B2W2 Unova Champion Battle", - "battle_kalos_champion": "XY Kalos Champion Battle", - "battle_alola_champion": "USUM Alola Champion Battle", - "battle_galar_champion": "SWSH Galar Champion Battle", - "battle_champion_geeta": "SV Champion Geeta Battle", - "battle_champion_nemona": "SV Champion Nemona Battle", - "battle_champion_kieran": "SV Champion Kieran Battle", - "battle_hoenn_elite": "ORAS Elite Four Battle", - "battle_unova_elite": "BW Elite Four Battle", - "battle_kalos_elite": "XY Elite Four Battle", - "battle_alola_elite": "SM Elite Four Battle", - "battle_galar_elite": "SWSH League Tournament Battle", - "battle_paldea_elite": "SV Elite Four Battle", - "battle_bb_elite": "SV BB League Elite Four Battle", - "battle_final_encounter": "PMD RTDX Rayquaza's Domain", - "battle_final": "BW Ghetsis Battle", - "battle_kanto_gym": "B2W2 Kanto Gym Battle", - "battle_johto_gym": "B2W2 Johto Gym Battle", - "battle_hoenn_gym": "B2W2 Hoenn Gym Battle", - "battle_sinnoh_gym": "B2W2 Sinnoh Gym Battle", - "battle_unova_gym": "BW Unova Gym Battle", - "battle_kalos_gym": "XY Kalos Gym Battle", - "battle_galar_gym": "SWSH Galar Gym Battle", - "battle_paldea_gym": "SV Paldea Gym Battle", - "battle_legendary_kanto": "XY Kanto Legendary Battle", - "battle_legendary_raikou": "HGSS Raikou Battle", - "battle_legendary_entei": "HGSS Entei Battle", - "battle_legendary_suicune": "HGSS Suicune Battle", - "battle_legendary_lugia": "HGSS Lugia Battle", - "battle_legendary_ho_oh": "HGSS Ho-oh Battle", - "battle_legendary_regis_g5": "B2W2 Legendary Titan Battle", - "battle_legendary_regis_g6": "ORAS Legendary Titan Battle", - "battle_legendary_gro_kyo": "ORAS Groudon & Kyogre Battle", - "battle_legendary_rayquaza": "ORAS Rayquaza Battle", - "battle_legendary_deoxys": "ORAS Deoxys Battle", - "battle_legendary_lake_trio": "ORAS Lake Guardians Battle", - "battle_legendary_sinnoh": "ORAS Sinnoh Legendary Battle", - "battle_legendary_dia_pal": "ORAS Dialga & Palkia Battle", - "battle_legendary_origin_forme": "LA Origin Dialga & Palkia Battle", - "battle_legendary_giratina": "ORAS Giratina Battle", - "battle_legendary_arceus": "HGSS Arceus Battle", - "battle_legendary_unova": "BW Unova Legendary Battle", - "battle_legendary_kyurem": "BW Kyurem Battle", - "battle_legendary_res_zek": "BW Reshiram & Zekrom Battle", - "battle_legendary_xern_yvel": "XY Xerneas & Yveltal Battle", - "battle_legendary_tapu": "SM Tapu Battle", - "battle_legendary_sol_lun": "SM Solgaleo & Lunala Battle", - "battle_legendary_ub": "SM Ultra Beast Battle", - "battle_legendary_dusk_dawn": "USUM Dusk Mane & Dawn Wings Necrozma Battle", - "battle_legendary_ultra_nec": "USUM Ultra Necrozma Battle", - "battle_legendary_zac_zam": "SWSH Zacian & Zamazenta Battle", - "battle_legendary_glas_spec": "SWSH Glastrier & Spectrier Battle", - "battle_legendary_calyrex": "SWSH Calyrex Battle", - "battle_legendary_riders": "SWSH Ice & Shadow Rider Calyrex Battle", - "battle_legendary_birds_galar": "SWSH Galarian Legendary Birds Battle", - "battle_legendary_ruinous": "SV Treasures of Ruin Battle", - "battle_legendary_kor_mir": "SV Depths of Area Zero Battle", - "battle_legendary_loyal_three": "SV Loyal Three Battle", - "battle_legendary_ogerpon": "SV Ogerpon Battle", - "battle_legendary_terapagos": "SV Terapagos Battle", - "battle_legendary_pecharunt": "SV Pecharunt Battle", - "battle_rival": "BW Rival Battle", - "battle_rival_2": "BW N Battle", - "battle_rival_3": "BW Final N Battle", - "battle_trainer": "BW Trainer Battle", - "battle_wild": "BW Wild Battle", - "battle_wild_strong": "BW Strong Wild Battle", - "end_summit": "PMD RTDX Sky Tower Summit", - "battle_rocket_grunt": "HGSS Team Rocket Battle", - "battle_aqua_magma_grunt": "ORAS Team Aqua & Magma Battle", - "battle_galactic_grunt": "BDSP Team Galactic Battle", - "battle_plasma_grunt": "BW Team Plasma Battle", - "battle_flare_grunt": "XY Team Flare Battle", - "battle_aether_grunt": "SM Aether Foundation Battle", - "battle_skull_grunt": "SM Team Skull Battle", - "battle_macro_grunt": "SWSH Trainer Battle", - "battle_galactic_admin": "BDSP Team Galactic Admin Battle", - "battle_skull_admin": "SM Team Skull Admin Battle", - "battle_oleana": "SWSH Oleana Battle", - "battle_rocket_boss": "USUM Giovanni Battle", - "battle_aqua_magma_boss": "ORAS Archie & Maxie Battle", - "battle_galactic_boss": "BDSP Cyrus Battle", - "battle_plasma_boss": "B2W2 Ghetsis Battle", - "battle_flare_boss": "XY Lysandre Battle", - "battle_aether_boss": "SM Lusamine Battle", - "battle_skull_boss": "SM Guzma Battle", - "battle_macro_boss": "SWSH Rose Battle", + "battle_kanto_champion": "B2W2 戦闘！チャンピオン（カントー）", + "battle_johto_champion": "B2W2 戦闘！チャンピオン（ジョウト）", + "battle_hoenn_champion_g5": "B2W2 戦闘！チャンピオン（ホウエン）", + "battle_hoenn_champion_g6": "ORAS 決戦！ダイゴ", + "battle_sinnoh_champion": "B2W2 戦闘！チャンピオン（シンオウ）", + "battle_champion_alder": "BW チャンピオン アデク", + "battle_champion_iris": "B2W2 戦闘！チャンピオンアイリス", + "battle_kalos_champion": "XY 戦闘！チャンピオン", + "battle_alola_champion": "USUM 頂上決戦！ハウ", + "battle_galar_champion": "SWSH 決戦！チャンピオンダンデ", + "battle_champion_geeta": "SV 戦闘！トップチャンピオン", + "battle_champion_nemona": "SV 戦闘！チャンピオンネモ", + "battle_champion_kieran": "SV 戦闘！チャンピオンスグリ", + "battle_hoenn_elite": "ORAS 戦闘！四天王", + "battle_unova_elite": "BW 戦闘！四天王", + "battle_kalos_elite": "XY 戦闘！四天王", + "battle_alola_elite": "SM 戦闘！四天王", + "battle_galar_elite": "SWSH 戦闘！ファイナルトーナメント！", + "battle_paldea_elite": "SV 戦闘！四天王", + "battle_bb_elite": "SV 戦闘！ブルベリーグ四天王", + "battle_final_encounter": "ポケダンDX レックウザ登場", + "battle_final": "BW 戦闘！ゲーチス", + "battle_kanto_gym": "B2W2 戦闘！ジムリーダー（カントー）", + "battle_johto_gym": "B2W2 戦闘！ジムリーダー（ジョウト）", + "battle_hoenn_gym": "B2W2 戦闘！ジムリーダー（ホウエン）", + "battle_sinnoh_gym": "B2W2 戦闘！ジムリーダー（シンオウ）", + "battle_unova_gym": "BW 戦闘！ジムリーダー", + "battle_kalos_gym": "XY 戦闘！ジムリーダー", + "battle_galar_gym": "SWSH 戦闘！ジムリーダー", + "battle_paldea_gym": "SV 戦闘！ジムリーダー", + "battle_legendary_kanto": "XY 戦闘！ミュウツー", + "battle_legendary_raikou": "HGSS 戦闘！ライコウ", + "battle_legendary_entei": "HGSS 戦闘！エンテイ", + "battle_legendary_suicune": "HGSS 戦闘！スイクン", + "battle_legendary_lugia": "HGSS 戦闘！ルギア", + "battle_legendary_ho_oh": "HGSS 戦闘！ホウオウ", + "battle_legendary_regis_g5": "B2W2 戦闘！レジロック・レジアイス・レジスチル", + "battle_legendary_regis_g6": "ORAS 戦闘！レジロック・レジアイス・レジスチル", + "battle_legendary_gro_kyo": "ORAS 戦闘！ゲンシカイキ", + "battle_legendary_rayquaza": "ORAS 戦闘！超古代ポケモン", + "battle_legendary_deoxys": "ORAS 戦闘！デオキシス", + "battle_legendary_lake_trio": "ORAS 戦闘！ユクシー・エムリット・アグノム", + "battle_legendary_sinnoh": "ORAS 戦闘！伝説のポケモン（シンオウ）", + "battle_legendary_dia_pal": "ORAS 戦闘！ディアルガ・パルキア", + "battle_legendary_origin_forme": "LA 戦い：ディアルガ・パルキア（オリジンフォルム）", + "battle_legendary_giratina": "ORAS 戦闘！ギラティナ", + "battle_legendary_arceus": "HGSS アルセウス", + "battle_legendary_unova": "BW 戦闘！伝説のポケモン", + "battle_legendary_kyurem": "BW 戦闘！キュレム", + "battle_legendary_res_zek": "BW 戦闘！ゼクロム・レシラム", + "battle_legendary_xern_yvel": "XY 戦闘！ゼルネアス・イベルタル・ジガルデ", + "battle_legendary_tapu": "SM 戦闘！カプ", + "battle_legendary_sol_lun": "SM 戦闘！ソルガレオ・ルナアーラ", + "battle_legendary_ub": "SM 戦闘！ウルトラビースト", + "battle_legendary_dusk_dawn": "USUM 戦闘！日食・月食ネクロズマ", + "battle_legendary_ultra_nec": "USUM 戦闘！ウルトラネクロズマ", + "battle_legendary_zac_zam": "SWSH 戦闘！ザシアン・ザマゼンタ", + "battle_legendary_glas_spec": "SWSH 戦闘！ブリザポス・レイスポス", + "battle_legendary_calyrex": "SWSH 戦闘！バドレックス", + "battle_legendary_riders": "SWSH 戦闘！豊穣の王", + "battle_legendary_birds_galar": "SWSH 戦闘！伝説のとりポケモン", + "battle_legendary_ruinous": "SV 戦闘！災厄ポケモン", + "battle_legendary_kor_mir": "SV 戦闘！エリアゼロのポケモン", + "battle_legendary_loyal_three": "SV 戦闘！ともっこ", + "battle_legendary_ogerpon": "SV 戦闘！オーガポン", + "battle_legendary_terapagos": "SV 戦闘！テラパゴス", + "battle_legendary_pecharunt": "SV 戦闘！モモワロウ", + "battle_rival": "BW 戦闘！チェレン・ベル", + "battle_rival_2": "BW 戦闘！N", + "battle_rival_3": "BW 決戦！N", + "battle_trainer": "BW 戦闘！トレーナー", + "battle_wild": "BW 戦闘！野生ポケモン", + "battle_wild_strong": "BW 戦闘！強い野生ポケモン", + "end_summit": "ポケダンDX 天空の塔 最上階", + "battle_rocket_grunt": "HGSS 戦闘！ロケット団", + "battle_aqua_magma_grunt": "ORAS 戦闘！アクア団・マグマ団", + "battle_galactic_grunt": "BDSP 戦闘！ギンガ団", + "battle_plasma_grunt": "BW 戦闘！プラズマ団", + "battle_flare_grunt": "XY 戦闘！フレア団", + "battle_aether_grunt": "SM 戦闘！エーテル財団トレーナー", + "battle_skull_grunt": "SM 戦闘！スカル団", + "battle_macro_grunt": "SWSH 戦闘！トレーナー", + "battle_galactic_admin": "BDSP 戦闘！ギンガ団幹部", + "battle_skull_admin": "SM 戦闘！スカル団幹部", + "battle_oleana": "SWSH 戦闘！オリーヴ", + "battle_rocket_boss": "USUM 戦闘！レインボーロケット団ボス", + "battle_aqua_magma_boss": "ORAS 戦闘！アクア団・マグマ団のリーダー", + "battle_galactic_boss": "BDSP 戦闘！ギンガ団ボス", + "battle_plasma_boss": "B2W2 戦闘！ゲーチス", + "battle_flare_boss": "XY 戦闘！フラダリ", + "battle_aether_boss": "SM 戦闘！ルザミーネ", + "battle_skull_boss": "SM 戦闘！スカル団ボス", + "battle_macro_boss": "SWSH 戦闘！ローズ", - "abyss": "PMD EoS Dark Crater", - "badlands": "PMD EoS Barren Valley", - "beach": "PMD EoS Drenched Bluff", - "cave": "PMD EoS Sky Peak Cave", - "construction_site": "PMD EoS Boulder Quarry", - "desert": "PMD EoS Northern Desert", - "dojo": "PMD EoS Marowak Dojo", - "end": "PMD RTDX Sky Tower", - "factory": "PMD EoS Concealed Ruins", - "fairy_cave": "PMD EoS Star Cave", - "forest": "PMD EoS Dusk Forest", - "grass": "PMD EoS Apple Woods", - "graveyard": "PMD EoS Mystifying Forest", - "ice_cave": "PMD EoS Vast Ice Mountain", - "island": "PMD EoS Craggy Coast", - "jungle": "Lmz - Jungle", - "laboratory": "Firel - Laboratory", - "lake": "PMD EoS Crystal Cave", - "meadow": "PMD EoS Sky Peak Forest", - "metropolis": "Firel - Metropolis", - "mountain": "PMD EoS Mt. Horn", - "plains": "PMD EoS Sky Peak Prairie", - "power_plant": "PMD EoS Far Amp Plains", - "ruins": "PMD EoS Deep Sealed Ruin", - "sea": "Andr06 - Marine Mystique", - "seabed": "Firel - Seabed", - "slum": "Andr06 - Sneaky Snom", - "snowy_forest": "PMD EoS Sky Peak Snowfield", - "space": "Firel - Aether", - "swamp": "PMD EoS Surrounded Sea", - "tall_grass": "PMD EoS Foggy Forest", - "temple": "PMD EoS Aegis Cave", - "town": "PMD EoS Random Dungeon Theme 3", - "volcano": "PMD EoS Steam Cave", - "wasteland": "PMD EoS Hidden Highland", - "encounter_ace_trainer": "BW Trainers' Eyes Meet (Ace Trainer)", - "encounter_backpacker": "BW Trainers' Eyes Meet (Backpacker)", - "encounter_clerk": "BW Trainers' Eyes Meet (Clerk)", - "encounter_cyclist": "BW Trainers' Eyes Meet (Cyclist)", - "encounter_lass": "BW Trainers' Eyes Meet (Lass)", - "encounter_parasol_lady": "BW Trainers' Eyes Meet (Parasol Lady)", - "encounter_pokefan": "BW Trainers' Eyes Meet (Poke Fan)", - "encounter_psychic": "BW Trainers' Eyes Meet (Psychic)", - "encounter_rich": "BW Trainers' Eyes Meet (Gentleman)", - "encounter_rival": "BW Cheren", - "encounter_roughneck": "BW Trainers' Eyes Meet (Roughneck)", - "encounter_scientist": "BW Trainers' Eyes Meet (Scientist)", - "encounter_twins": "BW Trainers' Eyes Meet (Twins)", - "encounter_youngster": "BW Trainers' Eyes Meet (Youngster)", - "heal": "BW Pokémon Heal", - "menu": "PMD EoS Welcome to the World of Pokémon!", - "title": "PMD EoS Top Menu Theme" + "abyss": "ポケダン空 やみのかこう", + "badlands": "ポケダン空 こかつのたに", + "beach": "ポケダン空 しめったいわば", + "cave": "ポケダン空 そらのいただき（どうくつ）", + "construction_site": "ポケダン空 きょだいがんせきぐん", + "desert": "ポケダン空 きたのさばく", + "dojo": "ポケダン空 ガラガラどうじょう", + "end": "ポケダンDX 天空の塔", + "factory": "ポケダン空 かくされたいせき", + "fairy_cave": "ポケダン空 ほしのどうくつ", + "forest": "ポケダン空 くろのもり", + "grass": "ポケダン空 リンゴのもり", + "graveyard": "ポケダン空 しんぴのもり", + "ice_cave": "ポケダン空 だいひょうざん", + "island": "ポケダン空 えんがんのいわば", + "jungle": "Lmz - Jungle(ジャングル)", + "laboratory": "Firel - Laboratory(ラボラトリー)", + "lake": "ポケダン空 すいしょうのどうくつ", + "meadow": "ポケダン空 そらのいただき（もり）", + "metropolis": "Firel - Metropolis(大都市)", + "mountain": "ポケダン空 ツノやま", + "plains": "ポケダン空 そらのいただき（そうげん）", + "power_plant": "ポケダン空 エレキへいげん", + "ruins": "ポケダン空 ふういんのいわば", + "sea": "Andr06 - Marine Mystique(海の神秘性)", + "seabed": "Firel - Seabed(海底)", + "slum": "Andr06 - Sneaky Snom(ずるいユキハミ)", + "snowy_forest": "ポケダン空 そらのいただき（ゆきやま）", + "space": "Firel - Aether(エーテル)", + "swamp": "ポケダン空 とざされたうみ", + "tall_grass": "ポケダン空 のうむのもり", + "temple": "ポケダン空 ばんにんのどうくつ", + "town": "ポケダン空 ランダムダンジョン3", + "volcano": "ポケダン空 ねっすいのどうくつ", + "wasteland": "ポケダン空 まぼろしのだいち", + "encounter_ace_trainer": "BW 視線！エリートトレーナー", + "encounter_backpacker": "BW 視線！バックパッカー", + "encounter_clerk": "BW 視線！ビジネスマン", + "encounter_cyclist": "BW 視線！サイクリング", + "encounter_lass": "BW 視線！ミニスカート", + "encounter_parasol_lady": "BW 視線！パラソルおねえさん", + "encounter_pokefan": "BW 視線！だいすきクラブ", + "encounter_psychic": "BW 視線！サイキッカー", + "encounter_rich": "BW 視線！ジェントルマン", + "encounter_rival": "BW チェレンのテーマ", + "encounter_roughneck": "BW 視線！スキンヘッズ", + "encounter_scientist": "BW 視線！けんきゅういん", + "encounter_twins": "BW 視線！ふたごちゃん", + "encounter_youngster": "BW 視線！たんぱんこぞう", + "heal": "BW 回復", + "menu": "ポケダン空 ようこそ！ ポケモンたちのせかいへ！", + "title": "ポケダン空 トップメニュー" } From e6a574c48f3627b7ec6283cbd1772213c372851d Mon Sep 17 00:00:00 2001 From: "Adrian T." <68144167+torranx@users.noreply.github.com> Date: Sat, 7 Sep 2024 03:17:08 +0800 Subject: [PATCH 24/83] =?UTF-8?q?[P2=20Bug]=20Revert=20to=20normal=20form?= =?UTF-8?q?=20when=20Pok=C3=A9mon=20is=20fainted=20(#4049)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * revert to normal forms when fainted * Remove `.js` from import Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com> --- src/phases/faint-phase.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/phases/faint-phase.ts b/src/phases/faint-phase.ts index d5dd9f61340..48366afaad4 100644 --- a/src/phases/faint-phase.ts +++ b/src/phases/faint-phase.ts @@ -17,6 +17,7 @@ import { ToggleDoublePositionPhase } from "./toggle-double-position-phase"; import { GameOverPhase } from "./game-over-phase"; import { SwitchPhase } from "./switch-phase"; import { VictoryPhase } from "./victory-phase"; +import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms"; export class FaintPhase extends PokemonPhase { private preventEndure: boolean; @@ -59,6 +60,7 @@ export class FaintPhase extends PokemonPhase { } this.scene.queueMessage(i18next.t("battle:fainted", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }), null, true); + this.scene.triggerPokemonFormChange(pokemon, SpeciesFormChangeActiveTrigger, true); if (pokemon.turnData?.attacksReceived?.length) { const lastAttack = pokemon.turnData.attacksReceived[0]; From ae50db7710ce371eb806f93c7dde386bee45e948 Mon Sep 17 00:00:00 2001 From: flx-sta <50131232+flx-sta@users.noreply.github.com> Date: Fri, 6 Sep 2024 16:24:38 -0700 Subject: [PATCH 25/83] [Optimization] parallel testing (#4075) * add: vitest projects (multiple) preparations for parallel testing * update: tests workflow better parallel testing --- .github/workflows/tests.yml | 78 +++++++++++++++++++++++++++++++++++-- vitest.config.ts | 59 +++++++++++++++------------- vitest.workspace.ts | 54 +++++++++++++++++++++++++ 3 files changed, 160 insertions(+), 31 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index adac45519ab..2a78ec252b8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,8 +15,8 @@ on: types: [checks_requested] jobs: - run-tests: # Define a job named "run-tests" - name: Run tests # Human-readable name for the job + run-misc-tests: # Define a job named "run-tests" + name: Run misc tests # Human-readable name for the job runs-on: ubuntu-latest # Specify the latest Ubuntu runner for the job steps: @@ -31,5 +31,75 @@ jobs: - name: Install Node.js dependencies # Step to install Node.js dependencies run: npm ci # Use 'npm ci' to install dependencies - - name: tests # Step to run tests - run: npm run test:silent \ No newline at end of file + - name: pre-test # pre-test to check overrides + run: npx vitest run --project pre + - name: test misc + run: npx vitest --project misc + + run-abilities-tests: + name: Run abilities tests + runs-on: ubuntu-latest + steps: + - name: Check out Git repository + uses: actions/checkout@v4 + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + - name: Install Node.js dependencies + run: npm ci + - name: pre-test + run: npx vitest run --project pre + - name: test abilities + run: npx vitest --project abilities + + run-items-tests: + name: Run items tests + runs-on: ubuntu-latest + steps: + - name: Check out Git repository + uses: actions/checkout@v4 + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + - name: Install Node.js dependencies + run: npm ci + - name: pre-test + run: npx vitest run --project pre + - name: test items + run: npx vitest --project items + + run-moves-tests: + name: Run moves tests + runs-on: ubuntu-latest + steps: + - name: Check out Git repository + uses: actions/checkout@v4 + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + - name: Install Node.js dependencies + run: npm ci + - name: pre-test + run: npx vitest run --project pre + - name: test moves + run: npx vitest --project moves + + run-battle-tests: + name: Run battle tests + runs-on: ubuntu-latest + steps: + - name: Check out Git repository + uses: actions/checkout@v4 + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 + - name: Install Node.js dependencies + run: npm ci + - name: pre-test + run: npx vitest run --project pre + - name: test battle + run: npx vitest --project battle \ No newline at end of file diff --git a/vitest.config.ts b/vitest.config.ts index d1827103807..9a765a89ae7 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -1,38 +1,43 @@ -import { defineProject } from 'vitest/config'; +import { defineProject, UserWorkspaceConfig } from 'vitest/config'; import { defaultConfig } from './vite.config'; +export const defaultProjectTestConfig: UserWorkspaceConfig["test"] = { + setupFiles: ['./src/test/vitest.setup.ts'], + server: { + deps: { + inline: ['vitest-canvas-mock'], + //@ts-ignore + optimizer: { + web: { + include: ['vitest-canvas-mock'], + } + } + } + }, + environment: 'jsdom' as const, + environmentOptions: { + jsdom: { + resources: 'usable', + }, + }, + threads: false, + trace: true, + restoreMocks: true, + watch: false, + coverage: { + provider: 'istanbul' as const, + reportsDirectory: 'coverage' as const, + reporters: ['text-summary', 'html'], + }, +} + export default defineProject(({ mode }) => ({ ...defaultConfig, test: { + ...defaultProjectTestConfig, name: "main", include: ["./src/test/**/*.{test,spec}.ts"], exclude: ["./src/test/pre.test.ts"], - setupFiles: ['./src/test/vitest.setup.ts'], - server: { - deps: { - inline: ['vitest-canvas-mock'], - optimizer: { - web: { - include: ['vitest-canvas-mock'], - } - } - } - }, - environment: 'jsdom' as const, - environmentOptions: { - jsdom: { - resources: 'usable', - }, - }, - threads: false, - trace: true, - restoreMocks: true, - watch: false, - coverage: { - provider: 'istanbul' as const, - reportsDirectory: 'coverage' as const, - reporters: ['text-summary', 'html'], - }, }, esbuild: { pure: mode === 'production' ? [ 'console.log' ] : [], diff --git a/vitest.workspace.ts b/vitest.workspace.ts index 38121942004..a885b77dc9d 100644 --- a/vitest.workspace.ts +++ b/vitest.workspace.ts @@ -1,5 +1,6 @@ import { defineWorkspace } from "vitest/config"; import { defaultConfig } from "./vite.config"; +import { defaultProjectTestConfig } from "./vitest.config"; export default defineWorkspace([ { @@ -10,5 +11,58 @@ export default defineWorkspace([ environment: "jsdom", }, }, + { + ...defaultConfig, + test: { + ...defaultProjectTestConfig, + name: "misc", + include: [ + "src/test/achievements/**/*.{test,spec}.ts", + "src/test/arena/**/*.{test,spec}.ts", + "src/test/battlerTags/**/*.{test,spec}.ts", + "src/test/eggs/**/*.{test,spec}.ts", + "src/test/field/**/*.{test,spec}.ts", + "src/test/inputs/**/*.{test,spec}.ts", + "src/test/localization/**/*.{test,spec}.ts", + "src/test/phases/**/*.{test,spec}.ts", + "src/test/settingMenu/**/*.{test,spec}.ts", + "src/test/sprites/**/*.{test,spec}.ts", + "src/test/ui/**/*.{test,spec}.ts", + "src/test/*.{test,spec}.ts", + ], + }, + }, + { + ...defaultConfig, + test: { + ...defaultProjectTestConfig, + name: "abilities", + include: ["src/test/abilities/**/*.{test,spec}.ts"], + }, + }, + { + ...defaultConfig, + test: { + ...defaultProjectTestConfig, + name: "battle", + include: ["src/test/battle/**/*.{test,spec}.ts"], + }, + }, + { + ...defaultConfig, + test: { + ...defaultProjectTestConfig, + name: "items", + include: ["src/test/items/**/*.{test,spec}.ts"], + }, + }, + { + ...defaultConfig, + test: { + ...defaultProjectTestConfig, + name: "moves", + include: ["src/test/moves/**/*.{test,spec}.ts"], + }, + }, "./vitest.config.ts", ]); From ba212945deb7c48ad843ac939d4e43531c100c2f Mon Sep 17 00:00:00 2001 From: James Diefenbach <105332964+j-diefenbach@users.noreply.github.com> Date: Sat, 7 Sep 2024 10:34:13 +1000 Subject: [PATCH 26/83] [Enhancement] Darker egg summary background image (#4076) * darker egg-summary background * reset old background for beta * darker egg summary bg --------- Co-authored-by: James Diefenbach --- public/images/ui/egg_summary_bg.png | Bin 1064 -> 2209 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/images/ui/egg_summary_bg.png b/public/images/ui/egg_summary_bg.png index 658f5df0e96bd901d105690d73500b965788df5c..b4ee3d86a507bfb99b4f9af2d71b5065e4ac943b 100644 GIT binary patch literal 2209 zcmeHJdsLEV9R5VSkQ8Pv%jHbd%;kmVQp*BU4DCW4b7h*ru=JEBT3VVYQkk?;OgqsE zrQ0bTLo{zF1YdcZV`-fdFsH03OEb|lykNqrK|eYGD^H;ZQHf65;B8 zXB(?7pFHn@d*8aYzMLLz`-^o-w%nqz9mg-e_Mjy#wz;q87M_VQ0pUl2aBMcaN}NY| zu2fPo5V!JQh)-3le%X3|imEFetXFh)9-@ZS3Izg26M4;4;7DJeQ*$Qqfr7_znUK>+ z!yS~0iC47@hA#%AmhhAwWj$i;I9K1T9pWnWPl(q%Wy9Q?BISYw3%nDQ<61Ds^%1E-LSea)-zIS_?CY_w{*9rcY0e?%4N- zy%&HJOj;gvsVUgB(Z1&^Dm7U29*WH#RHcU4+gTZ#M5T(7K%O3>nm#eylOfkX4%>I1 zFXKrl{2rRh(oL*kE&BanDaKTh5;eH>&`%;%Gu1#Pa*(o2*hGG!wc6~^kYN&C8}5d& z&!Y5*4rRD2t7>a)_(VxU#?tL}c6Lol{dkGyp#RBsqL?A)6KQF1-)oN|_P6hGXGvu& z^w&})R)US8{n%MEV<%KZNRl!$zl!$av`=r$h8I7Ixuuhus|(V{rrtfBo*0hyzScA~ zm9`;uPVMPY?tIrZz7T z9Y(9@^s7#Zr`+i`JP_>gL2CKXYoXvcP_~=PrP$6#AfHuT1f!klLPkEgQ(6rd4|t)x z2!?F(YDY4K;`vQJ=)ZlUN1QS3N*N4+fy^ghp~CZ# z5a~~_T0oSH8}dJc8URIs=+BWtQ3j3vpZ0Sj{P)`SFG{W3*G#TpFy7qe*gb(fy#(@f zZv-s8aSg$z+jG`6E9k%torZr(e7#56S*hJOEq*cj7r99*^ho zv$3Tq7{&4NsQ4f%L0ME(L}Gh*cxYWpvQDZWy&T)20@xBQ5r<=Ab@*N>xmydl`9({b zL-MS>A?LmQ1$Ct$7aqfQLO*k+FN!Nd)f8peOc;}HIwitB=@1GW2poq|avgUxVVYTD9;FVM^C zWK*QB&J#~uMp~p&g|a($rn_6W94?S*;dzYrV+Nz}=`JP=kAnq9$*of3()|d89n+6e zXS+0)X|#Sa%k_=h2W+DO{j=4AXu$C(n+s2KDl26y;6x|~q|FT6mB}BvW7tI@q>|u| z?f)*4M7n37R(}~(?JD!iG{_zRGcHtRKSrcFeEUqbcaBEWW*AK*dRtna)jBdzZUyx? z3r_giAo?UV3p|jv*w+YwObMAw$hHYEE`)^qBr^D8&5sL?1p>M4GMwNK@wD=-Fv#NY zk7Ng$7ydGAMn>m0{GM7YLBQ%Db!Y)2(?du5rcu1YduCAn`C!bTAxgQAIElf&I zu9{loZ)T5nE;jjq{rv`V`n0j8>VTj1&>w&0mNev`2f4V^iFkRSrCEP!PI>({S;{P@9eIb|i#An}qQzhH*{Siy$w;`s$>aLg4O+qW}LMB*T*(CZmX}11V z-tGfNIW~V4r0>+M%!`;4!?JJBmCAY3-DBmy{#yPtFup$C{;g8M&MQw>_uB8Tkxl<8 z@wP&_Am&`?@vnjPCwKpevN!z2wdd6A*Keb*X@)m`J^Sq1=R4EP?=3S5Ki^Uxop4sM z;Bvg2i_t%63z==%7w2!j^8Ubocg^-swc4pdn(>zdmqj%C`=7M?=lkH|DbB{#2R>Rv z+54%i;gs>$3Gn#A#I%()PR-*`*8yejD?)Ayjx$|$JhYHoB{5Ke^FHw`KJGhwoc2N% zzL(Z{ScD|JKKN$K0SO_XF~%xyHaQ51u}<0`DO47zz}d~@d4q>@x6XtX*G83`ww72i zk3)+bgv^`|=|L==t(Z6+s9Iw}%h?GVPBVE%hoe*%i zlhscp=c$&#l1FE_|1bmn_3qQ2Ip5B;@xN!;(|lmd_iHsZ`l;U=KHt0hRlj_3SzN-i z-`wn%Y7DA%Ht?9XDXu^8{JBQs%MP&{RR-3&25c-=96s#aZ*m&fp1-~KK*t^KC~v&{QzlWMkq;D0a@;)|+8yK@UnVrl zaoZeka9{^9=jv|wTDe<%2H(6^Td|G(6ES2C_OEHbbpC$YdRjDR_I99Jfn?J=0~V^gHDV>50~V>=D{PDxUOy z1=-kgl~rtB>u#YLeVN%PC|V=b{-Jw`46o-A77eKgQcDPU2J n!vdE|`Cq{`#zhtELiP-TmYXMaF?{6)W=;lAS3j3^P6 Date: Fri, 6 Sep 2024 22:54:54 -0400 Subject: [PATCH 27/83] [Item/Balance] Overhaul Lapsing Modifiers (#4032) * Refactor Lapsing Modifiers, Lerp Hue of Count * Fix Unit Tests * Add Documentation to `hslToHex` Function * Change Descriptions for New Behavior * Add Documentation to Lapsing Modifiers * Add Unit Tests for Lures * Update Unit Tests for X Items and Lures * Update Boilerplate Error Message * Update Boilerplate Docs --- create-test-boilerplate.js | 12 +- src/locales/en/modifier-type.json | 8 +- src/modifier/modifier-type.ts | 44 ++-- src/modifier/modifier.ts | 207 +++++++++--------- src/test/items/dire_hit.test.ts | 4 +- .../double_battle_chance_booster.test.ts | 105 +++++++++ .../items/temp_stat_stage_booster.test.ts | 28 +-- src/utils.ts | 20 ++ 8 files changed, 285 insertions(+), 143 deletions(-) create mode 100644 src/test/items/double_battle_chance_booster.test.ts diff --git a/create-test-boilerplate.js b/create-test-boilerplate.js index bf68258f321..3c53eb1125b 100644 --- a/create-test-boilerplate.js +++ b/create-test-boilerplate.js @@ -4,7 +4,8 @@ import { fileURLToPath } from 'url'; /** * This script creates a test boilerplate file for a move or ability. - * @param {string} type - The type of test to create. Either "move" or "ability". + * @param {string} type - The type of test to create. Either "move", "ability", + * or "item". * @param {string} fileName - The name of the file to create. * @example npm run create-test move tackle */ @@ -19,7 +20,7 @@ const type = args[0]; // "move" or "ability" let fileName = args[1]; // The file name if (!type || !fileName) { - console.error('Please provide both a type ("move" or "ability") and a file name.'); + console.error('Please provide both a type ("move", "ability", or "item") and a file name.'); process.exit(1); } @@ -40,8 +41,11 @@ if (type === 'move') { } else if (type === 'ability') { dir = path.join(__dirname, 'src', 'test', 'abilities'); description = `Abilities - ${formattedName}`; +} else if (type === "item") { + dir = path.join(__dirname, 'src', 'test', 'items'); + description = `Items - ${formattedName}`; } else { - console.error('Invalid type. Please use "move" or "ability".'); + console.error('Invalid type. Please use "move", "ability", or "item".'); process.exit(1); } @@ -98,4 +102,4 @@ describe("${description}", () => { // Write the template content to the file fs.writeFileSync(filePath, content, 'utf8'); -console.log(`File created at: ${filePath}`); \ No newline at end of file +console.log(`File created at: ${filePath}`); diff --git a/src/locales/en/modifier-type.json b/src/locales/en/modifier-type.json index f73a3dcccae..babad57b81b 100644 --- a/src/locales/en/modifier-type.json +++ b/src/locales/en/modifier-type.json @@ -47,10 +47,14 @@ "description": "Changes a Pokémon's nature to {{natureName}} and permanently unlocks the nature for the starter." }, "DoubleBattleChanceBoosterModifierType": { - "description": "Doubles the chance of an encounter being a double battle for {{battleCount}} battles." + "description": "Quadruples the chance of an encounter being a double battle for up to {{battleCount}} battles." }, "TempStatStageBoosterModifierType": { - "description": "Increases the {{stat}} of all party members by 1 stage for 5 battles." + "description": "Increases the {{stat}} of all party members by {{amount}} for up to 5 battles.", + "extra": { + "stage": "1 stage", + "percentage": "30%" + } }, "AttackTypeBoosterModifierType": { "description": "Increases the power of a Pokémon's {{moveType}}-type moves by 20%." diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index fe586074c79..d6cfd017829 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -433,37 +433,44 @@ export class RememberMoveModifierType extends PokemonModifierType { } export class DoubleBattleChanceBoosterModifierType extends ModifierType { - public battleCount: integer; + private maxBattles: number; - constructor(localeKey: string, iconImage: string, battleCount: integer) { - super(localeKey, iconImage, (_type, _args) => new Modifiers.DoubleBattleChanceBoosterModifier(this, this.battleCount), "lure"); + constructor(localeKey: string, iconImage: string, maxBattles: number) { + super(localeKey, iconImage, (_type, _args) => new Modifiers.DoubleBattleChanceBoosterModifier(this, maxBattles), "lure"); - this.battleCount = battleCount; + this.maxBattles = maxBattles; } - getDescription(scene: BattleScene): string { - return i18next.t("modifierType:ModifierType.DoubleBattleChanceBoosterModifierType.description", { battleCount: this.battleCount }); + getDescription(_scene: BattleScene): string { + return i18next.t("modifierType:ModifierType.DoubleBattleChanceBoosterModifierType.description", { + battleCount: this.maxBattles + }); } } export class TempStatStageBoosterModifierType extends ModifierType implements GeneratedPersistentModifierType { private stat: TempBattleStat; - private key: string; + private nameKey: string; + private quantityKey: string; constructor(stat: TempBattleStat) { - const key = TempStatStageBoosterModifierTypeGenerator.items[stat]; - super("", key, (_type, _args) => new Modifiers.TempStatStageBoosterModifier(this, this.stat)); + const nameKey = TempStatStageBoosterModifierTypeGenerator.items[stat]; + super("", nameKey, (_type, _args) => new Modifiers.TempStatStageBoosterModifier(this, this.stat, 5)); this.stat = stat; - this.key = key; + this.nameKey = nameKey; + this.quantityKey = (stat !== Stat.ACC) ? "percentage" : "stage"; } get name(): string { - return i18next.t(`modifierType:TempStatStageBoosterItem.${this.key}`); + return i18next.t(`modifierType:TempStatStageBoosterItem.${this.nameKey}`); } getDescription(_scene: BattleScene): string { - return i18next.t("modifierType:ModifierType.TempStatStageBoosterModifierType.description", { stat: i18next.t(getStatKey(this.stat)) }); + return i18next.t("modifierType:ModifierType.TempStatStageBoosterModifierType.description", { + stat: i18next.t(getStatKey(this.stat)), + amount: i18next.t(`modifierType:ModifierType.TempStatStageBoosterModifierType.extra.${this.quantityKey}`) + }); } getPregenArgs(): any[] { @@ -1348,9 +1355,9 @@ export const modifierTypes = { SUPER_REPEL: () => new DoubleBattleChanceBoosterModifierType('Super Repel', 10), MAX_REPEL: () => new DoubleBattleChanceBoosterModifierType('Max Repel', 25),*/ - LURE: () => new DoubleBattleChanceBoosterModifierType("modifierType:ModifierType.LURE", "lure", 5), - SUPER_LURE: () => new DoubleBattleChanceBoosterModifierType("modifierType:ModifierType.SUPER_LURE", "super_lure", 10), - MAX_LURE: () => new DoubleBattleChanceBoosterModifierType("modifierType:ModifierType.MAX_LURE", "max_lure", 25), + LURE: () => new DoubleBattleChanceBoosterModifierType("modifierType:ModifierType.LURE", "lure", 10), + SUPER_LURE: () => new DoubleBattleChanceBoosterModifierType("modifierType:ModifierType.SUPER_LURE", "super_lure", 15), + MAX_LURE: () => new DoubleBattleChanceBoosterModifierType("modifierType:ModifierType.MAX_LURE", "max_lure", 30), SPECIES_STAT_BOOSTER: () => new SpeciesStatBoosterModifierTypeGenerator(), @@ -1358,9 +1365,12 @@ export const modifierTypes = { DIRE_HIT: () => new class extends ModifierType { getDescription(_scene: BattleScene): string { - return i18next.t("modifierType:ModifierType.TempStatStageBoosterModifierType.description", { stat: i18next.t("modifierType:ModifierType.DIRE_HIT.extra.raises") }); + return i18next.t("modifierType:ModifierType.TempStatStageBoosterModifierType.description", { + stat: i18next.t("modifierType:ModifierType.DIRE_HIT.extra.raises"), + amount: i18next.t("modifierType:ModifierType.TempStatStageBoosterModifierType.extra.stage") + }); } - }("modifierType:ModifierType.DIRE_HIT", "dire_hit", (type, _args) => new Modifiers.TempCritBoosterModifier(type)), + }("modifierType:ModifierType.DIRE_HIT", "dire_hit", (type, _args) => new Modifiers.TempCritBoosterModifier(type, 5)), BASE_STAT_BOOSTER: () => new BaseStatBoosterModifierTypeGenerator(), diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index f3219c8bf73..c1d58a7bf39 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -292,70 +292,131 @@ export class AddVoucherModifier extends ConsumableModifier { } } +/** + * Modifier used for party-wide or passive items that start an initial + * {@linkcode battleCount} equal to {@linkcode maxBattles} that, for every + * battle, decrements. Typically, when {@linkcode battleCount} reaches 0, the + * modifier will be removed. If a modifier of the same type is to be added, it + * will reset {@linkcode battleCount} back to {@linkcode maxBattles} of the + * existing modifier instead of adding that modifier directly. + * @extends PersistentModifier + * @abstract + * @see {@linkcode add} + */ export abstract class LapsingPersistentModifier extends PersistentModifier { - protected battlesLeft: integer; + /** The maximum amount of battles the modifier will exist for */ + private maxBattles: number; + /** The current amount of battles the modifier will exist for */ + private battleCount: number; - constructor(type: ModifierTypes.ModifierType, battlesLeft?: integer, stackCount?: integer) { + constructor(type: ModifierTypes.ModifierType, maxBattles: number, battleCount?: number, stackCount?: integer) { super(type, stackCount); - this.battlesLeft = battlesLeft!; // TODO: is this bang correct? + this.maxBattles = maxBattles; + this.battleCount = battleCount ?? this.maxBattles; } - lapse(args: any[]): boolean { - return !!--this.battlesLeft; + /** + * Goes through existing modifiers for any that match the selected modifier, + * which will then either add it to the existing modifiers if none were found + * or, if one was found, it will refresh {@linkcode battleCount}. + * @param modifiers {@linkcode PersistentModifier} array of the player's modifiers + * @param _virtual N/A + * @param _scene N/A + * @returns true if the modifier was successfully added or applied, false otherwise + */ + add(modifiers: PersistentModifier[], _virtual: boolean, scene: BattleScene): boolean { + for (const modifier of modifiers) { + if (this.match(modifier)) { + const modifierInstance = modifier as LapsingPersistentModifier; + if (modifierInstance.getBattleCount() < modifierInstance.getMaxBattles()) { + modifierInstance.resetBattleCount(); + scene.playSound("se/restore"); + return true; + } + // should never get here + return false; + } + } + + modifiers.push(this); + return true; + } + + lapse(_args: any[]): boolean { + this.battleCount--; + return this.battleCount > 0; } getIcon(scene: BattleScene): Phaser.GameObjects.Container { const container = super.getIcon(scene); - const battleCountText = addTextObject(scene, 27, 0, this.battlesLeft.toString(), TextStyle.PARTY, { fontSize: "66px", color: "#f89890" }); + // Linear interpolation on hue + const hue = Math.floor(120 * (this.battleCount / this.maxBattles) + 5); + + // Generates the color hex code with a constant saturation and lightness but varying hue + const typeHex = Utils.hslToHex(hue, 0.50, 0.90); + const strokeHex = Utils.hslToHex(hue, 0.70, 0.30); + + const battleCountText = addTextObject(scene, 27, 0, this.battleCount.toString(), TextStyle.PARTY, { fontSize: "66px", color: typeHex }); battleCountText.setShadow(0, 0); - battleCountText.setStroke("#984038", 16); + battleCountText.setStroke(strokeHex, 16); battleCountText.setOrigin(1, 0); container.add(battleCountText); return container; } - getBattlesLeft(): integer { - return this.battlesLeft; + getBattleCount(): number { + return this.battleCount; } - getMaxStackCount(scene: BattleScene, forThreshold?: boolean): number { - return 99; - } -} - -export class DoubleBattleChanceBoosterModifier extends LapsingPersistentModifier { - constructor(type: ModifierTypes.DoubleBattleChanceBoosterModifierType, battlesLeft: integer, stackCount?: integer) { - super(type, battlesLeft, stackCount); + resetBattleCount(): void { + this.battleCount = this.maxBattles; } - match(modifier: Modifier): boolean { - if (modifier instanceof DoubleBattleChanceBoosterModifier) { - // Check type id to not match different tiers of lures - return modifier.type.id === this.type.id && modifier.battlesLeft === this.battlesLeft; - } - return false; - } - - clone(): DoubleBattleChanceBoosterModifier { - return new DoubleBattleChanceBoosterModifier(this.type as ModifierTypes.DoubleBattleChanceBoosterModifierType, this.battlesLeft, this.stackCount); + getMaxBattles(): number { + return this.maxBattles; } getArgs(): any[] { - return [ this.battlesLeft ]; + return [ this.maxBattles, this.battleCount ]; } + + getMaxStackCount(_scene: BattleScene, _forThreshold?: boolean): number { + return 1; + } +} + +/** + * Modifier used for passive items, specifically lures, that + * temporarily increases the chance of a double battle. + * @extends LapsingPersistentModifier + * @see {@linkcode apply} + */ +export class DoubleBattleChanceBoosterModifier extends LapsingPersistentModifier { + constructor(type: ModifierType, maxBattles:number, battleCount?: number, stackCount?: integer) { + super(type, maxBattles, battleCount, stackCount); + } + + match(modifier: Modifier): boolean { + return (modifier instanceof DoubleBattleChanceBoosterModifier) && (modifier.getMaxBattles() === this.getMaxBattles()); + } + + clone(): DoubleBattleChanceBoosterModifier { + return new DoubleBattleChanceBoosterModifier(this.type as ModifierTypes.DoubleBattleChanceBoosterModifierType, this.getMaxBattles(), this.getBattleCount(), this.stackCount); + } + /** * Modifies the chance of a double battle occurring - * @param args A single element array containing the double battle chance as a NumberHolder - * @returns {boolean} Returns true if the modifier was applied + * @param args [0] {@linkcode Utils.NumberHolder} for double battle chance + * @returns true if the modifier was applied */ apply(args: any[]): boolean { const doubleBattleChance = args[0] as Utils.NumberHolder; // This is divided because the chance is generated as a number from 0 to doubleBattleChance.value using Utils.randSeedInt // A double battle will initiate if the generated number is 0 - doubleBattleChance.value = Math.ceil(doubleBattleChance.value / 2); + doubleBattleChance.value = Math.ceil(doubleBattleChance.value / 4); return true; } @@ -369,16 +430,18 @@ export class DoubleBattleChanceBoosterModifier extends LapsingPersistentModifier * @see {@linkcode apply} */ export class TempStatStageBoosterModifier extends LapsingPersistentModifier { + /** The stat whose stat stage multiplier will be temporarily increased */ private stat: TempBattleStat; - private multiplierBoost: number; + /** The amount by which the stat stage itself or its multiplier will be increased by */ + private boost: number; - constructor(type: ModifierType, stat: TempBattleStat, battlesLeft?: number, stackCount?: number) { - super(type, battlesLeft ?? 5, stackCount); + constructor(type: ModifierType, stat: TempBattleStat, maxBattles: number, battleCount?: number, stackCount?: number) { + super(type, maxBattles, battleCount, stackCount); this.stat = stat; // Note that, because we want X Accuracy to maintain its original behavior, // it will increment as it did previously, directly to the stat stage. - this.multiplierBoost = stat !== Stat.ACC ? 0.3 : 1; + this.boost = (stat !== Stat.ACC) ? 0.3 : 1; } match(modifier: Modifier): boolean { @@ -390,11 +453,11 @@ export class TempStatStageBoosterModifier extends LapsingPersistentModifier { } clone() { - return new TempStatStageBoosterModifier(this.type, this.stat, this.battlesLeft, this.stackCount); + return new TempStatStageBoosterModifier(this.type, this.stat, this.getMaxBattles(), this.getBattleCount(), this.stackCount); } getArgs(): any[] { - return [ this.stat, this.battlesLeft ]; + return [ this.stat, ...super.getArgs() ]; } /** @@ -409,44 +472,14 @@ export class TempStatStageBoosterModifier extends LapsingPersistentModifier { } /** - * Increases the incoming stat stage matching {@linkcode stat} by {@linkcode multiplierBoost}. + * Increases the incoming stat stage matching {@linkcode stat} by {@linkcode boost}. * @param args [0] {@linkcode TempBattleStat} N/A * [1] {@linkcode Utils.NumberHolder} that holds the resulting value of the stat stage multiplier */ apply(args: any[]): boolean { - (args[1] as Utils.NumberHolder).value += this.multiplierBoost; + (args[1] as Utils.NumberHolder).value += this.boost; return true; } - - /** - * Goes through existing modifiers for any that match the selected modifier, - * which will then either add it to the existing modifiers if none were found - * or, if one was found, it will refresh {@linkcode battlesLeft}. - * @param modifiers {@linkcode PersistentModifier} array of the player's modifiers - * @param _virtual N/A - * @param _scene N/A - * @returns true if the modifier was successfully added or applied, false otherwise - */ - add(modifiers: PersistentModifier[], _virtual: boolean, _scene: BattleScene): boolean { - for (const modifier of modifiers) { - if (this.match(modifier)) { - const modifierInstance = modifier as TempStatStageBoosterModifier; - if (modifierInstance.getBattlesLeft() < 5) { - modifierInstance.battlesLeft = 5; - return true; - } - // should never get here - return false; - } - } - - modifiers.push(this); - return true; - } - - getMaxStackCount(_scene: BattleScene, _forThreshold?: boolean): number { - return 1; - } } /** @@ -456,12 +489,12 @@ export class TempStatStageBoosterModifier extends LapsingPersistentModifier { * @see {@linkcode apply} */ export class TempCritBoosterModifier extends LapsingPersistentModifier { - constructor(type: ModifierType, battlesLeft?: integer, stackCount?: number) { - super(type, battlesLeft || 5, stackCount); + constructor(type: ModifierType, maxBattles: number, battleCount?: number, stackCount?: number) { + super(type, maxBattles, battleCount, stackCount); } clone() { - return new TempCritBoosterModifier(this.type, this.stackCount); + return new TempCritBoosterModifier(this.type, this.getMaxBattles(), this.getBattleCount(), this.stackCount); } match(modifier: Modifier): boolean { @@ -486,36 +519,6 @@ export class TempCritBoosterModifier extends LapsingPersistentModifier { (args[0] as Utils.NumberHolder).value++; return true; } - - /** - * Goes through existing modifiers for any that match the selected modifier, - * which will then either add it to the existing modifiers if none were found - * or, if one was found, it will refresh {@linkcode battlesLeft}. - * @param modifiers {@linkcode PersistentModifier} array of the player's modifiers - * @param _virtual N/A - * @param _scene N/A - * @returns true if the modifier was successfully added or applied, false otherwise - */ - add(modifiers: PersistentModifier[], _virtual: boolean, _scene: BattleScene): boolean { - for (const modifier of modifiers) { - if (this.match(modifier)) { - const modifierInstance = modifier as TempCritBoosterModifier; - if (modifierInstance.getBattlesLeft() < 5) { - modifierInstance.battlesLeft = 5; - return true; - } - // should never get here - return false; - } - } - - modifiers.push(this); - return true; - } - - getMaxStackCount(_scene: BattleScene, _forThreshold?: boolean): number { - return 1; - } } export class MapModifier extends PersistentModifier { diff --git a/src/test/items/dire_hit.test.ts b/src/test/items/dire_hit.test.ts index 02f7c0d06a4..4b5988294f3 100644 --- a/src/test/items/dire_hit.test.ts +++ b/src/test/items/dire_hit.test.ts @@ -72,7 +72,7 @@ describe("Items - Dire Hit", () => { await game.phaseInterceptor.to(BattleEndPhase); const modifier = game.scene.findModifier(m => m instanceof TempCritBoosterModifier) as TempCritBoosterModifier; - expect(modifier.getBattlesLeft()).toBe(4); + expect(modifier.getBattleCount()).toBe(4); // Forced DIRE_HIT to spawn in the first slot with override game.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => { @@ -90,7 +90,7 @@ describe("Items - Dire Hit", () => { for (const m of game.scene.modifiers) { if (m instanceof TempCritBoosterModifier) { count++; - expect((m as TempCritBoosterModifier).getBattlesLeft()).toBe(5); + expect((m as TempCritBoosterModifier).getBattleCount()).toBe(5); } } expect(count).toBe(1); diff --git a/src/test/items/double_battle_chance_booster.test.ts b/src/test/items/double_battle_chance_booster.test.ts new file mode 100644 index 00000000000..808d4c7ca51 --- /dev/null +++ b/src/test/items/double_battle_chance_booster.test.ts @@ -0,0 +1,105 @@ +import { Moves } from "#app/enums/moves.js"; +import { Species } from "#app/enums/species.js"; +import { DoubleBattleChanceBoosterModifier } from "#app/modifier/modifier"; +import GameManager from "#test/utils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; +import { SPLASH_ONLY } from "../utils/testUtils"; +import { ShopCursorTarget } from "#app/enums/shop-cursor-target.js"; +import { Mode } from "#app/ui/ui.js"; +import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler.js"; +import { Button } from "#app/enums/buttons.js"; + +describe("Items - Double Battle Chance Boosters", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + const TIMEOUT = 20 * 1000; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(() => { + game = new GameManager(phaserGame); + }); + + it("should guarantee double battle with 2 unique tiers", async () => { + game.override + .startingModifier([ + { name: "LURE" }, + { name: "SUPER_LURE" } + ]) + .startingWave(2); + + await game.classicMode.startBattle(); + + expect(game.scene.getEnemyField().length).toBe(2); + }, TIMEOUT); + + it("should guarantee double boss battle with 3 unique tiers", async () => { + game.override + .startingModifier([ + { name: "LURE" }, + { name: "SUPER_LURE" }, + { name: "MAX_LURE" } + ]) + .startingWave(10); + + await game.classicMode.startBattle(); + + const enemyField = game.scene.getEnemyField(); + + expect(enemyField.length).toBe(2); + expect(enemyField[0].isBoss()).toBe(true); + expect(enemyField[1].isBoss()).toBe(true); + }, TIMEOUT); + + it("should renew how many battles are left of existing booster when picking up new booster of same tier", async() => { + game.override + .startingModifier([{ name: "LURE" }]) + .itemRewards([{ name: "LURE" }]) + .moveset(SPLASH_ONLY) + .startingLevel(200); + + await game.classicMode.startBattle([ + Species.PIKACHU + ]); + + game.move.select(Moves.SPLASH); + + await game.doKillOpponents(); + + await game.phaseInterceptor.to("BattleEndPhase"); + + const modifier = game.scene.findModifier(m => m instanceof DoubleBattleChanceBoosterModifier) as DoubleBattleChanceBoosterModifier; + expect(modifier.getBattleCount()).toBe(9); + + // Forced LURE to spawn in the first slot with override + game.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => { + const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler; + // Traverse to first modifier slot + handler.setCursor(0); + handler.setRowCursor(ShopCursorTarget.REWARDS); + handler.processInput(Button.ACTION); + }, () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("NewBattlePhase"), true); + + await game.phaseInterceptor.to("TurnInitPhase"); + + // Making sure only one booster is in the modifier list even after picking up another + let count = 0; + for (const m of game.scene.modifiers) { + if (m instanceof DoubleBattleChanceBoosterModifier) { + count++; + const modifierInstance = m as DoubleBattleChanceBoosterModifier; + expect(modifierInstance.getBattleCount()).toBe(modifierInstance.getMaxBattles()); + } + } + expect(count).toBe(1); + }, TIMEOUT); +}); diff --git a/src/test/items/temp_stat_stage_booster.test.ts b/src/test/items/temp_stat_stage_booster.test.ts index c81703220db..3e32fa13a04 100644 --- a/src/test/items/temp_stat_stage_booster.test.ts +++ b/src/test/items/temp_stat_stage_booster.test.ts @@ -10,12 +10,7 @@ import { Abilities } from "#app/enums/abilities"; import { TempStatStageBoosterModifier } from "#app/modifier/modifier"; import { Mode } from "#app/ui/ui"; import { Button } from "#app/enums/buttons"; -import { CommandPhase } from "#app/phases/command-phase"; -import { NewBattlePhase } from "#app/phases/new-battle-phase"; import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; -import { TurnInitPhase } from "#app/phases/turn-init-phase"; -import { BattleEndPhase } from "#app/phases/battle-end-phase"; -import { EnemyCommandPhase } from "#app/phases/enemy-command-phase"; import { ShopCursorTarget } from "#app/enums/shop-cursor-target"; @@ -46,7 +41,7 @@ describe("Items - Temporary Stat Stage Boosters", () => { }); it("should provide a x1.3 stat stage multiplier", async() => { - await game.startBattle([ + await game.classicMode.startBattle([ Species.PIKACHU ]); @@ -56,7 +51,7 @@ describe("Items - Temporary Stat Stage Boosters", () => { game.move.select(Moves.TACKLE); - await game.phaseInterceptor.runFrom(EnemyCommandPhase).to(TurnEndPhase); + await game.phaseInterceptor.runFrom("EnemyCommandPhase").to(TurnEndPhase); expect(partyMember.getStatStageMultiplier).toHaveReturnedWith(1.3); }, 20000); @@ -66,7 +61,7 @@ describe("Items - Temporary Stat Stage Boosters", () => { .startingModifier([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ACC }]) .ability(Abilities.SIMPLE); - await game.startBattle([ + await game.classicMode.startBattle([ Species.PIKACHU ]); @@ -89,7 +84,7 @@ describe("Items - Temporary Stat Stage Boosters", () => { it("should increase existing stat stage multiplier by 3/10 for the rest of the boosters", async() => { - await game.startBattle([ + await game.classicMode.startBattle([ Species.PIKACHU ]); @@ -113,7 +108,7 @@ describe("Items - Temporary Stat Stage Boosters", () => { it("should not increase past maximum stat stage multiplier", async() => { game.override.startingModifier([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ACC }, { name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ATK }]); - await game.startBattle([ + await game.classicMode.startBattle([ Species.PIKACHU ]); @@ -138,7 +133,7 @@ describe("Items - Temporary Stat Stage Boosters", () => { .startingLevel(200) .itemRewards([{ name: "TEMP_STAT_STAGE_BOOSTER", type: Stat.ATK }]); - await game.startBattle([ + await game.classicMode.startBattle([ Species.PIKACHU ]); @@ -146,10 +141,10 @@ describe("Items - Temporary Stat Stage Boosters", () => { await game.doKillOpponents(); - await game.phaseInterceptor.to(BattleEndPhase); + await game.phaseInterceptor.to("BattleEndPhase"); const modifier = game.scene.findModifier(m => m instanceof TempStatStageBoosterModifier) as TempStatStageBoosterModifier; - expect(modifier.getBattlesLeft()).toBe(4); + expect(modifier.getBattleCount()).toBe(4); // Forced X_ATTACK to spawn in the first slot with override game.onNextPrompt("SelectModifierPhase", Mode.MODIFIER_SELECT, () => { @@ -158,16 +153,17 @@ describe("Items - Temporary Stat Stage Boosters", () => { handler.setCursor(0); handler.setRowCursor(ShopCursorTarget.REWARDS); handler.processInput(Button.ACTION); - }, () => game.isCurrentPhase(CommandPhase) || game.isCurrentPhase(NewBattlePhase), true); + }, () => game.isCurrentPhase("CommandPhase") || game.isCurrentPhase("NewBattlePhase"), true); - await game.phaseInterceptor.to(TurnInitPhase); + await game.phaseInterceptor.to("TurnInitPhase"); // Making sure only one booster is in the modifier list even after picking up another let count = 0; for (const m of game.scene.modifiers) { if (m instanceof TempStatStageBoosterModifier) { count++; - expect((m as TempStatStageBoosterModifier).getBattlesLeft()).toBe(5); + const modifierInstance = m as TempStatStageBoosterModifier; + expect(modifierInstance.getBattleCount()).toBe(modifierInstance.getMaxBattles()); } } expect(count).toBe(1); diff --git a/src/utils.ts b/src/utils.ts index fd5430d7276..592981c7643 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -455,6 +455,26 @@ export function rgbaToInt(rgba: integer[]): integer { return (rgba[0] << 24) + (rgba[1] << 16) + (rgba[2] << 8) + rgba[3]; } +/** + * Provided valid HSV values, calculates and stitches together a string of that + * HSV color's corresponding hex code. + * + * Sourced from {@link https://stackoverflow.com/a/44134328}. + * @param h Hue in degrees, must be in a range of [0, 360] + * @param s Saturation percentage, must be in a range of [0, 1] + * @param l Ligthness percentage, must be in a range of [0, 1] + * @returns a string of the corresponding color hex code with a "#" prefix + */ +export function hslToHex(h: number, s: number, l: number): string { + const a = s * Math.min(l, 1 - l); + const f = (n: number) => { + const k = (n + h / 30) % 12; + const rgb = l - a * Math.max(-1, Math.min(k - 3, 9 - k, 1)); + return Math.round(rgb * 255).toString(16).padStart(2, "0"); + }; + return `#${f(0)}${f(8)}${f(4)}`; +} + /*This function returns true if the current lang is available for some functions If the lang is not in the function, it usually means that lang is going to use the default english version This function is used in: From dfa399386460d2657695e76faf13d52a33a93c62 Mon Sep 17 00:00:00 2001 From: James Diefenbach <105332964+j-diefenbach@users.noreply.github.com> Date: Sun, 8 Sep 2024 09:32:49 +1000 Subject: [PATCH 28/83] Egg summary background touchup (#4091) * darker egg-summary background * reset old background for beta * update egg summary bg * reset overrides --------- Co-authored-by: James Diefenbach --- public/images/ui/egg_summary_bg.png | Bin 2209 -> 2247 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/images/ui/egg_summary_bg.png b/public/images/ui/egg_summary_bg.png index b4ee3d86a507bfb99b4f9af2d71b5065e4ac943b..e81934b9d75b3acbed35b113f803dfa119a78631 100644 GIT binary patch literal 2247 zcmeH}{a;dd8^@2xRGMkvYeuEyW6ssYRV$W{iB6ruc?k;777XhDvtLxCg(9dFEvZxN%}<6DSC;`;R8hVF<&pLM2`nb!n|hMu|jFgY++ zF@1B7BJ3@irr`ENBMJ_Wj*gxTQ*fDsTy&plfyON~EL6~*jQ(+c(eVB2Dz3?7Dwpi! ztGvCIv|4`qx>lAzTaDh|TjIB;F_+5q8fQiJW#4W}pMur4hlrCB?UQ2pa;wEdMTu-rw>!2(k`mYcE#m;Q^# z!R~haj4N|s)K)z&;kLHR8GmTVZYUH-Q1-2plhY#=tzcq#s|UZXJ$*nXlX0Vqs&9TH zU!;s4zmi3To&3r8WYP4Ne()M+K5g#P0@L;J@l?m5++FiaNCau?ImczRclRF7x8m8l z>gwwH_csxUL|122a3(dr;ojlb#IxIL2mf_@T0=4$$?tEfR>Eb}2czz%?CtFzvuGy6 zQB_h?oKz)nsw9Fbme2MXyXH{0BphmwJHemMXbbkj(GKRaw8yWUy?WOh7OW0AKg7c( zLa^=#OsQfk$w7~ojOU+%CUnvZW2Dd?%Bm)4@vgSsHD3qc!slwS92UZ>N) z_R0C;P5Q+E*o71YrDJ}sCngVg58t#2b^#xUzZ?hgyT5B=R*)fJuX_;!c{vv1H-&6UFaBoNJ(s zQKz8AxHcbkUOKt{z~KgGP6KtV1P<5egSS=+!{gIb5BLT|r#>6Ws44`-LP@Te&iha6 z=p+D6p4zz|Hq0=f2_3$HBffN(BP#+3OuyZ-C*36r=9m{Ny@s1UnSJQtX)x+(-Dwc) zKE&TD)~Ke9;0v|F#5!ogk9nbE#HD>;cm6N?KWM^72wlrU@dBevmR5)(I?J;qg2^+L zLjN6iD+1_DkdgjxSfCA^lM&tZqUqx#X>q01A<@@{&?nD{rgxe~%3YaJk&fOQRARej zf-hZli+wXso3%sXgayxjqF$Kq%Tn-^UrE<2SRGiR@=@=*J$>SxPYw*?XOb78`~4Wl z`r3m4&_2V|0Cj)=Zp9JVo;RFj4D~xToCX5u#q_YFTsGUqQLNXKwVtmuHMY*?E?;sh z67RGyOG?-+mP|_Ok7;3`#6$y{QS*$KF$@s0V0-w$1X>cVQ&Y?IZHkzlj`p7eW(st1opF4XfoH z2vF(;fx6F&gqh@(R9+ywHo~?U#QYzTG0*pWK7U??IhNHz6T<%qI(--%NGr9AGT6m+ zSG5$Q`oI)%Wx!Pmg_(MR5T+A=X&ibnN|4AmMG!w}>dRBl=fB(k3wOYcw=$N7ebv)U z=9px%oIg3K^niAYc+fK?)^$nAl=#C6hjW{&&EGDJ(Ol_pX9C1VB}BGG;J^3_=!8=B literal 2209 zcmeHJdsLEV9R5VSkQ8Pv%jHbd%;kmVQp*BU4DCW4b7h*ru=JEBT3VVYQkk?;OgqsE zrQ0bTLo{zF1YdcZV`-fdFsH03OEb|lykNqrK|eYGD^H;ZQHf65;B8 zXB(?7pFHn@d*8aYzMLLz`-^o-w%nqz9mg-e_Mjy#wz;q87M_VQ0pUl2aBMcaN}NY| zu2fPo5V!JQh)-3le%X3|imEFetXFh)9-@ZS3Izg26M4;4;7DJeQ*$Qqfr7_znUK>+ z!yS~0iC47@hA#%AmhhAwWj$i;I9K1T9pWnWPl(q%Wy9Q?BISYw3%nDQ<61Ds^%1E-LSea)-zIS_?CY_w{*9rcY0e?%4N- zy%&HJOj;gvsVUgB(Z1&^Dm7U29*WH#RHcU4+gTZ#M5T(7K%O3>nm#eylOfkX4%>I1 zFXKrl{2rRh(oL*kE&BanDaKTh5;eH>&`%;%Gu1#Pa*(o2*hGG!wc6~^kYN&C8}5d& z&!Y5*4rRD2t7>a)_(VxU#?tL}c6Lol{dkGyp#RBsqL?A)6KQF1-)oN|_P6hGXGvu& z^w&})R)US8{n%MEV<%KZNRl!$zl!$av`=r$h8I7Ixuuhus|(V{rrtfBo*0hyzScA~ zm9`;uPVMPY?tIrZz7T z9Y(9@^s7#Zr`+i`JP_>gL2CKXYoXvcP_~=PrP$6#AfHuT1f!klLPkEgQ(6rd4|t)x z2!?F(YDY4K;`vQJ=)ZlUN1QS3N*N4+fy^ghp~CZ# z5a~~_T0oSH8}dJc8URIs=+BWtQ3j3vpZ0Sj{P)`SFG{W3*G#TpFy7qe*gb(fy#(@f zZv-s8aSg$z+jG`6E9k%torZr(e7#56S*hJOEq*cj7r99*^ho zv$3Tq7{&4NsQ4f%L0ME(L}Gh*cxYWpvQDZWy&T)20@xBQ5r<=Ab@*N>xmydl`9({b zL-MS>A?LmQ1$Ct$7aqfQLO*k+FN!Nd)f8peOc;}HIwitB=@1GW2poq|avgUxVVYTD9;FVM^C zWK*QB&J#~uMp~p&g|a($rn_6W94?S*;dzYrV+Nz}=`JP=kAnq9$*of3()|d89n+6e zXS+0)X|#Sa%k_=h2W+DO{j=4AXu$C(n+s2KDl26y;6x|~q|FT6mB}BvW7tI@q>|u| z?f)*4M7n37R(}~(?JD!iG{_zRGcHtRKSrcFeEUqbcaBEWW*AK*dRtna)jBdzZUyx? z3r_giAo?UV3p|jv*w+YwObMAw$hHYEE`)^qBr^D8&5sL?1p>M4GMwNK@wD=-Fv#NY zk7Ng$7ydGAMn>m0{GM7YLBQ%Db!Y)2(?du5rcu1YduCAn`C!bTAxgQAIElf&I zu9{loZ)T5nE;jjq{rv`V`n0j8>VTj1&>w&0mNev`2f4V^iFkRSrCEP! Date: Sun, 8 Sep 2024 11:33:33 +1000 Subject: [PATCH 29/83] Fixed small RNG misusage (#4092) --- src/phases/attempt-run-phase.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/phases/attempt-run-phase.ts b/src/phases/attempt-run-phase.ts index 9cf86fed592..46d68f6005a 100644 --- a/src/phases/attempt-run-phase.ts +++ b/src/phases/attempt-run-phase.ts @@ -28,7 +28,7 @@ export class AttemptRunPhase extends PokemonPhase { applyAbAttrs(RunSuccessAbAttr, playerPokemon, null, false, escapeChance); - if (Utils.randSeedInt(100) < escapeChance.value) { + if (playerPokemon.randSeedInt(100) < escapeChance.value) { this.scene.playSound("se/flee"); this.scene.queueMessage(i18next.t("battle:runAwaySuccess"), null, true, 500); From ffcedfd9a4b9f35ad61c035ebe22a494ecf45500 Mon Sep 17 00:00:00 2001 From: "Amani H." <109637146+xsn34kzx@users.noreply.github.com> Date: Sat, 7 Sep 2024 21:40:45 -0400 Subject: [PATCH 30/83] [Dev] Save Data Version Migration (#4080) * Initial Draft * Successfuly Migration with Vitamins and White Herb * Apply Session Data Patches Earlier * Remove Stray `console.log` --- src/system/game-data.ts | 138 ++++++-------------------------- src/system/modifier-data.ts | 10 +-- src/system/version-converter.ts | 137 +++++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+), 120 deletions(-) create mode 100644 src/system/version-converter.ts diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 746af4d47a5..800b8baecff 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -1,7 +1,7 @@ import i18next from "i18next"; import BattleScene, { PokeballCounts, bypassLogin } from "../battle-scene"; import Pokemon, { EnemyPokemon, PlayerPokemon } from "../field/pokemon"; -import { pokemonEvolutions, pokemonPrevolutions } from "../data/pokemon-evolutions"; +import { pokemonPrevolutions } from "../data/pokemon-evolutions"; import PokemonSpecies, { allSpecies, getPokemonSpecies, noStarterFormKeys, speciesStarters } from "../data/pokemon-species"; import * as Utils from "../utils"; import Overrides from "#app/overrides"; @@ -27,7 +27,7 @@ import { Tutorial } from "../tutorial"; import { speciesEggMoves } from "../data/egg-moves"; import { allMoves } from "../data/move"; import { TrainerVariant } from "../field/trainer"; -import { Variant, variantData } from "#app/data/variant"; +import { Variant } from "#app/data/variant"; import {setSettingGamepad, SettingGamepad, settingGamepadDefaults} from "./settings/settings-gamepad"; import {setSettingKeyboard, SettingKeyboard} from "#app/system/settings/settings-keyboard"; import { TerrainChangedEvent, WeatherChangedEvent } from "#app/events/arena.js"; @@ -45,6 +45,7 @@ import { TerrainType } from "#app/data/terrain.js"; import { OutdatedPhase } from "#app/phases/outdated-phase.js"; import { ReloadSessionPhase } from "#app/phases/reload-session-phase.js"; import { RUN_HISTORY_LIMIT } from "#app/ui/run-history-ui-handler"; +import { applySessionDataPatches, applySettingsDataPatches, applySystemDataPatches } from "./version-converter"; export const defaultStarterSpecies: Species[] = [ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, @@ -93,7 +94,7 @@ export function decrypt(data: string, bypassLogin: boolean): string { : (data: string) => AES.decrypt(data, saveKey).toString(enc.Utf8))(data); } -interface SystemSaveData { +export interface SystemSaveData { trainerId: integer; secretId: integer; gender: PlayerGender; @@ -456,17 +457,14 @@ export class GameData { localStorage.setItem(`data_${loggedInUser?.username}`, encrypt(systemDataStr, bypassLogin)); - /*const versions = [ this.scene.game.config.gameVersion, data.gameVersion || '0.0.0' ]; - - if (versions[0] !== versions[1]) { - const [ versionNumbers, oldVersionNumbers ] = versions.map(ver => ver.split('.').map(v => parseInt(v))); - }*/ const lsItemKey = `runHistoryData_${loggedInUser?.username}`; const lsItem = localStorage.getItem(lsItemKey); if (!lsItem) { localStorage.setItem(lsItemKey, ""); } + applySystemDataPatches(systemData); + this.trainerId = systemData.trainerId; this.secretId = systemData.secretId; @@ -474,9 +472,7 @@ export class GameData { this.saveSetting(SettingKeys.Player_Gender, systemData.gender === PlayerGender.FEMALE ? 1 : 0); - const initStarterData = !systemData.starterData; - - if (initStarterData) { + if (!systemData.starterData) { this.initStarterData(); if (systemData["starterMoveData"]) { @@ -494,25 +490,20 @@ export class GameData { } this.migrateStarterAbilities(systemData, this.starterData); - } else { - if ([ "1.0.0", "1.0.1" ].includes(systemData.gameVersion)) { - this.migrateStarterAbilities(systemData); - } - //this.fixVariantData(systemData); - this.fixStarterData(systemData); - // Migrate ability starter data if empty for caught species - Object.keys(systemData.starterData).forEach(sd => { - if (systemData.dexData[sd].caughtAttr && !systemData.starterData[sd].abilityAttr) { - systemData.starterData[sd].abilityAttr = 1; + + const starterIds = Object.keys(this.starterData).map(s => parseInt(s) as Species); + for (const s of starterIds) { + this.starterData[s].candyCount += this.dexData[s].caughtCount; + this.starterData[s].candyCount += this.dexData[s].hatchedCount * 2; + if (this.dexData[s].caughtAttr & DexAttr.SHINY) { + this.starterData[s].candyCount += 4; } - }); + } + } else { this.starterData = systemData.starterData; } if (systemData.gameStats) { - if (systemData.gameStats.legendaryPokemonCaught !== undefined && systemData.gameStats.subLegendaryPokemonCaught === undefined) { - this.fixLegendaryStats(systemData); - } this.gameStats = systemData.gameStats; } @@ -558,17 +549,6 @@ export class GameData { this.consolidateDexData(this.dexData); this.defaultDexData = null; - if (initStarterData) { - const starterIds = Object.keys(this.starterData).map(s => parseInt(s) as Species); - for (const s of starterIds) { - this.starterData[s].candyCount += this.dexData[s].caughtCount; - this.starterData[s].candyCount += this.dexData[s].hatchedCount * 2; - if (this.dexData[s].caughtAttr & DexAttr.SHINY) { - this.starterData[s].candyCount += 4; - } - } - } - resolve(true); } catch (err) { console.error(err); @@ -747,6 +727,7 @@ export class GameData { setSetting(this.scene, setting, valueIndex); settings[setting] = valueIndex; + settings["gameVersion"] = this.scene.game.config.gameVersion; localStorage.setItem("settings", JSON.stringify(settings)); @@ -857,13 +838,7 @@ export class GameData { const settings = JSON.parse(localStorage.getItem("settings")!); // TODO: is this bang correct? - // TODO: Remove this block after save migration is implemented - if (settings.hasOwnProperty("REROLL_TARGET") && !settings.hasOwnProperty(SettingKeys.Shop_Cursor_Target)) { - settings[SettingKeys.Shop_Cursor_Target] = settings["REROLL_TARGET"]; - delete settings["REROLL_TARGET"]; - localStorage.setItem("settings", JSON.stringify(settings)); - } - // End of block to remove + applySettingsDataPatches(settings); for (const setting of Object.keys(settings)) { setSetting(this.scene, setting, settings[setting]); @@ -1226,7 +1201,7 @@ export class GameData { } parseSessionData(dataStr: string): SessionSaveData { - return JSON.parse(dataStr, (k: string, v: any) => { + const sessionData = JSON.parse(dataStr, (k: string, v: any) => { /*const versions = [ scene.game.config.gameVersion, sessionData.gameVersion || '0.0.0' ]; if (versions[0] !== versions[1]) { @@ -1283,6 +1258,10 @@ export class GameData { return v; }) as SessionSaveData; + + applySessionDataPatches(sessionData); + + return sessionData; } saveAll(scene: BattleScene, skipVerification: boolean = false, sync: boolean = false, useCachedSession: boolean = false, useCachedSystem: boolean = false): Promise { @@ -1885,75 +1864,4 @@ export class GameData { } } } - - fixVariantData(systemData: SystemSaveData): void { - const starterIds = Object.keys(this.starterData).map(s => parseInt(s) as Species); - const starterData = systemData.starterData; - const dexData = systemData.dexData; - if (starterIds.find(id => (dexData[id].caughtAttr & DexAttr.VARIANT_2 || dexData[id].caughtAttr & DexAttr.VARIANT_3) && !variantData[id])) { - for (const s of starterIds) { - const species = getPokemonSpecies(s); - if (variantData[s]) { - const tempCaughtAttr = dexData[s].caughtAttr; - let seenVariant2 = false; - let seenVariant3 = false; - const checkEvoSpecies = (es: Species) => { - seenVariant2 ||= !!(dexData[es].seenAttr & DexAttr.VARIANT_2); - seenVariant3 ||= !!(dexData[es].seenAttr & DexAttr.VARIANT_3); - if (pokemonEvolutions.hasOwnProperty(es)) { - for (const pe of pokemonEvolutions[es]) { - checkEvoSpecies(pe.speciesId); - } - } - }; - checkEvoSpecies(s); - if (dexData[s].caughtAttr & DexAttr.VARIANT_2 && !seenVariant2) { - dexData[s].caughtAttr ^= DexAttr.VARIANT_2; - } - if (dexData[s].caughtAttr & DexAttr.VARIANT_3 && !seenVariant3) { - dexData[s].caughtAttr ^= DexAttr.VARIANT_3; - } - starterData[s].abilityAttr = (tempCaughtAttr & DexAttr.DEFAULT_VARIANT ? AbilityAttr.ABILITY_1 : 0) - | (tempCaughtAttr & DexAttr.VARIANT_2 && species.ability2 ? AbilityAttr.ABILITY_2 : 0) - | (tempCaughtAttr & DexAttr.VARIANT_3 && species.abilityHidden ? AbilityAttr.ABILITY_HIDDEN : 0); - } else { - const tempCaughtAttr = dexData[s].caughtAttr; - if (dexData[s].caughtAttr & DexAttr.VARIANT_2) { - dexData[s].caughtAttr ^= DexAttr.VARIANT_2; - } - if (dexData[s].caughtAttr & DexAttr.VARIANT_3) { - dexData[s].caughtAttr ^= DexAttr.VARIANT_3; - } - starterData[s].abilityAttr = (tempCaughtAttr & DexAttr.DEFAULT_VARIANT ? AbilityAttr.ABILITY_1 : 0) - | (tempCaughtAttr & DexAttr.VARIANT_2 && species.ability2 ? AbilityAttr.ABILITY_2 : 0) - | (tempCaughtAttr & DexAttr.VARIANT_3 && species.abilityHidden ? AbilityAttr.ABILITY_HIDDEN : 0); - } - } - } - } - - fixStarterData(systemData: SystemSaveData): void { - for (const starterId of defaultStarterSpecies) { - systemData.starterData[starterId].abilityAttr |= AbilityAttr.ABILITY_1; - systemData.dexData[starterId].caughtAttr |= DexAttr.FEMALE; - } - } - - fixLegendaryStats(systemData: SystemSaveData): void { - systemData.gameStats.subLegendaryPokemonSeen = 0; - systemData.gameStats.subLegendaryPokemonCaught = 0; - systemData.gameStats.subLegendaryPokemonHatched = 0; - allSpecies.filter(s => s.subLegendary).forEach(s => { - const dexEntry = systemData.dexData[s.speciesId]; - systemData.gameStats.subLegendaryPokemonSeen += dexEntry.seenCount; - systemData.gameStats.legendaryPokemonSeen = Math.max(systemData.gameStats.legendaryPokemonSeen - dexEntry.seenCount, 0); - systemData.gameStats.subLegendaryPokemonCaught += dexEntry.caughtCount; - systemData.gameStats.legendaryPokemonCaught = Math.max(systemData.gameStats.legendaryPokemonCaught - dexEntry.caughtCount, 0); - systemData.gameStats.subLegendaryPokemonHatched += dexEntry.hatchedCount; - systemData.gameStats.legendaryPokemonHatched = Math.max(systemData.gameStats.legendaryPokemonHatched - dexEntry.hatchedCount, 0); - }); - systemData.gameStats.subLegendaryPokemonSeen = Math.max(systemData.gameStats.subLegendaryPokemonSeen, systemData.gameStats.subLegendaryPokemonCaught); - systemData.gameStats.legendaryPokemonSeen = Math.max(systemData.gameStats.legendaryPokemonSeen, systemData.gameStats.legendaryPokemonCaught); - systemData.gameStats.mythicalPokemonSeen = Math.max(systemData.gameStats.mythicalPokemonSeen, systemData.gameStats.mythicalPokemonCaught); - } } diff --git a/src/system/modifier-data.ts b/src/system/modifier-data.ts index 0f3e28fe11c..1514f7e3fb3 100644 --- a/src/system/modifier-data.ts +++ b/src/system/modifier-data.ts @@ -3,11 +3,11 @@ import { PersistentModifier } from "../modifier/modifier"; import { GeneratedPersistentModifierType, ModifierType, ModifierTypeGenerator, getModifierTypeFuncById } from "../modifier/modifier-type"; export default class ModifierData { - private player: boolean; - private typeId: string; - private typePregenArgs: any[]; - private args: any[]; - private stackCount: integer; + public player: boolean; + public typeId: string; + public typePregenArgs: any[]; + public args: any[]; + public stackCount: integer; public className: string; diff --git a/src/system/version-converter.ts b/src/system/version-converter.ts new file mode 100644 index 00000000000..ed65fcd99b8 --- /dev/null +++ b/src/system/version-converter.ts @@ -0,0 +1,137 @@ +import { allSpecies } from "#app/data/pokemon-species.js"; +import { AbilityAttr, defaultStarterSpecies, DexAttr, SessionSaveData, SystemSaveData } from "./game-data"; +import { SettingKeys } from "./settings/settings"; + +const LATEST_VERSION = "1.0.5"; + +export function applySessionDataPatches(data: SessionSaveData) { + const curVersion = data.gameVersion; + if (curVersion !== LATEST_VERSION) { + switch (curVersion) { + case "1.0.0": + case "1.0.1": + case "1.0.2": + case "1.0.3": + case "1.0.4": + // --- PATCHES --- + + // Fix Battle Items, Vitamins, and Lures + data.modifiers.forEach((m) => { + if (m.className === "PokemonBaseStatModifier") { + m.className = "BaseStatModifier"; + } else if (m.className === "PokemonResetNegativeStatStageModifier") { + m.className = "ResetNegativeStatStageModifier"; + } else if (m.className === "TempBattleStatBoosterModifier") { + m.className = "TempStatStageBoosterModifier"; + m.typeId = "TEMP_STAT_STAGE_BOOSTER"; + + // Migration from TempBattleStat to Stat + const newStat = m.typePregenArgs[0] + 1; + m.typePregenArgs[0] = newStat; + + // From [ stat, battlesLeft ] to [ stat, maxBattles, battleCount ] + m.args = [ newStat, 5, m.args[1] ]; + } else if (m.className === "DoubleBattleChanceBoosterModifier") { + let maxBattles: number; + switch (m.typeId) { + case "MAX_LURE": + maxBattles = 30; + break; + case "SUPER_LURE": + maxBattles = 15; + break; + default: + maxBattles = 10; + break; + } + + // From [ battlesLeft ] to [ maxBattles, battleCount ] + m.args = [ maxBattles, m.args[0] ]; + } + }); + + data.enemyModifiers.forEach((m) => { + if (m.className === "PokemonBaseStatModifier") { + m.className = "BaseStatModifier"; + } + }); + } + + data.gameVersion = LATEST_VERSION; + } +} + +export function applySystemDataPatches(data: SystemSaveData) { + const curVersion = data.gameVersion; + if (curVersion !== LATEST_VERSION) { + switch (curVersion) { + case "1.0.0": + case "1.0.1": + case "1.0.2": + case "1.0.3": + case "1.0.4": + // --- LEGACY PATCHES --- + if (data.starterData) { + // Migrate ability starter data if empty for caught species + Object.keys(data.starterData).forEach(sd => { + if (data.dexData[sd].caughtAttr && !data.starterData[sd].abilityAttr) { + data.starterData[sd].abilityAttr = 1; + } + }); + } + + // Fix Legendary Stats + if (data.gameStats && (data.gameStats.legendaryPokemonCaught !== undefined && data.gameStats.subLegendaryPokemonCaught === undefined)) { + data.gameStats.subLegendaryPokemonSeen = 0; + data.gameStats.subLegendaryPokemonCaught = 0; + data.gameStats.subLegendaryPokemonHatched = 0; + allSpecies.filter(s => s.subLegendary).forEach(s => { + const dexEntry = data.dexData[s.speciesId]; + data.gameStats.subLegendaryPokemonSeen += dexEntry.seenCount; + data.gameStats.legendaryPokemonSeen = Math.max(data.gameStats.legendaryPokemonSeen - dexEntry.seenCount, 0); + data.gameStats.subLegendaryPokemonCaught += dexEntry.caughtCount; + data.gameStats.legendaryPokemonCaught = Math.max(data.gameStats.legendaryPokemonCaught - dexEntry.caughtCount, 0); + data.gameStats.subLegendaryPokemonHatched += dexEntry.hatchedCount; + data.gameStats.legendaryPokemonHatched = Math.max(data.gameStats.legendaryPokemonHatched - dexEntry.hatchedCount, 0); + }); + data.gameStats.subLegendaryPokemonSeen = Math.max(data.gameStats.subLegendaryPokemonSeen, data.gameStats.subLegendaryPokemonCaught); + data.gameStats.legendaryPokemonSeen = Math.max(data.gameStats.legendaryPokemonSeen, data.gameStats.legendaryPokemonCaught); + data.gameStats.mythicalPokemonSeen = Math.max(data.gameStats.mythicalPokemonSeen, data.gameStats.mythicalPokemonCaught); + } + + // --- PATCHES --- + + // Fix Starter Data + if (data.gameVersion) { + for (const starterId of defaultStarterSpecies) { + data.starterData[starterId].abilityAttr |= AbilityAttr.ABILITY_1; + data.dexData[starterId].caughtAttr |= DexAttr.FEMALE; + } + } + } + + data.gameVersion = LATEST_VERSION; + } +} + +export function applySettingsDataPatches(settings: Object) { + const curVersion = settings.hasOwnProperty("gameVersion") ? settings["gameVersion"] : "1.0.0"; + if (curVersion !== LATEST_VERSION) { + switch (curVersion) { + case "1.0.0": + case "1.0.1": + case "1.0.2": + case "1.0.3": + case "1.0.4": + // --- PATCHES --- + + // Fix Reward Cursor Target + if (settings.hasOwnProperty("REROLL_TARGET") && !settings.hasOwnProperty(SettingKeys.Shop_Cursor_Target)) { + settings[SettingKeys.Shop_Cursor_Target] = settings["REROLL_TARGET"]; + delete settings["REROLL_TARGET"]; + localStorage.setItem("settings", JSON.stringify(settings)); + } + } + // Note that the current game version will be written at `saveSettings` + } +} From a214110030e62c1e8143ec8d5a713720c022ffcf Mon Sep 17 00:00:00 2001 From: damocleas Date: Sat, 7 Sep 2024 23:17:02 -0400 Subject: [PATCH 31/83] Voucher Event (#4094) * Update modifier-type.ts * Great tier vouch * Update trainer-victory-phase.ts * Update trainer-victory-phase.ts * Update timed-event-manager.ts and loading-scene.ts (#1) * Update timed-event-manager.ts and loading-scene.ts * egg-update-zh-cn update * Update language codes in loading-scene.ts and timed-event-manager.ts * updated image --------- Co-authored-by: Frederico Santos --- public/images/events/egg-update_de.png | Bin 0 -> 12951 bytes public/images/events/egg-update_en.png | Bin 0 -> 12926 bytes public/images/events/egg-update_es.png | Bin 0 -> 202251 bytes public/images/events/egg-update_fr.png | Bin 0 -> 13387 bytes public/images/events/egg-update_it.png | Bin 0 -> 12844 bytes public/images/events/egg-update_ja.png | Bin 0 -> 13612 bytes public/images/events/egg-update_ko.png | Bin 0 -> 12565 bytes public/images/events/egg-update_pt-BR.png | Bin 0 -> 13518 bytes public/images/events/egg-update_zh-CN.png | Bin 0 -> 51829 bytes src/loading-scene.ts | 22 +++++++++++----------- src/modifier/modifier-type.ts | 7 ++++--- src/phases/trainer-victory-phase.ts | 2 +- src/timed-event-manager.ts | 16 ++++++++-------- 13 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 public/images/events/egg-update_de.png create mode 100644 public/images/events/egg-update_en.png create mode 100644 public/images/events/egg-update_es.png create mode 100644 public/images/events/egg-update_fr.png create mode 100644 public/images/events/egg-update_it.png create mode 100644 public/images/events/egg-update_ja.png create mode 100644 public/images/events/egg-update_ko.png create mode 100644 public/images/events/egg-update_pt-BR.png create mode 100644 public/images/events/egg-update_zh-CN.png diff --git a/public/images/events/egg-update_de.png b/public/images/events/egg-update_de.png new file mode 100644 index 0000000000000000000000000000000000000000..5de94877d5ca33464f8b06e46d195668bd6b9d5f GIT binary patch literal 12951 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 literal 0 HcmV?d00001 diff --git a/public/images/events/egg-update_es.png b/public/images/events/egg-update_es.png new file mode 100644 index 0000000000000000000000000000000000000000..ec5f5c46d178e24ad4c18fd6211f2a62bc7b905f GIT binary patch literal 202251 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