Merge branch 'beta' into shed-tail

This commit is contained in:
innerthunder 2024-09-22 22:39:27 -07:00
commit d840720aa5
99 changed files with 2646 additions and 341 deletions

64
src/data/ability.ts Executable file → Normal file
View File

@ -1798,6 +1798,61 @@ export class PostDefendStealHeldItemAbAttr extends PostDefendAbAttr {
}
}
/**
* Base class for defining all {@linkcode Ability} Attributes after a status effect has been set.
* @see {@linkcode applyPostSetStatus()}.
*/
export class PostSetStatusAbAttr extends AbAttr {
/**
* Does nothing after a status condition is set.
* @param pokemon {@linkcode Pokemon} that status condition was set on.
* @param sourcePokemon {@linkcode Pokemon} that that set the status condition. Is `null` if status was not set by a Pokemon.
* @param passive Whether this ability is a passive.
* @param effect {@linkcode StatusEffect} that was set.
* @param args Set of unique arguments needed by this attribute.
* @returns `true` if application of the ability succeeds.
*/
applyPostSetStatus(pokemon: Pokemon, sourcePokemon: Pokemon | null = null, passive: boolean, effect: StatusEffect, simulated: boolean, args: any[]) : boolean | Promise<boolean> {
return false;
}
}
/**
* If another Pokemon burns, paralyzes, poisons, or badly poisons this Pokemon,
* that Pokemon receives the same non-volatile status condition as part of this
* ability attribute. For Synchronize ability.
*/
export class SynchronizeStatusAbAttr extends PostSetStatusAbAttr {
/**
* If the `StatusEffect` that was set is Burn, Paralysis, Poison, or Toxic, and the status
* was set by a source Pokemon, set the source Pokemon's status to the same `StatusEffect`.
* @param pokemon {@linkcode Pokemon} that status condition was set on.
* @param sourcePokemon {@linkcode Pokemon} that that set the status condition. Is null if status was not set by a Pokemon.
* @param passive Whether this ability is a passive.
* @param effect {@linkcode StatusEffect} that was set.
* @param args Set of unique arguments needed by this attribute.
* @returns `true` if application of the ability succeeds.
*/
override applyPostSetStatus(pokemon: Pokemon, sourcePokemon: Pokemon | null = null, passive: boolean, effect: StatusEffect, simulated: boolean, args: any[]): boolean {
/** Synchronizable statuses */
const syncStatuses = new Set<StatusEffect>([
StatusEffect.BURN,
StatusEffect.PARALYSIS,
StatusEffect.POISON,
StatusEffect.TOXIC
]);
if (sourcePokemon && syncStatuses.has(effect)) {
if (!simulated) {
sourcePokemon.trySetStatus(effect, true, pokemon);
}
return true;
}
return false;
}
}
export class PostVictoryAbAttr extends AbAttr {
applyPostVictory(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean | Promise<boolean> {
return false;
@ -4677,6 +4732,10 @@ export function applyStatMultiplierAbAttrs(attrType: Constructor<StatMultiplierA
pokemon: Pokemon, stat: BattleStat, statValue: Utils.NumberHolder, simulated: boolean = false, ...args: any[]): Promise<void> {
return applyAbAttrsInternal<StatMultiplierAbAttr>(attrType, pokemon, (attr, passive) => attr.applyStatStage(pokemon, passive, simulated, stat, statValue, args), args);
}
export function applyPostSetStatusAbAttrs(attrType: Constructor<PostSetStatusAbAttr>,
pokemon: Pokemon, effect: StatusEffect, sourcePokemon?: Pokemon | null, simulated: boolean = false, ...args: any[]): Promise<void> {
return applyAbAttrsInternal<PostSetStatusAbAttr>(attrType, pokemon, (attr, passive) => attr.applyPostSetStatus(pokemon, sourcePokemon, passive, effect, simulated, args), args, false, simulated);
}
/**
* Applies a field Stat multiplier attribute
@ -4907,7 +4966,8 @@ export function initAbilities() {
.attr(EffectSporeAbAttr),
new Ability(Abilities.SYNCHRONIZE, 3)
.attr(SyncEncounterNatureAbAttr)
.unimplemented(),
.attr(SynchronizeStatusAbAttr)
.partial(), // interaction with psycho shift needs work, keeping to old Gen interaction for now
new Ability(Abilities.CLEAR_BODY, 3)
.attr(ProtectStatAbAttr)
.ignorable(),
@ -5879,6 +5939,6 @@ export function initAbilities() {
new Ability(Abilities.POISON_PUPPETEER, 9)
.attr(UncopiableAbilityAbAttr)
.attr(UnswappableAbilityAbAttr)
.conditionalAttr(pokemon => pokemon.species.speciesId===Species.PECHARUNT, ConfusionOnStatusEffectAbAttr, StatusEffect.POISON, StatusEffect.TOXIC)
.attr(ConfusionOnStatusEffectAbAttr, StatusEffect.POISON, StatusEffect.TOXIC)
);
}

View File

@ -915,12 +915,12 @@ export abstract class BattleAnim {
this.srcLine = [ userFocusX, userFocusY, targetFocusX, targetFocusY ];
this.dstLine = [ userInitialX, userInitialY, targetInitialX, targetInitialY ];
let r = anim!.frames.length; // TODO: is this bang correct?
let r = anim?.frames.length ?? 0;
let f = 0;
scene.tweens.addCounter({
duration: Utils.getFrameMs(3),
repeat: anim!.frames.length, // TODO: is this bang correct?
repeat: anim?.frames.length ?? 0,
onRepeat: () => {
if (!f) {
userSprite.setVisible(false);
@ -1264,7 +1264,7 @@ export class CommonBattleAnim extends BattleAnim {
}
getAnim(): AnimConfig | null {
return this.commonAnim ? commonAnims.get(this.commonAnim)! : null; // TODO: is this bang correct?
return this.commonAnim ? commonAnims.get(this.commonAnim) ?? null : null;
}
isOppAnim(): boolean {
@ -1284,7 +1284,7 @@ export class MoveAnim extends BattleAnim {
getAnim(): AnimConfig {
return moveAnims.get(this.move) instanceof AnimConfig
? moveAnims.get(this.move) as AnimConfig
: moveAnims.get(this.move)![this.user?.isPlayer() ? 0 : 1] as AnimConfig; // TODO: is this bang correct?
: moveAnims.get(this.move)?.[this.user?.isPlayer() ? 0 : 1] as AnimConfig;
}
isOppAnim(): boolean {
@ -1316,7 +1316,7 @@ export class MoveChargeAnim extends MoveAnim {
getAnim(): AnimConfig {
return chargeAnims.get(this.chargeAnim) instanceof AnimConfig
? chargeAnims.get(this.chargeAnim) as AnimConfig
: chargeAnims.get(this.chargeAnim)![this.user?.isPlayer() ? 0 : 1] as AnimConfig; // TODO: is this bang correct?
: chargeAnims.get(this.chargeAnim)?.[this.user?.isPlayer() ? 0 : 1] as AnimConfig;
}
}

View File

@ -651,7 +651,7 @@ export default class Move implements Localizable {
}
/**
* Applies each {@linkcode MoveCondition} of this move to the params
* Applies each {@linkcode MoveCondition} function of this move to the params, determines if the move can be used prior to calling each attribute's apply()
* @param user {@linkcode Pokemon} to apply conditions to
* @param target {@linkcode Pokemon} to apply conditions to
* @param move {@linkcode Move} to apply conditions to
@ -2156,21 +2156,20 @@ export class PsychoShiftEffectAttr extends MoveEffectAttr {
if (target.status) {
return false;
}
//@ts-ignore - how can target.status.effect be checked when we return `false` before when it's defined?
if (!target.status || (target.status.effect === statusToApply && move.chance < 0)) { // TODO: resolve ts-ignore
const statusAfflictResult = target.trySetStatus(statusToApply, true, user);
if (statusAfflictResult) {
} else {
const canSetStatus = target.canSetStatus(statusToApply, true, false, user);
if (canSetStatus) {
if (user.status) {
user.scene.queueMessage(getStatusEffectHealText(user.status.effect, getPokemonNameWithAffix(user)));
}
user.resetStatus();
user.updateInfo();
target.trySetStatus(statusToApply, true, user);
}
return statusAfflictResult;
}
return false;
return canSetStatus;
}
}
getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
@ -5358,6 +5357,21 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
}
}
export class ChillyReceptionAttr extends ForceSwitchOutAttr {
// using inherited constructor
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
user.scene.arena.trySetWeather(WeatherType.SNOW, true);
return super.apply(user, target, move, args);
}
getCondition(): MoveConditionFunc {
// chilly reception move will go through if the weather is change-able to snow, or the user can switch out, else move will fail
return (user, target, move) => user.scene.arena.trySetWeather(WeatherType.SNOW, true) || super.getSwitchOutCondition()(user, target, move);
}
}
export class RemoveTypeAttr extends MoveEffectAttr {
private removedType: Type;
@ -9135,8 +9149,7 @@ export function initMoves() {
new AttackMove(Moves.AURA_WHEEL, Type.ELECTRIC, MoveCategory.PHYSICAL, 110, 100, 10, 100, 0, 8)
.attr(StatStageChangeAttr, [ Stat.SPD ], 1, true)
.makesContact(false)
.attr(AuraWheelTypeAttr)
.condition((user, target, move) => [user.species.speciesId, user.fusionSpecies?.speciesId].includes(Species.MORPEKO)), // Missing custom fail message
.attr(AuraWheelTypeAttr),
new AttackMove(Moves.BREAKING_SWIPE, Type.DRAGON, MoveCategory.PHYSICAL, 60, 100, 15, 100, 0, 8)
.target(MoveTarget.ALL_NEAR_ENEMIES)
.attr(StatStageChangeAttr, [ Stat.ATK ], -1),
@ -9548,10 +9561,9 @@ export function initMoves() {
.makesContact(),
new SelfStatusMove(Moves.SHED_TAIL, Type.NORMAL, -1, 10, -1, 0, 9)
.attr(ShedTailAttr),
new StatusMove(Moves.CHILLY_RECEPTION, Type.ICE, -1, 10, -1, 0, 9)
.attr(WeatherChangeAttr, WeatherType.SNOW)
.attr(ForceSwitchOutAttr, true)
.target(MoveTarget.BOTH_SIDES),
new SelfStatusMove(Moves.CHILLY_RECEPTION, Type.ICE, -1, 10, -1, 0, 9)
.attr(PreMoveMessageAttr, (user, move) => i18next.t("moveTriggers:chillyReception", {pokemonName: getPokemonNameWithAffix(user)}))
.attr(ChillyReceptionAttr, true),
new SelfStatusMove(Moves.TIDY_UP, Type.NORMAL, -1, 10, -1, 0, 9)
.attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPD ], 1, true, null, true, true)
.attr(RemoveArenaTrapAttr, true)

View File

@ -597,7 +597,7 @@ export class TrainerConfig {
case "flare": {
return {
[TrainerPoolTier.COMMON]: [Species.FLETCHLING, Species.LITLEO, Species.INKAY, Species.HELIOPTILE, Species.ELECTRIKE, Species.SKORUPI, Species.PURRLOIN, Species.CLAWITZER, Species.PANCHAM, Species.ESPURR, Species.BUNNELBY],
[TrainerPoolTier.UNCOMMON]: [Species.LITWICK, Species.SNEASEL, Species.PUMPKABOO, Species.PHANTUMP, Species.HONEDGE, Species.BINACLE, Species.BERGMITE, Species.HOUNDOUR, Species.SKRELP, Species.SLIGGOO],
[TrainerPoolTier.UNCOMMON]: [Species.LITWICK, Species.SNEASEL, Species.PUMPKABOO, Species.PHANTUMP, Species.HONEDGE, Species.BINACLE, Species.HOUNDOUR, Species.SKRELP, Species.SLIGGOO],
[TrainerPoolTier.RARE]: [Species.NOIVERN, Species.HISUI_AVALUGG, Species.HISUI_SLIGGOO]
};
}
@ -640,14 +640,14 @@ export class TrainerConfig {
return {
[TrainerPoolTier.COMMON]: [ Species.ZUBAT, Species.GRIMER, Species.STUNKY, Species.FOONGUS, Species.MAREANIE, Species.TOXEL, Species.SHROODLE, Species.PALDEA_WOOPER ],
[TrainerPoolTier.UNCOMMON]: [ Species.GASTLY, Species.SEVIPER, Species.SKRELP, Species.ALOLA_GRIMER, Species.GALAR_SLOWPOKE, Species.HISUI_QWILFISH ],
[TrainerPoolTier.RARE]: [ Species.BULBASAUR, Species.GLIMMET ]
[TrainerPoolTier.RARE]: [ Species.GLIMMET, Species.BULBASAUR ]
};
}
case "star_4": {
return {
[TrainerPoolTier.COMMON]: [ Species.CLEFFA, Species.IGGLYBUFF, Species.AZURILL, Species.COTTONEE, Species.FLABEBE, Species.HATENNA, Species.IMPIDIMP, Species.TINKATINK ],
[TrainerPoolTier.UNCOMMON]: [ Species.TOGEPI, Species.GARDEVOIR, Species.SYLVEON, Species.KLEFKI, Species.MIMIKYU, Species.ALOLA_VULPIX ],
[TrainerPoolTier.RARE]: [ Species.POPPLIO, Species.GALAR_PONYTA ]
[TrainerPoolTier.RARE]: [ Species.GALAR_PONYTA, Species.POPPLIO ]
};
}
case "star_5": {
@ -1509,7 +1509,7 @@ export const trainerConfigs: TrainerConfigs = {
.setSpeciesPools({
[TrainerPoolTier.COMMON]: [Species.CARVANHA, Species.WAILMER, Species.ZIGZAGOON, Species.LOTAD, Species.CORPHISH, Species.SPHEAL, Species.REMORAID, Species.QWILFISH, Species.BARBOACH],
[TrainerPoolTier.UNCOMMON]: [Species.CLAMPERL, Species.CHINCHOU, Species.WOOPER, Species.WINGULL, Species.TENTACOOL, Species.AZURILL, Species.CLOBBOPUS, Species.HORSEA],
[TrainerPoolTier.RARE]: [Species.MANTINE, Species.DHELMISE, Species.HISUI_QWILFISH, Species.ARROKUDA, Species.PALDEA_WOOPER, Species.SKRELP],
[TrainerPoolTier.RARE]: [Species.MANTYKE, Species.DHELMISE, Species.HISUI_QWILFISH, Species.ARROKUDA, Species.PALDEA_WOOPER, Species.SKRELP],
[TrainerPoolTier.SUPER_RARE]: [Species.DONDOZO, Species.BASCULEGION]
}),
[TrainerType.MATT]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("aqua_admin", "aqua", [Species.SHARPEDO]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aqua_magma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
@ -1527,8 +1527,8 @@ export const trainerConfigs: TrainerConfigs = {
[TrainerType.PLASMA_GRUNT]: new TrainerConfig(++t).setHasGenders("Plasma Grunt Female").setHasDouble("Plasma Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_plasma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
.setSpeciesPools({
[TrainerPoolTier.COMMON]: [Species.PATRAT, Species.LILLIPUP, Species.PURRLOIN, Species.SCRAFTY, Species.WOOBAT, Species.VANILLITE, Species.SANDILE, Species.TRUBBISH, Species.TYMPOLE],
[TrainerPoolTier.UNCOMMON]: [Species.FRILLISH, Species.VENIPEDE, Species.GOLETT, Species.TIMBURR, Species.DARUMAKA, Species.FOONGUS, Species.JOLTIK],
[TrainerPoolTier.RARE]: [Species.PAWNIARD, Species.RUFFLET, Species.VULLABY, Species.ZORUA, Species.DRILBUR, Species.KLINK, Species.CUBCHOO, Species.MIENFOO, Species.DURANT, Species.BOUFFALANT],
[TrainerPoolTier.UNCOMMON]: [Species.FRILLISH, Species.VENIPEDE, Species.GOLETT, Species.TIMBURR, Species.DARUMAKA, Species.FOONGUS, Species.JOLTIK, Species.CUBCHOO, Species.KLINK],
[TrainerPoolTier.RARE]: [Species.PAWNIARD, Species.RUFFLET, Species.VULLABY, Species.ZORUA, Species.DRILBUR, Species.MIENFOO, Species.DURANT, Species.BOUFFALANT],
[TrainerPoolTier.SUPER_RARE]: [Species.DRUDDIGON, Species.HISUI_ZORUA, Species.AXEW, Species.DEINO]
}),
[TrainerType.ZINZOLIN]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("plasma_sage", "plasma", [Species.CRYOGONAL]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_plasma_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
@ -1537,7 +1537,7 @@ export const trainerConfigs: TrainerConfigs = {
.setSpeciesPools({
[TrainerPoolTier.COMMON]: [Species.FLETCHLING, Species.LITLEO, Species.PONYTA, Species.INKAY, Species.HOUNDOUR, Species.SKORUPI, Species.SCRAFTY, Species.CROAGUNK, Species.SCATTERBUG, Species.ESPURR],
[TrainerPoolTier.UNCOMMON]: [Species.HELIOPTILE, Species.ELECTRIKE, Species.SKRELP, Species.PANCHAM, Species.PURRLOIN, Species.POOCHYENA, Species.BINACLE, Species.CLAUNCHER, Species.PUMPKABOO, Species.PHANTUMP],
[TrainerPoolTier.RARE]: [Species.LITWICK, Species.SNEASEL, Species.PAWNIARD, Species.BERGMITE, Species.SLIGGOO],
[TrainerPoolTier.RARE]: [Species.LITWICK, Species.SNEASEL, Species.PAWNIARD, Species.SLIGGOO],
[TrainerPoolTier.SUPER_RARE]: [Species.NOIVERN, Species.HISUI_SLIGGOO, Species.HISUI_AVALUGG]
}),
[TrainerType.BRYONY]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("flare_admin_female", "flare", [Species.LIEPARD]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_flare_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
@ -1545,15 +1545,15 @@ export const trainerConfigs: TrainerConfigs = {
[TrainerType.AETHER_GRUNT]: new TrainerConfig(++t).setHasGenders("Aether Grunt Female").setHasDouble("Aether Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aether_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
.setSpeciesPools({
[TrainerPoolTier.COMMON]: [ Species.PIKIPEK, Species.ROCKRUFF, Species.ALOLA_DIGLETT, Species.ALOLA_EXEGGUTOR, Species.YUNGOOS, Species.CORSOLA, Species.ALOLA_GEODUDE, Species.ALOLA_RAICHU, Species.BOUNSWEET, Species.LILLIPUP, Species.KOMALA, Species.MORELULL, Species.COMFEY, Species.TOGEDEMARU],
[TrainerPoolTier.UNCOMMON]: [ Species.POLIWAG, Species.STUFFUL, Species.ORANGURU, Species.PASSIMIAN, Species.BRUXISH, Species.MINIOR, Species.WISHIWASHI, Species.CRABRAWLER, Species.CUTIEFLY, Species.ORICORIO, Species.MUDBRAY, Species.PYUKUMUKU, Species.ALOLA_MAROWAK],
[TrainerPoolTier.RARE]: [ Species.GALAR_CORSOLA, Species.ALOLA_SANDSHREW, Species.ALOLA_VULPIX, Species.TURTONATOR, Species.DRAMPA],
[TrainerPoolTier.UNCOMMON]: [ Species.POLIWAG, Species.STUFFUL, Species.ORANGURU, Species.PASSIMIAN, Species.BRUXISH, Species.MINIOR, Species.WISHIWASHI, Species.ALOLA_SANDSHREW, Species.ALOLA_VULPIX, Species.CRABRAWLER, Species.CUTIEFLY, Species.ORICORIO, Species.MUDBRAY, Species.PYUKUMUKU, Species.ALOLA_MAROWAK],
[TrainerPoolTier.RARE]: [ Species.GALAR_CORSOLA, Species.TURTONATOR, Species.MIMIKYU, Species.MAGNEMITE, Species.DRAMPA],
[TrainerPoolTier.SUPER_RARE]: [Species.JANGMO_O, Species.PORYGON]
}),
[TrainerType.FABA]: new TrainerConfig(++t).setMoneyMultiplier(1.5).initForEvilTeamAdmin("aether_admin", "aether", [Species.HYPNO]).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_aether_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene)),
[TrainerType.SKULL_GRUNT]: new TrainerConfig(++t).setHasGenders("Skull Grunt Female").setHasDouble("Skull Grunts").setMoneyMultiplier(1.0).setEncounterBgm(TrainerType.PLASMA_GRUNT).setBattleBgm("battle_plasma_grunt").setMixedBattleBgm("battle_skull_grunt").setVictoryBgm("victory_team_plasma").setPartyTemplateFunc(scene => getEvilGruntPartyTemplate(scene))
.setSpeciesPools({
[TrainerPoolTier.COMMON]: [ Species.SALANDIT, Species.ALOLA_RATTATA, Species.EKANS, Species.ALOLA_MEOWTH, Species.SCRAGGY, Species.KOFFING, Species.ALOLA_GRIMER, Species.MAREANIE, Species.SPINARAK, Species.TRUBBISH],
[TrainerPoolTier.UNCOMMON]: [ Species.FOMANTIS, Species.SABLEYE, Species.SANDILE, Species.HOUNDOUR, Species.ALOLA_MAROWAK, Species.GASTLY, Species.PANCHAM, Species.DROWZEE, Species.ZUBAT, Species.VENIPEDE, Species.VULLABY],
[TrainerPoolTier.COMMON]: [ Species.SALANDIT, Species.ALOLA_RATTATA, Species.EKANS, Species.ALOLA_MEOWTH, Species.SCRAGGY, Species.KOFFING, Species.ALOLA_GRIMER, Species.MAREANIE, Species.SPINARAK, Species.TRUBBISH, Species.DROWZEE],
[TrainerPoolTier.UNCOMMON]: [ Species.FOMANTIS, Species.SABLEYE, Species.SANDILE, Species.HOUNDOUR, Species.ALOLA_MAROWAK, Species.GASTLY, Species.PANCHAM, Species.ZUBAT, Species.VENIPEDE, Species.VULLABY],
[TrainerPoolTier.RARE]: [Species.SANDYGAST, Species.PAWNIARD, Species.MIMIKYU, Species.DHELMISE, Species.WISHIWASHI, Species.NYMBLE],
[TrainerPoolTier.SUPER_RARE]: [Species.GRUBBIN, Species.DEWPIDER]
}),
@ -1916,7 +1916,14 @@ export const trainerConfigs: TrainerConfigs = {
p.formIndex = 1; // Mega Kangaskhan
p.generateName();
}))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.GASTRODON, Species.SEISMITOAD]))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([Species.GASTRODON, Species.SEISMITOAD], TrainerSlot.TRAINER, true, p => {
//Storm Drain Gastrodon, Water Absorb Seismitoad
if (p.species.speciesId === Species.GASTRODON) {
p.abilityIndex = 0;
} else if (p.species.speciesId === Species.SEISMITOAD) {
p.abilityIndex = 2;
}
}))
.setPartyMemberFunc(5, getRandomPartyMemberFunc([Species.MEWTWO], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
@ -2153,9 +2160,23 @@ export const trainerConfigs: TrainerConfigs = {
p.pokeball = PokeballType.MASTER_BALL;
})),
[TrainerType.GUZMA]: new TrainerConfig(++t).setName("Guzma").initForEvilTeamLeader("Skull Boss", []).setMixedBattleBgm("battle_skull_boss").setVictoryBgm("victory_team_plasma")
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.LOKIX, Species.YANMEGA ]))
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.LOKIX, Species.YANMEGA ], TrainerSlot.TRAINER, true, p => {
//Tinted Lens Lokix, Tinted Lens Yanmega
if (p.species.speciesId === Species.LOKIX) {
p.abilityIndex = 2;
} else if (p.species.speciesId === Species.YANMEGA) {
p.abilityIndex = 1;
}
}))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HERACROSS ]))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SCIZOR, Species.KLEAVOR ]))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SCIZOR, Species.KLEAVOR ], TrainerSlot.TRAINER, true, p => {
//Technician Scizor, Sharpness Kleavor
if (p.species.speciesId === Species.SCIZOR) {
p.abilityIndex = 1;
} else if (p.species.speciesId === Species.KLEAVOR) {
p.abilityIndex = 2;
}
}))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.GALVANTULA, Species.VIKAVOLT]))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.PINSIR ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
@ -2175,25 +2196,32 @@ export const trainerConfigs: TrainerConfigs = {
p.abilityIndex = 2; //Anticipation
p.pokeball = PokeballType.ULTRA_BALL;
}))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.HISUI_SAMUROTT, Species.CRAWDAUNT ], TrainerSlot.TRAINER, true, p => {
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.SCIZOR, Species.KLEAVOR ], TrainerSlot.TRAINER, true, p => {
//Technician Scizor, Sharpness Kleavor
if (p.species.speciesId === Species.SCIZOR) {
p.abilityIndex = 1;
} else if (p.species.speciesId === Species.KLEAVOR) {
p.abilityIndex = 2;
}
}))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.HISUI_SAMUROTT, Species.CRAWDAUNT ], TrainerSlot.TRAINER, true, p => {
p.abilityIndex = 2; //Sharpness Hisui Samurott, Adaptability Crawdaunt
}))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.SCIZOR, Species.KLEAVOR ]))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.PINSIR ], TrainerSlot.TRAINER, true, p => {
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.BUZZWOLE ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ROGUE_BALL;
}))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.XURKITREE ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ROGUE_BALL;
}))
.setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.PINSIR ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.formIndex = 1;
p.generateAndPopulateMoveset();
p.generateName();
p.pokeball = PokeballType.ULTRA_BALL;
}))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.BUZZWOLE ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ROGUE_BALL;
}))
.setPartyMemberFunc(5, getRandomPartyMemberFunc([ Species.XURKITREE ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ROGUE_BALL;
})),
[TrainerType.ROSE]: new TrainerConfig(++t).setName("Rose").initForEvilTeamLeader("Macro Boss", []).setMixedBattleBgm("battle_macro_boss").setVictoryBgm("victory_team_plasma")
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ARCHALUDON ]))
@ -2209,17 +2237,16 @@ export const trainerConfigs: TrainerConfigs = {
p.pokeball = PokeballType.ULTRA_BALL;
})),
[TrainerType.ROSE_2]: new TrainerConfig(++t).setName("Rose").initForEvilTeamLeader("Macro Boss", [], true).setMixedBattleBgm("battle_macro_boss").setVictoryBgm("victory_team_plasma")
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.MELMETAL ], TrainerSlot.TRAINER, true, p => {
.setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.ARCHALUDON ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();
p.pokeball = PokeballType.ULTRA_BALL;
}))
.setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.AEGISLASH, Species.GHOLDENGO ]))
.setPartyMemberFunc(2, getRandomPartyMemberFunc([ Species.DRACOVISH, Species.DRACOZOLT ], TrainerSlot.TRAINER, true, p => {
p.generateAndPopulateMoveset();
p.abilityIndex = 1; //Strong Jaw Dracovish, Hustle Dracozolt
}))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.ARCHALUDON ]))
.setPartyMemberFunc(3, getRandomPartyMemberFunc([ Species.MELMETAL ]))
.setPartyMemberFunc(4, getRandomPartyMemberFunc([ Species.GALAR_ARTICUNO, Species.GALAR_ZAPDOS, Species.GALAR_MOLTRES ], TrainerSlot.TRAINER, true, p => {
p.setBoss(true, 2);
p.generateAndPopulateMoveset();

View File

@ -33,6 +33,7 @@ export class Arena {
public tags: ArenaTag[];
public bgm: string;
public ignoreAbilities: boolean;
public ignoringEffectSource: BattlerIndex | null;
private lastTimeOfDay: TimeOfDay;
@ -569,8 +570,9 @@ export class Arena {
}
}
setIgnoreAbilities(ignoreAbilities: boolean = true): void {
setIgnoreAbilities(ignoreAbilities: boolean, ignoringEffectSource: BattlerIndex | null = null): void {
this.ignoreAbilities = ignoreAbilities;
this.ignoringEffectSource = ignoreAbilities ? ignoringEffectSource : null;
}
/**

View File

@ -20,7 +20,7 @@ import { reverseCompatibleTms, tmSpecies, tmPoolTiers } from "../data/tms";
import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HighestStatBoostTag, SubstituteTag, 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";
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, PostSetStatusAbAttr, applyPostSetStatusAbAttrs } from "../data/ability";
import PokemonData from "../system/pokemon-data";
import { BattlerIndex } from "../battle";
import { Mode } from "../ui/ui";
@ -1365,7 +1365,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
if (this.isFusion() && ability.hasAttr(NoFusionAbilityAbAttr)) {
return false;
}
if (this.scene?.arena.ignoreAbilities && ability.isIgnorable) {
const arena = this.scene?.arena;
if (arena.ignoreAbilities && arena.ignoringEffectSource !== this.getBattlerIndex() && ability.isIgnorable) {
return false;
}
if (this.summonData?.abilitySuppressed && !ability.hasAttr(UnsuppressableAbilityAbAttr)) {
@ -3366,7 +3367,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
if (asPhase) {
this.scene.unshiftPhase(new ObtainStatusEffectPhase(this.scene, this.getBattlerIndex(), effect, cureTurn, sourceText!, sourcePokemon!)); // TODO: are these bangs correct?
this.scene.unshiftPhase(new ObtainStatusEffectPhase(this.scene, this.getBattlerIndex(), effect, cureTurn, sourceText, sourcePokemon));
return true;
}
@ -3400,6 +3401,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
if (effect !== StatusEffect.FAINT) {
this.scene.triggerPokemonFormChange(this, SpeciesFormChangeStatusEffectTrigger, true);
applyPostSetStatusAbAttrs(PostSetStatusAbAttr, this, effect, sourcePokemon);
}
return true;

View File

@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "Giftpuppenspiel",
"description": "Wenn Infamomo ein Ziel mit einer Attacke vergiftet, so wird dieses auch verwirrt."
"description": "Wenn das Pokémon ein Ziel mit einer Attacke vergiftet, so wird dieses auch verwirrt."
}
}

View File

@ -83,9 +83,11 @@
"battle_aether_grunt": "SM Vs. Æther Foundation",
"battle_skull_grunt": "SM Vs. Team Skull Rüpel",
"battle_macro_grunt": "SWSH Vs. Trainer",
"battle_star_grunt": "KAPU Vs. Team Star",
"battle_galactic_admin": "BDSP Vs. Team Galactic Commander",
"battle_skull_admin": "SM Vs. Team Skull Vorstand",
"battle_oleana": "SWSH Vs. Oleana",
"battle_oleana": "SWSH Vs. Olivia",
"battle_star_admin": "KAPU Vs. Team Star Boss",
"battle_rocket_boss": "USUM Vs. Giovanni",
"battle_aqua_magma_boss": "ORAS Vs. Team Aqua & Magma Boss",
"battle_galactic_boss": "BDSP Vs. Zyrus",
@ -94,6 +96,7 @@
"battle_aether_boss": "SM Vs. Samantha",
"battle_skull_boss": "SM Vs. Bromley",
"battle_macro_boss": "SWSH Vs. Rose",
"battle_star_boss": "KAPU Vs. Cosima",
"abyss": "PMD Erkundungsteam Himmel Dunkelkrater",
"badlands": "PMD Erkundungsteam Himmel Kargtal",
@ -108,17 +111,17 @@
"forest": "PMD Erkundungsteam Himmel Düsterwald",
"grass": "PMD Erkundungsteam Himmel Apfelwald",
"graveyard": "PMD Erkundungsteam Himmel Verwirrwald",
"ice_cave": "PMD Erkundungsteam Himmel Rieseneisberg",
"ice_cave": "Firel - -50°C",
"island": "PMD Erkundungsteam Himmel Schroffküste",
"jungle": "Lmz - Jungle",
"laboratory": "Firel - Laboratory",
"lake": "PMD Erkundungsteam Himmel Kristallhöhle",
"lake": "Lmz - Lake",
"meadow": "PMD Erkundungsteam Himmel Himmelsgipfel-Wald",
"metropolis": "Firel - Metropolis",
"mountain": "PMD Erkundungsteam Himmel Hornberg",
"plains": "PMD Erkundungsteam Himmel Himmelsgipfel-Prärie",
"power_plant": "PMD Erkundungsteam Himmel Weite Ampere-Ebene",
"ruins": "PMD Erkundungsteam Himmel Tiefes Ruinenverlies",
"plains": "Firel - Route 888",
"power_plant": "Firel - The Klink",
"ruins": "Lmz - Ancient Ruins",
"sea": "Andr06 - Marine Mystique",
"seabed": "Firel - Seabed",
"slum": "Andr06 - Sneaky Snom",
@ -128,7 +131,7 @@
"tall_grass": "PMD Erkundungsteam Himmel Nebelwald",
"temple": "PMD Erkundungsteam Himmel Ägishöhle",
"town": "PMD Erkundungsteam Himmel Zufälliges Dungeon-Theme 3",
"volcano": "PMD Erkundungsteam Himmel Dunsthöhle",
"volcano": "Firel - Twisturn Volcano",
"wasteland": "PMD Erkundungsteam Himmel Verborgenes Hochland",
"encounter_ace_trainer": "SW Trainerblicke treffen sich (Ass-Trainer)",
"encounter_backpacker": "SW Trainerblicke treffen sich (Backpacker)",

View File

@ -715,12 +715,16 @@
"encounter": {
"1": "Achtung hier ist Endstation für dich!",
"2": "Du bist ein Trainer, oder? Wir von MC Wertpapiere wissen so etwas.\n$Ich fürchte, das gibt dir trotzdem nicht das Recht, sich in unsere Arbeit einzumischen.",
"3": "Ich bin von MC Versicherungen! Hast du eine Lebensversicherung?"
"3": "Ich bin von MC Versicherungen! Hast du eine Lebensversicherung?",
"4": "Ich habe dich gefunden! Das bedeutet es ist Zeit für einen Pokémon-Kampf!",
"5": "Eine Standpauke von Frau Olivia ist schlimmer als alles, was Sie tun können!"
},
"victory": {
"1": "Ich habe keine andere Wahl, als respektvoll zurückzutreten.",
"2": "Mein Erspartes aufzugeben bringt mich in die roten Zahlen...",
"3": "Okay zurück an die Arbeit. Versicherungen verkauft sich nicht von alleine."
"3": "Okay zurück an die Arbeit. Versicherungen verkauft sich nicht von alleine.",
"4": "Ich habe sogar meine Pokémon ausgetauscht...",
"5": "Kämpfen hat nicht funktioniert... Jetzt können wir nur noch rennen!"
}
},
"oleana": {
@ -735,6 +739,73 @@
"3": "Ich bin eine müde Olivia... Ob es Macro Cosmos Betten gibt?"
}
},
"star_grunt": {
"encounter": {
"1": "Wir sind von Team Star, wo jeder nach den Sternen greifen kann!",
"2": "Wir werden mit voller Kraft auf dich losgehen - Hasta la vistar! ★",
"3": "Könntest du bitte wieder abzischen? Sonst muss ich dich davonjagen. Aus reinem Selbstschutz!",
"4": "Es tut mir furchtbar leid, aber wenn du nicht umkehrst, könnte es ungemütlich für dich werden.",
"4_female": "Es tut mir furchtbar leid, aber wenn du nicht umkehrst, könnte es ungemütlich für dich werden.",
"5": "Och nee, nicht noch so ein Clown..."
},
"victory": {
"1": "Jetzt bin ich die Person, die Sterne sieht...",
"2": "Jemand wie du wäre bei Team Star wahrscheinlich im Nullkommanichts an der Spitze.$Alle hätten Angst vor dir. Trotzdem...",
"3": "Da war meine Selbstverteidigung wohl nicht gut genug...",
"4": "H-hasta la vistar... ★",
"5": "Als neues Mitglied bei Team Star bekommt man echt nur die Drecksarbeit ab..."
}
},
"giacomo": {
"encounter": {
"1": "Du willst dich echt mit Team Star anlegen? Bist du lebensmüde, oder was?",
"2": "Weil ich so nett bin, leg ich zu deinem Abgang auch ein fettes Requiem auf!$Lass uns die Party in Schwung bringen"
},
"victory": {
"1": " Besser hätte ich es auch nicht sagen können...",
"2": "Uff, da hab ich schon bessere Shows gegeben... Schade, aber verloren ist verloren."
}
},
"mela": {
"encounter": {
"1": "Du bist also diese Pfeife, die sich unbedingt mit uns anlegen will...$Dir werd ich zeigen, was mit Leuten passiert, die sich mit uns anlegen!",
"2": "Yeah, lassen wirs krachen!"
},
"victory": {
"1": "Uff, ich hab echt versagt... Das wars dann wohl...",
"2": "Ich... brannte so sehr auf diesen Kampf. Doch jetzt ist meine Flamme erloschen..."
}
},
"atticus": {
"encounter": {
"1": "hr habt Team Star Leid angetan, unverschämter Schurke! Mein Gift soll Euer Niedergang sein!",
"2": "Eure Bereitschaft zum Duell erfreut mich! Möge der Kampf ein ehrwürdiger sein!"
},
"victory": {
"1": "Meine Gefährten... Vergebt mir...",
"2": "Ich habe eine klare Niederlage erlitten, bei der Groll und Bitterkeit fehl am Platz wären."
}
},
"ortega": {
"encounter": {
"1": "Wenn ich mit dir fertig bin, wirst du heulend nach Hause rennen!",
"2": "Ich werde gewinnen, also spar dir deinen überheblichen Auftritt!"
},
"victory": {
"1": "Was?! Wie konnte ich nur verlieren? Warum? Warum nur?!",
"2": "Graaaah! Du bist viel zu stark, das ist so was von unfair!"
}
},
"eri": {
"encounter": {
"1": "Wer auch immer es auf Team Star abgesehen hat, wird zerschmettert!",
"2": "Ich kann genauso gut austeilen wie einstecken! Wer am Ende noch steht, gewinnt."
},
"victory": {
"1": "Leute, es tut mir so leid...",
"2": "Ich habe alles gegeben... Ich bereue nichts..."
}
},
"rocket_boss_giovanni_1": {
"encounter": {
"1": "Ich bin beeindruckt, du hast es bis hierher geschafft!\n$Ich bin Giovanni, der Anführer von Team Rocket!\n$Wir regieren den Untergrund von Kanto!\n$Und wir lassen sicherlich nicht zu, dass ein Kind uns aufhält!"
@ -933,6 +1004,28 @@
"1": "Ich nehme an, es muss den Anschein haben, dass ich etwas Schreckliches tue.\n$Ich erwarte nicht, dass du es verstehst. Aber ich muss der Galar-Region grenzenlose Energie\n$bereitstellen, um ewigen Wohlstand zu gewährleisten."
}
},
"star_boss_penny_1": {
"encounter": {
"1": "Ich bin Team Stars Big Boss. Mein Name ist Cassiopeia...$Die Gründerin von Team Star ist kampfbereit! Verneigt euch vor meiner unermesslichen Kraft!"
},
"victory": {
"1": "... ... .."
},
"defeat": {
"1": "Heh..."
}
},
"star_boss_penny_2": {
"encounter": {
"1": "Ich werde mich in diesem Kampf nicht zurückhalten! Ich werde dem Kodex von Team Star treu bleiben!$Unsere Evoli-Power verwandelt euch in Sternenstaub!"
},
"victory": {
"1": "Es ist vorbei..."
},
"defeat": {
"1": "Du bist unfassbar stark. Kein Wunder, dass die anderen Bosse gegen dich verloren haben..."
}
},
"brock": {
"encounter": {
"1": "Meine Expertise in Bezug auf Gesteins-Pokémon wird dich besiegen! Komm schon!",

View File

@ -65,6 +65,7 @@
"suppressAbilities": "Die Fähigkeit von {{pokemonName}} wirkt nicht mehr!",
"revivalBlessing": "{{pokemonName}} ist wieder fit und kampfbereit!",
"swapArenaTags": "{{pokemonName}} hat die Effekte, die auf den beiden Seiten des Kampffeldes wirken, miteinander getauscht!",
"chillyReception": "{{pokemonName}} erzählt einen schlechten Witz, der nicht besonders gut ankommt...",
"exposedMove": "{{pokemonName}} erkennt {{targetPokemonName}}!",
"safeguard": "{{targetName}} wird durch Bodyguard geschützt!",
"afterYou": "{{targetName}} lässt sich auf Galanterie ein!"

View File

@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "Aura-Rad",
"effect": "Mithilfe der in den Backentaschen gespeicherten Energie greift der Anwender an und erhöht seine Initiative. Der Typ der Attacke hängt von Morpekos Form ab."
"effect": "Mithilfe der in den Backentaschen gespeicherten Energie greift der Anwender an und erhöht seine Initiative. Wenn dies von Morpeko verwendet wird hängt der Typ der Attacke von dessen Form ab."
},
"breakingSwipe": {
"name": "Breitseite",

View File

@ -1,4 +1,5 @@
{
"pikachu": "Normal",
"pikachuCosplay": "Cosplay",
"pikachuCoolCosplay": "Rocker-Pikachu",
"pikachuBeautyCosplay": "Damen-Pikachu",
@ -6,7 +7,9 @@
"pikachuSmartCosplay": "Professoren-Pikachu",
"pikachuToughCosplay": "Wrestler-Pikachu",
"pikachuPartner": "Partner-Pikachu",
"eevee": "Normal",
"eeveePartner": "Partner-Evoli",
"pichu": "Normal",
"pichuSpiky": "Strubbelohr-Pichu",
"unownA": "A",
"unownB": "B",
@ -36,36 +39,65 @@
"unownZ": "Z",
"unownExclamation": "!",
"unownQuestion": "?",
"castform": "Normalform",
"castformSunny": "Sonnenform",
"castformRainy": "Regenform",
"castformSnowy": "Schneeform",
"deoxysNormal": "Normalform",
"deoxysAttack": "Angriffsform",
"deoxysDefense": "Verteidigungsform",
"deoxysSpeed": "Initiativeform",
"burmyPlant": "Pflanzenumhang",
"burmySandy": "Sandumhang",
"burmyTrash": "Lumpenumhang",
"cherubiOvercast": "Wolkenform",
"cherubiSunshine": "Sonnenform",
"shellosEast": "Östliches Meer",
"shellosWest": "Westliches Meer",
"rotom": "Normalform",
"rotomHeat": "Hitze-Rotom",
"rotomWash": "Wasch-Rotom",
"rotomFrost": "Frost-Rotom",
"rotomFan": "Wirbel-Rotom",
"rotomMow": "Schneid-Rotom",
"dialga": "Normalform",
"dialgaOrigin": "Urform",
"palkia": "Normalform",
"palkiaOrigin": "Urform",
"giratinaAltered": "Wandelform",
"giratinaOrigin": "Urform",
"shayminLand": "Landform",
"shayminSky": "Zenitform",
"basculinRedStriped": "Rotlinige Form",
"basculinBlueStriped": "Blaulinige Form",
"basculinWhiteStriped": "Weißlinige Form",
"darumaka": "Normalmodus",
"darumakaZen": "Trance-Modus",
"deerlingSpring": "Frühlingsform",
"deerlingSummer": "Sommerform",
"deerlingAutumn": "Herbstform",
"deerlingWinter": "Winterform",
"tornadusIncarnate": "Inkarnationsform",
"tornadusTherian": "Tiergeistform",
"thundurusIncarnate": "Inkarnationsform",
"thundurusTherian": "Tiergeistform",
"landorusIncarnate": "Inkarnationsform",
"landorusTherian": "Tiergeistform",
"kyurem": "Normal",
"kyuremBlack": "Schwarzes Kyurem",
"kyuremWhite": "Weißes Kyurem",
"keldeoOrdinary": "Standardform",
"keldeoResolute": "Resolutform",
"meloettaAria": "Gesangsform",
"meloettaPirouette": "Tanzform",
"froakieBattleBond": "Ash-Form",
"genesect": "Normal",
"genesectShock": "Blitzmodul",
"genesectBurn": "Flammenmodul",
"genesectChill": "Gefriermodul",
"genesectDouse": "Aquamodul",
"froakie": "Normalform",
"froakieBattleBond": "Freundschaftsakt",
"froakieAsh": "Ash-Form",
"scatterbugMeadow": "Blumenmeermuster",
"scatterbugIcySnow": "Frostmuster",
"scatterbugPolar": "Schneefeldmuster",
@ -91,6 +123,7 @@
"flabebeOrange": "Orangeblütler",
"flabebeBlue": "Blaublütler",
"flabebeWhite": "Weißblütler",
"furfrou": "Zottelform",
"furfrouHeart": "Herzchenschnitt",
"furfrouStar": "Sternchenschnitt",
"furfrouDiamond": "Diamantenschitt",
@ -100,6 +133,11 @@
"furfrouLaReine": "Königinnenschnitt",
"furfrouKabuki": "Kabuki-Schnitt",
"furfrouPharaoh": "Herrscherschnitt",
"espurrMale": "männlich",
"espurrFemale": "weiblich",
"honedgeShiled": "Schildform",
"honedgeBlade": "Klingenform",
"pumpkaboo": "Größe M",
"pumpkabooSmall": "Größe S",
"pumpkabooLarge": "Größe L",
"pumpkabooSuper": "Größe XL",
@ -110,11 +148,37 @@
"zygarde50Pc": "50% Form Scharwandel",
"zygarde10Pc": "10% Form Scharwandel",
"zygardeComplete": "Optimum-Form",
"hoopa": "Gebanntes Hoopa",
"hoopaUnbound": "Entfesseltes Hoopa",
"oricorioBaile": "Flamenco-Stil",
"oricorioPompom": "Cheerleading-Stil",
"oricorioPau": "Hula-Stil",
"oricorioSensu": "Buyo-Stil",
"rockruff": "Normalform",
"rockruffOwnTempo": "Gleichmut",
"rockruffMidday": "Tagform",
"rockruffMidnight": "Nachtform",
"rockruffDusk": "Zwielichtform",
"wishiwashi": "Einzelform",
"wishiwashiSchool": "Schwarmform",
"typeNullNormal": "Typ:Normal",
"typeNullFighting": "Typ:Kampf",
"typeNullFlying": "Typ:Flug",
"typeNullPoison": "Typ:Gift",
"typeNullGround": "Typ:Boden",
"typeNullRock": "Typ:Gestein",
"typeNullBug": "Typ:Käfer",
"typeNullGhost": "Typ:Geist",
"typeNullSteel": "Typ:Stahl",
"typeNullFire": "Typ:Feuer",
"typeNullWater": "Typ:Wasser",
"typeNullGrass": "Typ:Pflanze",
"typeNullElectric": "Typ:Elektro",
"typeNullPsychic": "Typ:Psycho",
"typeNullIce": "Typ:Eis",
"typeNullDragon": "Typ:Drache",
"typeNullDark": "Typ:Unlicht",
"typeNullFairy": "Typ:Fee",
"miniorRedMeteor": "Rote-Meteorform",
"miniorOrangeMeteor": "Oranger-Meteorform",
"miniorYellowMeteor": "Gelber-Meteorform",
@ -131,25 +195,66 @@
"miniorViolet": "Violetter Kern",
"mimikyuDisguised": "Verkleidete Form",
"mimikyuBusted": "Entlarvte Form",
"necrozma": "Normalform",
"necrozmaDuskMane": "Abendmähne",
"necrozmaDawnWings": "Morgenschwingen",
"necrozmaUltra": "Ultra-Necrozma",
"magearna": "Normalform",
"magearnaOriginal": "Originalfarbe",
"marshadow": "Normalform",
"marshadowZenith": "Zenitform",
"cramorant": "Normalform",
"cramorantGulping": "Schlingform",
"cramorantGorging": "Stopfform",
"toxelAmped": "Hoch-Form",
"toxelLowkey": "Tief-Form",
"sinisteaPhony": "Fälschungsform",
"sinisteaAntique": "Originalform",
"milceryVanillaCream": "Vanille-Creme",
"milceryRubyCream": "Ruby-Creme",
"milceryMatchaCream": "Matcha-Creme",
"milceryMintCream": "Minz-Creme",
"milceryLemonCream": "Zitronen-Creme",
"milcerySaltedCream": "Salz-Creme",
"milceryRubySwirl": "Ruby-Mix",
"milceryCaramelSwirl": "Karamell-Mix",
"milceryRainbowSwirl": "Trio-Mix",
"eiscue": "Tiefkühlkopf",
"eiscueNoIce": "Wohlfühlkopf",
"indeedeeMale": "männlich",
"indeedeeFemale": "weiblich",
"morpekoFullBelly": "Pappsattmuster",
"morpekoHangry": "Kohldampfmuster",
"zacianHeroOfManyBattles": "Heldenhafter Krieger",
"zacianCrowned": "König des Schwertes",
"zamazentaHeroOfManyBattles": "Heldenhafter Krieger",
"zamazentaCrowned": "König des Schildes",
"kubfuSingleStrike": "Fokussierter Stil",
"kubfuRapidStrike": "Fließender Stil",
"zarude": "Normalform",
"zarudeDada": "Papa",
"calyrex": "Normalform",
"calyrexIce": "Schimmelreiter",
"calyrexShadow": "Rappenreiter",
"basculinMale": "männlich",
"basculinFemale": "weiblich",
"enamorusIncarnate": "Inkarnationsform",
"enamorusTherian": "Tiergeistform",
"lechonkMale": "männlich",
"lechonkFemale": "weiblich",
"tandemausFour": "Dreierfamilie",
"tandemausThree": "Viererfamilie",
"squawkabillyGreenPlumage": "Grüngefiedert",
"squawkabillyBluePlumage": "Blaugefiedert",
"squawkabillyYellowPlumage": "Gelbgefiedert",
"squawkabillyWhitePlumage": "Weißgefiedert",
"finizenZero": "Alltagsform",
"finizenHero": "Heldenform",
"tatsugiriCurly": "Gebogene Form",
"tatsugiriDroopy": "Hängende Form",
"tatsugiriStretchy": "Gestrekte Form",
"dunsparceTwo": "Zweisegmentform",
"dunsparceThree": "Dreisegmentform",
"gimmighoulChest": "Truhenform",
"gimmighoulRoaming": "Wanderform",
"koraidonApexBuild": "Vollkommene Gestalt",
@ -164,7 +269,22 @@
"miraidonGlideMode": "Gleitmodus",
"poltchageistCounterfeit": "Imitationsform",
"poltchageistArtisan": "Kostbarkeitsform",
"poltchageistUnremarkable": "Simple Form",
"poltchageistMasterpiece": "Edle Form",
"ogerponTealMask": "Türkisgrüne Maske",
"ogerponTealMaskTera": "Türkisgrüne Maske (Terakristallisiert)",
"ogerponWellspringMask": "Brunnenmaske",
"ogerponWellspringMaskTera": "Brunnenmaske (Terakristallisiert)",
"ogerponHearthflameMask": "Ofenmaske",
"ogerponHearthflameMaskTera": "Ofenmaske (Terakristallisiert)",
"ogerponCornerstoneMask": "Fundamentmaske",
"ogerponCornerstoneMaskTera": "Fundamentmaske (Terakristallisiert)",
"terpagos": "Normalform",
"terpagosTerastal": "Terakristall-Form",
"terpagosStellar": "Stellarform",
"galarDarumaka": "Normalmodus",
"galarDarumakaZen": "Trance-Modus",
"paldeaTaurosCombat": "Gefechtsvariante",
"paldeaTaurosBlaze": "Flammenvariante",
"paldeaTaurosAqua": "Flutenvariante"
}
}

View File

@ -126,5 +126,8 @@
"skull_grunts": "Rüpel von Team Skull",
"macro_grunt": "Angestellter von Macro Cosmos",
"macro_grunt_female": "Angestellte von Macro Cosmos",
"macro_grunts": "Angestellte von Macro Cosmos"
"macro_grunts": "Angestellte von Macro Cosmos",
"star_grunt": "Rüpel von Team Star",
"star_grunt_female": "Rüpel von Team Star",
"star_grunts": "Rüpel von Team Star"
}

View File

@ -142,6 +142,11 @@
"faba": "Fabian",
"plumeria": "Fran",
"oleana": "Olivia",
"giacomo": "Pinio",
"mela": "Irsa",
"atticus": "Shugi",
"ortega": "Otis",
"eri": "Rioba",
"maxie": "Marc",
"archie": "Adrian",
@ -151,6 +156,7 @@
"lusamine": "Samantha",
"guzma": "Bromley",
"rose": "Rose",
"cassiopeia": "Cosima",
"blue_red_double": "Blau & Rot",
"red_blue_double": "Rot & Blau",

View File

@ -19,6 +19,7 @@
"aether_boss": "Æther-Präsidentin",
"skull_boss": "Skull-Boss",
"macro_boss": "Geschäftsführer von Macro Cosmos",
"star_boss": "Team Star Big Boss",
"rocket_admin": "Team Rocket Vorstand",
"rocket_admin_female": "Team Rocket Vorstand",
"magma_admin": "Team Magma Vorstand",
@ -33,6 +34,6 @@
"flare_admin_female": "Team Flare Vorstand",
"aether_admin": "Æther-Regionalleiter",
"skull_admin": "Team Skull Vorstand",
"macro_admin": "Vizepräsidentin von Macro Cosmos"
"macro_admin": "Vizepräsidentin von Macro Cosmos",
"star_admin": "Team Star Boss"
}

View File

@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "Poison Puppeteer",
"description": "Pokémon poisoned by Pecharunt's moves will also become confused."
"description": "Pokémon poisoned by this Pokémon's moves will also become confused."
}
}

View File

@ -111,7 +111,7 @@
"forest": "PMD EoS Dusk Forest",
"grass": "PMD EoS Apple Woods",
"graveyard": "PMD EoS Mystifying Forest",
"ice_cave": "Firel - -60F",
"ice_cave": "Firel - -50°C",
"island": "PMD EoS Craggy Coast",
"jungle": "Lmz - Jungle",
"laboratory": "Firel - Laboratory",

View File

@ -766,6 +766,7 @@
"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?",
"4": "I found you! In that case, time for a Pokémon battle!",
"4_female": "I found you! In that case, time for a Pokémon battle!",
"5": "An earful from Ms. Oleana is way worse than anything you can do!"
},
"victory": {
@ -796,7 +797,8 @@
"3": "If you don't clear out real quick-like, I'll hafta come at you in self-defense. You get me?",
"4": "Sorry, but if you don't turn yourself around here, amigo, we'll have to send you packing!",
"4_female": "Sorry, but if you don't turn yourself around here, amiga, we'll have to send you packing!",
"5": "Oh great. Here comes another rando to ruin my day."
"5": "Oh great. Here comes another rando to ruin my day.",
"5_female": "Oh great. Here comes another rando to ruin my day."
},
"victory": {
"1": "How come I'M the one seeing stars?!",
@ -819,6 +821,7 @@
"mela": {
"encounter": {
"1": "So you're the dope who picked a fight with Team Star... Prepare to get messed up.",
"1_female": "So you're the dope who picked a fight with Team Star... Prepare to get messed up.",
"2": "All riiight, BRING IT! I'll blow everythin' sky high!"
},
"victory": {
@ -829,6 +832,7 @@
"atticus": {
"encounter": {
"1": "You have some nerve baring your fangs at Team Star. Come, then, villainous wretch!",
"1_female": "You have some nerve baring your fangs at Team Star. Come, then, villainous wretch!",
"2": "Be warned—I shall spare thee no mercy! En garde!"
},
"victory": {
@ -839,7 +843,8 @@
"ortega": {
"encounter": {
"1": "I promise I'll play nice, so don't blame me when this battle sends you blubbering back home!",
"2": "I'll wipe that smug look off your face for sure! You're going down!"
"2": "I'll wipe that smug look off your face for sure! You're going down!",
"2_female": "I'll wipe that smug look off your face for sure! You're going down!"
},
"victory": {
"1": "Ugh! How could I LOSE! What the HECK!",

View File

@ -66,6 +66,7 @@
"suppressAbilities": "{{pokemonName}}'s ability\nwas suppressed!",
"revivalBlessing": "{{pokemonName}} was revived!",
"swapArenaTags": "{{pokemonName}} swapped the battle effects affecting each side of the field!",
"chillyReception": "{{pokemonName}} is preparing to tell a chillingly bad joke!",
"exposedMove": "{{pokemonName}} identified\n{{targetPokemonName}}!",
"safeguard": "{{targetName}} is protected by Safeguard!",
"substituteOnOverlap": "{{pokemonName}} already\nhas a substitute!",

View File

@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "Aura Wheel",
"effect": "Morpeko attacks and raises its Speed with the energy stored in its cheeks. This move's type changes depending on the user's form."
"effect": "The user attacks and raises its Speed with the energy stored in its cheeks. If used by Morpeko, this move's type changes depending on the user's form."
},
"breakingSwipe": {
"name": "Breaking Swipe",

View File

@ -1,4 +1,5 @@
{
"pikachu": "Normal",
"pikachuCosplay": "Cosplay",
"pikachuCoolCosplay": "Cool Cosplay",
"pikachuBeautyCosplay": "Beauty Cosplay",
@ -6,8 +7,10 @@
"pikachuSmartCosplay": "Smart Cosplay",
"pikachuToughCosplay": "Tough Cosplay",
"pikachuPartner": "Partner",
"eevee": "Normal",
"eeveePartner": "Partner",
"pichuSpiky": "Spiky",
"pichu": "Normal",
"pichuSpiky": "Spiky-Eared",
"unownA": "A",
"unownB": "B",
"unownC": "C",
@ -36,135 +39,252 @@
"unownZ": "Z",
"unownExclamation": "!",
"unownQuestion": "?",
"castformSunny": "Sunny",
"castformRainy": "Rainy",
"castformSnowy": "Snowy",
"deoxysNormal": "Normal",
"burmyPlant": "Plant",
"burmySandy": "Sandy",
"burmyTrash": "Trash",
"shellosEast": "East",
"shellosWest": "West",
"castform": "Normal Form",
"castformSunny": "Sunny Form",
"castformRainy": "Rainy Form",
"castformSnowy": "Snowy Form",
"deoxysNormal": "Normal Forme",
"deoxysAttack": "Attack Forme",
"deoxysDefense": "Defense Forme",
"deoxysSpeed": "Speed Forme",
"burmyPlant": "Plant Cloak",
"burmySandy": "Sandy Cloak",
"burmyTrash": "Trash Cloak",
"cherubiOvercast": "Overcast Form",
"cherubiSunshine": "Sunshine Form",
"shellosEast": "East Sea",
"shellosWest": "West Sea",
"rotom": "Normal",
"rotomHeat": "Heat",
"rotomWash": "Wash",
"rotomFrost": "Frost",
"rotomFan": "Fan",
"rotomMow": "Mow",
"giratinaAltered": "Altered",
"shayminLand": "Land",
"basculinRedStriped": "Red Striped",
"basculinBlueStriped": "Blue Striped",
"basculinWhiteStriped": "White Striped",
"deerlingSpring": "Spring",
"deerlingSummer": "Summer",
"deerlingAutumn": "Autumn",
"deerlingWinter": "Winter",
"tornadusIncarnate": "Incarnate",
"thundurusIncarnate": "Incarnate",
"landorusIncarnate": "Incarnate",
"keldeoOrdinary": "Ordinary",
"meloettaAria": "Aria",
"meloettaPirouette": "Pirouette",
"dialga": "Normal",
"dialgaOrigin": "Origin Forme",
"palkia": "Normal",
"palkiaOrigin": "Origin Forme",
"giratinaAltered": "Altered Forme",
"giratinaOrigin": "Origin Forme",
"shayminLand": "Land Forme",
"shayminSky": "Sky Forme",
"basculinRedStriped": "Red-Striped Form",
"basculinBlueStriped": "Blue-Striped Form",
"basculinWhiteStriped": "White-Striped Form",
"darumaka": "Standard Mode",
"darumakaZen": "Zen Mode",
"deerlingSpring": "Spring Form",
"deerlingSummer": "Summer Form",
"deerlingAutumn": "Autumn Form",
"deerlingWinter": "Winter Form",
"tornadusIncarnate": "Incarnate Forme",
"tornadusTherian": "Therian Forme",
"thundurusIncarnate": "Incarnate Forme",
"thundurusTherian": "Therian Forme",
"landorusIncarnate": "Incarnate Forme",
"landorusTherian": "Therian Forme",
"kyurem": "Normal",
"kyuremBlack": "Black",
"kyuremWhite": "White",
"keldeoOrdinary": "Ordinary Form",
"keldeoResolute": "Resolute",
"meloettaAria": "Aria Forme",
"meloettaPirouette": "Pirouette Forme",
"genesect": "Normal",
"genesectShock": "Shock Drive",
"genesectBurn": "Burn Drive",
"genesectChill": "Chill Drive",
"genesectDouse": "Douse Drive",
"froakie": "Normal",
"froakieBattleBond": "Battle Bond",
"scatterbugMeadow": "Meadow",
"scatterbugIcySnow": "Icy Snow",
"scatterbugPolar": "Polar",
"scatterbugTundra": "Tundra",
"scatterbugContinental": "Continental",
"scatterbugGarden": "Garden",
"scatterbugElegant": "Elegant",
"scatterbugModern": "Modern",
"scatterbugMarine": "Marine",
"scatterbugArchipelago": "Archipelago",
"scatterbugHighPlains": "High Plains",
"scatterbugSandstorm": "Sandstorm",
"scatterbugRiver": "River",
"scatterbugMonsoon": "Monsoon",
"scatterbugSavanna": "Savanna",
"scatterbugSun": "Sun",
"scatterbugOcean": "Ocean",
"scatterbugJungle": "Jungle",
"scatterbugFancy": "Fancy",
"scatterbugPokeBall": "Poké Ball",
"flabebeRed": "Red",
"flabebeYellow": "Yellow",
"flabebeOrange": "Orange",
"flabebeBlue": "Blue",
"flabebeWhite": "White",
"furfrouHeart": "Heart",
"furfrouStar": "Star",
"furfrouDiamond": "Diamond",
"furfrouDebutante": "Debutante",
"furfrouMatron": "Matron",
"furfrouDandy": "Dandy",
"furfrouLaReine": "La Reine",
"furfrouKabuki": "Kabuki",
"furfrouPharaoh": "Pharaoh",
"pumpkabooSmall": "Small",
"pumpkabooLarge": "Large",
"pumpkabooSuper": "Super",
"xerneasNeutral": "Neutral",
"xerneasActive": "Active",
"froakieAsh": "Ash",
"scatterbugMeadow": "Meadow Pattern",
"scatterbugIcySnow": "Icy Snow Pattern",
"scatterbugPolar": "Polar Pattern",
"scatterbugTundra": "Tundra Pattern",
"scatterbugContinental": "Continental Pattern",
"scatterbugGarden": "Garden Pattern",
"scatterbugElegant": "Elegant Pattern",
"scatterbugModern": "Modern Pattern",
"scatterbugMarine": "Marine Pattern",
"scatterbugArchipelago": "Archipelago Pattern",
"scatterbugHighPlains": "High Plains Pattern",
"scatterbugSandstorm": "Sandstorm Pattern",
"scatterbugRiver": "River Pattern",
"scatterbugMonsoon": "Monsoon Pattern",
"scatterbugSavanna": "Savanna Pattern",
"scatterbugSun": "Sun Pattern",
"scatterbugOcean": "Ocean Pattern",
"scatterbugJungle": "Jungle Pattern",
"scatterbugFancy": "Fancy Pattern",
"scatterbugPokeBall": "Poké Ball Pattern",
"flabebeRed": "Red Flower",
"flabebeYellow": "Yellow Flower",
"flabebeOrange": "Orange Flower",
"flabebeBlue": "Blue Flower",
"flabebeWhite": "White Flower",
"furfrou": "Natural Form",
"furfrouHeart": "Heart Trim",
"furfrouStar": "Star Trim",
"furfrouDiamond": "Diamond Trim",
"furfrouDebutante": "Debutante Trim",
"furfrouMatron": "Matron Trim",
"furfrouDandy": "Dandy Trim",
"furfrouLaReine": "La Reine Trim",
"furfrouKabuki": "Kabuki Trim",
"furfrouPharaoh": "Pharaoh Trim",
"espurrMale": "Male",
"espurrFemale": "Female",
"honedgeShiled": "Shield Forme",
"honedgeBlade": "Blade Forme",
"pumpkaboo": "Average Size",
"pumpkabooSmall": "Small Size",
"pumpkabooLarge": "Large Size",
"pumpkabooSuper": "Super Size",
"xerneasNeutral": "Neutral Mode",
"xerneasActive": "Active Mode",
"zygarde50": "50% Forme",
"zygarde10": "10% Forme",
"zygarde50Pc": "50% Forme Power Construct",
"zygarde10Pc": "10% Forme Power Construct",
"zygardeComplete": "Complete Forme",
"oricorioBaile": "Baile",
"oricorioPompom": "Pom-Pom",
"oricorioPau": "Pau",
"oricorioSensu": "Sensu",
"hoopa": "Confined",
"hoopaUnbound": "Unbound",
"oricorioBaile": "Baile Style",
"oricorioPompom": "Pom-Pom Style",
"oricorioPau": "Pau Style",
"oricorioSensu": "Sensu Style",
"rockruff": "Normal",
"rockruffOwnTempo": "Own Tempo",
"miniorRedMeteor": "Red Meteor",
"miniorOrangeMeteor": "Orange Meteor",
"miniorYellowMeteor": "Yellow Meteor",
"miniorGreenMeteor": "Green Meteor",
"miniorBlueMeteor": "Blue Meteor",
"miniorIndigoMeteor": "Indigo Meteor",
"miniorVioletMeteor": "Violet Meteor",
"miniorRed": "Red",
"miniorOrange": "Orange",
"miniorYellow": "Yellow",
"miniorGreen": "Green",
"miniorBlue": "Blue",
"miniorIndigo": "Indigo",
"miniorViolet": "Violet",
"mimikyuDisguised": "Disguised",
"mimikyuBusted": "Busted",
"rockruffMidday": "Midday Form",
"rockruffMidnight": "Midnight Form",
"rockruffDusk": "Dusk Form",
"wishiwashi": "Solo Form",
"wishiwashiSchool": "School",
"typeNullNormal": "Type: Normal",
"typeNullFighting": "Type: Fighting",
"typeNullFlying": "Type: Flying",
"typeNullPoison": "Type: Poison",
"typeNullGround": "Type: Ground",
"typeNullRock": "Type: Rock",
"typeNullBug": "Type: Bug",
"typeNullGhost": "Type: Ghost",
"typeNullSteel": "Type: Steel",
"typeNullFire": "Type: Fire",
"typeNullWater": "Type: Water",
"typeNullGrass": "Type: Grass",
"typeNullElectric": "Type: Electric",
"typeNullPsychic": "Type: Psychic",
"typeNullIce": "Type: Ice",
"typeNullDragon": "Type: Dragon",
"typeNullDark": "Type: Dark",
"typeNullFairy": "Type: Fairy",
"miniorRedMeteor": "Red Meteor Form",
"miniorOrangeMeteor": "Orange Meteor Form",
"miniorYellowMeteor": "Yellow Meteor Form",
"miniorGreenMeteor": "Green Meteor Form",
"miniorBlueMeteor": "Blue Meteor Form",
"miniorIndigoMeteor": "Indigo Meteor Form",
"miniorVioletMeteor": "Violet Meteor Form",
"miniorRed": "Red Core Form",
"miniorOrange": "Orange Core Form",
"miniorYellow": "Yellow Core Form",
"miniorGreen": "Green Core Form",
"miniorBlue": "Blue Core Form",
"miniorIndigo": "Indigo Core Form",
"miniorViolet": "Violet Core Form",
"mimikyuDisguised": "Disguised Form",
"mimikyuBusted": "Busted Form",
"necrozma": "Normal",
"necrozmaDuskMane": "Dusk Mane",
"necrozmaDawnWings": "Dawn Wings",
"necrozmaUltra": "Ultra",
"magearna": "Normal",
"magearnaOriginal": "Original",
"marshadow": "Normal",
"marshadowZenith": "Zenith",
"sinisteaPhony": "Phony",
"sinisteaAntique": "Antique",
"cramorant": "Normal",
"cramorantGulping": "Gulping Form",
"cramorantGorging": "Gorging Form",
"toxelAmped": "Amped Form",
"toxelLowkey": "Low-Key Form",
"sinisteaPhony": "Phony Form",
"sinisteaAntique": "Antique Form",
"milceryVanillaCream": "Vanilla Cream",
"milceryRubyCream": "Ruby Cream",
"milceryMatchaCream": "Matcha Cream",
"milceryMintCream": "Mint Cream",
"milceryLemonCream": "Lemon Cream",
"milcerySaltedCream": "Salted Cream",
"milceryRubySwirl": "Ruby Swirl",
"milceryCaramelSwirl": "Caramel Swirl",
"milceryRainbowSwirl": "Rainbow Swirl",
"eiscue": "Ice Face",
"eiscueNoIce": "No Ice",
"indeedeeMale": "Male",
"indeedeeFemale": "Female",
"morpekoFullBelly": "Full Belly",
"morpekoFullBelly": "Full Belly Mode",
"morpekoHangry": "Hangry Mode",
"zacianHeroOfManyBattles": "Hero Of Many Battles",
"zacianCrowned": "Crowned",
"zamazentaHeroOfManyBattles": "Hero Of Many Battles",
"zamazentaCrowned": "Crowned",
"kubfuSingleStrike": "Single Strike Style",
"kubfuRapidStrike": "Rapid Strike Style",
"zarude": "Normal",
"zarudeDada": "Dada",
"enamorusIncarnate": "Incarnate",
"calyrex": "Normal",
"calyrexIce": "Ice Rider",
"calyrexShadow": "Shadow Rider",
"basculinMale": "Male",
"basculinFemale": "Female",
"enamorusIncarnate": "Incarnate Forme",
"enamorusTherian": "Therian Forme",
"lechonkMale": "Male",
"lechonkFemale": "Female",
"tandemausFour": "Family of Four",
"tandemausThree": "Family of Three",
"squawkabillyGreenPlumage": "Green Plumage",
"squawkabillyBluePlumage": "Blue Plumage",
"squawkabillyYellowPlumage": "Yellow Plumage",
"squawkabillyWhitePlumage": "White Plumage",
"tatsugiriCurly": "Curly",
"tatsugiriDroopy": "Droopy",
"tatsugiriStretchy": "Stretchy",
"gimmighoulChest": "Chest",
"gimmighoulRoaming": "Roaming",
"finizenZero": "Zero Form",
"finizenHero": "Hero Form",
"tatsugiriCurly": "Curly Form",
"tatsugiriDroopy": "Droopy Form",
"tatsugiriStretchy": "Stretchy Form",
"dunsparceTwo": "Two-Segment Form",
"dunsparceThree": "Three-Segment Form",
"gimmighoulChest": "Chest Form",
"gimmighoulRoaming": "Roaming Form",
"koraidonApexBuild": "Apex Build",
"koraidonLimitedBuild": "Limited Build",
"koraidonSprintingBuild": "Sprinting Build",
"koraidonSwimmingBuild": "Swimming Build",
"koraidonGlidingBuild": "Gliding Build",
"miraidonUltimateMode": "Ultimate Mode",
"miraidonLowPowerMode": "Low Power Mode",
"miraidonLowPowerMode": "Low-Power Mode",
"miraidonDriveMode": "Drive Mode",
"miraidonAquaticMode": "Aquatic Mode",
"miraidonGlideMode": "Glide Mode",
"poltchageistCounterfeit": "Counterfeit",
"poltchageistArtisan": "Artisan",
"paldeaTaurosCombat": "Combat",
"paldeaTaurosBlaze": "Blaze",
"paldeaTaurosAqua": "Aqua"
}
"poltchageistCounterfeit": "Counterfeit Form",
"poltchageistArtisan": "Artisan Form",
"poltchageistUnremarkable": "Unremarkable Form",
"poltchageistMasterpiece": "Masterpiece Form",
"ogerponTealMask": "Teal Mask",
"ogerponTealMaskTera": "Teal Mask Terastallized",
"ogerponWellspringMask": "Wellspring Mask",
"ogerponWellspringMaskTera": "Wellspring Mask Terastallized",
"ogerponHearthflameMask": "Hearthflame Mask",
"ogerponHearthflameMaskTera": "Hearthflame Mask Terastallized",
"ogerponCornerstoneMask": "Cornerstone Mask",
"ogerponCornerstoneMaskTera": "Cornerstone Mask Terastallized",
"terpagos": "Normal Form",
"terpagosTerastal": "Terastal Form",
"terpagosStellar": "Stellar Form",
"galarDarumaka": "Standard Mode",
"galarDarumakaZen": "Zen Mode",
"paldeaTaurosCombat": "Combat Breed",
"paldeaTaurosBlaze": "Blaze Breed",
"paldeaTaurosAqua": "Aqua Breed"
}

View File

@ -155,7 +155,7 @@
"lusamine": "Lusamine",
"guzma": "Guzma",
"rose": "Rose",
"cassiopeia": "Cassiopeia",
"cassiopeia": "Penny",
"blue_red_double": "Blue & Red",
"red_blue_double": "Red & Blue",

View File

@ -4,7 +4,7 @@
"costar": "¡{{pokemonName}} copió los cambios de características de {{allyName}}!",
"iceFaceAvoidedDamage": "¡{{pokemonNameWithAffix}} evitó\ndaño con {{abilityName}}!",
"perishBody": "¡{{abilityName}} de {{pokemonName}} debilitará a ambos Pokémon en 3 turnos!",
"poisonHeal": "¡{{pokemonNameWithAffix}} restauró algunos de sus PS gracias a {{abilityName}}!",
"poisonHeal": "¡{{pokemonName}} restauró algunos de sus PS gracias a {{abilityName}}!",
"trace": "¡{{pokemonName}} ha copiado la habilidad {{abilityName}} \nde {{targetName}}!",
"windPowerCharged": "¡{{pokemonName}} se ha cargado de electricidad gracias a {{moveName}}!",
"quickDraw": "¡{{pokemonName}} ataca primero gracias a la habilidad Mano Rápida!",

View File

@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "Títere Tóxico",
"description": "Los rivales que Pecharunt envenene con sus movimientos también sufrirán confusión."
"description": "Los rivales que el usuario envenene con sus movimientos también sufrirán confusión."
}
}

View File

@ -107,17 +107,17 @@
"forest": "PMD EoS - Bosque Sombrío",
"grass": "PMD EoS - Manzanar",
"graveyard": "PMD EoS - Bosque Misterio",
"ice_cave": "PMD EoS - Gran Iceberg",
"ice_cave": "Firel - -50°C",
"island": "PMD EoS - Costa Escarpada",
"jungle": "Lmz - Jungla",
"laboratory": "Firel - Laboratorio",
"lake": "PMD EoS - Cueva Cristal",
"lake": "Lmz - Lake",
"meadow": "PMD EoS - Bosque de la Cumbre del Cielo",
"metropolis": "Firel - Metrópolis",
"mountain": "PMD EoS - Monte Cuerno",
"plains": "PMD EoS - Pradera de la Cumbre del Cielo",
"power_plant": "PMD EoS - Pradera Destello",
"ruins": "PMD EoS - Sima Hermética",
"plains": "Firel - Route 888",
"power_plant": "Firel - The Klink",
"ruins": "Lmz - Ancient Ruins",
"sea": "Andr06 - Misticismo marino",
"seabed": "Firel - Lecho del mar",
"slum": "Andr06 - Snom sigiloso",
@ -127,7 +127,7 @@
"tall_grass": "PMD EoS - Bosque Niebla",
"temple": "PMD EoS - Cueva Regia",
"town": "PMD EoS - Tema del territorio aleatorio 3",
"volcano": "PMD EoS - Cueva Vapor",
"volcano": "Firel - Twisturn Volcano",
"wasteland": "PMD EoS - Corazón Tierra Oculta",
"encounter_ace_trainer": "BW - ¡Vs. entrenador guay!",
"encounter_backpacker": "BW - ¡Vs. mochilero!",

View File

@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "Rueda Aural",
"effect": "La energía que acumula en las mejillas le sirve para atacar y aumentar su Velocidad. Este movimiento cambia de tipo según la forma que adopte Morpeko."
"effect": "La energía que acumula en las mejillas le sirve para atacar y aumentar su Velocidad. Si es utilizado por Morpeko, este movimiento cambia de tipo según la forma que adopte."
},
"breakingSwipe": {
"name": "Vasto Impacto",

View File

@ -1,4 +1,5 @@
{
"pikachu": "Normal",
"pikachuCosplay": "Coqueta",
"pikachuCoolCosplay": "Roquera",
"pikachuBeautyCosplay": "Aristócrata",
@ -6,7 +7,9 @@
"pikachuSmartCosplay": "Erudita",
"pikachuToughCosplay": "Enmascarada",
"pikachuPartner": "Compañero",
"eevee": "Normal",
"eeveePartner": "Compañero",
"pichu": "Normal",
"pichuSpiky": "Picoreja",
"unownA": "A",
"unownB": "B",
@ -36,36 +39,65 @@
"unownZ": "Z",
"unownExclamation": "!",
"unownQuestion": "?",
"castform": "Normal Form",
"castformSunny": "Sol",
"castformRainy": "Lluvia",
"castformSnowy": "Nieve",
"deoxysNormal": "Normal",
"deoxysAttack": "Ataque",
"deoxysDefense": "Defensa",
"deoxysSpeed": "Velocidad",
"burmyPlant": "Planta",
"burmySandy": "Arena",
"burmyTrash": "Basura",
"cherubiOvercast": "Encapotado",
"cherubiSunshine": "Soleado",
"shellosEast": "Este",
"shellosWest": "Oeste",
"rotom": "Normal",
"rotomHeat": "Calor",
"rotomWash": "Lavado",
"rotomFrost": "Frío",
"rotomFan": "Ventilador",
"rotomMow": "Corte",
"dialga": "Normal",
"dialgaOrigin": "Origen",
"palkia": "Normal",
"palkiaOrigin": "Origen",
"giratinaAltered": "Modificada",
"giratinaOrigin": "Origen",
"shayminLand": "Tierra",
"shayminSky": "Cielo",
"basculinRedStriped": "Raya Roja",
"basculinBlueStriped": "Raya Azul",
"basculinWhiteStriped": "Raya Blanca",
"darumaka": "Modo Normal",
"darumakaZen": "Modo Daruma",
"deerlingSpring": "Primavera",
"deerlingSummer": "Verano",
"deerlingAutumn": "Otoño",
"deerlingWinter": "Invierno",
"tornadusIncarnate": "Avatar",
"tornadusTherian": "Tótem",
"thundurusIncarnate": "Avatar",
"thundurusTherian": "Tótem",
"landorusIncarnate": "Avatar",
"landorusTherian": "Tótem",
"kyurem": "Normal",
"kyuremBlack": "Negro",
"kyuremWhite": "Blanco",
"keldeoOrdinary": "Habitual",
"keldeoResolute": "Brío",
"meloettaAria": "Lírica",
"meloettaPirouette": "Danza",
"genesect": "Normal",
"genesectShock": "FulgoROM",
"genesectBurn": "PiroROM",
"genesectChill": "CrioROM",
"genesectDouse": "HidroROM",
"froakie": "Normal",
"froakieBattleBond": "Fuerte Afecto",
"froakieAsh": "Ash",
"scatterbugMeadow": "Floral",
"scatterbugIcySnow": "Polar",
"scatterbugPolar": "Taiga",
@ -91,6 +123,7 @@
"flabebeOrange": "Naranja",
"flabebeBlue": "Azul",
"flabebeWhite": "Blanco",
"furfrou": "Salvaje",
"furfrouHeart": "Corazón",
"furfrouStar": "Estrella",
"furfrouDiamond": "Diamante",
@ -100,9 +133,14 @@
"furfrouLaReine": "Aristócrata",
"furfrouKabuki": "Kabuki",
"furfrouPharaoh": "Faraónico",
"pumpkabooSmall": "Pequeño",
"pumpkabooLarge": "Grande",
"pumpkabooSuper": "Enorme",
"espurrMale": "Macho",
"espurrFemale": "Hembra",
"honedgeShiled": "Escudo",
"honedgeBlade": "Filo",
"pumpkaboo": "Tamaño Normal",
"pumpkabooSmall": "Tamaño Pequeño",
"pumpkabooLarge": "Tamaño Grande",
"pumpkabooSuper": "Tamaño Extragrande",
"xerneasNeutral": "Relajado",
"xerneasActive": "Activo",
"zygarde50": "Al 50%",
@ -110,11 +148,37 @@
"zygarde50Pc": "Zygarde al 50%",
"zygarde10Pc": "Zygarde al 10%",
"zygardeComplete": "Zygarde Completo",
"hoopa": "Contenido",
"hoopaUnbound": "Desatado",
"oricorioBaile": "Apasionado",
"oricorioPompom": "Animado",
"oricorioPau": "Plácido",
"oricorioSensu": "Refinado",
"rockruff": "Normal",
"rockruffOwnTempo": "Ritmo Propio",
"rockruffMidday": "Diurna",
"rockruffMidnight": "Nocturna",
"rockruffDusk": "Crepuscular",
"wishiwashi": "Solo Form",
"wishiwashiSchool": "Banco",
"typeNullNormal": "Tipo Normal",
"typeNullFighting": "Tipo Lucha",
"typeNullFlying": "Tipo Volador",
"typeNullPoison": "Tipo Veneno",
"typeNullGround": "Tipo Tierra",
"typeNullRock": "Tipo Roca",
"typeNullBug": "Tipo Bicho",
"typeNullGhost": "Tipo Fantasma",
"typeNullSteel": "Tipo Acero",
"typeNullFire": "Tipo Fuego",
"typeNullWater": "Tipo Agua",
"typeNullGrass": "Tipo Planta",
"typeNullElectric": "Tipo Eléctrico",
"typeNullPsychic": "Tipo Psíquico",
"typeNullIce": "Tipo Hielo",
"typeNullDragon": "Tipo Dragón",
"typeNullDark": "Tipo Siniestro",
"typeNullFairy": "Tipo Hada",
"miniorRedMeteor": "Núcleo Rojo",
"miniorOrangeMeteor": "Núcleo Naranja",
"miniorYellowMeteor": "Núcleo Amarillo",
@ -131,25 +195,66 @@
"miniorViolet": "Violeta",
"mimikyuDisguised": "Encubierta",
"mimikyuBusted": "Descubierta",
"necrozma": "Normal",
"necrozmaDuskMane": "Melena Crepuscular",
"necrozmaDawnWings": "Asas Alvorada",
"necrozmaUltra": "Ultra",
"magearna": "Normal",
"magearnaOriginal": "Vetusto",
"marshadow": "Normal",
"marshadowZenith": "Cénit",
"cramorant": "Normal",
"cramorantGulping": "Tragatodo",
"cramorantGorging": "Engulletodo",
"toxelAmped": "Agudo",
"toxelLowkey": "Grave",
"sinisteaPhony": "Falsificada",
"sinisteaAntique": "Genuina",
"milceryVanillaCream": "Crema de Vainilla",
"milceryRubyCream": "Crema Rosa",
"milceryMatchaCream": "Crema de Té",
"milceryMintCream": "Crema de Menta",
"milceryLemonCream": "Crema de Limón",
"milcerySaltedCream": "Crema Salada",
"milceryRubySwirl": "Mezcla Rosa",
"milceryCaramelSwirl": "Mezcla Caramelo",
"milceryRainbowSwirl": "Tres Sabores",
"eiscue": "Cara de Hielo",
"eiscueNoIce": "Cara Deshielo",
"indeedeeMale": "Macho",
"indeedeeFemale": "Hembra",
"morpekoFullBelly": "Saciada",
"morpekoHangry": "Voraz",
"zacianHeroOfManyBattles": "Guerrero avezado",
"zacianCrowned": "Espada Suprema",
"zamazentaHeroOfManyBattles": "Guerrero avezado",
"zamazentaCrowned": "Escudo Supremo",
"kubfuSingleStrike": "Estilo Brusco",
"kubfuRapidStrike": "Estilo Fluido",
"zarude": "Normal",
"zarudeDada": "Papá",
"calyrex": "Normal",
"calyrexIce": "Jinete Glacial",
"calyrexShadow": "Jinete Espectral",
"basculinMale": "Macho",
"basculinFemale": "Hembra",
"enamorusIncarnate": "Avatar",
"enamorusTherian": "Tótem",
"lechonkMale": "Macho",
"lechonkFemale": "Hembra",
"tandemausFour": "Familia de Cuatro",
"tandemausThree": "Familia de Tres",
"squawkabillyGreenPlumage": "Plumaje Verde",
"squawkabillyBluePlumage": "Plumaje Azul",
"squawkabillyYellowPlumage": "Plumaje Amarillo",
"squawkabillyWhitePlumage": "Plumaje Blanco",
"finizenZero": "Ingenua",
"finizenHero": "Heroica",
"tatsugiriCurly": "Curvada",
"tatsugiriDroopy": "Lánguida",
"tatsugiriStretchy": "Estirada",
"dunsparceTwo": "Binodular",
"dunsparceThree": "Trinodular",
"gimmighoulChest": "Cofre",
"gimmighoulRoaming": "Andante",
"koraidonApexBuild": "Forma Plena",
@ -164,6 +269,21 @@
"miraidonGlideMode": "Modo Planeo",
"poltchageistCounterfeit": "Fraudulenta",
"poltchageistArtisan": "Opulenta",
"poltchageistUnremarkable": "Mediocre",
"poltchageistMasterpiece": "Exquisita",
"ogerponTealMask": "Máscara Turquesa",
"ogerponTealMaskTera": "Máscara Turquesa Teracristal",
"ogerponWellspringMask": "Máscara Fuente",
"ogerponWellspringMaskTera": "Máscara Fuente Teracristal",
"ogerponHearthflameMask": "Máscara Horno",
"ogerponHearthflameMaskTera": "Máscara Horno Teracristal",
"ogerponCornerstoneMask": "Máscara Cimiento",
"ogerponCornerstoneMaskTera": "Máscara Cimiento Teracristal",
"terpagos": "Normal",
"terpagosTerastal": "Teracristal",
"terpagosStellar": "Astral",
"galarDarumaka": "Modo Normal",
"galarDarumakaZen": "Modo Daruma",
"paldeaTaurosCombat": "Combatiente",
"paldeaTaurosBlaze": "Ardiente",
"paldeaTaurosAqua": "Acuático"

View File

@ -98,5 +98,8 @@
"youngster": "Joven",
"aether_grunt": "Empleado de la Fundación Æther",
"aether_grunt_female": "Empleada de la Fundación Æther",
"aether_grunts": "Empleados de la Fundación Æther"
"aether_grunts": "Empleados de la Fundación Æther",
"star_grunt": "Star Grunt",
"star_grunt_female": "Star Grunt",
"star_grunts": "Star Grunts"
}

View File

@ -138,6 +138,15 @@
"rood": "Ruga",
"xerosic": "Xero",
"bryony": "Begonia",
"faba": "Fabio",
"plumeria": "Francine",
"oleana": "Olivia",
"giacomo": "Anán",
"mela": "Melo",
"atticus": "Henzo",
"ortega": "Gus",
"eri": "Erin",
"maxie": "Magno",
"archie": "Aquiles",
"cyrus": "Helio",
@ -145,6 +154,10 @@
"lysandre": "Lysson",
"faba": "Fabio",
"lusamine": "Samina",
"guzma": "Guzmán",
"rose": "Rose",
"cassiopeia": "Noa",
"blue_red_double": "Azul y Rojo",
"red_blue_double": "Rojo y Azul",
"tate_liza_double": "Vito y Leti",

View File

@ -17,6 +17,9 @@
"plasma_boss": "Team Plasma Boss",
"flare_boss": "Team Flare Boss",
"aether_boss": "Presidente Æther",
"skull_boss": "Team Skull Boss",
"macro_boss": "Macro Cosmos President",
"star_boss": "Team Star Leader",
"rocket_admin": "Team Rocket Admin",
"rocket_admin_female": "Team Rocket Admin",
@ -30,5 +33,8 @@
"plasma_admin": "Team Plasma Admin",
"flare_admin": "Team Flare Admin",
"flare_admin_female": "Team Flare Admin",
"aether_admin": "Director de la Fundación Æther"
"aether_admin": "Director de la Fundación Æther",
"skull_admin": "Team Skull Admin",
"macro_admin": "Macro Cosmos",
"star_admin": "Team Star Squad Boss"
}

View File

@ -1077,7 +1077,7 @@
},
"thermalExchange": {
"name": "Thermodynamique",
"description": "Lorsque le Pokémon est touché par une capacité de type Feu, il ne subit aucun dégât et son Attaque augmente."
"description": "Lorsque le Pokémon est touché par une capacité de type Feu, son Attaque augmente. Il ne peut pas être brulé."
},
"angerShell": {
"name": "Courroupace",
@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "Emprise Toxique",
"description": "Lorsque Pêchaminus empoisonne un Pokémon grâce à lune de ses capacités, ce dernier devient également confus."
"description": "Lorsque le Pokémon en empoisonne un autre grâce à lune de ses capacités, ce dernier devient également confus."
}
}

View File

@ -14,6 +14,10 @@
"moneyWon": "Vous remportez\n{{moneyAmount}} ₽ !",
"moneyPickedUp": "Vous obtenez {{moneyAmount}} ₽ !",
"pokemonCaught": "Vous avez attrapé\n{{pokemonName}} !",
"pokemonObtained": "Vous obtenez\nun {{pokemonName}} !",
"pokemonBrokeFree": "Oh non !\nLe Pokémon sest libéré !",
"pokemonFled": "Le {{pokemonName}} sauvage\nprend la fuite !",
"playerFled": "Vous fuyez le {{pokemonName}} !",
"addedAsAStarter": "{{pokemonName}} est ajouté\ncomme starter !",
"partyFull": "Votre équipe est pleine.\nRelâcher un Pokémon pour {{pokemonName}} ?",
"pokemon": "de Pokémon",
@ -65,6 +69,7 @@
"skipItemQuestion": "Êtes-vous sûr·e de ne pas vouloir prendre dobjet ?",
"itemStackFull": "Quantité maximale de {{fullItemName}} atteinte.\nVous recevez {{itemName}} à la place.",
"eggHatching": "Hein ?",
"eggSkipPrompt": "Aller directement au résumé des Œufs éclos ?",
"ivScannerUseQuestion": "Utiliser le Scanner dIV\nsur {{pokemonName}} ?",
"wildPokemonWithAffix": "{{pokemonName}} sauvage",
"foePokemonWithAffix": "{{pokemonName}} ennemi",
@ -99,7 +104,7 @@
"unlockedSomething": "{{unlockedThing}}\na été débloqué.",
"congratulations": "Félicitations !",
"beatModeFirstTime": "{{speciesName}} a battu le mode {{gameMode}} pour la première fois !\nVous avez reçu {{newModifier}} !",
"eggSkipPrompt": "Aller directement au résumé des Œufs éclos ?",
"ppReduced": "Les PP de la capacité {{moveName}}\nde{{targetName}} baissent de {{reduction}} !",
"battlerTagsHealBlock": "{{pokemonNameWithAffix}} ne peut pas guérir !",
"battlerTagsHealBlockOnRemove": "Le blocage de soins qui affectait\n{{pokemonNameWithAffix}} sest dissipé !"
}

View File

@ -83,9 +83,11 @@
"battle_aether_grunt": "SL - Vs. Fondation Æther",
"battle_skull_grunt": "SL - Vs. Team Skull",
"battle_macro_grunt": "ÉB - Vs. Macro Cosmos",
"battle_star_grunt": "ÉV - Vs. Team Star",
"battle_galactic_admin": "DÉPS - Vs. Admin Team Galaxie",
"battle_skull_admin": "SL - Vs. Admin Team Skull",
"battle_oleana": "ÉB - Vs. Liv",
"battle_star_admin": "ÉV - Vs. Boss de la Team Star",
"battle_rocket_boss": "USUL - Vs. Giovanni",
"battle_aqua_magma_boss": "ROSA - Vs. Arthur/Max",
"battle_galactic_boss": "DÉPS - Vs. Hélio",
@ -94,6 +96,7 @@
"battle_aether_boss": "SL - Vs. Elsa-Mina",
"battle_skull_boss": "SL - Vs. Guzma",
"battle_macro_boss": "ÉB - Vs. Shehroz",
"battle_star_boss": "ÉV - Vs. Cassiopée",
"abyss": "PDM EdC - Cratère Obscur",
"badlands": "PDM EdC - Vallée Stérile",
@ -108,17 +111,17 @@
"forest": "PDM EdC - Forêt Crépuscule",
"grass": "PDM EdC - Bois aux Pommes",
"graveyard": "PDM EdC - Forêt Trompeuse",
"ice_cave": "PDM EdC - Montagne Glacier",
"ice_cave": "Firel - -50°C",
"island": "PDM EdC - Côte Escarpée",
"jungle": "Lmz - Jungle",
"laboratory": "Firel - Laboratory",
"lake": "PDM EdC - Caverne Cristal",
"lake": "Lmz - Lake",
"meadow": "PDM EdC - Pic Céleste (forêt)",
"metropolis": "Firel - Metropolis",
"mountain": "PDM EdC - Mont Corne",
"plains": "PDM EdC - Pic Céleste (prairie)",
"power_plant": "PDM EdC - Plaines Élek",
"ruins": "PDM EdC - Ruine Scellée",
"plains": "Firel - Route 888",
"power_plant": "Firel - The Klink",
"ruins": "Lmz - Ancient Ruins",
"sea": "Andr06 - Marine Mystique",
"seabed": "Firel - Seabed",
"slum": "Andr06 - Sneaky Snom",
@ -128,7 +131,7 @@
"tall_grass": "PDM EdC - Forêt Brumeuse",
"temple": "PDM EdC - Grotte Égide",
"town": "PDM EdC - Donjon aléatoire - Thème 3",
"volcano": "PDM EdC - Grotte Étuve",
"volcano": "Firel - Twisturn Volcano",
"wasteland": "PDM EdC - Terres Illusoires",
"encounter_ace_trainer": "NB - Regards croisés (Topdresseur·euse)",
"encounter_backpacker": "NB - Regards croisés (Randonneur·euse)",

View File

@ -344,12 +344,17 @@
"1": "Hop hop hop ! Terminus !",
"2": "Tes un Dresseur nest-ce pas ?\n$Jai bien peur ce que ne soit pas une excuse suffisante pour nous interrompre dans notre travail.",
"2_female": "Tes une Dresseuse nest-ce pas ?\n$Jai bien peur ce que ne soit pas une excuse suffisante pour nous interrompre dans notre travail.",
"3": "Je travaille à Macro Cosmos Assurances !\nBesoin dune assurance-vie ?"
"3": "Je travaille à Macro Cosmos Assurances !\nBesoin dune assurance-vie ?",
"4": "Trouvé !\nPetit interlude combat !",
"4_female": "Trouvée !\nPetit interlude combat !",
"5": "Une soufflante de la part de madame Liv est la pire chose qui puisse arriver !"
},
"victory": {
"1": "Je nai dautre choix que respectueusement me retirer.",
"2": "Mon argent de poche…\nPlus quà manger des pâtes pour la fin du mois…",
"3": "Chez Macro Cosmos, rien nest comparable à notre dévotion au travail !"
"3": "Chez Macro Cosmos, rien nest comparable à notre dévotion au travail !",
"4": "Jai même pensé à chager de Pokémon en combat…",
"5": "Combattre ne sert à rien…\nPlus quà me barrer !"
}
},
"oleana": {
@ -365,6 +370,77 @@
"3": "*soupir* Je suis fatiguée parton…"
}
},
"star_grunt": {
"encounter": {
"1": "Ouais, un peu de respect, tu veux ?\n Tu sais à qui tas affaire ?",
"2": "Notre comité daccueil va pas te faire de cadeau ! Hasta la vistaaar ! ★",
"3": "Tu peux aller voir ailleurs si jy suis ?\n$Si tu refuses, je mautorise à faire valoir mes droits de légitime défense, je te préviens !",
"4": "Désolé, mais si tu refuses de partir, on sera obligés de ty forcer, et ça sera pas joli joli.",
"4_female": "Désolé, mais si tu refuses de partir, on sera obligés de ty forcer, et ça sera pas joli joli.",
"5": "Quoi ? Toi aussi, tes venu me casser les pieds ? Cest vraiment pas ma journée…",
"5_female": "Quoi ? Toi aussi, tes venue me casser les pieds ? Cest vraiment pas ma journée…"
},
"victory": {
"1": "Comment c'est ça peut être moi qui voit les étoiles ?!",
"2": "Ten as dans le ventre.\n$Tas peut-être ce quil faut pour te faire une place dans la constellation de la Team Star.",
"3": "Ma défense était pourtant bonne…\nMais cétait pas assez visiblement !",
"4": "Ha… hasta la vistar… ☆",
"5": "Jaurais jamais cru quêtre Sbire de la Team Star serait un tel fadeau…"
}
},
"giacomo": {
"encounter": {
"1": "Tu dois vraiment pas tenir à ta life pour défier la Team Star comme ça !",
"2": "Tends un peu loreille… Tu lentends ?\nCest ton requiem !"
},
"victory": {
"1": "Pfff, quelle ironie, franchement…",
"2": "Jpensais pas jouer le refrain de ma défaite…"
}
},
"mela": {
"encounter": {
"1": "Alors, cest toi le guedin quose nous défier ?\nSois prêt pour ta raclée.",
"1_female": "Alors, cest toi la guedin quose nous défier ?\nSois prête pour ta raclée.",
"2": "Y a pas à dire, tes bien une tête brûlée !\nMais fais gaffe, jen ai aussi sous lcapot !"
},
"victory": {
"1": "Quoi, cest comme ça quça finit ?\nPfff… Jai la haine…",
"2": "Jvoulais tout bruler… Mais jme suis juste consumée.\nY reste plus rien."
}
},
"atticus": {
"encounter": {
"1": "Tas vraiment du cran de venir provoquer la Team Star.\nDestinée fatale - Au poison succombera - Lennemi juré.",
"1_female": "Tas vraiment du cran de venir provoquer la Team Star.\nDestinée fatale - Au poison succombera - Lennemie jurée.",
"2": "Vive expectative - Respect et adversité - Combat au sommet."
},
"victory": {
"1": "Pardon, mes amis…",
"2": "Ta victoire névoque en moi ni rancune ni douleur.\nMon âme est en paix et jaccepte ma défaite."
}
},
"ortega": {
"encounter": {
"1": "Jvais bien moccuper de toi, alors viens pas pleurer si tu perds.",
"2": "Tas beau avoir lair sûr de toi, aujourdhui, cest moi qui vais gagner. Je te le garantis !",
"2_female": "Tas beau avoir lair sûr de toi, aujourdhui, cest moi qui vais gagner. Je te le garantis !"
},
"victory": {
"1": "Hein ? Jai perdu ? Mais pourquoi ?!\nPourquoi, pourquoi, pourquoi, POURQUOI ?!",
"2": "Mais pourquoi ça fonctionne pas ?!"
}
},
"eri": {
"encounter": {
"1": "Jignore tes intentions, mais mon rôle est danéantir quiconque sattaque à la Team Star !",
"2": "Si on mattaque, je riposte ! Nous verrons bien qui de nous deux restera debout à la fin !"
},
"victory": {
"1": "Les amis…\nJe suis désolée…",
"2": "Jai donné mon maximum… et pourtant…\nÇa na pas suffi… Jai échoué…"
}
},
"rocket_boss_giovanni_1": {
"encounter": {
"1": "Bien. Je dois admettre que je suis impressionné de te voir ici !"
@ -499,6 +575,28 @@
"1": "Les ignorants sans aucune vision nauront donc de cesse de souiller ce monde."
}
},
"star_boss_penny_1": {
"encounter": {
"1": "Je suis la Big Boss de la Team Star, Cassiopée…\n$Incline-toi devant la toute-puissance de la Big Boss !!!"
},
"victory": {
"1": "… … …"
},
"defeat": {
"1": "Hé…"
}
},
"star_boss_penny_2": {
"encounter": {
"1": "Le code dhonneur de la Team Star exige que nous donnions le maximum en combat !\n$Par le pouvoir de lÉvolition, on va te réduire en poussière détoiles !"
},
"victory": {
"1": "… Tout est fini"
},
"defeat": {
"1": "Tu es redoutable.\nPas étonnant que les boss de la Team aient perdu contre toi."
}
},
"brock": {
"encounter": {
"1": "Mon expertise des types Roche va te mettre au sol ! En garde !",

View File

@ -66,6 +66,7 @@
"suppressAbilities": "Le talent de {{pokemonName}}\na été rendu inactif !",
"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}} !",
"chillyReception": "{{pokemonName}} sapprête\nà faire un mauvais jeu de mots…",
"exposedMove": "{{targetPokemonName}} est identifié\npar {{pokemonName}} !",
"safeguard": "{{targetName}} est protégé\npar la capacité Rune Protect !",
"substituteOnOverlap": "{{pokemonName}} a déjà\nun clone !",

View File

@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "Roue Libre",
"effect": "Inflige et change en type Ténèbres"
"effect": "Le Pokémon libère lénergie stockée dans ses joues pour attaquer et augmenter sa Vitesse. Le type de cette capacité change en fonction de la forme du lanceur."
},
"breakingSwipe": {
"name": "Abattage",

View File

@ -1,4 +1,5 @@
{
"pikachu": "Normal",
"pikachuCosplay": "Cosplayeur",
"pikachuCoolCosplay": "Cosplay Rockeur",
"pikachuBeautyCosplay": "Cosplay Lady",
@ -6,7 +7,9 @@
"pikachuSmartCosplay": "Cosplay Docteur",
"pikachuToughCosplay": "Cosplay Catcheur",
"pikachuPartner": "Partenaire",
"eevee": "Normal",
"eeveePartner": "Partenaire",
"pichu": "Normal",
"pichuSpiky": "Troizépi",
"unownA": "A",
"unownB": "B",
@ -36,36 +39,65 @@
"unownZ": "Z",
"unownExclamation": "!",
"unownQuestion": "?",
"castform": "Normal Form",
"castformSunny": "Solaire",
"castformRainy": "Eau de Pluie",
"castformSnowy": "Blizzard",
"deoxysNormal": "Normal",
"deoxysAttack": "Attaque",
"deoxysDefense": "Défense",
"deoxysSpeed": "Vitesse",
"burmyPlant": "Plante",
"burmySandy": "Sable",
"burmyTrash": "Déchet",
"cherubiOvercast": "Couvert",
"cherubiSunshine": "Ensoleillé",
"shellosEast": "Orient",
"shellosWest": "Occident",
"rotom": "Normal",
"rotomHeat": "Chaleur",
"rotomWash": "Lavage",
"rotomFrost": "Froid",
"rotomFan": "Hélice",
"rotomMow": "Tonte",
"dialga": "Normal",
"dialgaOrigin": "Originel",
"palkia": "Normal",
"palkiaOrigin": "Originel",
"giratinaAltered": "Alternatif",
"giratinaOrigin": "Originel",
"shayminLand": "Terrestre",
"shayminSky": "Céleste",
"basculinRedStriped": "Motif Rouge",
"basculinBlueStriped": "Motif Bleu",
"basculinWhiteStriped": "Motif Blanc",
"darumaka": "Mode Normal",
"darumakaZen": "Mode Transe",
"deerlingSpring": "Printemps",
"deerlingSummer": "Été",
"deerlingAutumn": "Automne",
"deerlingWinter": "Hiver",
"tornadusIncarnate": "Avatar",
"tornadusTherian": "Totémique",
"thundurusIncarnate": "Avatar",
"thundurusTherian": "Totémique",
"landorusIncarnate": "Avatar",
"landorusTherian": "Totémique",
"kyurem": "Normal",
"kyuremBlack": "Noir",
"kyuremWhite": "Blanc",
"keldeoOrdinary": "Normal",
"keldeoResolute": "Décidé",
"meloettaAria": "Chant",
"meloettaPirouette": "Danse",
"genesect": "Normal",
"genesectShock": "Module Choc",
"genesectBurn": "Module Pyro",
"genesectChill": "Module Cryo",
"genesectDouse": "Module Aqua",
"froakie": "Normal",
"froakieBattleBond": "Synergie",
"froakieAsh": "Sachanobi",
"scatterbugMeadow": "Floraison",
"scatterbugIcySnow": "Blizzard",
"scatterbugPolar": "Banquise",
@ -91,6 +123,7 @@
"flabebeOrange": "Orange",
"flabebeBlue": "Bleu",
"flabebeWhite": "Blanc",
"furfrou": "Sauvage",
"furfrouHeart": "Cœur",
"furfrouStar": "Étoile",
"furfrouDiamond": "Diamant",
@ -100,21 +133,52 @@
"furfrouLaReine": "Reine",
"furfrouKabuki": "Kabuki",
"furfrouPharaoh": "Pharaon",
"pumpkabooSmall": "Mini",
"pumpkabooLarge": "Maxi",
"pumpkabooSuper": "Ultra",
"espurrMale": "Mâle",
"espurrFemale": "Femelle",
"honedgeShiled": "Parade",
"honedgeBlade": "Assaut",
"pumpkaboo": "Taille Normale",
"pumpkabooSmall": "Taille Mini",
"pumpkabooLarge": "Taille Maxi",
"pumpkabooSuper": "Taille Ultra",
"xerneasNeutral": "Paisible",
"xerneasActive": "Déchaîné",
"xerneasActive": "Déchainé",
"zygarde50": "Forme 50%",
"zygarde10": "Forme 10%",
"zygarde50Pc": "Rassemblement Forme 50%",
"zygarde10Pc": "Rassemblement Forme 10%",
"hoopa": "Enchainé",
"hoopaUnbound": "Déchainé",
"zygardeComplete": "Parfait",
"oricorioBaile": "Flamenco",
"oricorioPompom": "Pom-Pom",
"oricorioPau": "Hula",
"oricorioSensu": "Buyō",
"rockruff": "Normal",
"rockruffOwnTempo": "Tempo Perso",
"rockruffMidday": "Diurne",
"rockruffMidnight": "Nocturne",
"rockruffDusk": "Crépusculaire",
"wishiwashi": "Solitaire",
"wishiwashiSchool": "Banc",
"typeNullNormal": "Type: Normal",
"typeNullFighting": "Type: Combat",
"typeNullFlying": "Type: Vol",
"typeNullPoison": "Type: Poison",
"typeNullGround": "Type: Sol",
"typeNullRock": "Type: Roche",
"typeNullBug": "Type: Insecte",
"typeNullGhost": "Type: Spectre",
"typeNullSteel": "Type: Acier",
"typeNullFire": "Type: Feu",
"typeNullWater": "Type: Eau",
"typeNullGrass": "Type: Plante",
"typeNullElectric": "Type: Électrik",
"typeNullPsychic": "Type: Psy",
"typeNullIce": "Type: Glace",
"typeNullDragon": "Type: Dragon",
"typeNullDark": "Type: Ténèbres",
"typeNullFairy": "Type: Fée",
"miniorRedMeteor": "Météore Rouge",
"miniorOrangeMeteor": "Météore Orange",
"miniorYellowMeteor": "Météore Jaune",
@ -131,25 +195,66 @@
"miniorViolet": "Violet",
"mimikyuDisguised": "Déguisé",
"mimikyuBusted": "Démasqué",
"necrozma": "Normal",
"necrozmaDuskMane": "Crinière du Couchant",
"necrozmaDawnWings": "Ailes de lAurore",
"necrozmaUltra": "Ultra",
"magearna": "Normal",
"magearnaOriginal": "Couleur du Passé",
"marshadow": "Normal",
"marshadowZenith": "Zénith",
"cramorant": "Normal",
"cramorantGulping": "Gobe-Tout",
"cramorantGorging": "Gobe-Chu",
"toxelAmped": "Aigu",
"toxelLowkey": "Grave",
"sinisteaPhony": "Contrefaçon",
"sinisteaAntique": "Authentique",
"milceryVanillaCream": "Lait Vanille",
"milceryRubyCream": "Lait Ruby",
"milceryMatchaCream": "Lait Matcha",
"milceryMintCream": "Lait Menthe",
"milceryLemonCream": "Lait Citron",
"milcerySaltedCream": "Lait Salé",
"milceryRubySwirl": "Mélange Ruby",
"milceryCaramelSwirl": "Mélange Caramel",
"milceryRainbowSwirl": "Mélange Tricolore",
"eiscue": "Tête de Gel",
"eiscueNoIce": "Tête Dégel",
"indeedeeMale": "Mâle",
"indeedeeFemale": "Femelle",
"morpekoFullBelly": "Rassasié",
"morpekoHangry": "Affamé",
"zacianHeroOfManyBattles": "Héros Aguerri",
"zacianCrowned": "Épée Suprême",
"zamazentaHeroOfManyBattles": "Héros Aguerri",
"zamazentaCrowned": "Bouclier Suprême",
"kubfuSingleStrike": "Poing Final",
"kubfuRapidStrike": "Mille Poings",
"zarude": "Normal",
"zarudeDada": "Papa",
"calyrex": "Normal",
"calyrexIce": "Cavalier du Froid",
"calyrexShadow": "Cavalier dEffroi",
"basculinMale": "Mâle",
"basculinFemale": "Femelle",
"enamorusIncarnate": "Avatar",
"enamorusTherian": "Totémique",
"lechonkMale": "Mâle",
"lechonkFemale": "Femelle",
"tandemausFour": "Famille de Quatre",
"tandemausThree": "Famille de Trois",
"squawkabillyGreenPlumage": "Plumage Vert",
"squawkabillyBluePlumage": "Plumage Bleu",
"squawkabillyYellowPlumage": "Plumage Jaune",
"squawkabillyWhitePlumage": "Plumage Blanc",
"finizenZero": "Ordinaire",
"finizenHero": "Super",
"tatsugiriCurly": "Courbé",
"tatsugiriDroopy": "Affalé",
"tatsugiriStretchy": "Raide",
"dunsparceTwo": "Double",
"dunsparceThree": "Triple",
"gimmighoulChest": "Coffre",
"gimmighoulRoaming": "Marche",
"koraidonApexBuild": "Final",
@ -164,7 +269,22 @@
"miraidonGlideMode": "Aérien",
"poltchageistCounterfeit": "Imitation",
"poltchageistArtisan": "Onéreux",
"poltchageistUnremarkable": "Médiocre",
"poltchageistMasterpiece": "Exceptionnelle",
"ogerponTealMaskTera": "Masque Turquoise",
"ogerponTealMask": "Masque Turquoise Téracristal",
"ogerponWellspringMask": "Masque du Puits",
"ogerponWellspringMaskTera": "Masque du Puits Téracristal",
"ogerponHearthflameMask": "Masque du Fourneau",
"ogerponHearthflameMaskTera": "Masque du Fourneau Téracristal",
"ogerponCornerstoneMask": "Masque de la Pierre",
"ogerponCornerstoneMaskTera": "Masque de la Pierre Téracristal",
"terpagos": "Normal",
"terpagosTerastal": "Téracristal",
"terpagosStellar": "Stellaire",
"galarDarumaka": "Mode Normal",
"galarDarumakaZen": "Mode Transe",
"paldeaTaurosCombat": "Combatif",
"paldeaTaurosBlaze": "Flamboyant",
"paldeaTaurosAqua": "Aquatique"
}
}

View File

@ -126,5 +126,8 @@
"skull_grunts": "Sbires de la Team Skull",
"macro_grunt": "Employé de Macro Cosmos",
"macro_grunt_female": "Employée de Macro Cosmos",
"macro_grunts": "Employés de Macro Cosmos"
"macro_grunts": "Employés de Macro Cosmos",
"star_grunt": "Sbire de la Team Star",
"star_grunt_female": "Sbire de la Team Star",
"star_grunts": "Sbires de la Team Star"
}

View File

@ -141,6 +141,11 @@
"faba": "Saubohne",
"plumeria": "Apocyne",
"oleana": "Liv",
"giacomo": "Brome",
"mela": "Meloco",
"atticus": "Erio",
"ortega": "Ortiga",
"eri": "Nèflie",
"maxie": "Max",
"archie": "Arthur",
@ -150,6 +155,7 @@
"lusamine": "Elsa-Mina",
"guzma": "Guzma",
"rose": "Shehroz",
"cassiopeia": "Pania",
"blue_red_double": "Blue & Red",
"red_blue_double": "Red & Blue",

View File

@ -19,6 +19,7 @@
"aether_boss": "Présidente dÆther",
"skull_boss": "Boss de la Team Skull",
"macro_boss": "Président de Macro Cosmos",
"star_boss": "Leader de la Team Star",
"rocket_admin": "Admin Team Rocket",
"rocket_admin_female": "Admin Team Rocket",
@ -34,5 +35,6 @@
"flare_admin_female": "Manageuse de la Team Flare",
"aether_admin": "Directeur dÆther",
"skull_admin": "Admin Team Skull",
"macro_admin": "Macro Cosmos"
"macro_admin": "Macro Cosmos",
"star_admin": "Boss déquipe de la Team Star"
}

View File

@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "\tMalia Tossica",
"description": "I Pokémon avvelenati dalle mosse di Pecharunt entreranno anche in stato di confusione."
"description": "I Pokémon avvelenati dalle mosse di questo Pokémon entreranno anche in stato di confusione."
}
}

View File

@ -66,6 +66,7 @@
"revivalBlessing": "{{pokemonName}} torna in forze!",
"swapArenaTags": "{{pokemonName}} ha invertito gli effetti attivi\nnelle due metà del campo!",
"exposedMove": "{{pokemonName}} ha identificato\n{{targetPokemonName}}!",
"chillyReception": "{{pokemonName}} sta per fare una battuta!",
"safeguard": "Salvaguardia protegge {{targetName}}!",
"afterYou": "{{pokemonName}} approfitta della cortesia!"
}

View File

@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "Ruota d'Aura",
"effect": "Il Pokémon emette l'energia accumulata nelle guance per attaccare e aumentare la Velocità. Il tipo della mossa cambia in base alla forma assunta da Morpeko."
"effect": "Il Pokémon emette l'energia accumulata nelle guance per attaccare e aumentare la Velocità. Se usata da Morpeko, il tipo della mossa cambia in base alla forma assunta."
},
"breakingSwipe": {
"name": "Vastoimpatto",

View File

@ -1,4 +1,5 @@
{
"pikachu": "Normale",
"pikachuCosplay": "Cosplay",
"pikachuCoolCosplay": "Cosplay classe",
"pikachuBeautyCosplay": "Cosplay bellezza",
@ -6,7 +7,9 @@
"pikachuSmartCosplay": "Cosplay acume",
"pikachuToughCosplay": "Cosplay grinta",
"pikachuPartner": "Compagno",
"eevee": "Normale",
"eeveePartner": "Compagno",
"pichu": "Normale",
"pichuSpiky": "Spunzorek",
"unownA": "A",
"unownB": "B",
@ -36,36 +39,65 @@
"unownZ": "Z",
"unownExclamation": "!",
"unownQuestion": "?",
"castform": "Normale",
"castformSunny": "Sole",
"castformRainy": "Pioggia",
"castformSnowy": "Nuvola di neve",
"deoxysNormal": "Normale",
"deoxysAttack": "Attacco",
"deoxysDefense": "Difesa",
"deoxysSpeed": "Velocità",
"burmyPlant": "Pianta",
"burmySandy": "Sabbia",
"burmyTrash": "Scarti",
"cherubiOvercast": "Nuvola",
"cherubiSunshine": "Splendore",
"shellosEast": "Est",
"shellosWest": "Ovest",
"rotom": "Normale",
"rotomHeat": "Calore",
"rotomWash": "Lavaggio",
"rotomFrost": "Gelo",
"rotomFan": "Vortice",
"rotomMow": "Taglio",
"dialga": "Normale",
"dialgaOrigin": "Originale",
"palkia": "Normale",
"palkiaOrigin": "Originale",
"giratinaAltered": "Alterata",
"giratinaOrigin": "Originale",
"shayminLand": "Terra",
"shayminSky": "Cielo",
"basculinRedStriped": "Linearossa",
"basculinBlueStriped": "Lineablu",
"basculinWhiteStriped": "Lineabianca",
"darumaka": "Stato Normale",
"darumakaZen": "Stato Zen",
"deerlingSpring": "Primavera",
"deerlingSummer": "Estate",
"deerlingAutumn": "Autunno",
"deerlingWinter": "Inverno",
"tornadusIncarnate": "Incarnazione",
"tornadusTherian": "Totem",
"thundurusIncarnate": "Incarnazione",
"thundurusTherian": "Totem",
"landorusIncarnate": "Incarnazione",
"landorusTherian": "Totem",
"kyurem": "Normale",
"kyuremBlack": "Nero",
"kyuremWhite": "Bianco",
"keldeoOrdinary": "Normale",
"keldeoResolute": "Risoluta",
"meloettaAria": "Canto",
"meloettaPirouette": "Danza",
"genesect": "Normale",
"genesectShock": "Voltmodulo",
"genesectBurn": "Piromodulo",
"genesectChill": "Gelomodulo",
"genesectDouse": "Idromodulo",
"froakie": "Normale",
"froakieBattleBond": "Morfosintonia",
"froakieAsh": "Ash",
"scatterbugMeadow": "Giardinfiore",
"scatterbugIcySnow": "Nevi perenni",
"scatterbugPolar": "Nordico",
@ -91,6 +123,7 @@
"flabebeOrange": "Arancione",
"flabebeBlue": "Blu",
"flabebeWhite": "Bianco",
"furfrou": "Selvatica",
"furfrouHeart": "Cuore",
"furfrouStar": "Stella",
"furfrouDiamond": "Diamante",
@ -100,21 +133,52 @@
"furfrouLaReine": "Regina",
"furfrouKabuki": "Kabuki",
"furfrouPharaoh": "Faraone",
"espurrMale": "Maschio",
"espurrFemale": "Femmina",
"honedgeShiled": "Scudo",
"honedgeBlade": "Spada",
"pumpkaboo": "Normale",
"pumpkabooSmall": "Mini",
"pumpkabooLarge": "Grande",
"pumpkabooSuper": "Maxi",
"xerneasNeutral": "Relax",
"xerneasActive": "Attivo",
"zygarde50": "Forma 50%",
"zygarde10": "Forma 10%",
"zygarde50Pc": "Forma 50% Sciamefusione",
"zygarde10Pc": "Forma 10% Sciamefusione",
"zygardeComplete": "Forma perfetta",
"zygarde50": "50%",
"zygarde10": "10%",
"zygarde50Pc": "50% Sciamefusione",
"zygarde10Pc": "10% Sciamefusione",
"zygardeComplete": "perfetta",
"hoopa": "Vincolato",
"hoopaUnbound": "Libero",
"oricorioBaile": "Flamenco",
"oricorioPompom": "Cheerdance",
"oricorioPau": "Hula",
"oricorioSensu": "Buyō",
"rockruff": "Normale",
"rockruffOwnTempo": "Mentelocale",
"rockruffMidday": "Giorno",
"rockruffMidnight": "Notte",
"rockruffDusk": "Crepuscolo",
"wishiwashi": "Individuale",
"wishiwashiSchool": "Banco",
"typeNullNormal": "Tipo Normale",
"typeNullFighting": "Tipo Lotta",
"typeNullFlying": "Tipo Volante",
"typeNullPoison": "Tipo Veleno",
"typeNullGround": "Tipo Terra",
"typeNullRock": "Tipo Roccia",
"typeNullBug": "Tipo Coleottero",
"typeNullGhost": "Tipo Spettro",
"typeNullSteel": "Tipo Acciaio",
"typeNullFire": "Tipo Fuoco",
"typeNullWater": "Tipo Acqua",
"typeNullGrass": "Tipo Erba",
"typeNullElectric": "Tipo Elettro",
"typeNullPsychic": "Tipo Psico",
"typeNullIce": "Tipo Ghiaccio",
"typeNullDragon": "Tipo Drago",
"typeNullDark": "Tipo Buio",
"typeNullFairy": "Tipo Folletto",
"miniorRedMeteor": "Nucleo Rosso",
"miniorOrangeMeteor": "Nucleo Arancione",
"miniorYellowMeteor": "Nucleo Giallo",
@ -131,25 +195,66 @@
"miniorViolet": "Violetto",
"mimikyuDisguised": "Mascherata",
"mimikyuBusted": "Smascherata",
"necrozma": "Normale",
"necrozmaDuskMane": "Criniera del Vespro",
"necrozmaDawnWings": "Ali dell'Aurora",
"necrozmaUltra": "Ultra",
"magearna": "Normale",
"magearnaOriginal": "Colore Antico",
"marshadow": "Normale",
"marshadowZenith": "Zenith",
"cramorant": "Normale",
"cramorantGulping": "Inghiottitutto",
"cramorantGorging": "Inghiottintero",
"toxelAmped": "Melodia",
"toxelLowkey": "Basso",
"sinisteaPhony": "Contraffatta",
"sinisteaAntique": "Autentica",
"milceryVanillaCream": "Lattevaniglia",
"milceryRubyCream": "Latterosa",
"milceryMatchaCream": "Lattematcha",
"milceryMintCream": "Lattementa",
"milceryLemonCream": "Lattelimone",
"milcerySaltedCream": "Lattesale",
"milceryRubySwirl": "Rosamix",
"milceryCaramelSwirl": "Caramelmix",
"milceryRainbowSwirl": "Triplomix",
"eiscue": "Gelofaccia",
"eiscueNoIce": "Liquefaccia",
"indeedeeMale": "Maschio",
"indeedeeFemale": "Femmina",
"morpekoFullBelly": "Panciapiena",
"morpekoHangry": "Panciavuota",
"zacianHeroOfManyBattles": "Eroe di Mille Lotte",
"zacianCrowned": "Re delle Spade",
"zamazentaHeroOfManyBattles": "Eroe di Mille Lotte",
"zamazentaCrowned": "Re degli Scudi",
"kubfuSingleStrike": "Singolcolpo",
"kubfuRapidStrike": "Pluricolpo",
"zarude": "Normale",
"zarudeDada": "Papà",
"calyrex": "Normale",
"calyrexIce": "Cavaliere Glaciale",
"calyrexShadow": "Cavaliere Spettrale",
"basculinMale": "Maschio",
"basculinFemale": "Femmina",
"enamorusIncarnate": "Incarnazione",
"enamorusTherian": "Totem",
"lechonkMale": "Maschio",
"lechonkFemale": "Femmina",
"tandemausFour": "Quadrifamiglia",
"tandemausThree": "Trifamiglia",
"squawkabillyGreenPlumage": "Piume Verdi",
"squawkabillyBluePlumage": "Piume Azzurre",
"squawkabillyYellowPlumage": "Piume Gialle",
"squawkabillyWhitePlumage": "Piume Bianche",
"finizenZero": "Ingenua",
"finizenHero": "Possente",
"tatsugiriCurly": "Arcuata",
"tatsugiriDroopy": "Adagiata",
"tatsugiriStretchy": "Tesa",
"dunsparceTwo": "Bimetamero",
"dunsparceThree": "Trimetamero",
"gimmighoulChest": "Scrigno",
"gimmighoulRoaming": "Ambulante",
"koraidonApexBuild": "Foggia Integrale",
@ -164,7 +269,22 @@
"miraidonGlideMode": "Assetto Planata",
"poltchageistCounterfeit": "Taroccata",
"poltchageistArtisan": "Pregiata",
"poltchageistUnremarkable": "Dozzinale",
"poltchageistMasterpiece": "Eccezionale",
"ogerponTealMask": "Maschera Turchese",
"ogerponTealMaskTera": "Maschera Turchese Teracristal",
"ogerponWellspringMask": "Maschera Pozzo",
"ogerponWellspringMaskTera": "Maschera Pozzo Teracristal",
"ogerponHearthflameMask": "Maschera Focolare",
"ogerponHearthflameMaskTera": "Maschera Focolare Teracristal",
"ogerponCornerstoneMask": "Maschera Fondamenta",
"ogerponCornerstoneMaskTera": "Maschera Fondamenta Teracristal",
"terpagos": "Normale",
"terpagosTerastal": "Teracristal",
"terpagosStellar": "Astrale",
"galarDarumaka": "Normale",
"galarDarumakaZen": "Stato Zen",
"paldeaTaurosCombat": "Combattiva",
"paldeaTaurosBlaze": "Infuocata",
"paldeaTaurosAqua": "Acquatica"
}
}

View File

@ -126,5 +126,8 @@
"skull_grunts": "Reclute Team Skull",
"macro_grunt": "Impiegato Macro Cosmos",
"macro_grunt_female": "Impiegata Macro Cosmos",
"macro_grunts": "Impiegati Macro Cosmos"
"macro_grunts": "Impiegati Macro Cosmos",
"star_grunt": "Recluta Team Star",
"star_grunt_female": "Recluta Team Star",
"star_grunts": "Reclute Team Star"
}

View File

@ -139,6 +139,13 @@
"xerosic": "Xante",
"bryony": "Bromelia",
"faba": "Vicio",
"plumeria": "Plumeria",
"oleana": "Olive",
"giacomo": "Romelio",
"mela": "Pruna",
"atticus": "Henzo",
"ortega": "Ortiz",
"eri": "Nespera",
"maxie": "Max",
"archie": "Ivan",
@ -147,6 +154,9 @@
"lysandre": "Elisio",
"lusamine": "Samina",
"guzma": "Guzman",
"rose": "Rose",
"cassiopeia": "Penny",
"blue_red_double": "Blu & Rosso",
"red_blue_double": "Rosso & Blu",
"tate_liza_double": "Tell & Pat",

View File

@ -19,6 +19,7 @@
"aether_boss": "Direttrice Æther",
"skull_boss": "Capo Team Skull",
"macro_boss": "Presidente Macro Cosmos",
"star_boss": "Arcicapo Team Star",
"rocket_admin": "Tenente Team Rocket",
"rocket_admin_female": "Tenente Team Rocket",
@ -34,6 +35,7 @@
"flare_admin_female": "Ufficiale Team Flare",
"aether_admin": "Capo Filiale Æther",
"skull_admin": "Ufficiale Team Skull",
"macro_admin": "Vicepresidente Macro Cosmos"
"macro_admin": "Vicepresidente Macro Cosmos",
"star_admin": "Capobanda Team Star"
}

View File

@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "どくくぐつ",
"description": "モモワロウの 技によって どく状態に なった 相手は こんらん状態にも なってしまう。"
"description": "このポケモンの 技によって どく状態に なった 相手は こんらん状態にも なってしまう。"
}
}

View File

@ -83,9 +83,11 @@
"battle_aether_grunt": "SM 戦闘!エーテル財団トレーナー",
"battle_skull_grunt": "SM 戦闘!スカル団",
"battle_macro_grunt": "SWSH 戦闘!トレーナー",
"battle_star_grunt": "SV 戦闘スター団",
"battle_galactic_admin": "BDSP 戦闘!ギンガ団幹部",
"battle_skull_admin": "SM 戦闘!スカル団幹部",
"battle_oleana": "SWSH 戦闘!オリーヴ",
"battle_star_admin": "SV 戦闘スター団ボス",
"battle_rocket_boss": "USUM 戦闘!レインボーロケット団ボス",
"battle_aqua_magma_boss": "ORAS 戦闘!アクア団・マグマ団のリーダー",
"battle_galactic_boss": "BDSP 戦闘!ギンガ団ボス",
@ -94,6 +96,7 @@
"battle_aether_boss": "SM 戦闘!ルザミーネ",
"battle_skull_boss": "SM 戦闘!スカル団ボス",
"battle_macro_boss": "SWSH 戦闘!ローズ",
"battle_star_boss": "SV 戦闘カシオペア",
"abyss": "ポケダン空 やみのかこう",
"badlands": "ポケダン空 こかつのたに",
@ -108,17 +111,17 @@
"forest": "ポケダン空 くろのもり",
"grass": "ポケダン空 リンゴのもり",
"graveyard": "ポケダン空 しんぴのもり",
"ice_cave": "ポケダン空 だいひょうざん",
"ice_cave": "Firel - -50°C",
"island": "ポケダン空 えんがんのいわば",
"jungle": "Lmz - Jungle(ジャングル)",
"laboratory": "Firel - Laboratory(ラボラトリー)",
"lake": "ポケダン空 すいしょうのどうくつ",
"lake": "Lmz - Lake(湖)",
"meadow": "ポケダン空 そらのいただき(もり)",
"metropolis": "Firel - Metropolis(大都市)",
"mountain": "ポケダン空 ツノやま",
"plains": "ポケダン空 そらのいただき(そうげん)",
"power_plant": "ポケダン空 エレキへいげん",
"ruins": "ポケダン空 ふういんのいわば",
"plains": "Firel - Route 888(888ばんどうろ)",
"power_plant": "Firel - The Klink(ザ・ギアル)",
"ruins": "Lmz - Ancient Ruins",
"sea": "Andr06 - Marine Mystique(海の神秘性)",
"seabed": "Firel - Seabed(海底)",
"slum": "Andr06 - Sneaky Snom(ずるいユキハミ)",
@ -128,7 +131,7 @@
"tall_grass": "ポケダン空 のうむのもり",
"temple": "ポケダン空 ばんにんのどうくつ",
"town": "ポケダン空 ランダムダンジョン3",
"volcano": "ポケダン空 ねっすいのどうくつ",
"volcano": "Firel - Twisturn Volcano(曲がる折れる火山)",
"wasteland": "ポケダン空 まぼろしのだいち",
"encounter_ace_trainer": "BW 視線!エリートトレーナー",
"encounter_backpacker": "BW 視線!バックパッカー",

View File

@ -764,12 +764,16 @@
"1": "不審者を 追い払って\nたんまり ボーナス いただくぜ",
"2": "ジャマは 許しません!\n$マクロコスモスの さまざまな\n関連会社を 守るためにも 追い返します",
"2_female": "ジャマは 許しません!\n$マクロコスモスの さまざまな\n関連会社を 守るためにも 追い返します",
"3": "マクロコスモス生命です!\n保険に 入っていますか"
"3": "マクロコスモス生命です!\n保険に 入っていますか",
"4": "見つけた! では 勝負だ!",
"5": "オリーヴさまに 怒られたくないから あきらめない!"
},
"victory": {
"1": "ボーナスが……\n夢の マイホームが……",
"2": "負けたからには\n素直に 引き下がりましょう。\n$だが ローズ委員長の\nジャマは しないでくださいよ。",
"3": "マクロコスモス生命の 仕事なら\n誰にも 負けないのに…"
"3": "マクロコスモス生命の 仕事なら\n誰にも 負けないのに…",
"4": "ポケモンを 入れ替えたのに……",
"5": "かくれんぼも ダメ!\n勝負も ダメ 逃げるしかない"
}
},
"oleana": {
@ -785,6 +789,73 @@
"3": "まあ 生意気!\nオリーヴの パートナーを キズつけるなんて"
}
},
"star_grunt": {
"encounter": {
"1": "We're Team Star, kid. We burn so bright, it hurts to look at us!",
"2": "We'll come at you full force - Hasta la vistaaar! ★",
"3": "If you don't clear out real quick-like, I'll hafta come at you in self-defense. You get me?",
"4": "Sorry, but if you don't turn yourself around here, amigo, we'll have to send you packing!",
"4_female": "Sorry, but if you don't turn yourself around here, amiga, we'll have to send you packing!",
"5": "Oh great. Here comes another rando to ruin my day."
},
"victory": {
"1": "How come I'M the one seeing stars?!",
"2": "You're scary, kid. If you joined Team Star, you'd be looking down from the top in no time!",
"3": "I defended myself all right... But it wasn't enough!",
"4": "H-hasta la vistar... ★",
"5": "I didn't think grunt work for Team Star newbies would be this much of a chore..."
}
},
"giacomo": {
"encounter": {
"1": "You don't really think things through, do ya? Declarin' war on Team Star is a real bad move.",
"2": "I'll play you a sick requiem as you crash and burn. Let's get this party staaarteeed!"
},
"victory": {
"1": "Guess that's that...",
"2": "You turned my melody into a threnody..."
}
},
"mela": {
"encounter": {
"1": "So you're the dope who picked a fight with Team Star... Prepare to get messed up.",
"2": "All riiight, BRING IT! I'll blow everythin' sky high!"
},
"victory": {
"1": "Ugh. Is this really how it's gonna end? What a hassle...",
"2": "I burned through everythin' I had...and now I've sputtered out."
}
},
"atticus": {
"encounter": {
"1": "You have some nerve baring your fangs at Team Star. Come, then, villainous wretch!",
"2": "Be warned—I shall spare thee no mercy! En garde!"
},
"victory": {
"1": "Forgive me, my friends...",
"2": "You have utterly bested me. But thy victory stir'd no bitterness within me—such was its brilliance."
}
},
"ortega": {
"encounter": {
"1": "I promise I'll play nice, so don't blame me when this battle sends you blubbering back home!",
"2": "I'll wipe that smug look off your face for sure! You're going down!"
},
"victory": {
"1": "Ugh! How could I LOSE! What the HECK!",
"2": "Arrrrgggh! That strength of yours is SO. NOT. FAIR."
}
},
"eri": {
"encounter": {
"1": "Doesn't matter who you are. I'll bury anyone who tries to take down Team Star!",
"2": "I give as good as I get—that's a promise! We'll see who's left standing in the end!"
},
"victory": {
"1": "I'm so sorry, everyone...",
"2": "I gave it my all, but it wasn't enough—I wasn't enough..."
}
},
"rocket_boss_giovanni_1": {
"encounter": {
"1": "こんな所 まで よく来た…"
@ -985,6 +1056,28 @@
"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."
}
},
"star_boss_penny_1": {
"encounter": {
"1": "I'm the big boss of Team Star. The name's Cassiopeia. \n$Now, bow down before the overwhelming might of Team Star's founder!"
},
"victory": {
"1": "... ... .."
},
"defeat": {
"1": "Heh..."
}
},
"star_boss_penny_2": {
"encounter": {
"1": "I won't hold back in this battle! I'll stay true to Team Star's code! \n$My Veevee power will crush you into stardust!"
},
"victory": {
"1": "...It's all over now."
},
"defeat": {
"1": "I can't fault you on your battle skills at all... Considering how the bosses fell at your hands."
}
},
"brock": {
"encounter": {
"1": "My expertise on Rock-type Pokémon will take you down! Come on!",

View File

@ -64,6 +64,8 @@
"copyType": "{{pokemonName}}は {{targetPokemonName}}と\n同じタイプに なった",
"suppressAbilities": "{{pokemonName}}の 特性が 効かなくなった!",
"revivalBlessing": "{{pokemonName}}は\n復活して 戦えるようになった",
"swapArenaTags": "{{pokemonName}}は\nお互いの 場の効果を 入れ替えた",
"chillyReception": "{{pokemonName}}は\n寒い ギャグを かました",
"swapArenaTags": "{{pokemonName}}は\nお互いの 場の 効果を 入れ替えた",
"exposedMove": "{{pokemonName}}は {{targetPokemonName}}の\n正体を 見破った",
"afterYou": "{{pokemonName}}は\nお言葉に 甘えることにした"

View File

@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "オーラぐるま",
"effect": "ほほぶくろに 溜めた エネルギーで 攻撃し 自分の 素早さを あげる。 モルペコの 姿で タイプが 変わる。"
"effect": "ほほぶくろに 溜めた エネルギーで 攻撃し 自分の 素早さを あげる。 モルペコが こ技を 使う場合 姿で 技の タイプが 変わる。"
},
"breakingSwipe": {
"name": "ワイドブレイカー",

View File

@ -1,4 +1,5 @@
{
"pikachu": "通常",
"pikachuCosplay": "コスプレ",
"pikachuCoolCosplay": "クールなコスプレ",
"pikachuBeautyCosplay": "きれいなコスプレ",
@ -6,7 +7,9 @@
"pikachuSmartCosplay": "かしこいコスプレ",
"pikachuToughCosplay": "パワフルなコスプレ",
"pikachuPartner": "パートナー",
"eevee": "通常",
"eeveePartner": "パートナー",
"pichu": "通常",
"pichuSpiky": "ギザみみ",
"unownA": "A",
"unownB": "B",
@ -36,36 +39,65 @@
"unownZ": "Z",
"unownExclamation": "!",
"unownQuestion": "?",
"castform": "ポワルンのすがた",
"castformSunny": "たいよう",
"castformRainy": "あまみず",
"castformSnowy": "ゆきぐも",
"deoxysNormal": "ノーマル",
"burmyPlant": "くさき",
"burmySandy": "すなち",
"burmyTrash": "ゴミ",
"deoxysNormal": "ノーマルフォルム",
"deoxysAttack": "アタック",
"deoxysDefense": "ディフェンス",
"deoxysSpeed": "スピード",
"burmyPlant": "くさきのミノ",
"burmySandy": "すなちのミノ",
"burmyTrash": "ゴミのミノ",
"cherubiOvercast": "ネガフォルム",
"cherubiSunshine": "ポジフォルム",
"shellosEast": "ひがし",
"shellosWest": "にし",
"rotom": "通常",
"rotomHeat": "ヒート",
"rotomWash": "ウォッシュ",
"rotomFrost": "フロスト",
"rotomFan": "スピン",
"rotomMow": "カット",
"giratinaAltered": "アナザー",
"shayminLand": "ランド",
"dialga": "通常",
"dialgaOrigin": "オリジンフォルム",
"palkia": "通常",
"palkiaOrigin": "オリジンフォルム",
"giratinaAltered": "アナザーフォルム",
"giratinaOrigin": "オリジンフォルム",
"shayminLand": "ランドフォルム",
"shayminSky": "スカイフォルム",
"basculinRedStriped": "赤筋",
"basculinBlueStriped": "青筋",
"basculinWhiteStriped": "白筋",
"darumaka": "ノーマルモード",
"darumakaZen": "ダルマモード",
"deerlingSpring": "春",
"deerlingSummer": "夏",
"deerlingAutumn": "秋",
"deerlingWinter": "冬",
"tornadusIncarnate": "けしん",
"thundurusIncarnate": "けしん",
"landorusIncarnate": "けしん",
"keldeoOrdinary": "いつも",
"tornadusIncarnate": "けしんフォルム",
"tornadusTherian": "れいじゅうフォルム",
"thundurusIncarnate": "けしんフォルム",
"thundurusTherian": "れいじゅうフォルム",
"landorusIncarnate": "けしんフォルム",
"landorusTherian": "れいじゅうフォルム",
"kyurem": "通常",
"kyuremBlack": "ブラックキュレム",
"kyuremWhite": "ホワイトキュレム",
"keldeoOrdinary": "いつものすがた",
"keldeoResolute": "かくごのすがた",
"meloettaAria": "ボイス",
"meloettaPirouette": "ステップ",
"genesect": "通常",
"genesectShock": "イナズマカセット",
"genesectBurn": "ブレイズカセット",
"genesectChill": "フリーズカセット",
"genesectDouse": "アクアカセット",
"froakie": "通常",
"froakieBattleBond": "きずなへんげ",
"froakieAsh": "サトシゲッコウガ",
"scatterbugMeadow": "はなぞの",
"scatterbugIcySnow": "ひょうせつ",
"scatterbugPolar": "ゆきぐに",
@ -91,6 +123,7 @@
"flabebeOrange": "オレンジ",
"flabebeBlue": "青",
"flabebeWhite": "白",
"furfrou": "やせいのすがた",
"furfrouHeart": "ハート",
"furfrouStar": "スター",
"furfrouDiamond": "ダイア",
@ -100,9 +133,14 @@
"furfrouLaReine": "クイーン",
"furfrouKabuki": "カブキ",
"furfrouPharaoh": "キングダム",
"pumpkabooSmall": "ちいさい",
"pumpkabooLarge": "おおきい",
"pumpkabooSuper": "とくだい",
"espurrMale": "オス",
"espurrFemale": "メス",
"honedgeShiled": "シールドフォルム",
"honedgeBlade": "ブレードフォルム",
"pumpkaboo": "ふつうのサイズ",
"pumpkabooSmall": "ちいさいサイズ",
"pumpkabooLarge": "おおきいサイズ",
"pumpkabooSuper": "とくだいサイズ",
"xerneasNeutral": "リラックス",
"xerneasActive": "アクティブ",
"zygarde50": "50%フォルム",
@ -110,11 +148,37 @@
"zygarde50Pc": "50%フォルム スワームチェンジ",
"zygarde10Pc": "10%フォルム スワームチェンジ",
"zygardeComplete": "パーフェクトフォルム",
"hoopa": "いましめられしフーパ",
"hoopaUnbound": "ときはなたれしフーパ",
"oricorioBaile": "めらめら",
"oricorioPompom": "ぱちぱち",
"oricorioPau": "ふらふら",
"oricorioSensu": "まいまい",
"rockruff": "通常",
"rockruffOwnTempo": "マイペース",
"rockruffMidday": "まひるのすがた",
"rockruffMidnight": "まよなかのすがた",
"rockruffDusk": "たそがれのすがた",
"wishiwashi": "たんどくのすがた",
"wishiwashiSchool": "むれたすがた",
"typeNullNormal": "タイプ:ノーマル",
"typeNullFighting": "タイプ:かくとう",
"typeNullFlying": "タイプ:ひこう",
"typeNullPoison": "タイプ:どく",
"typeNullGround": "タイプ:じめん",
"typeNullRock": "タイプ:いわ",
"typeNullBug": "タイプ:むし",
"typeNullGhost": "タイプ:ゴースト",
"typeNullSteel": "タイプ:はがね",
"typeNullFire": "タイプ:ほのお",
"typeNullWater": "タイプ:みず",
"typeNullGrass": "タイプ:くさ",
"typeNullElectric": "タイプ:でんき",
"typeNullPsychic": "タイプ:エスパー",
"typeNullIce": "タイプ:こおり",
"typeNullDragon": "タイプ:ドラゴン",
"typeNullDark": "タイプ:あく",
"typeNullFairy": "タイプ:フェアリー",
"miniorRedMeteor": "赤 りゅうせい",
"miniorOrangeMeteor": "オレンジ りゅうせい",
"miniorYellowMeteor": "黄 りゅうせい",
@ -131,22 +195,63 @@
"miniorViolet": "紫",
"mimikyuDisguised": "ばけたすがた",
"mimikyuBusted": "ばれたすがた",
"magearnaOriginal": "500ねんまえ",
"necrozma": "ネクロズマ",
"necrozmaDuskMane": "たそがれのたてがみ",
"necrozmaDawnWings": "あかつきのつばさ",
"necrozmaUltra": "ウルトラネクロズマ",
"magearna": "通常",
"magearnaOriginal": "500ねんまえのいろ",
"marshadow": "通常",
"marshadowZenith": "Zパワー",
"cramorant": "通常",
"cramorantGulping": "うのみのすがた",
"cramorantGorging": "まるのみのすがた",
"toxelAmped": "ハイなすがた",
"toxelLowkey": "ローなすがた",
"sinisteaPhony": "がんさく",
"sinisteaAntique": "しんさく",
"eiscueNoIce": "ナイスなし",
"milceryVanillaCream": "ミルキィバニラ",
"milceryRubyCream": "ミルキィルビー",
"milceryMatchaCream": "ミルキィまっちゃ",
"milceryMintCream": "ミルキィミント",
"milceryLemonCream": "ミルキィレモン",
"milcerySaltedCream": "ミルキィソルト",
"milceryRubySwirl": "ルビーミックス",
"milceryCaramelSwirl": "キャラメルミックス",
"milceryRainbowSwirl": "トリプルミックス",
"eiscue": "アイスフェイス",
"eiscueNoIce": "ナイスフェイス",
"indeedeeMale": "オス",
"indeedeeFemale": "メス",
"morpekoFullBelly": "まんぷく",
"morpekoFullBelly": "まんぷくもよう",
"morpekoHangry": "はらぺこもよう",
"zacianHeroOfManyBattles": "れきせんのゆうしゃ",
"zacianCrowned": "けんのおう",
"zamazentaHeroOfManyBattles": "れきせんのゆうしゃ",
"zamazentaCrowned": "たてのおう",
"kubfuSingleStrike": "いちげきのかた",
"kubfuRapidStrike": "れんげきのかた",
"zarude": "通常",
"zarudeDada": "とうちゃん",
"enamorusIncarnate": "けしん",
"calyrex": "通常",
"calyrexIce": "はくばじょうのすがた",
"calyrexShadow": "こくばじょうのすがた",
"basculinMale": "オス",
"basculinFemale": "メス",
"enamorusIncarnate": "けしんフォルム",
"enamorusTherian": "れいじゅうフォルム",
"lechonkMale": "オス",
"lechonkFemale": "メス",
"tandemausFour": "4ひきかぞく",
"tandemausThree": "3びきかぞく",
"squawkabillyGreenPlumage": "グリーンフェザー",
"squawkabillyBluePlumage": "ブルーフェザー",
"squawkabillyYellowPlumage": "イエローフェザー",
"squawkabillyWhitePlumage": "ホワイトフェザー",
"dunsparceTwo": "ふたふしフォルム",
"dunsparceThree": "みつふしフォルム",
"finizenZero": "ナイーブフォルム",
"finizenHero": "マイティフォルム",
"tatsugiriCurly": "そったすがた",
"tatsugiriDroopy": "たれたすがた",
"tatsugiriStretchy": "のびたすがた",
@ -164,7 +269,22 @@
"miraidonGlideMode":"グライドモード",
"poltchageistCounterfeit": "マガイモノ",
"poltchageistArtisan": "タカイモノ",
"poltchageistUnremarkable": "ボンサクのすがた",
"poltchageistMasterpiece": "ケッサクのすがた",
"ogerponTealMask": "みどりのめん",
"ogerponTealMaskTera": "みどりのめん テラスタル",
"ogerponWellspringMask": "いどのめん",
"ogerponWellspringMaskTera": "いどのめん テラスタル",
"ogerponHearthflameMask": "かまどのめん",
"ogerponHearthflameMaskTera": "かまどのめん テラスタル",
"ogerponCornerstoneMask": "いしずえのめん",
"ogerponCornerstoneMaskTera": "いしずえのめん テラスタル",
"terpagos": "ノーマルフォルム",
"terpagosTerastal": "テラスタルフォルム",
"terpagosStellar": "ステラフォルム",
"galarDarumaka": "ノーマルモード",
"galarDarumakaZen": "ダルマモード",
"paldeaTaurosCombat": "コンバット",
"paldeaTaurosBlaze": "ブレイズ",
"paldeaTaurosAqua": "ウォーター"
}
}

View File

@ -126,5 +126,8 @@
"skull_grunts": "スカル団の下っ端",
"macro_grunt": "マクロコスモスのトレーナ",
"macro_grunt_female": "マクロコスモスのトレーナ",
"macro_grunts": "マクロコスモスのトレーナ"
"macro_grunts": "マクロコスモスのトレーナ",
"star_grunt": "スター団の下っ端",
"star_grunt_female": "スター団の下っ端",
"star_grunts": "スター団の下っ端"
}

View File

@ -141,6 +141,11 @@
"faba": "ザオボー",
"plumeria": "プルメリ",
"oleana": "オリーヴ",
"giacomo": "ピーニャ",
"mela": "メロコ",
"atticus": "シュウメイ",
"ortega": "オルティガ",
"eri": "ビワ",
"maxie": "マツブサ",
"archie": "アオギリ",
@ -150,6 +155,7 @@
"lusamine": "ルザミーネ",
"guzma": "グズマ",
"rose": "ローズ",
"cassiopeia": "ボタン",
"blue_red_double": "グリーンとレッド",
"red_blue_double": "レッドとグリーン",

View File

@ -19,6 +19,7 @@
"aether_boss": "エーテル代表",
"skull_boss": "スカル団ボス",
"macro_boss": "マクロコスモス社長",
"star_boss": "スター団ボス",
"rocket_admin": "ロケット団幹部",
"rocket_admin_female": "ロケット団幹部",
@ -34,5 +35,6 @@
"flare_admin_female": "フレア団幹部",
"aether_admin": "エーテル支部長",
"skull_admin": "スカル団幹部",
"macro_admin": "マクロコスモス"
"macro_admin": "マクロコスモス",
"star_admin": "スター団 組ボス"
}

View File

@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "독조종",
"description": "복숭악동의 기술에 의해 독 상태가 된 상대는 혼란 상태도 되어 버린다."
"description": " 기술에 의해 독 상태가 된 상대는 혼란 상태도 되어 버린다."
}
}

View File

@ -83,9 +83,11 @@
"battle_aether_grunt": "SM 에테르재단 배틀",
"battle_skull_grunt": "SM 스컬단 배틀",
"battle_macro_grunt": "SWSH 트레이너 배틀",
"battle_star_grunt": "SV 스타단 배틀",
"battle_galactic_admin": "BDSP 갤럭시단 간부 배틀",
"battle_skull_admin": "SM 스컬단 간부 배틀",
"battle_oleana": "SWSH 올리브 배틀",
"battle_star_admin": "SV 스타단 보스 배틀",
"battle_rocket_boss": "USUM 비주기 배틀",
"battle_aqua_magma_boss": "ORAS 아강 & 마적 배틀",
"battle_galactic_boss": "BDSP 태홍 배틀",
@ -94,6 +96,7 @@
"battle_aether_boss": "SM 루자미네 배틀",
"battle_skull_boss": "SM 구즈마 배틀",
"battle_macro_boss": "SWSH 로즈 배틀",
"battle_star_boss": "SV 카시오페아 배틀",
"abyss": "불가사의 던전 하늘의 탐험대 어둠의 화구",
"badlands": "불가사의 던전 하늘의 탐험대 불모의 계곡",
"beach": "불가사의 던전 하늘의 탐험대 축축한 암반",
@ -107,17 +110,17 @@
"forest": "불가사의 던전 하늘의 탐험대 검은 숲",
"grass": "불가사의 던전 하늘의 탐험대 사과의 숲",
"graveyard": "불가사의 던전 하늘의 탐험대 신비의 숲",
"ice_cave": "불가사의 던전 하늘의 탐험대 광대한 얼음산",
"ice_cave": "Firel - -50°C",
"island": "불가사의 던전 하늘의 탐험대 연안의 암반",
"jungle": "Lmz - Jungle",
"laboratory": "Firel - Laboratory",
"lake": "불가사의 던전 하늘의 탐험대 수정 동굴",
"jungle": "Lmz - 정글",
"laboratory": "Firel - 연구소",
"lake": "Lmz - 호수",
"meadow": "불가사의 던전 하늘의 탐험대 하늘 꼭대기 숲",
"metropolis": "Firel - Metropolis",
"mountain": "불가사의 던전 하늘의 탐험대 뿔산",
"plains": "불가사의 던전 하늘의 탐험대 하늘 꼭대기 초원",
"power_plant": "불가사의 던전 하늘의 탐험대 일렉트릭 평원",
"ruins": "불가사의 던전 하늘의 탐험대 봉인의 암반",
"plains": "Firel - Route 888",
"power_plant": "Firel - 기어르",
"ruins": "Lmz - 고대 유적",
"sea": "Andr06 - Marine Mystique",
"seabed": "Firel - Seabed",
"slum": "Andr06 - Sneaky Snom",
@ -127,7 +130,7 @@
"tall_grass": "불가사의 던전 하늘의 탐험대 짙은 안개의 숲",
"temple": "불가사의 던전 하늘의 탐험대 파수꾼의 동굴",
"town": "불가사의 던전 하늘의 탐험대 랜덤 던전 테마 3",
"volcano": "불가사의 던전 하늘의 탐험대 열수의 동굴",
"volcano": "Firel - Twisturn Volcano",
"wasteland": "불가사의 던전 하늘의 탐험대 환상의 대지",
"encounter_ace_trainer": "BW 눈이 마주치면 승부! (엘리트 트레이너)",
"encounter_backpacker": "BW 눈이 마주치면 승부! (등산가)",

View File

@ -715,12 +715,16 @@
"encounter": {
"1": "당신은 여기서 끝날 것 같네요!",
"2": "당신은 트레이너 맞죠? 하지만 우리를 방해하는 건 용납 못 합니다!",
"3": "매크로코스모스 생명입니다! 가입하신 실비보험은 있으신가요?"
"3": "매크로코스모스 생명입니다! 가입하신 실비보험은 있으신가요?",
"4": "찾았다! 그렇다면 포켓몬 승부입니다!",
"5": "올리브님에게 혼나기 싫으니까 포기하지 않겠습니다!"
},
"victory": {
"1": "순순히 물러나는 것 말고는 선택지가 없군요.",
"2": "용돈을 뺏기다니… 패배는 적자로 이어지는구나…",
"3": "매크로코스모스 생명에 관한 일이라면 누구에게도 지지 않을 텐데…"
"3": "매크로코스모스 생명에 관한 일이라면 누구에게도 지지 않을 텐데…",
"4": "심지어 포켓몬 교체도 했는데…",
"5": "승부도 안 되면! 도망치는 수밖에 없다!"
}
},
"oleana": {
@ -735,6 +739,73 @@
"3": "아아… 이 올리브님 조금 지쳤어…"
}
},
"star_grunt": {
"encounter": {
"1": "우리는 우는 아이도 웃게 하는 스타단!",
"2": "멤버들을 총동원해서 공격할 테니, 수고하셨스타~! ★",
"3": "빨리 돌아가지 그래? 아니면 방어권을 행사하는 수밖에 없다고?",
"4": "미안하지만 돌아가지 않겠다면 힘으로라도 쫓아내 주겠어!",
"4_female": "미안하지만 돌아가지 않겠다면 힘으로라도 쫓아내 주겠어!",
"5": "아~ 또 사람이 와 버렸잖아."
},
"victory": {
"1": "저 하늘의 별이 되는 건 나였네!?",
"2": "스타단에 들어가면 다들 쫄아서 꼭대기에서 군림할 수 있는 거 아니었어?",
"3": "나의 방어권이…!",
"4": "수, 수고하셨스타… ★",
"5": "스타단 신입이 이렇게 귀찮은 일일 줄이야…"
}
},
"giacomo": {
"encounter": {
"1": "스타단에게 싸움을 걸다니, 넌 정말 겁이 없구나?",
"2": "레퀴엠을 들려줄 테니! 자! 파티를 시작하자고!"
},
"victory": {
"1": "결국 이렇게 되는 건가…",
"2": "레퀴엠을 들은 건 내 쪽이었네."
}
},
"mela": {
"encounter": {
"1": "…우리에게 싸움을 걸었다는 녀석이 너냐? …터뜨려 주지.",
"2": "좋아! …그럼, 한번 터뜨려 볼까!"
},
"victory": {
"1": "이걸로 끝인 건가? …이런 이런.",
"2": "그렇게 타오르고 타오르다… 완전히 연소해 버린 건가…"
}
},
"atticus": {
"encounter": {
"1": "스타단을 해하려 하는 괘씸한 자는 독으로 해치울 뿐!",
"2": "그럼, 진검승부를 펼쳐 봅시다!"
},
"victory": {
"1": "동지들이여, 미안하오…",
"2": "미련 하나 남지 않을 정도로 명백한 소인의 완패였소…"
}
},
"ortega": {
"encounter": {
"1": "잔뜩 귀여워해 줄 테니까 울며불며 돌아갈 준비나 하라고!",
"2": "어디 한번 여유롭게 굴어 보시지. 내가 이길 테니까!"
},
"victory": {
"1": "어째서 내가 지는 건데!? 대체 왜! 어째서 진 거냐고~!!",
"2": "젠장~! 너무 강하잖아! 비겁해!"
}
},
"eri": {
"encounter": {
"1": "어디의 누가 됐든 스타단을 노리는 자는 박살 낼 뿐!",
"2": "맞았으면 그저 맞받아칠 뿐!! 승리는 끝까지 서 있는 사람의 것이니까!!"
},
"victory": {
"1": "얘들아… 미안해…",
"2": "열심히… 했는데… 나는 역시… 부족했어…"
}
},
"rocket_boss_giovanni_1": {
"encounter": {
"1": "그래서! 여기까지 오다니, 감탄이 절로 나오는군!"
@ -933,6 +1004,28 @@
"1": "너희가 보기에는 내가 끔찍한 짓을 벌이고 있는 것처럼 보이겠지? 조금도 이해가 가지 않을 거야.\n$하지만 난 가라르지방의 영원한 번영을 위해서 무한한 에너지를 가져다줘야 해."
}
},
"star_boss_penny_1": {
"encounter": {
"1": "내가 바로 스타단의 진 보스, 카시오페아… \n$…진 보스의 힘 앞에 무릎 꿇게 만들어 주겠어!!"
},
"victory": {
"1": "… … …"
},
"defeat": {
"1": "후후…"
}
},
"star_boss_penny_2": {
"encounter": {
"1": "승부인 이상, 봐주지 않아! 그것이 스타단의 규칙이니까! \n$브이브이 파워로 우주의 먼지로 만들어 주겠어!!"
},
"victory": {
"1": "이걸로 진짜 끝이구나…"
},
"defeat": {
"1": "군더더기가 없는 실력이네. 보스들이 당한 걸 생각해 보면 말이야."
}
},
"brock": {
"encounter": {
"1": "내 전문인 바위 타입 포켓몬으로 널 쓰러뜨려줄게! 덤벼!",

View File

@ -66,6 +66,7 @@
"suppressAbilities": "{{pokemonName}}의\n특성이 효과를 발휘하지 못하게 되었다!",
"revivalBlessing": "{{pokemonName}}[[는]]\n정신을 차려 싸울 수 있게 되었다!",
"swapArenaTags": "{{pokemonName}}[[는]]\n서로의 필드 효과를 교체했다!",
"chillyReception": "{{pokemonName}}[[는]] 썰렁한 개그를 선보였다!",
"exposedMove": "{{pokemonName}}[[는]]\n{{targetPokemonName}}의 정체를 꿰뚫어 보았다!",
"safeguard": "{{targetName}}[[는]] 신비의 베일이 지켜 주고 있다!",
"afterYou": "{{pokemonName}}[[는]]\n배려를 받아들이기로 했다!"

View File

@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "오라휠",
"effect": "볼주머니에 저장해둔 에너지로 공격하고 자신의 스피드를 올린다. 모르페코 모습에 따라 타입이 바뀐다."
"effect": "볼주머니에 저장해둔 에너지로 공격하고 자신의 스피드를 올린다. 모르페코가 사용할 경우 모습에 따라 타입이 바뀐다."
},
"breakingSwipe": {
"name": "와이드브레이커",

View File

@ -1,4 +1,5 @@
{
"pikachu": "일반",
"pikachuCosplay": "옷갈아입기",
"pikachuCoolCosplay": "하드록",
"pikachuBeautyCosplay": "마담",
@ -6,7 +7,9 @@
"pikachuSmartCosplay": "닥터",
"pikachuToughCosplay": "마스크드",
"pikachuPartner": "파트너",
"eevee": "일반",
"eeveePartner": "파트너",
"pichu": "일반",
"pichuSpiky": "삐쭉귀",
"unownA": "A",
"unownB": "B",
@ -36,36 +39,65 @@
"unownZ": "Z",
"unownExclamation": "!",
"unownQuestion": "?",
"castform": "평상시",
"castformSunny": "태양의 모습",
"castformRainy": "빗방울의 모습",
"castformSnowy": "설운의 모습",
"deoxysNormal": "노말폼",
"deoxysAttack": "어택폼",
"deoxysDefense": "디펜스폼",
"deoxysSpeed": "스피드폼",
"burmyPlant": "초목도롱",
"burmySandy": "모래땅도롱",
"burmyTrash": "슈레도롱",
"cherubiOvercast": "네거폼",
"cherubiSunshine": "포지폼",
"shellosEast": "동쪽바다의 모습",
"shellosWest": "서쪽바다의 모습",
"rotomHeat": "히트",
"rotomWash": "워시",
"rotomFrost": "프로스트",
"rotomFan": "스핀",
"rotomMow": "커트",
"rotom": "로토무",
"rotomHeat": "히트로토무",
"rotomWash": "워시로토무",
"rotomFrost": "프로스트로토무",
"rotomFan": "스핀로토무",
"rotomMow": "커트로토무",
"dialga": "어나더폼",
"dialgaOrigin": "오리진폼",
"palkia": "어나더폼",
"palkiaOrigin": "오리진폼",
"giratinaAltered": "어나더폼",
"giratinaOrigin": "오리진폼",
"shayminLand": "랜드폼",
"shayminSky": "스카이폼",
"basculinRedStriped": "적색근의 모습",
"basculinBlueStriped": "청색근의 모습",
"basculinWhiteStriped": "백색근의 모습",
"darumaka": "노말모드",
"darumakaZen": "달마모드",
"deerlingSpring": "봄의 모습",
"deerlingSummer": "여름의 모습",
"deerlingAutumn": "가을의 모습",
"deerlingWinter": "겨울의 모습",
"tornadusIncarnate": "화신폼",
"tornadusTherian": "영물폼",
"thundurusIncarnate": "화신폼",
"thundurusTherian": "영물폼",
"landorusIncarnate": "화신폼",
"landorusTherian": "영물폼",
"kyurem": "큐레무",
"kyuremBlack": "블랙큐레무",
"kyuremWhite": "화이트큐레무",
"keldeoOrdinary": "평상시 모습",
"keldeoResolute": "각오의 모습",
"meloettaAria": "보이스폼",
"meloettaPirouette": "스텝폼",
"genesect": "노말폼",
"genesectShock": "라이트닝폼",
"genesectBurn": "블레이즈폼",
"genesectChill": "프리즈폼",
"genesectDouse": "아쿠아폼",
"froakie": "개굴닌자",
"froakieBattleBond": "유대변화",
"froakieAsh": "지우개굴닌자",
"scatterbugMeadow": "화원의 모양",
"scatterbugIcySnow": "빙설의 모양",
"scatterbugPolar": "설국의 모양",
@ -91,6 +123,7 @@
"flabebeOrange": "오렌지색 꽃",
"flabebeBlue": "파란 꽃",
"flabebeWhite": "하얀 꽃",
"furfrou": "일반",
"furfrouHeart": "하트컷",
"furfrouStar": "스타컷",
"furfrouDiamond": "다이아컷",
@ -100,6 +133,11 @@
"furfrouLaReine": "퀸컷",
"furfrouKabuki": "가부키컷",
"furfrouPharaoh": "킹덤컷",
"espurrMale": "수컷의 모습",
"espurrFemale": "암컷의 모습",
"honedgeShiled": "실드폼",
"honedgeBlade": "블레이드폼",
"pumpkaboo": "보통 사이즈",
"pumpkabooSmall": "작은 사이즈",
"pumpkabooLarge": "큰 사이즈",
"pumpkabooSuper": "특대 사이즈",
@ -110,11 +148,37 @@
"zygarde50Pc": "스웜체인지 50%폼",
"zygarde10Pc": "스웜체인지 10%폼",
"zygardeComplete": "퍼펙트폼",
"hoopa": "굴레에 빠진 모습",
"hoopaUnbound": "굴레를 벗어난 모습",
"oricorioBaile": "이글이글스타일",
"oricorioPompom": "파칙파칙스타일",
"oricorioPau": "훌라훌라스타일",
"oricorioSensu": "하늘하늘스타일",
"rockruff": "일반",
"rockruffOwnTempo": "마이페이스",
"rockruffMidday": "한낮의 모습",
"rockruffMidnight": "한밤중의 모습",
"rockruffDusk": "황혼의 모습",
"wishiwashi": "단독의 모습",
"wishiwashiSchool": "군집의 모습",
"typeNullNormal": "노말",
"typeNullFighting": "격투",
"typeNullFlying": "비행",
"typeNullPoison": "독",
"typeNullGround": "땅",
"typeNullRock": "바위",
"typeNullBug": "벌레",
"typeNullGhost": "고스트",
"typeNullSteel": "강철",
"typeNullFire": "불꽃",
"typeNullWater": "물",
"typeNullGrass": "풀",
"typeNullElectric": "전기",
"typeNullPsychic": "에스퍼",
"typeNullIce": "얼음",
"typeNullDragon": "드래곤",
"typeNullDark": "악",
"typeNullFairy": "페어리",
"miniorRedMeteor": "유성의 모습(빨강)",
"miniorOrangeMeteor": "유성의 모습(주황)",
"miniorYellowMeteor": "유성의 모습(노랑)",
@ -131,25 +195,66 @@
"miniorViolet": "보라색 코어",
"mimikyuDisguised": "둔갑한 모습",
"mimikyuBusted": "들킨 모습",
"necrozma": "네크로즈마",
"necrozmaDuskMane": "황혼의 갈기",
"necrozmaDawnWings": "새벽의 날개",
"necrozmaUltra": "울트라네크로즈마",
"magearna": "일반적인 모습",
"magearnaOriginal": "500년 전의 색",
"marshadowZenith": "투지를 불태운 마샤도",
"marshadow": "일반적인 모습",
"marshadowZenith": "타오르는 투지의 모습",
"cramorant": "일반",
"cramorantGulping": "그대로 삼킨 모습",
"cramorantGorging": "통째로 삼킨 모습",
"toxelAmped": "하이한 모습",
"toxelLowkey": "로우한 모습",
"sinisteaPhony": "위작품",
"sinisteaAntique": "진작품",
"milceryVanillaCream": "밀키바닐라",
"milceryRubyCream": "밀키루비",
"milceryMatchaCream": "밀키말차",
"milceryMintCream": "밀키민트",
"milceryLemonCream": "밀키레몬",
"milcerySaltedCream": "밀키솔트",
"milceryRubySwirl": "루비믹스",
"milceryCaramelSwirl": "캐러멜믹스",
"milceryRainbowSwirl": "트리플믹스",
"eiscue": "아이스페이스",
"eiscueNoIce": "나이스페이스",
"indeedeeMale": "수컷의 모습",
"indeedeeFemale": "암컷의 모습",
"morpekoFullBelly": "배부른 모양",
"morpekoHangry": "배고픈 모양",
"zacianHeroOfManyBattles": "역전의 용사",
"zacianCrowned": "검왕",
"zamazentaHeroOfManyBattles": "역전의 용사",
"zamazentaCrowned": "방패왕",
"kubfuSingleStrike": "일격의 태세",
"kubfuRapidStrike": "연격의 태세",
"zarude": "일반",
"zarudeDada": "아빠",
"calyrex": "일반",
"calyrexIce": "백마 탄 모습",
"calyrexShadow": "흑마 탄 모습",
"basculinMale": "수컷의 모습",
"basculinFemale": "암컷의 모습",
"enamorusIncarnate": "화신폼",
"enamorusTherian": "영물폼",
"lechonkMale": "수컷의 모습",
"lechonkFemale": "암컷의 모습",
"tandemausFour": "네 식구",
"tandemausThree": "세 식구",
"squawkabillyGreenPlumage": "그린 페더",
"squawkabillyBluePlumage": "블루 페더",
"squawkabillyYellowPlumage": "옐로 페더",
"squawkabillyWhitePlumage": "화이트 페더",
"finizenZero": "나이브폼",
"finizenHero": "마이티폼",
"tatsugiriCurly": "젖힌 모습",
"tatsugiriDroopy": "늘어진 모습",
"tatsugiriStretchy": "뻗은 모습",
"dunsparceTwo": "두 마디 폼",
"dunsparceThree": "세 마디 폼",
"gimmighoulChest": "상자폼",
"gimmighoulRoaming": "도보폼",
"koraidonApexBuild": "완전형태",
@ -164,7 +269,22 @@
"miraidonGlideMode": "글라이드모드",
"poltchageistCounterfeit": "가짜배기의 모습",
"poltchageistArtisan": "알짜배기의 모습",
"poltchageistUnremarkable": "범작의 모습",
"poltchageistMasterpiece": "걸작의 모습",
"ogerponTealMask": "벽록의가면",
"ogerponTealMaskTera": "벽록의가면 테라스탈",
"ogerponWellspringMask": "우물의가면",
"ogerponWellspringMaskTera": "우물의가면 테라스탈",
"ogerponHearthflameMask": "화덕의가면",
"ogerponHearthflameMaskTera": "화덕의가면 테라스탈",
"ogerponCornerstoneMask": "주춧돌의가면",
"ogerponCornerstoneMaskTera": "주춧돌의가면 테라스탈",
"terpagos": "노말폼",
"terpagosTerastal": "테라스탈폼",
"terpagosStellar": "스텔라폼",
"galarDarumaka": "노말모드",
"galarDarumakaZen": "달마모드",
"paldeaTaurosCombat": "컴뱃종",
"paldeaTaurosBlaze": "블레이즈종",
"paldeaTaurosAqua": "워터종"
}
}

View File

@ -126,5 +126,8 @@
"skull_grunts": "스컬단 조무래기들",
"macro_grunt": "매크로코스모스 직원",
"macro_grunt_female": "매크로코스모스 직원",
"macro_grunts": "매크로코스모스 직원들"
"macro_grunts": "매크로코스모스 직원들",
"star_grunt": "스타단 조무래기",
"star_grunt_female": "스타단 조무래기",
"star_grunts": "스타단 조무래기들"
}

View File

@ -141,6 +141,11 @@
"faba": "자우보",
"plumeria": "플루메리",
"oleana": "올리브",
"giacomo": "피나",
"mela": "멜로코",
"atticus": "추명",
"ortega": "오르티가",
"eri": "비파",
"maxie": "마적",
"archie": "아강",
@ -150,6 +155,7 @@
"lusamine": "루자미네",
"guzma": "구즈마",
"rose": "로즈",
"cassiopeia": "모란",
"blue_red_double": "그린 & 레드",
"red_blue_double": "레드 & 그린",

View File

@ -19,6 +19,7 @@
"aether_boss": "에테르재단 대표",
"skull_boss": "스컬단 보스",
"macro_boss": "매크로코스모스 사장",
"star_boss": "스타단 보스",
"rocket_admin": "로켓단 간부",
"rocket_admin_female": "로켓단 간부",
@ -34,5 +35,6 @@
"flare_admin_female": "플레어단 간부",
"aether_admin": "에테르재단 지부장",
"skull_admin": "스컬단 간부",
"macro_admin": "매크로코스모스 간부"
"macro_admin": "매크로코스모스 간부",
"star_admin": "스타단 군단 보스"
}

View File

@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "Poison Puppeteer",
"description": "Pokémon envenenados pelos movimentos de Pecharunt também ficarão confusos."
"description": "Pokémon envenenados pelos movimentos deste Pokémon também ficarão confusos."
}
}

View File

@ -83,9 +83,11 @@
"battle_aether_grunt": "SM Batalha da Fundação Aether",
"battle_skull_grunt": "SM Batalha da Equipe Skull",
"battle_macro_grunt": "SWSH Batalha de Treinador",
"battle_star_grunt": "SV Batalha da Equipe Estrela",
"battle_galactic_admin": "BDSP Batalha com Admin da Equipe Galáctica",
"battle_skull_admin": "SM Batalha com Admin da Euipe Skull",
"battle_oleana": "SWSH Batalha da Oleana",
"battle_star_admin": "SV Chefe da Equipe Estrela",
"battle_rocket_boss": "USUM Batalha do Giovanni",
"battle_aqua_magma_boss": "ORAS Batalha do Maxie & Archie",
"battle_galactic_boss": "BDSP Batalha do Cyrus",
@ -94,6 +96,7 @@
"battle_aether_boss": "SM Batalha da Lusamine",
"battle_skull_boss": "SM Batalha do Guzma",
"battle_macro_boss": "SWSH Batalha do Rose",
"battle_star_boss": "SV Batalha da Cassiopeia",
"abyss": "PMD EoS Dark Crater",
"badlands": "PMD EoS Barren Valley",
@ -108,17 +111,17 @@
"forest": "PMD EoS Dusk Forest",
"grass": "PMD EoS Apple Woods",
"graveyard": "PMD EoS Mystifying Forest",
"ice_cave": "PMD EoS Vast Ice Mountain",
"ice_cave": "Firel - -50°C",
"island": "PMD EoS Craggy Coast",
"jungle": "Lmz - Jungle",
"laboratory": "Firel - Laboratory",
"lake": "PMD EoS Crystal Cave",
"lake": "Lmz - Lake",
"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",
"plains": "Firel - Route 888",
"power_plant": "Firel - The Klink",
"ruins": "Lmz - Ancient Ruins",
"sea": "Andr06 - Marine Mystique",
"seabed": "Firel - Seabed",
"slum": "Andr06 - Sneaky Snom",
@ -128,7 +131,7 @@
"tall_grass": "PMD EoS Foggy Forest",
"temple": "PMD EoS Aegis Cave",
"town": "PMD EoS Random Dungeon Theme 3",
"volcano": "PMD EoS Steam Cave",
"volcano": "Firel - Twisturn Volcano",
"wasteland": "PMD EoS Hidden Highland",
"encounter_ace_trainer": "BW Encontro com Treinador (Treinador Ás)",
"encounter_backpacker": "BW Encontro com Treinador (Mochileiro)",

View File

@ -749,12 +749,16 @@
"encounter": {
"1": "Parece que aqui é o fim da linha para você!",
"2": "Você é um treinador, não é? Temo que isso não lhe dê o direito de interferir em nosso trabalho.",
"3": "Sou da Macro Cosmos Seguros! Já tem um seguro de vida?"
"3": "Sou da Macro Cosmos Seguros! Já tem um seguro de vida?",
"4": "Te encontrei! Nesse caso, é hora de uma batalha Pokémon!",
"5": "Ouvir uma bronca da Srta. Oleana é bem pior do que qualquer coisa que você possa fazer!"
},
"victory": {
"1": "Eu não tenho muita escolha a não ser recuar respeitosamente.",
"2": "Ter que desistir do meu dinheiro... Perder significa que estou de volta no vermelho...",
"3": "Ninguém pode vencer a Macro Cosmos quando se trata de nossa dedicação ao trabalho!"
"3": "Ninguém pode vencer a Macro Cosmos quando se trata de nossa dedicação ao trabalho!",
"4": "Eu até troquei meu Pokémon...",
"5": "As batalhas não funcionaram... A única coisa a fazer agora é fugir!"
}
},
"oleana": {
@ -769,6 +773,73 @@
"3": "*suspiro* Eu sou uma Oleana cansada..."
}
},
"star_grunt": {
"encounter": {
"1": "Nós somos a Equipe Estrela, garoto. Brilhamos tão forte que dói olhar pra nós!",
"2": "Vamos com tudo pra cima de você - Hasta la vistaaar! ★",
"3": "Se você não sair rapidinho, vou ter que me defender. Entendeu?",
"4": "Desculpe, mas se você não der meia-volta, amigo, vamos ter que te despachar!",
"4_female": "Desculpe, mas se você não der meia-volta, amiga, vamos ter que te despachar!",
"5": "Ótimo. Lá vem mais um qualquer para estragar o meu dia."
},
"victory": {
"1": "Como é que EU estou vendo estrelas?!",
"2": "Você é assustador, garoto. Se você se juntasse à Equipe Estrela, estaria no topo rapidinho!",
"3": "Me defendi bem... Mas não foi o suficiente!",
"4": "H-hasta la vistar... ★",
"5": "Eu não achei que o trabalho de recruta da Equipe Estrela seria uma tarefa tão pesada..."
}
},
"giacomo": {
"encounter": {
"1": "Você realmente não pensa muito, né? Declarar guerra contra a Equipe Estrela é uma jogada muito ruim.",
"2": "Vou tocar uma sinfonia do seu fracasso enquanto você cai e queima. Vamos começar a festa!"
},
"victory": {
"1": "Acho que é isso...",
"2": "Você transformou minha melodia em um lamento..."
}
},
"mela": {
"encounter": {
"1": "Então você é o idiota que arrumou briga com a Equipe Estrela... Prepare-se para ser destruído.",
"2": "Tudo bem, VAMOS LÁ! Vou explodir tudo!"
},
"victory": {
"1": "Ugh. É assim que isso vai acabar? Que problema...",
"2": "Usei tudo o que eu tinha... e agora apaguei."
}
},
"atticus": {
"encounter": {
"1": "Você tem coragem de mostrar suas garras para a Equipe Estrela. Venha, então, vil criatura!",
"2": "Esteja avisado—não te darei misericórdia! Em guarda!"
},
"victory": {
"1": "Perdoem-me, meus amigos...",
"2": "Você me venceu completamente. Mas sua vitória não me trouxe amargura—tamanha foi sua brilhante execução."
}
},
"ortega": {
"encounter": {
"1": "Prometo que serei gentil, então não me culpe quando essa batalha te mandar chorando de volta para casa!",
"2": "Vou apagar esse sorriso convencido do seu rosto com certeza! Você vai perder!"
},
"victory": {
"1": "Ugh! Como eu pude PERDER! Que RAIVA!",
"2": "Arrrrgggh! Essa sua força é tão INJUSTA."
}
},
"eri": {
"encounter": {
"1": "Não importa quem você é. Vou derrubar qualquer um que tente destruir a Equipe Estrela!",
"2": "Eu dou tudo de mim, e isso é uma promessa! Vamos ver quem fica de pé no final!"
},
"victory": {
"1": "Me desculpem, pessoal...",
"2": "Dei tudo de mim, mas não foi o suficiente—eu não fui o suficiente..."
}
},
"rocket_boss_giovanni_1": {
"encounter": {
"1": "Tenho que admitir, estou impressionado que tenha chegado até aqui!"
@ -968,6 +1039,28 @@
"1": "Eu suponho que deve parecer que estou fazendo algo terrível. Eu não espero que você entenda.\n$Mas eu devo fornecer à região de Galar energia ilimitada para garantir prosperidade eterna."
}
},
"star_boss_penny_1": {
"encounter": {
"1": "Eu sou a grande chefe da Equipe Estrela. Meu nome é Cassiopeia. \n$Agora, ajoelhe-se diante do poder esmagador da fundadora da Equipe Estrela!"
},
"victory": {
"1": "... ... .."
},
"defeat": {
"1": "Heh..."
}
},
"star_boss_penny_2": {
"encounter": {
"1": "Não vou me segurar nesta batalha! Vou permanecer fiel ao código da Equipe Estrela! \n$Meu poder Veevee vai te reduzir a pó estelar!"
},
"victory": {
"1": "...Agora acabou tudo."
},
"defeat": {
"1": "Não posso te culpar por suas habilidades de batalha... Considerando como os chefes caíram diante de você."
}
},
"brock": {
"encounter": {
"1": "Minha especialidade em Pokémon do tipo Pedra vai te derrubar! Vamos lá!",

View File

@ -61,6 +61,7 @@
"suppressAbilities": "A habilidade de {{pokemonName}}\nfoi suprimida!",
"revivalBlessing": "{{pokemonName}} foi reanimado!",
"swapArenaTags": "{{pokemonName}} trocou os efeitos de batalha que afetam cada lado do campo!",
"chillyReception": "{{pokemonName}} está prestes a contar uma piada gelada!",
"exposedMove": "{{pokemonName}} identificou\n{{targetPokemonName}}!",
"safeguard": "{{targetName}} está protegido por Safeguard!",
"afterYou": "{{pokemonName}} aceitou a gentil oferta!"

View File

@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "Aura Wheel",
"effect": "Morpeko ataca e aumenta sua Velocidade com a energia armazenada em suas bochechas. O tipo deste movimento muda dependendo da forma do usuário."
"effect": "O usuário ataca e aumenta sua Velocidade com a energia armazenada em suas bochechas. Se usado por Morpeko, o tipo deste movimento muda dependendo da forma do usuário."
},
"breakingSwipe": {
"name": "Breaking Swipe",

View File

@ -1,4 +1,5 @@
{
"pikachu": "Normal",
"pikachuCosplay": "Cosplay",
"pikachuCoolCosplay": "Cosplay Legal",
"pikachuBeautyCosplay": "Cosplay Bonito",
@ -6,7 +7,9 @@
"pikachuSmartCosplay": "Cosplay Inteligente",
"pikachuToughCosplay": "Cosplay Forte",
"pikachuPartner": "Parceiro",
"eevee": "Normal",
"eeveePartner": "Parceiro",
"pichu": "Normal",
"pichuSpiky": "Orelha Espetada",
"unownA": "A",
"unownB": "B",
@ -36,36 +39,65 @@
"unownZ": "Z",
"unownExclamation": "!",
"unownQuestion": "?",
"castform": "Normal",
"castformSunny": "Ensolarado",
"castformRainy": "Chuvoso",
"castformSnowy": "Nevado",
"deoxysNormal": "Normal",
"deoxysAttack": "Ataque",
"deoxysDefense": "Defesa",
"deoxysSpeed": "Velocidade",
"burmyPlant": "Vegetal",
"burmySandy": "Arenoso",
"burmyTrash": "Lixo",
"cherubiOvercast": "Nublado",
"cherubiSunshine": "Solar",
"shellosEast": "Leste",
"shellosWest": "Oeste",
"rotom": "Normal",
"rotomHeat": "Calor",
"rotomWash": "Lavagem",
"rotomFrost": "Congelante",
"rotomFan": "Ventilador",
"rotomMow": "Corte",
"dialga": "Normal",
"dialgaOrigin": "Origem",
"palkia": "Normal",
"palkiaOrigin": "Origem",
"giratinaAltered": "Alterado",
"giratinaOrigin": "Origem",
"shayminLand": "Terrestre",
"shayminSky": "Céu",
"basculinRedStriped": "Listras Vermelhas",
"basculinBlueStriped": "Listras Azuis",
"basculinWhiteStriped": "Listras Brancas",
"darumaka": "Padrão",
"darumakaZen": "Zen",
"deerlingSpring": "Primavera",
"deerlingSummer": "Verão",
"deerlingAutumn": "Outono",
"deerlingWinter": "Inverno",
"tornadusIncarnate": "Materializado",
"tornadusTherian": "Therian",
"thundurusIncarnate": "Materializado",
"thundurusTherian": "Therian",
"landorusIncarnate": "Materializado",
"landorusTherian": "Therian",
"kyurem": "Normal",
"kyuremBlack": "Preto",
"kyuremWhite": "Branco",
"keldeoOrdinary": "Comum",
"keldeoResolute": "Resoluto",
"meloettaAria": "Ária",
"meloettaPirouette": "Pirueta",
"genesect": "Normal",
"genesectShock": "Disco Elétrico",
"genesectBurn": "Disco Incendiante",
"genesectChill": "Disco Congelante",
"genesectDouse": "Disco Hídrico",
"froakie": "Normal",
"froakieBattleBond": "Vínculo de Batalha",
"froakieAsh": "Ash",
"scatterbugMeadow": "Prado",
"scatterbugIcySnow": "Neve Congelada",
"scatterbugPolar": "Polar",
@ -91,6 +123,7 @@
"flabebeOrange": "Laranja",
"flabebeBlue": "Azul",
"flabebeWhite": "Branca",
"furfrou": "Selvagem",
"furfrouHeart": "Coração",
"furfrouStar": "Estrela",
"furfrouDiamond": "Diamante",
@ -100,6 +133,11 @@
"furfrouLaReine": "Aristocrático",
"furfrouKabuki": "Kabuki",
"furfrouPharaoh": "Faraó",
"espurrMale": "Macho",
"espurrFemale": "Fêmea",
"honedgeShiled": "Escudo",
"honedgeBlade": "Lâmina",
"pumpkaboo": "Normal",
"pumpkabooSmall": "Pequeno",
"pumpkabooLarge": "Grande",
"pumpkabooSuper": "Extragrande",
@ -110,11 +148,37 @@
"zygarde50Pc": "Forma 50% Agrupada",
"zygarde10Pc": "Forma 10% Agrupada",
"zygardeComplete": "Forma Completa",
"hoopa": "Contido",
"hoopaUnbound": "Libertado",
"oricorioBaile": "Flamenco",
"oricorioPompom": "Pompom",
"oricorioPau": "Hula",
"oricorioSensu": "Leque",
"rockruff": "Normal",
"rockruffOwnTempo": "Próprio Tempo",
"rockruffMidday": "Diurno",
"rockruffMidnight": "Noturno",
"rockruffDusk": "Crepúsculo",
"wishiwashi": "Individual",
"wishiwashiSchool": "Cardume",
"typeNullNormal": "Tipo: Normal",
"typeNullFighting": "Tipo: Lutador",
"typeNullFlying": "Tipo: Voador",
"typeNullPoison": "Tipo: Veneno",
"typeNullGround": "Tipo: Terra",
"typeNullRock": "Tipo: Pedra",
"typeNullBug": "Tipo: Inseto",
"typeNullGhost": "Tipo: Fantasma",
"typeNullSteel": "Tipo: Aço",
"typeNullFire": "Tipo: Fogo",
"typeNullWater": "Tipo: Água",
"typeNullGrass": "Tipo: Grama",
"typeNullElectric": "Tipo: Elétrico",
"typeNullPsychic": "Tipo: Psíquico",
"typeNullIce": "Tipo: Gelo",
"typeNullDragon": "Tipo: Dragão",
"typeNullDark": "Tipo: Sombrio",
"typeNullFairy": "Tipo: Fada",
"miniorRedMeteor": "Meteoro Vermelho",
"miniorOrangeMeteor": "Meteoro Laranja",
"miniorYellowMeteor": "Meteoro Amarelo",
@ -131,25 +195,66 @@
"miniorViolet": "Violeta",
"mimikyuDisguised": "Disfarçado",
"mimikyuBusted": "Descoberto",
"necrozma": "Normal",
"necrozmaDuskMane": "Juba Crepúsculo",
"necrozmaDawnWings": "Asas Alvorada",
"necrozmaUltra": "Ultra",
"magearna": "Normal",
"magearnaOriginal": "Original",
"marshadow": "Normal",
"marshadowZenith": "Zênite",
"cramorant": "Normal",
"cramorantGulping": "Engolidor",
"cramorantGorging": "Devorador",
"toxelAmped": "Agudo",
"toxelLowkey": "Grave",
"sinisteaPhony": "Falsificado",
"sinisteaAntique": "Autêntico",
"milceryVanillaCream": "Creme de Baunilha",
"milceryRubyCream": "Creme Rubi",
"milceryMatchaCream": "Creme de Chá Verde",
"milceryMintCream": "Creme de Menta",
"milceryLemonCream": "Creme de Lima",
"milcerySaltedCream": "Creme Salgado",
"milceryRubySwirl": "Mistura Rubi",
"milceryCaramelSwirl": "Mistura de Caramelo",
"milceryRainbowSwirl": "Mistura Tricolor",
"eiscue": "Cara de Gelo",
"eiscueNoIce": "Descongelado",
"indeedeeMale": "Macho",
"indeedeeFemale": "Fêmea",
"morpekoFullBelly": "Saciado",
"morpekoHangry": "Voraz",
"zacianHeroOfManyBattles": "Herói Veterano",
"zacianCrowned": "Coroado",
"zamazentaHeroOfManyBattles": "Herói Veterano",
"zamazentaCrowned": "Coroado",
"kubfuSingleStrike": "Golpe Decisivo",
"kubfuRapidStrike": "Golpe Fluido",
"zarude": "Normal",
"zarudeDada": "Papa",
"calyrex": "Normal",
"calyrexIce": "Cavaleiro Glacial",
"calyrexShadow": "Cavaleiro Espectral",
"basculinMale": "Macho",
"basculinFemale": "Fêmea",
"enamorusIncarnate": "Materializado",
"enamorusTherian": "Therian",
"lechonkMale": "Macho",
"lechonkFemale": "Fêmea",
"tandemausFour": "Família de Quatro",
"tandemausThree": "Família de Três",
"squawkabillyGreenPlumage": "Plumas Verdes",
"squawkabillyBluePlumage": "Plumas Azuis",
"squawkabillyYellowPlumage": "Plumas Amarelas",
"squawkabillyWhitePlumage": "Plumas Brancas",
"finizenZero": "Ingênuo",
"finizenHero": "Heroico",
"tatsugiriCurly": "Curvado",
"tatsugiriDroopy": "Caído",
"tatsugiriStretchy": "Reto",
"dunsparceTwo": "Duplo",
"dunsparceThree": "Triplo",
"gimmighoulChest": "Baú",
"gimmighoulRoaming": "Perambulante",
"koraidonApexBuild": "Forma Plena",
@ -164,6 +269,21 @@
"miraidonGlideMode": "Modo Aéreo",
"poltchageistCounterfeit": "Imitação",
"poltchageistArtisan": "Artesão",
"poltchageistUnremarkable": "Medíocre",
"poltchageistMasterpiece": "Excepcional",
"ogerponTealMask": "Máscara Turquesa",
"ogerponTealMaskTera": "Máscara Turquesa Terastalizada",
"ogerponWellspringMask": "Máscara Nascente",
"ogerponWellspringMaskTera": "Máscara Nascente Terastalizada",
"ogerponHearthflameMask": "Máscara Fornalha",
"ogerponHearthflameMaskTera": "Máscara Fornalha Terastalizada",
"ogerponCornerstoneMask": "Máscara Alicerce",
"ogerponCornerstoneMaskTera": "Máscara Alicerce Terastalizada",
"terpagos": "Normal",
"terpagosTerastal": "Teracristal",
"terpagosStellar": "Astral",
"galarDarumaka": "Padrão",
"galarDarumakaZen": "Zen",
"paldeaTaurosCombat": "Combate",
"paldeaTaurosBlaze": "Chamas",
"paldeaTaurosAqua": "Aquático"

View File

@ -126,6 +126,8 @@
"skull_grunts": "Capangas da Equipe Skull",
"macro_grunt": "Treinador da Macro Cosmos",
"macro_grunt_female": "Treinadora da Macro Cosmos",
"macro_grunts": "Treinadores da Macro Cosmos"
"macro_grunts": "Treinadores da Macro Cosmos",
"star_grunt": "Capanga da Equipe Estrela",
"star_grunt_female": "Capanga da Equipe Estrela",
"star_grunts": "Capangas da Equipe Estrela"
}

View File

@ -141,6 +141,12 @@
"faba": "Faba",
"plumeria": "Plumeria",
"oleana": "Oleana",
"giacomo": "Giacomo",
"mela": "Mela",
"atticus": "Atticus",
"ortega": "Ortega",
"eri": "Eri",
"maxie": "Maxie",
"archie": "Archie",
"cyrus": "Cyrus",
@ -149,6 +155,8 @@
"lusamine": "Lusamine",
"guzma": "Guzma",
"rose": "Rose",
"cassiopeia": "Penny",
"blue_red_double": "Blue & Red",
"red_blue_double": "Red & Blue",
"tate_liza_double": "Tate & Liza",

View File

@ -19,6 +19,7 @@
"aether_boss": "Presidente Aether",
"skull_boss": "Chefe da Equipe Skull",
"macro_boss": "Presidente da Macro Cosmos",
"star_boss": "Líder da Equipe Estrela",
"rocket_admin": "Admin da Equipe Rocket",
"rocket_admin_female": "Admin da Equipe Rocket",
@ -34,5 +35,6 @@
"flare_admin_female": "Admin da Equipe Flare",
"aether_admin": "Admin da Fundação Aether",
"skull_admin": "Admin da Equipe Skull",
"macro_admin": "Macro Cosmos"
"macro_admin": "Macro Cosmos",
"star_admin": "Chefe de Esquadrão da Equipe Estrela"
}

View File

@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "毒傀儡",
"description": "因桃歹郎的招式而陷入中毒状态的\n对手同时也会陷入混乱状态。"
"description": "因此宝可梦的招式而陷入中毒状态的对手\n同时也会陷入混乱状态。"
}
}

View File

@ -81,9 +81,11 @@
"battle_aether_grunt": "日月「战斗!以太基金会」",
"battle_skull_grunt": "日月「战斗!骷髅队」",
"battle_macro_grunt": "剑盾「战斗!马洛科蒙集团」",
"battle_star_grunt": "SV Team Star Battle",
"battle_galactic_admin": "晶灿钻石·明亮珍珠「战斗!银河队干部」",
"battle_skull_admin": "日月「战斗!骷髅队干部」",
"battle_oleana": "剑盾「战斗!奥利薇」",
"battle_star_admin": "SV Team Star Boss",
"battle_rocket_boss": "究极日月「战斗!坂木」",
"battle_aqua_magma_boss": "Ω红宝石α蓝宝石「战斗!水梧桐・赤焰松」",
"battle_galactic_boss": "晶灿钻石·明亮珍珠「战斗!赤日」",
@ -92,6 +94,7 @@
"battle_aether_boss": "日月「战斗!露莎米奈」",
"battle_skull_boss": "日月「战斗!古兹马」",
"battle_macro_boss": "剑盾「战斗!洛兹」",
"battle_star_boss": "SV Cassiopeia Battle",
"abyss": "空之探险队「黑暗小丘」",
"badlands": "空之探险队「枯竭之谷」",
@ -106,17 +109,17 @@
"forest": "空之探险队「黑暗森林」",
"grass": "空之探险队「苹果森林」",
"graveyard": "空之探险队「神秘森林」",
"ice_cave": "空之探险队「大冰山」",
"ice_cave": "Firel - -50°C",
"island": "空之探险队「沿岸岩地」",
"jungle": "Lmz - 丛林",
"laboratory": "Firel - 研究所",
"lake": "空之探险队「水晶洞窟」",
"lake": "Lmz - Lake",
"meadow": "空之探险队「天空顶端(森林)」",
"metropolis": "Firel - 城市",
"mountain": "空之探险队「角山」",
"plains": "空之探险队「天空顶端(草原)」",
"power_plant": "空之探险队「电气平原 深处」",
"ruins": "空之探险队「封印岩地 深处」",
"plains": "Firel - Route 888",
"power_plant": "Firel - The Klink",
"ruins": "Lmz - Ancient Ruins",
"sea": "Andr06 - 海洋之秘",
"seabed": "Firel - 海底",
"slum": "Andr06 - 狡猾的雪吞虫",
@ -126,7 +129,7 @@
"tall_grass": "空之探险队「浓雾森林」",
"temple": "空之探险队「守护洞穴」",
"town": "空之探险队「随机迷宫3」",
"volcano": "空之探险队「热水洞窟」",
"volcano": "Firel - Twisturn Volcano",
"wasteland": "空之探险队「梦幻高原」",
"encounter_ace_trainer": "黑白 「视线!精英训练师」",
"encounter_backpacker": "黑白 「视线!背包客」",

View File

@ -715,12 +715,16 @@
"encounter": {
"1": "你的对战生涯到此为止了。",
"2": "你是一名训练师吧\n你没有干涉我们工作的权力",
"3": "我是马洛科蒙集团的,要买马洛科蒙人寿保险吗。"
"3": "我是马洛科蒙集团的,要买马洛科蒙人寿保险吗。",
"4": "I found you! In that case, time for a Pokémon battle!",
"5": "An earful from Ms. Oleana is way worse than anything you can do!"
},
"victory": {
"1": "除了礼貌地撤退我似乎别无选择…",
"2": "没法留住我的零花钱了,我又要财政赤字了…",
"3": "没人能比马洛科蒙集团的我们工作更卷!"
"3": "没人能比马洛科蒙集团的我们工作更卷!",
"4": "I even switched up my Pokémon...",
"5": "Battles didn't work... Only thing to do now is run!"
}
},
"oleana": {
@ -735,6 +739,73 @@
"3": "*叹气*奥利薇累累了……"
}
},
"star_grunt": {
"encounter": {
"1": "We're Team Star, kid. We burn so bright, it hurts to look at us!",
"2": "We'll come at you full force - Hasta la vistaaar! ★",
"3": "If you don't clear out real quick-like, I'll hafta come at you in self-defense. You get me?",
"4": "Sorry, but if you don't turn yourself around here, amigo, we'll have to send you packing!",
"4_female": "Sorry, but if you don't turn yourself around here, amiga, we'll have to send you packing!",
"5": "Oh great. Here comes another rando to ruin my day."
},
"victory": {
"1": "How come I'M the one seeing stars?!",
"2": "You're scary, kid. If you joined Team Star, you'd be looking down from the top in no time!",
"3": "I defended myself all right... But it wasn't enough!",
"4": "H-hasta la vistar... ★",
"5": "I didn't think grunt work for Team Star newbies would be this much of a chore..."
}
},
"giacomo": {
"encounter": {
"1": "You don't really think things through, do ya? Declarin' war on Team Star is a real bad move.",
"2": "I'll play you a sick requiem as you crash and burn. Let's get this party staaarteeed!"
},
"victory": {
"1": "Guess that's that...",
"2": "You turned my melody into a threnody..."
}
},
"mela": {
"encounter": {
"1": "So you're the dope who picked a fight with Team Star... Prepare to get messed up.",
"2": "All riiight, BRING IT! I'll blow everythin' sky high!"
},
"victory": {
"1": "Ugh. Is this really how it's gonna end? What a hassle...",
"2": "I burned through everythin' I had...and now I've sputtered out."
}
},
"atticus": {
"encounter": {
"1": "You have some nerve baring your fangs at Team Star. Come, then, villainous wretch!",
"2": "Be warned—I shall spare thee no mercy! En garde!"
},
"victory": {
"1": "Forgive me, my friends...",
"2": "You have utterly bested me. But thy victory stir'd no bitterness within me—such was its brilliance."
}
},
"ortega": {
"encounter": {
"1": "I promise I'll play nice, so don't blame me when this battle sends you blubbering back home!",
"2": "I'll wipe that smug look off your face for sure! You're going down!"
},
"victory": {
"1": "Ugh! How could I LOSE! What the HECK!",
"2": "Arrrrgggh! That strength of yours is SO. NOT. FAIR."
}
},
"eri": {
"encounter": {
"1": "Doesn't matter who you are. I'll bury anyone who tries to take down Team Star!",
"2": "I give as good as I get—that's a promise! We'll see who's left standing in the end!"
},
"victory": {
"1": "I'm so sorry, everyone...",
"2": "I gave it my all, but it wasn't enough—I wasn't enough..."
}
},
"rocket_boss_giovanni_1": {
"encounter": {
"1": "我不得不说,能来到这里,你的确很不简单!"
@ -922,6 +993,28 @@
"1": "你完全不理解!"
}
},
"star_boss_penny_1": {
"encounter": {
"1": "I'm the big boss of Team Star. The name's Cassiopeia. \n$Now, bow down before the overwhelming might of Team Star's founder!"
},
"victory": {
"1": "... ... .."
},
"defeat": {
"1": "Heh..."
}
},
"star_boss_penny_2": {
"encounter": {
"1": "I won't hold back in this battle! I'll stay true to Team Star's code! \n$My Veevee power will crush you into stardust!"
},
"victory": {
"1": "...It's all over now."
},
"defeat": {
"1": "I can't fault you on your battle skills at all... Considering how the bosses fell at your hands."
}
},
"macro_boss_rose_2": {
"encounter": {
"1": "我致力于解决伽勒尔的能源问题\n——当然也是全世界的能源问题。\n$我的经验与成果,造就了马洛科蒙集团,证明了我的正确与成功!\n$就算输了,我也不会改变主意的……"

View File

@ -65,6 +65,7 @@
"suppressAbilities": "{{pokemonName}}的特性\n变得无效了",
"revivalBlessing": "{{pokemonName}}复活了!",
"swapArenaTags": "{{pokemonName}}\n交换了双方的场地效果",
"chillyReception": "{{pokemonName}}\n说出了冷笑话",
"exposedMove": "{{pokemonName}}识破了\n{{targetPokemonName}}的原型!",
"safeguard": "{{targetName}}\n正受到神秘之幕的保护",
"afterYou": "{{pokemonName}}\n接受了对手的好意"

View File

@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "气场轮",
"effect": "用储存在颊囊里的能量进行攻击,\n并提高自己的速度。其属性会随着\n莫鲁贝可的样子而改变"
"effect": "用储存在颊囊里的能量进行攻击,\n并提高自己的速度。如果由莫鲁贝可使用,\n其属性会随着它的样子而改变"
},
"breakingSwipe": {
"name": "广域破坏",

View File

@ -1,4 +1,5 @@
{
"pikachu": "Normal",
"pikachuCosplay": "换装",
"pikachuCoolCosplay": "摇滚巨星",
"pikachuBeautyCosplay": "贵妇",
@ -6,7 +7,9 @@
"pikachuSmartCosplay": "博士",
"pikachuToughCosplay": "面罩摔跤手",
"pikachuPartner": "搭档",
"eevee": "Normal",
"eeveePartner": "搭档",
"pichu": "Normal",
"pichuSpiky": "刺刺耳",
"unownA": "A",
"unownB": "B",
@ -36,36 +39,65 @@
"unownZ": "Z",
"unownExclamation": "!",
"unownQuestion": "?",
"castform": "Normal Form",
"castformSunny": "晴天",
"castformRainy": "雨天",
"castformSnowy": "雪天",
"deoxysNormal": "普通",
"deoxysAttack": "Attack",
"deoxysDefense": "Defense",
"deoxysSpeed": "Speed",
"burmyPlant": "草木蓑衣",
"burmySandy": "砂土蓑衣",
"burmyTrash": "垃圾蓑衣",
"cherubiOvercast": "Overcast",
"cherubiSunshine": "Sunshine",
"shellosEast": "东海",
"shellosWest": "西海",
"rotom": "Normal",
"rotomHeat": "加热",
"rotomWash": "清洗",
"rotomFrost": "结冰",
"rotomFan": "旋转",
"rotomMow": "切割",
"dialga": "Normal",
"dialgaOrigin": "Origin",
"palkia": "Normal",
"palkiaOrigin": "Origin",
"giratinaAltered": "别种",
"giratinaOrigin": "Origin",
"shayminLand": "陆上",
"shayminSky": "Sky",
"basculinRedStriped": "红条纹",
"basculinBlueStriped": "蓝条纹",
"basculinWhiteStriped": "白条纹",
"darumaka": "Standard Mode",
"darumakaZen": "Zen",
"deerlingSpring": "春天",
"deerlingSummer": "夏天",
"deerlingAutumn": "秋天",
"deerlingWinter": "冬天",
"tornadusIncarnate": "化身",
"tornadusTherian": "Therian",
"thundurusIncarnate": "化身",
"thundurusTherian": "Therian",
"landorusIncarnate": "化身",
"landorusTherian": "Therian",
"kyurem": "Normal",
"kyuremBlack": "Black",
"kyuremWhite": "White",
"keldeoOrdinary": "通常",
"keldeoResolute": "Resolute",
"meloettaAria": "歌声",
"meloettaPirouette": "舞步形态",
"genesect": "Normal",
"genesectShock": "Shock Drive",
"genesectBurn": "Burn Drive",
"genesectChill": "Chill Drive",
"genesectDouse": "Douse Drive",
"froakie": "Normal",
"froakieBattleBond": "牵绊变身",
"froakieAsh": "Ash",
"scatterbugMeadow": "花园花纹",
"scatterbugIcySnow": "冰雪花纹",
"scatterbugPolar": "雪国花纹",
@ -91,6 +123,7 @@
"flabebeOrange": "橙花",
"flabebeBlue": "蓝花",
"flabebeWhite": "白花",
"furfrou": "Natural Form",
"furfrouHeart": "心形造型",
"furfrouStar": "星形造型",
"furfrouDiamond": "菱形造型",
@ -100,6 +133,11 @@
"furfrouLaReine": "女王造型",
"furfrouKabuki": "歌舞伎造型",
"furfrouPharaoh": "国王造型",
"espurrMale": "Male",
"espurrFemale": "Female",
"honedgeShiled": "Shield",
"honedgeBlade": "Blade",
"pumpkaboo": "Average Size",
"pumpkabooSmall": "小尺寸",
"pumpkabooLarge": "大尺寸",
"pumpkabooSuper": "特大尺寸",
@ -110,11 +148,37 @@
"zygarde50Pc": "50%形态 群聚变形",
"zygarde10Pc": "10%形态 群聚变形",
"zygardeComplete": "完全体形态",
"hoopa": "Confined",
"hoopaUnbound": "Unbound",
"oricorioBaile": "热辣热辣风格",
"oricorioPompom": "啪滋啪滋风格",
"oricorioPau": "呼拉呼拉风格",
"oricorioSensu": "轻盈轻盈风格",
"rockruff": "Normal",
"rockruffOwnTempo": "特殊岩狗狗",
"rockruffMidday": "Midday",
"rockruffMidnight": "Midnight",
"rockruffDusk": "Dusk",
"wishiwashi": "Solo Form",
"wishiwashiSchool": "School",
"typeNullNormal": "Type: Normal",
"typeNullFighting": "Type: Fighting",
"typeNullFlying": "Type: Flying",
"typeNullPoison": "Type: Poison",
"typeNullGround": "Type: Ground",
"typeNullRock": "Type: Rock",
"typeNullBug": "Type: Bug",
"typeNullGhost": "Type: Ghost",
"typeNullSteel": "Type: Steel",
"typeNullFire": "Type: Fire",
"typeNullWater": "Type: Water",
"typeNullGrass": "Type: Grass",
"typeNullElectric": "Type: Electric",
"typeNullPsychic": "Type: Psychic",
"typeNullIce": "Type: Ice",
"typeNullDragon": "Type: Dragon",
"typeNullDark": "Type: Dark",
"typeNullFairy": "Type: Fairy",
"miniorRedMeteor": "红色核心",
"miniorOrangeMeteor": "橙色核心",
"miniorYellowMeteor": "黄色核心",
@ -131,25 +195,66 @@
"miniorViolet": "紫色",
"mimikyuDisguised": "化形",
"mimikyuBusted": "现形",
"necrozma": "Normal",
"necrozmaDuskMane": "Dusk Mane",
"necrozmaDawnWings": "Dawn Wings",
"necrozmaUltra": "Ultra",
"magearna": "Normal",
"magearnaOriginal": "500年前的颜色",
"marshadow": "Normal",
"marshadowZenith": "全力",
"cramorant": "Normal",
"cramorantGulping": "Gulping Form",
"cramorantGorging": "Gorging Form",
"toxelAmped": "Amped Form",
"toxelLowkey": "Low-Key Form",
"sinisteaPhony": "赝品",
"sinisteaAntique": "真品",
"milceryVanillaCream": "Vanilla Cream",
"milceryRubyCream": "Ruby Cream",
"milceryMatchaCream": "Matcha Cream",
"milceryMintCream": "Mint Cream",
"milceryLemonCream": "Lemon Cream",
"milcerySaltedCream": "Salted Cream",
"milceryRubySwirl": "Ruby Swirl",
"milceryCaramelSwirl": "Caramel Swirl",
"milceryRainbowSwirl": "Rainbow Swirl",
"eiscue": "Ice Face",
"eiscueNoIce": "解冻头",
"indeedeeMale": "雄性",
"indeedeeFemale": "雌性",
"morpekoFullBelly": "满腹花纹",
"morpekoHangry": "Hangry",
"zacianHeroOfManyBattles": "百战勇者",
"zacianCrowned": "Crowned",
"zamazentaHeroOfManyBattles": "百战勇者",
"zamazentaCrowned": "Crowned",
"kubfuSingleStrike": "Single Strike",
"kubfuRapidStrike": "Rapid Strike",
"zarude": "Normal",
"zarudeDada": "老爹",
"calyrex": "Normal",
"calyrexIce": "Ice Rider",
"calyrexShadow": "Shadow Rider",
"basculinMale": "Male",
"basculinFemale": "Female",
"enamorusIncarnate": "化身",
"enamorusTherian": "Therian",
"lechonkMale": "Male",
"lechonkFemale": "Female",
"tandemausFour": "Family of Four",
"tandemausThree": "Family of Three",
"squawkabillyGreenPlumage": "绿羽毛",
"squawkabillyBluePlumage": "蓝羽毛",
"squawkabillyYellowPlumage": "黄羽毛",
"squawkabillyWhitePlumage": "白羽毛",
"finizenZero": "Zero",
"finizenHero": "Hero",
"tatsugiriCurly": "上弓姿势",
"tatsugiriDroopy": "下垂姿势",
"tatsugiriStretchy": "平挺姿势",
"dunsparceTwo": "Two-Segment",
"dunsparceThree": "Three-Segment",
"gimmighoulChest": "宝箱形态",
"gimmighoulRoaming": "徒步形态",
"koraidonApexBuild": "顶尖形态",
@ -164,6 +269,21 @@
"miraidonGlideMode": "滑翔模式",
"poltchageistCounterfeit": "冒牌货",
"poltchageistArtisan": "高档货",
"poltchageistUnremarkable": "Unremarkable",
"poltchageistMasterpiece": "Masterpiece",
"ogerponTealMask": "Teal Mask",
"ogerponTealMaskTera": "Teal Mask Terastallized",
"ogerponWellspringMask": "Wellspring Mask",
"ogerponWellspringMaskTera": "Wellspring Mask Terastallized",
"ogerponHearthflameMask": "Hearthflame Mask",
"ogerponHearthflameMaskTera": "Hearthflame Mask Terastallized",
"ogerponCornerstoneMask": "Cornerstone Mask",
"ogerponCornerstoneMaskTera": "Cornerstone Mask Terastallized",
"terpagos": "Normal Form",
"terpagosTerastal": "Terastal",
"terpagosStellar": "Stellar",
"galarDarumaka": "Standard Mode",
"galarDarumakaZen": "Zen",
"paldeaTaurosCombat": "斗战种",
"paldeaTaurosBlaze": "火炽种",
"paldeaTaurosAqua": "水澜种"

View File

@ -126,5 +126,8 @@
"skull_grunts": "骷髅队手下",
"macro_grunt": "马洛科蒙训练师",
"macro_grunt_female": "马洛科蒙训练师",
"macro_grunts": "马洛科蒙训练师"
"macro_grunts": "马洛科蒙训练师",
"star_grunt": "Star Grunt",
"star_grunt_female": "Star Grunt",
"star_grunts": "Star Grunts"
}

View File

@ -30,10 +30,6 @@
"crasher_wake": "吉宪",
"fantina": "梅丽莎",
"byron": "东瓜",
"faba": "扎奥博",
"plumeria": "布尔美丽",
"oleana": "奥莉薇",
"candice": "小菘",
"volkner": "电次",
"cilan": "天桐",
@ -142,6 +138,15 @@
"rood": "罗德",
"xerosic": "库瑟洛斯奇",
"bryony": "芭菈",
"faba": "扎奥博",
"plumeria": "布尔美丽",
"oleana": "奥莉薇",
"giacomo": "Giacomo",
"mela": "Mela",
"atticus": "Atticus",
"ortega": "Ortega",
"eri": "Eri",
"maxie": "赤焰松",
"archie": "水梧桐",
"cyrus": "赤日",
@ -150,6 +155,7 @@
"lusamine": "露莎米奈",
"guzma": "古兹马",
"rose": "洛兹",
"cassiopeia": "牡丹",
"blue_red_double": "青绿 & 赤红",
"red_blue_double": "赤红 & 青绿",

View File

@ -19,6 +19,7 @@
"aether_boss": "以太基金会理事长",
"skull_boss": "骷髅队老大",
"macro_boss": "马洛科蒙总裁",
"star_boss": "Team Star Leader",
"rocket_admin": "火箭队干部",
"rocket_admin_female": "火箭队干部",
@ -34,5 +35,6 @@
"flare_admin_female": "闪焰队干部",
"aether_admin": "以太基金会干部",
"skull_admin": "骷髅队干部",
"macro_admin": "马洛科蒙干部"
"macro_admin": "马洛科蒙干部",
"star_admin": "Team Star Squad Boss"
}

View File

@ -1237,6 +1237,6 @@
},
"poisonPuppeteer": {
"name": "毒傀儡",
"description": "因為桃歹郎的招式而陷入中\n毒狀態的對手同時也會陷入\n混亂狀態。"
"description": "因為此寶可夢的招式而陷入中毒狀態的對手\n同時也會陷入混亂狀態。"
}
}

View File

@ -83,6 +83,9 @@
"battle_galactic_boss": "晶燦鑽石·明亮珍珠「戰鬥!赤日」",
"battle_plasma_boss": "黑2白2「戰鬥魁奇思」",
"battle_flare_boss": "XY「戰鬥弗拉達利」",
"battle_star_grunt": "SV Team Star Battle",
"battle_star_admin": "SV Team Star Boss",
"battle_star_boss": "SV Cassiopeia Battle",
"abyss": "空之探險隊「黑暗小丘」",
"badlands": "空之探險隊「枯竭之谷」",
@ -97,17 +100,17 @@
"forest": "空之探險隊「黑暗森林」",
"grass": "空之探險隊「蘋果森林」",
"graveyard": "空之探險隊「神秘森林」",
"ice_cave": "空之探險隊「大冰山」",
"ice_cave": "Firel - -50°C",
"island": "空之探險隊「沿岸岩地」",
"jungle": "Lmz - 叢林",
"laboratory": "Firel - 研究所",
"lake": "空之探險隊「水晶洞窟」",
"lake": "Lmz - Lake",
"meadow": "空之探險隊「天空頂端(森林)」",
"metropolis": "Firel - 城市",
"mountain": "空之探險隊「角山」",
"plains": "空之探險隊「天空頂端(草原)」",
"power_plant": "空之探險隊「電氣平原 深處」",
"ruins": "空之探險隊「封印岩地 深處」",
"plains": "Firel - Route 888",
"power_plant": "Firel - The Klink",
"ruins": "Lmz - Ancient Ruins",
"sea": "Andr06 - 海洋之秘",
"seabed": "Firel - 海底",
"slum": "Andr06 - 狡猾的雪吞蟲",
@ -117,7 +120,7 @@
"tall_grass": "空之探險隊「濃霧森林」",
"temple": "空之探險隊「守護洞穴」",
"town": "空之探險隊「隨機迷宮3」",
"volcano": "空之探險隊「熱水洞窟」",
"volcano": "Firel - Twisturn Volcano",
"wasteland": "空之探險隊「夢幻高原」",
"encounter_ace_trainer": "黑白 「視線!精英訓練師」",

View File

@ -65,6 +65,7 @@
"suppressAbilities": "{{pokemonName}}的特性\n變得無效了",
"revivalBlessing": "{{pokemonName}}復活了!",
"swapArenaTags": "{{pokemonName}}\n交換了雙方的場地效果",
"chillyReception": "{{pokemonName}}\n說了冷笑話",
"exposedMove": "{{pokemonName}}識破了\n{{targetPokemonName}}的原形!",
"safeguard": "{{targetName}}\n正受到神秘之幕的保護",
"afterYou": "{{pokemonName}}\n接受了對手的好意"

View File

@ -3129,7 +3129,7 @@
},
"auraWheel": {
"name": "氣場輪",
"effect": "用儲存在頰囊裏的能量進行\n攻擊並提高自己的速度。\n其屬性會隨着莫魯貝可的樣\n子而改變"
"effect": "用儲存在頰囊裏的能量進行\n攻擊並提高自己的速度。\n如果由莫魯貝可使用,\n其屬性會隨着它的樣子而改變"
},
"breakingSwipe": {
"name": "廣域破壞",

View File

@ -1,4 +1,5 @@
{
"pikachu": "Normal",
"pikachuCosplay": "換裝",
"pikachuCoolCosplay": "搖滾巨星",
"pikachuBeautyCosplay": "貴婦",
@ -6,7 +7,9 @@
"pikachuSmartCosplay": "博士",
"pikachuToughCosplay": "面罩摔跤手",
"pikachuPartner": "搭檔",
"eevee": "Normal",
"eeveePartner": "搭檔",
"pichu": "Normal",
"pichuSpiky": "刺刺耳",
"unownA": "A",
"unownB": "B",
@ -36,36 +39,65 @@
"unownZ": "Z",
"unownExclamation": "!",
"unownQuestion": "?",
"castform": "Normal Form",
"castformSunny": "晴天",
"castformRainy": "雨天",
"castformSnowy": "雪天",
"deoxysNormal": "普通",
"deoxysAttack": "Attack",
"deoxysDefense": "Defense",
"deoxysSpeed": "Speed",
"burmyPlant": "草木蓑衣",
"burmySandy": "砂土蓑衣",
"burmyTrash": "垃圾蓑衣",
"cherubiOvercast": "Overcast",
"cherubiSunshine": "Sunshine",
"shellosEast": "東海",
"shellosWest": "西海",
"rotom": "Normal",
"rotomHeat": "加熱",
"rotomWash": "清洗",
"rotomFrost": "結冰",
"rotomFan": "旋轉",
"rotomMow": "切割",
"dialga": "Normal",
"dialgaOrigin": "Origin",
"palkia": "Normal",
"palkiaOrigin": "Origin",
"giratinaAltered": "別種",
"giratinaOrigin": "Origin",
"shayminLand": "陸上",
"shayminSky": "Sky",
"basculinRedStriped": "紅條紋",
"basculinBlueStriped": "藍條紋",
"basculinWhiteStriped": "白條紋",
"darumaka": "Standard Mode",
"darumakaZen": "Zen",
"deerlingSpring": "春天",
"deerlingSummer": "夏天",
"deerlingAutumn": "秋天",
"deerlingWinter": "冬天",
"tornadusIncarnate": "化身",
"tornadusTherian": "Therian",
"thundurusIncarnate": "化身",
"thundurusTherian": "Therian",
"landorusIncarnate": "化身",
"landorusTherian": "Therian",
"kyurem": "Normal",
"kyuremBlack": "Black",
"kyuremWhite": "White",
"keldeoOrdinary": "通常",
"keldeoResolute": "Resolute",
"meloettaAria": "歌聲",
"meloettaPirouette": "舞步形態",
"genesect": "Normal",
"genesectShock": "Shock Drive",
"genesectBurn": "Burn Drive",
"genesectChill": "Chill Drive",
"genesectDouse": "Douse Drive",
"froakie": "Normal",
"froakieBattleBond": "牽絆變身",
"froakieAsh": "Ash",
"scatterbugMeadow": "花園花紋",
"scatterbugIcySnow": "冰雪花紋",
"scatterbugPolar": "雪國花紋",
@ -91,6 +123,7 @@
"flabebeOrange": "橙花",
"flabebeBlue": "藍花",
"flabebeWhite": "白花",
"furfrou": "Natural Form",
"furfrouHeart": "心形造型",
"furfrouStar": "星形造型",
"furfrouDiamond": "菱形造型",
@ -100,6 +133,11 @@
"furfrouLaReine": "女王造型",
"furfrouKabuki": "歌舞伎造型",
"furfrouPharaoh": "國王造型",
"espurrMale": "Male",
"espurrFemale": "Female",
"honedgeShiled": "Shield",
"honedgeBlade": "Blade",
"pumpkaboo": "Average Size",
"pumpkabooSmall": "小尺寸",
"pumpkabooLarge": "大尺寸",
"pumpkabooSuper": "特大尺寸",
@ -110,11 +148,37 @@
"zygarde50Pc": "50%形態 群聚變形",
"zygarde10Pc": "10%形態 群聚變形",
"zygardeComplete": "完全體形態",
"hoopa": "Confined",
"hoopaUnbound": "Unbound",
"oricorioBaile": "熱辣熱辣風格",
"oricorioPompom": "啪滋啪滋風格",
"oricorioPau": "呼拉呼拉風格",
"oricorioSensu": "輕盈輕盈風格",
"rockruff": "Normal",
"rockruffOwnTempo": "特殊岩狗狗",
"rockruffMidday": "Midday",
"rockruffMidnight": "Midnight",
"rockruffDusk": "Dusk",
"wishiwashi": "Solo Form",
"wishiwashiSchool": "School",
"typeNullNormal": "Type: Normal",
"typeNullFighting": "Type: Fighting",
"typeNullFlying": "Type: Flying",
"typeNullPoison": "Type: Poison",
"typeNullGround": "Type: Ground",
"typeNullRock": "Type: Rock",
"typeNullBug": "Type: Bug",
"typeNullGhost": "Type: Ghost",
"typeNullSteel": "Type: Steel",
"typeNullFire": "Type: Fire",
"typeNullWater": "Type: Water",
"typeNullGrass": "Type: Grass",
"typeNullElectric": "Type: Electric",
"typeNullPsychic": "Type: Psychic",
"typeNullIce": "Type: Ice",
"typeNullDragon": "Type: Dragon",
"typeNullDark": "Type: Dark",
"typeNullFairy": "Type: Fairy",
"miniorRedMeteor": "紅色核心",
"miniorOrangeMeteor": "橙色核心",
"miniorYellowMeteor": "黃色核心",
@ -131,25 +195,66 @@
"miniorViolet": "紫色",
"mimikyuDisguised": "化形",
"mimikyuBusted": "現形",
"necrozma": "Normal",
"necrozmaDuskMane": "Dusk Mane",
"necrozmaDawnWings": "Dawn Wings",
"necrozmaUltra": "Ultra",
"magearna": "Normal",
"magearnaOriginal": "500年前的顔色",
"marshadow": "Normal",
"marshadowZenith": "全力",
"cramorant": "Normal",
"cramorantGulping": "Gulping Form",
"cramorantGorging": "Gorging Form",
"toxelAmped": "Amped Form",
"toxelLowkey": "Low-Key Form",
"sinisteaPhony": "赝品",
"sinisteaAntique": "真品",
"milceryVanillaCream": "Vanilla Cream",
"milceryRubyCream": "Ruby Cream",
"milceryMatchaCream": "Matcha Cream",
"milceryMintCream": "Mint Cream",
"milceryLemonCream": "Lemon Cream",
"milcerySaltedCream": "Salted Cream",
"milceryRubySwirl": "Ruby Swirl",
"milceryCaramelSwirl": "Caramel Swirl",
"milceryRainbowSwirl": "Rainbow Swirl",
"eiscue": "Ice Face",
"eiscueNoIce": "解凍頭",
"indeedeeMale": "雄性",
"indeedeeFemale": "雌性",
"morpekoFullBelly": "滿腹花紋",
"morpekoHangry": "Hangry",
"zacianHeroOfManyBattles": "百戰勇者",
"zacianCrowned": "Crowned",
"zamazentaHeroOfManyBattles": "百戰勇者",
"zamazentaCrowned": "Crowned",
"kubfuSingleStrike": "Single Strike",
"kubfuRapidStrike": "Rapid Strike",
"zarude": "Normal",
"zarudeDada": "老爹",
"calyrex": "Normal",
"calyrexIce": "Ice Rider",
"calyrexShadow": "Shadow Rider",
"basculinMale": "Male",
"basculinFemale": "Female",
"enamorusIncarnate": "化身",
"enamorusTherian": "Therian",
"lechonkMale": "Male",
"lechonkFemale": "Female",
"tandemausFour": "Family of Four",
"tandemausThree": "Family of Three",
"squawkabillyGreenPlumage": "綠羽毛",
"squawkabillyBluePlumage": "藍羽毛",
"squawkabillyYellowPlumage": "黃羽毛",
"squawkabillyWhitePlumage": "白羽毛",
"finizenZero": "Zero",
"finizenHero": "Hero",
"tatsugiriCurly": "上弓姿勢",
"tatsugiriDroopy": "下垂姿勢",
"tatsugiriStretchy": "平挺姿勢",
"dunsparceTwo": "Two-Segment",
"dunsparceThree": "Three-Segment",
"gimmighoulChest": "寶箱形態",
"gimmighoulRoaming": "徒步形態",
"koraidonApexBuild": "頂尖形態",
@ -164,6 +269,21 @@
"miraidonGlideMode":"滑翔模式",
"poltchageistCounterfeit": "冒牌貨",
"poltchageistArtisan": "高檔貨",
"poltchageistUnremarkable": "Unremarkable",
"poltchageistMasterpiece": "Masterpiece",
"ogerponTealMask": "Teal Mask",
"ogerponTealMaskTera": "Teal Mask Terastallized",
"ogerponWellspringMask": "Wellspring Mask",
"ogerponWellspringMaskTera": "Wellspring Mask Terastallized",
"ogerponHearthflameMask": "Hearthflame Mask",
"ogerponHearthflameMaskTera": "Hearthflame Mask Terastallized",
"ogerponCornerstoneMask": "Cornerstone Mask",
"ogerponCornerstoneMaskTera": "Cornerstone Mask Terastallized",
"terpagos": "Normal Form",
"terpagosTerastal": "Terastal",
"terpagosStellar": "Stellar",
"galarDarumaka": "Standard Mode",
"galarDarumakaZen": "Zen",
"paldeaTaurosCombat": "鬥戰種",
"paldeaTaurosBlaze": "火熾種",
"paldeaTaurosAqua": "水瀾種"

View File

@ -117,5 +117,8 @@
"plasma_grunts": "等离子队手下們",
"flare_grunt": "闪焰队手下",
"flare_grunt_female": "闪焰队手下",
"flare_grunts": "闪焰队手下們"
"flare_grunts": "闪焰队手下們",
"star_grunt": "Star Grunt",
"star_grunt_female": "Star Grunt",
"star_grunts": "Star Grunts"
}

View File

@ -141,6 +141,11 @@
"faba": "扎奧博",
"plumeria": "布爾美麗",
"oleana": "奧利薇",
"giacomo": "Giacomo",
"mela": "Mela",
"atticus": "Atticus",
"ortega": "Ortega",
"eri": "Eri",
"maxie": "赤焰松",
"archie": "水梧桐",
@ -150,6 +155,7 @@
"lusamine": "露莎米奈",
"guzma": "古茲馬",
"rose": "洛茲",
"cassiopeia": "牡丹",
"blue_red_double": "青綠 & 赤紅",
"red_blue_double": "赤紅 & 青綠",

View File

@ -16,6 +16,10 @@
"galactic_boss": "銀河隊老大",
"plasma_boss": "等離子隊老大",
"flare_boss": "閃焰隊老大",
"aether_boss": "Aether President",
"skull_boss": "Team Skull Boss",
"macro_boss": "Macro Cosmos President",
"star_boss": "Team Star Leader",
"rocket_admin": "火箭隊幹部",
"rocket_admin_female": "火箭隊幹部",
@ -28,5 +32,9 @@
"plasma_sage": "等離子隊賢人",
"plasma_admin": "等離子隊幹部",
"flare_admin": "閃焰隊幹部",
"flare_admin_female": "閃焰隊幹部"
"flare_admin_female": "閃焰隊幹部",
"aether_admin": "Aether Foundation Admin",
"skull_admin": "Team Skull Admin",
"macro_admin": "Macro Cosmos",
"star_admin": "Team Star Squad Boss"
}

View File

@ -1288,6 +1288,21 @@ function skipInClassicAfterWave(wave: integer, defaultWeight: integer): Weighted
function skipInLastClassicWaveOrDefault(defaultWeight: integer) : WeightedModifierTypeWeightFunc {
return skipInClassicAfterWave(199, defaultWeight);
}
/**
* High order function that returns a WeightedModifierTypeWeightFunc to ensure Lures don't spawn on Classic 199
* or if the lure still has over 60% of its duration left
* @param maxBattles The max battles the lure type in question lasts. 10 for green, 15 for Super, 30 for Max
* @param weight The desired weight for the lure when it does spawn
* @returns A WeightedModifierTypeWeightFunc
*/
function lureWeightFunc(maxBattles: number, weight: number): WeightedModifierTypeWeightFunc {
return (party: Pokemon[]) => {
const lures = party[0].scene.getModifiers(Modifiers.DoubleBattleChanceBoosterModifier);
return !(party[0].scene.gameMode.isClassic && party[0].scene.currentBattle.waveIndex === 199) && (lures.length === 0 || lures.filter(m => m.getMaxBattles() === maxBattles && m.getBattleCount() >= maxBattles * 0.6).length === 0) ? weight : 0;
};
}
class WeightedModifierType {
public modifierType: ModifierType;
public weight: integer | WeightedModifierTypeWeightFunc;
@ -1611,7 +1626,7 @@ const modifierPool: ModifierPool = {
const thresholdPartyMemberCount = Math.min(party.filter(p => p.hp && p.getMoveset().filter(m => m?.ppUsed && (m.getMovePp() - m.ppUsed) <= 5 && m.ppUsed >= Math.floor(m.getMovePp() / 2)).length).length, 3);
return thresholdPartyMemberCount;
}, 3),
new WeightedModifierType(modifierTypes.LURE, skipInLastClassicWaveOrDefault(2)),
new WeightedModifierType(modifierTypes.LURE, lureWeightFunc(10, 2)),
new WeightedModifierType(modifierTypes.TEMP_STAT_STAGE_BOOSTER, 4),
new WeightedModifierType(modifierTypes.BERRY, 2),
new WeightedModifierType(modifierTypes.TM_COMMON, 2),
@ -1668,7 +1683,7 @@ const modifierPool: ModifierPool = {
return thresholdPartyMemberCount;
}, 3),
new WeightedModifierType(modifierTypes.DIRE_HIT, 4),
new WeightedModifierType(modifierTypes.SUPER_LURE, skipInLastClassicWaveOrDefault(4)),
new WeightedModifierType(modifierTypes.SUPER_LURE, lureWeightFunc(15, 4)),
new WeightedModifierType(modifierTypes.NUGGET, skipInLastClassicWaveOrDefault(5)),
new WeightedModifierType(modifierTypes.EVOLUTION_ITEM, (party: Pokemon[]) => {
return Math.min(Math.ceil(party[0].scene.currentBattle.waveIndex / 15), 8);
@ -1691,7 +1706,7 @@ const modifierPool: ModifierPool = {
}),
[ModifierTier.ULTRA]: [
new WeightedModifierType(modifierTypes.ULTRA_BALL, (party: Pokemon[]) => (hasMaximumBalls(party, PokeballType.ULTRA_BALL)) ? 0 : 15, 15),
new WeightedModifierType(modifierTypes.MAX_LURE, skipInLastClassicWaveOrDefault(4)),
new WeightedModifierType(modifierTypes.MAX_LURE, lureWeightFunc(30, 4)),
new WeightedModifierType(modifierTypes.BIG_NUGGET, skipInLastClassicWaveOrDefault(12)),
new WeightedModifierType(modifierTypes.PP_MAX, 3),
new WeightedModifierType(modifierTypes.MINT, 4),

View File

@ -74,7 +74,7 @@ export class MovePhase extends BattlePhase {
if (!this.followUp) {
if (this.move.getMove().checkFlag(MoveFlags.IGNORE_ABILITIES, this.pokemon, null)) {
this.scene.arena.setIgnoreAbilities();
this.scene.arena.setIgnoreAbilities(true, this.pokemon.getBattlerIndex());
}
} else {
this.pokemon.turnData.hitsLeft = 0; // TODO: is `0` correct?

View File

@ -9,26 +9,26 @@ import { PokemonPhase } from "./pokemon-phase";
import { PostTurnStatusEffectPhase } from "./post-turn-status-effect-phase";
export class ObtainStatusEffectPhase extends PokemonPhase {
private statusEffect: StatusEffect | undefined;
private cureTurn: integer | null;
private sourceText: string | null;
private sourcePokemon: Pokemon | null;
private statusEffect?: StatusEffect | undefined;
private cureTurn?: integer | null;
private sourceText?: string | null;
private sourcePokemon?: Pokemon | null;
constructor(scene: BattleScene, battlerIndex: BattlerIndex, statusEffect?: StatusEffect, cureTurn?: integer | null, sourceText?: string, sourcePokemon?: Pokemon) {
constructor(scene: BattleScene, battlerIndex: BattlerIndex, statusEffect?: StatusEffect, cureTurn?: integer | null, sourceText?: string | null, sourcePokemon?: Pokemon | null) {
super(scene, battlerIndex);
this.statusEffect = statusEffect;
this.cureTurn = cureTurn!; // TODO: is this bang correct?
this.sourceText = sourceText!; // TODO: is this bang correct?
this.sourcePokemon = sourcePokemon!; // For tracking which Pokemon caused the status effect // TODO: is this bang correct?
this.cureTurn = cureTurn;
this.sourceText = sourceText;
this.sourcePokemon = sourcePokemon; // For tracking which Pokemon caused the status effect
}
start() {
const pokemon = this.getPokemon();
if (!pokemon?.status) {
if (pokemon?.trySetStatus(this.statusEffect, false, this.sourcePokemon)) {
if (pokemon && !pokemon.status) {
if (pokemon.trySetStatus(this.statusEffect, false, this.sourcePokemon)) {
if (this.cureTurn) {
pokemon.status!.cureTurn = this.cureTurn; // TODO: is this bang correct?
pokemon.status!.cureTurn = this.cureTurn; // TODO: is this bang correct?
}
pokemon.updateInfo(true);
new CommonBattleAnim(CommonAnim.POISON + (this.statusEffect! - 1), pokemon).play(this.scene, false, () => {
@ -40,8 +40,8 @@ export class ObtainStatusEffectPhase extends PokemonPhase {
});
return;
}
} else if (pokemon.status.effect === this.statusEffect) {
this.scene.queueMessage(getStatusEffectOverlapText(this.statusEffect, getPokemonNameWithAffix(pokemon)));
} else if (pokemon.status?.effect === this.statusEffect) {
this.scene.queueMessage(getStatusEffectOverlapText(this.statusEffect ?? StatusEffect.NONE, getPokemonNameWithAffix(pokemon)));
}
this.end();
}

View File

@ -0,0 +1,109 @@
import { StatusEffect } from "#app/data/status-effect";
import GameManager from "#app/test/utils/gameManager";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
describe("Abilities - Synchronize", () => {
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")
.startingLevel(100)
.enemySpecies(Species.MAGIKARP)
.enemyAbility(Abilities.SYNCHRONIZE)
.moveset([Moves.SPLASH, Moves.THUNDER_WAVE, Moves.SPORE, Moves.PSYCHO_SHIFT])
.ability(Abilities.NO_GUARD);
}, 20000);
it("does not trigger when no status is applied by opponent Pokemon", async () => {
await game.classicMode.startBattle([Species.FEEBAS]);
game.move.select(Moves.SPLASH);
await game.phaseInterceptor.to("BerryPhase");
expect(game.scene.getParty()[0].status).toBeUndefined();
expect(game.phaseInterceptor.log).not.toContain("ShowAbilityPhase");
}, 20000);
it("sets the status of the source pokemon to Paralysis when paralyzed by it", async () => {
await game.classicMode.startBattle([Species.FEEBAS]);
game.move.select(Moves.THUNDER_WAVE);
await game.phaseInterceptor.to("BerryPhase");
expect(game.scene.getParty()[0].status?.effect).toBe(StatusEffect.PARALYSIS);
expect(game.scene.getEnemyParty()[0].status?.effect).toBe(StatusEffect.PARALYSIS);
expect(game.phaseInterceptor.log).toContain("ShowAbilityPhase");
}, 20000);
it("does not trigger on Sleep", async () => {
await game.classicMode.startBattle();
game.move.select(Moves.SPORE);
await game.phaseInterceptor.to("BerryPhase");
expect(game.scene.getParty()[0].status?.effect).toBeUndefined();
expect(game.scene.getEnemyParty()[0].status?.effect).toBe(StatusEffect.SLEEP);
expect(game.phaseInterceptor.log).not.toContain("ShowAbilityPhase");
}, 20000);
it("does not trigger when Pokemon is statused by Toxic Spikes", async () => {
game.override
.ability(Abilities.SYNCHRONIZE)
.enemyAbility(Abilities.BALL_FETCH)
.enemyMoveset(Array(4).fill(Moves.TOXIC_SPIKES));
await game.classicMode.startBattle([Species.FEEBAS, Species.MILOTIC]);
game.move.select(Moves.SPLASH);
await game.toNextTurn();
game.doSwitchPokemon(1);
await game.phaseInterceptor.to("BerryPhase");
expect(game.scene.getParty()[0].status?.effect).toBe(StatusEffect.POISON);
expect(game.scene.getEnemyParty()[0].status?.effect).toBeUndefined();
expect(game.phaseInterceptor.log).not.toContain("ShowAbilityPhase");
}, 20000);
it("shows ability even if it fails to set the status of the opponent Pokemon", async () => {
await game.classicMode.startBattle([Species.PIKACHU]);
game.move.select(Moves.THUNDER_WAVE);
await game.phaseInterceptor.to("BerryPhase");
expect(game.scene.getParty()[0].status?.effect).toBeUndefined();
expect(game.scene.getEnemyParty()[0].status?.effect).toBe(StatusEffect.PARALYSIS);
expect(game.phaseInterceptor.log).toContain("ShowAbilityPhase");
}, 20000);
it("should activate with Psycho Shift after the move clears the status", async () => {
game.override.statusEffect(StatusEffect.PARALYSIS);
await game.classicMode.startBattle();
game.move.select(Moves.PSYCHO_SHIFT);
await game.phaseInterceptor.to("BerryPhase");
expect(game.scene.getParty()[0].status?.effect).toBe(StatusEffect.PARALYSIS); // keeping old gen < V impl for now since it's buggy otherwise
expect(game.scene.getEnemyParty()[0].status?.effect).toBe(StatusEffect.PARALYSIS);
expect(game.phaseInterceptor.log).toContain("ShowAbilityPhase");
}, 20000);
});

View File

@ -0,0 +1,71 @@
import { Abilities } from "#app/enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import { WeatherType } from "#enums/weather-type";
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 - Chilly Reception", () => {
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")
.moveset([Moves.CHILLY_RECEPTION, Moves.SNOWSCAPE])
.enemyMoveset(Array(4).fill(Moves.SPLASH))
.enemyAbility(Abilities.NONE)
.ability(Abilities.NONE);
});
it("should still change the weather if user can't switch out", async () => {
await game.classicMode.startBattle([Species.SLOWKING]);
game.move.select(Moves.CHILLY_RECEPTION);
await game.phaseInterceptor.to("BerryPhase", false);
expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.SNOW);
}, TIMEOUT);
it("should switch out even if it's snowing", async () => {
await game.classicMode.startBattle([Species.SLOWKING, Species.MEOWTH]);
// first turn set up snow with snowscape, try chilly reception on second turn
game.move.select(Moves.SNOWSCAPE);
await game.phaseInterceptor.to("BerryPhase", false);
expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.SNOW);
await game.phaseInterceptor.to("TurnInitPhase", false);
game.move.select(Moves.CHILLY_RECEPTION);
game.doSelectPartyPokemon(1);
await game.phaseInterceptor.to("BerryPhase", false);
expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.SNOW);
expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MEOWTH);
}, TIMEOUT);
it("happy case - switch out and weather changes", async () => {
await game.classicMode.startBattle([Species.SLOWKING, Species.MEOWTH]);
game.move.select(Moves.CHILLY_RECEPTION);
game.doSelectPartyPokemon(1);
await game.phaseInterceptor.to("BerryPhase", false);
expect(game.scene.arena.weather?.weatherType).toBe(WeatherType.SNOW);
expect(game.scene.getPlayerField()[0].species.speciesId).toBe(Species.MEOWTH);
}, TIMEOUT);
});

View File

@ -1,4 +1,4 @@
import BattleScene from "../battle-scene";
import BattleScene, { InfoToggle } from "../battle-scene";
import { addTextObject, TextStyle } from "./text";
import { getTypeDamageMultiplierColor, Type } from "../data/type";
import { Command } from "./command-ui-handler";
@ -10,9 +10,10 @@ import i18next from "i18next";
import {Button} from "#enums/buttons";
import Pokemon, { PokemonMove } from "#app/field/pokemon";
import { CommandPhase } from "#app/phases/command-phase";
import MoveInfoOverlay from "./move-info-overlay";
import { BattleType } from "#app/battle";
export default class FightUiHandler extends UiHandler {
export default class FightUiHandler extends UiHandler implements InfoToggle {
public static readonly MOVES_CONTAINER_NAME = "moves";
private movesContainer: Phaser.GameObjects.Container;
@ -26,6 +27,7 @@ export default class FightUiHandler extends UiHandler {
private accuracyText: Phaser.GameObjects.Text;
private cursorObj: Phaser.GameObjects.Image | null;
private moveCategoryIcon: Phaser.GameObjects.Sprite;
private moveInfoOverlay : MoveInfoOverlay;
protected fieldIndex: integer = 0;
protected cursor2: integer = 0;
@ -85,6 +87,24 @@ export default class FightUiHandler extends UiHandler {
this.accuracyText.setOrigin(1, 0.5);
this.accuracyText.setVisible(false);
this.moveInfoContainer.add(this.accuracyText);
// prepare move overlay
const overlayScale = 1;
this.moveInfoOverlay = new MoveInfoOverlay(this.scene, {
delayVisibility: true,
scale: overlayScale,
onSide: true,
right: true,
x: 0,
y: -MoveInfoOverlay.getHeight(overlayScale, true),
width: (this.scene.game.canvas.width / 6) + 4,
hideEffectBox: true,
hideBg: true
});
ui.add(this.moveInfoOverlay);
// register the overlay to receive toggle events
this.scene.addInfoToggle(this.moveInfoOverlay);
this.scene.addInfoToggle(this);
}
show(args: any[]): boolean {
@ -103,6 +123,8 @@ export default class FightUiHandler extends UiHandler {
this.setCursor(this.getCursor());
}
this.displayMoves();
this.toggleInfo(false); // in case cancel was pressed while info toggle is active
this.active = true;
return true;
}
@ -160,6 +182,27 @@ export default class FightUiHandler extends UiHandler {
return success;
}
toggleInfo(visible: boolean): void {
if (visible) {
this.movesContainer.setVisible(false);
this.cursorObj?.setVisible(false);
}
this.scene.tweens.add({
targets: [this.movesContainer, this.cursorObj],
duration: Utils.fixedInt(125),
ease: "Sine.easeInOut",
alpha: visible ? 0 : 1
});
if (!visible) {
this.movesContainer.setVisible(true);
this.cursorObj?.setVisible(true);
}
}
isActive(): boolean {
return this.active;
}
getCursor(): integer {
return !this.fieldIndex ? this.cursor : this.cursor2;
}
@ -167,6 +210,7 @@ export default class FightUiHandler extends UiHandler {
setCursor(cursor: integer): boolean {
const ui = this.getUi();
this.moveInfoOverlay.clear();
const changed = this.getCursor() !== cursor;
if (changed) {
if (!this.fieldIndex) {
@ -220,6 +264,7 @@ export default class FightUiHandler extends UiHandler {
//** Changes the text color and shadow according to the determined TextStyle */
this.ppText.setColor(this.getTextColor(ppColorStyle, false));
this.ppText.setShadowColor(this.getTextColor(ppColorStyle, true));
this.moveInfoOverlay.show(pokemonMove.getMove());
pokemon.getOpponents().forEach((opponent) => {
opponent.updateEffectiveness(this.getEffectivenessText(pokemon, opponent, pokemonMove));
@ -307,8 +352,10 @@ export default class FightUiHandler extends UiHandler {
this.accuracyLabel.setVisible(false);
this.accuracyText.setVisible(false);
this.moveCategoryIcon.setVisible(false);
this.moveInfoOverlay.clear();
messageHandler.bg.setVisible(true);
this.eraseCursor();
this.active = false;
}
clearMoves() {

View File

@ -15,12 +15,16 @@ export interface MoveInfoOverlaySettings {
//location and width of the component; unaffected by scaling
x?: number;
y?: number;
width?: number; // default is always half the screen, regardless of scale
/** Default is always half the screen, regardless of scale */
width?: number;
/** Determines whether to display the small secondary box */
hideEffectBox?: boolean;
hideBg?: boolean;
}
const EFF_HEIGHT = 46;
const EFF_HEIGHT = 48;
const EFF_WIDTH = 82;
const DESC_HEIGHT = 46;
const DESC_HEIGHT = 48;
const BORDER = 8;
const GLOBAL_SCALE = 6;
@ -38,6 +42,7 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem
private acc: Phaser.GameObjects.Text;
private typ: Phaser.GameObjects.Sprite;
private cat: Phaser.GameObjects.Sprite;
private descBg: Phaser.GameObjects.NineSlice;
private options : MoveInfoOverlaySettings;
@ -52,9 +57,9 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem
// prepare the description box
const width = (options?.width || MoveInfoOverlay.getWidth(scale, scene)) / scale; // divide by scale as we always want this to be half a window wide
const descBg = addWindow(scene, (options?.onSide && !options?.right ? EFF_WIDTH : 0), options?.top ? EFF_HEIGHT : 0, width - (options?.onSide ? EFF_WIDTH : 0), DESC_HEIGHT);
descBg.setOrigin(0, 0);
this.add(descBg);
this.descBg = addWindow(scene, (options?.onSide && !options?.right ? EFF_WIDTH : 0), options?.top ? EFF_HEIGHT : 0, width - (options?.onSide ? EFF_WIDTH : 0), DESC_HEIGHT);
this.descBg.setOrigin(0, 0);
this.add(this.descBg);
// 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 } });
@ -125,6 +130,14 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem
this.acc.setOrigin(1, 0.5);
this.val.add(this.acc);
if (options?.hideEffectBox) {
this.val.setVisible(false);
}
if (options?.hideBg) {
this.descBg.setVisible(false);
}
// hide this component for now
this.setVisible(false);
}
@ -176,8 +189,19 @@ export default class MoveInfoOverlay extends Phaser.GameObjects.Container implem
this.active = false;
}
toggleInfo(force?: boolean): void {
this.setVisible(force ?? !this.visible);
toggleInfo(visible: boolean): void {
if (visible) {
this.setVisible(true);
}
this.scene.tweens.add({
targets: this.desc,
duration: Utils.fixedInt(125),
ease: "Sine.easeInOut",
alpha: visible ? 1 : 0
});
if (!visible) {
this.setVisible(false);
}
}
isActive(): boolean {

View File

@ -12,6 +12,7 @@ import ConfirmUiHandler from "./confirm-ui-handler";
import { StatsContainer } from "./stats-container";
import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor } from "./text";
import { addWindow } from "./ui-theme";
import { Species } from "#enums/species";
interface LanguageSetting {
infoContainerTextSize: string;
@ -234,7 +235,19 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
this.pokemonGenderText.setVisible(false);
}
if (pokemon.species.forms?.[pokemon.formIndex]?.formName) {
const formKey = (pokemon.species?.forms?.[pokemon.formIndex!]?.formKey);
const formText = Utils.capitalizeString(formKey, "-", false, false) || "";
const speciesName = Utils.capitalizeString(Species[pokemon.species.getRootSpeciesId()], "_", true, false);
let formName = "";
if (pokemon.species.speciesId === Species.ARCEUS) {
formName = i18next.t(`pokemonInfo:Type.${formText?.toUpperCase()}`);
} else {
const i18key = `pokemonForm:${speciesName}${formText}`;
formName = i18next.exists(i18key) ? i18next.t(i18key) : formText;
}
if (formName) {
this.pokemonFormLabelText.setVisible(true);
this.pokemonFormText.setVisible(true);
const newForm = BigInt(1 << pokemon.formIndex) * DexAttr.DEFAULT_FORM;
@ -247,11 +260,10 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container {
this.pokemonFormLabelText.setShadowColor(getTextColor(TextStyle.WINDOW, true, this.scene.uiTheme));
}
const formName = pokemon.species.forms?.[pokemon.formIndex]?.formName;
this.pokemonFormText.setText(formName.length > this.numCharsBeforeCutoff ? formName.substring(0, this.numCharsBeforeCutoff - 3) + "..." : formName);
if (formName.length > this.numCharsBeforeCutoff) {
this.pokemonFormText.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.pokemonFormText.width, this.pokemonFormText.height), Phaser.Geom.Rectangle.Contains);
this.pokemonFormText.on("pointerover", () => (this.scene as BattleScene).ui.showTooltip("", pokemon.species.forms?.[pokemon.formIndex]?.formName, true));
this.pokemonFormText.on("pointerover", () => (this.scene as BattleScene).ui.showTooltip("", formName, true));
this.pokemonFormText.on("pointerout", () => (this.scene as BattleScene).ui.hideTooltip());
} else {
this.pokemonFormText.disableInteractive();